Index: head/graphics/cimg/Makefile
===================================================================
--- head/graphics/cimg/Makefile	(revision 411917)
+++ head/graphics/cimg/Makefile	(revision 411918)
@@ -1,140 +1,140 @@
 # Created by: thierry@pompo.net
 # $FreeBSD$
 
 PORTNAME=	cimg
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.7.0
 PORTEPOCH=	3
 CATEGORIES=	graphics devel
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	C++ Template Image Processing Library
 
 LICENSE=	CeCILL_C CeCILL
 LICENSE_COMB=	dual
 LICENSE_NAME_CeCILL_C=	CeCILL-C
 LICENSE_NAME_CeCILL=	CeCILL
 LICENSE_FILE_CeCILL_C=	${WRKSRC}/Licence_CeCILL-C_V1-en.txt
 LICENSE_FILE_CeCILL=	${WRKSRC}/Licence_CeCILL_V2-en.txt
 LICENSE_PERMS_CeCILL_C=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 LICENSE_PERMS_CeCILL=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 ONLY_FOR_ARCHS=	i386 amd64
 ONLY_FOR_ARCHS_REASON=	"invokes i386 asm"
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	dtschump
 GH_PROJECT=	CImg
 GH_TAGNAME=	${DISTVERSIONPREFIX}.${DISTVERSION:S/.//g}
 
 .if !defined(WITHOUT_LAPACK)
 . if defined(WITH_ATLAS)
 USES+=		blaslapack:atlas
 . else
 USES+=		blaslapack
 . endif
 .endif
 
 BUILD_WRKSRC=	${WRKSRC}/examples
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDOCS} || ${PORT_OPTIONS:MEXAMPLES}
-USES+=		gmake
+USES+=		gmake pkgconf:build
 .endif
 
 .if ${PORT_OPTIONS:MDOCS}
 REINPLACE_ARGS=	-i ""
 LIB_DEPENDS+=	libboard.so:${PORTSDIR}/graphics/libboard
 
 . if !defined(WITH_DEBUG)
 LIB_DEPENDS+=	libpng.so:${PORTSDIR}/graphics/png		\
 		libtiff.so:${PORTSDIR}/graphics/tiff		\
 		libIlmImf.so:${PORTSDIR}/graphics/OpenEXR	\
 		libgimp-2.0.so:${PORTSDIR}/graphics/gimp-app	\
 		libfftw3.so:${PORTSDIR}/math/fftw3		\
 		libopencv_legacy.so:${PORTSDIR}/graphics/opencv	\
 		libopencv_core.so:${PORTSDIR}/graphics/opencv-core\
 		libGraphicsMagick.so:${PORTSDIR}/graphics/GraphicsMagick
 USES+=		jpeg
 ALL_TARGET=	Mlinux
 . else
 ALL_TARGET=	dlinux
 WITHOUT_MEDCON=	yes
 WITHOUT_FFMPEG=	yes
 WITHOUT_LAPACK=	yes
 . endif
 
 . if !defined(WITHOUT_MEDCON)
 RUN_DEPENDS+=	medcon:${PORTSDIR}/graphics/xmedcon
 . endif
 . if !defined(WITHOUT_FFMPEG)
 LIB_DEPENDS+=	libavformat.so:${PORTSDIR}/multimedia/ffmpeg
 . endif
 
 . if !defined(WITHOUT_LAPACK)
 # Don't really need Fortran, but required to link with blas/lapack
 USES+=	fortran
 . endif
 
 . if defined(WITH_XSHM)
 USE_XORG+=	xext
 . endif
 
 DOCBASE=	README.txt
 PROGS=		CImg_demo captcha curve_editor2d dtmri_view3d			\
 	edge_explorer2d fade_images gaussian_fit1d generate_loop_macros		\
 	hough_transform2d image2ascii image_registration2d image_surface3d	\
 	jawbreaker mcf_levelsets2d mcf_levelsets3d odykill			\
 	pde_TschumperleDeriche2d pde_heatflow2d plotter1d radon_transform2d	\
 	scene3d spherical_function3d tetris tron tutorial use_RGBclass		\
 	use_chlpca use_draw_gradient use_jpeg_buffer use_nlmeans use_skeleton	\
 	wavelet_atrous
 .else
 NO_BUILD=	yes
 .endif
 
 .include <bsd.port.pre.mk>
 
 pre-configure-DOCS-on:
 	${REINPLACE_CMD} -e 's|make|${MAKE_CMD}|' ${BUILD_WRKSRC}/Makefile
 
 pre-configure-DOCS-off:
 	${REINPLACE_CMD} -e 's|^OPTFLAGS|#OPTFLAGS|' ${BUILD_WRKSRC}/Makefile
 
 pre-configure:
 . if !defined(WITHOUT_FFMPEG)
 	${REINPLACE_CMD} -e 's|#CIMG_FFMPEG_CFLAGS|CIMG_FFMPEG_CFLAGS|'	\
 		-e 's|#CIMG_FFMPEG_LDFLAGS|CIMG_FFMPEG_LDFLAGS|'	\
 		${BUILD_WRKSRC}/Makefile
 . endif
 . if !defined(WITHOUT_LAPACK)
 	${REINPLACE_CMD} -e 's|#CIMG_LAPACK_CFLAGS|CIMG_LAPACK_CFLAGS|'			\
 		-e 's|#CIMG_LAPACK_LIBS|CIMG_LAPACK_LIBS|'			\
 		-e 's|-lblas -llapack|-L${LOCALBASE}/lib ${BLASLIB} ${LAPACKLIB}|'	\
 		${BUILD_WRKSRC}/Makefile
 . endif
 . if defined(WITH_XSHM)
 	${REINPLACE_CMD} -e 's|CIMG_XSHM_CFLAGS = #|CIMG_XSHM_CFLAGS =|'	\
 		-e 's|CIMG_XSHM_LDFLAGS = #|CIMG_XSHM_LDFLAGS =|'		\
 		${BUILD_WRKSRC}/Makefile
 . endif
 	${REINPLACE_CMD} -e 's|-pedantic|${CFLAGS}|' ${BUILD_WRKSRC}/Makefile
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/CImg.h ${STAGEDIR}${PREFIX}/include
 
 do-install-DOCS-on:
 	${INSTALL_PROGRAM} ${PROGS:C|^|${BUILD_WRKSRC}/|} ${STAGEDIR}${PREFIX}/bin
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${DOCBASE:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 do-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${CP} -R ${WRKSRC}/examples/* ${STAGEDIR}${EXAMPLESDIR}
 	@(cd ${STAGEDIR}${EXAMPLESDIR} && ${MAKE_CMD} clean)
 	@${RM} ${STAGEDIR}${EXAMPLESDIR}/*.orig
 
 .include <bsd.port.post.mk>