- Fix DIST_SUBDIR;

- Fix install with -DNOPORTDOCS -DNOPORTEXAMPLES (1)

Reported by:	itetcu (1)

2 files changed, 81 insertions, 77 deletions

diff --git a/graphics/cimg/Makefile b/graphics/cimg/Makefile
index c5fa86141b47..3c3cea5752b4 100644
--- a/graphics/cimg/Makefile
+++ b/graphics/cimg/Makefile
@@ -12,7 +12,7 @@ PORTEPOCH=	2
 CATEGORIES=	graphics devel
 MASTER_SITES=	SF
 DISTNAME=	CImg-${DISTVERSION}
-DIST_SUBDIR=	${PKGNAME}
+DIST_SUBDIR=	${PORTNAME}-${PORTVERSION},${PORTEPOCH}
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	The C++ Template Image Processing Library
@@ -43,19 +43,19 @@ LIB_DEPENDS+=	png:${PORTSDIR}/graphics/png		\
 		Magick:${PORTSDIR}/graphics/ImageMagick	\
 		fftw3:${PORTSDIR}/math/fftw3
 ALL_TARGET=	oFreeBSD
-.else
+. else
 ALL_TARGET=	dFreeBSD
 . endif
 
-.if !defined(WITHOUT_GM)
+. if !defined(WITHOUT_GM)
 RUN_DEPENDS+=	gm:${PORTSDIR}/graphics/GraphicsMagick
-.endif
-.if !defined(WITHOUT_MEDCON)
+. endif
+. if !defined(WITHOUT_MEDCON)
 RUN_DEPENDS+=	medcon:${PORTSDIR}/graphics/xmedcon
-.endif
-.if !defined(WITHOUT_FFMPEG)
+. endif
+. if !defined(WITHOUT_FFMPEG)
 RUN_DEPENDS+=	ffmpeg:${PORTSDIR}/multimedia/ffmpeg
-.endif
+. endif
 
 DOCBASE=	CHANGES.txt README.txt
 DOCREFS=	CImg.doxygen CImg_documentation.h CImg_reference.pdf chat.shtml	\
@@ -63,12 +63,12 @@ DOCREFS=	CImg.doxygen CImg_documentation.h CImg_reference.pdf chat.shtml	\
 		header_reference.html img index.shtml links.shtml news.shtml	\
 		reference screenshots.shtml
 .else
-NOBUILD=	yes
+NO_BUILD=	yes
 .endif
 
 pre-configure:
-	${DIRNAME} `${LOCALBASE}/bin/${F77} -print-libgcc-file-name` > ${WRKSRC}/LIBDIR
 .if !defined(NOPORTDOCS)
+	${DIRNAME} `${LOCALBASE}/bin/${F77} -print-libgcc-file-name` > ${WRKSRC}/LIBDIR
 	${GREP} -lR 'img/' ${BUILD_WRKSRC} |	\
 		${XARGS} ${REINPLACE_CMD} -e 's|"img/|"${EXAMPLESDIR}/img/|g'
 	${REINPLACE_CMD} -e 's|make|${GMAKE}|' ${BUILD_WRKSRC}/Makefile
@@ -85,14 +85,18 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/CImg.h ${PREFIX}/include
 .if !defined(NOPORTDOCS)
 	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/CImg_demo ${PREFIX}/bin
-	${MKDIR} ${DOCSDIR} ${EXAMPLESDIR}
+	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${DOCBASE:S|^|${WRKSRC}/|} ${DOCSDIR}
 . for doc in ${DOCREFS}
 	${CP} -R ${WRKSRC}/documentation/${doc} ${DOCSDIR}
 . endfor
+	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR}
+.endif
+.if !defined(NOPORTEXAMPLES)
+	${MKDIR} ${EXAMPLESDIR}
 	${CP} -R ${WRKSRC}/examples/* ${EXAMPLESDIR}
 	@(cd ${EXAMPLESDIR} && ${GMAKE} clean)
-	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR} ${EXAMPLESDIR}
+	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${EXAMPLESDIR}
 	${FIND} ${DOCSDIR} ${EXAMPLESDIR} -type f -exec ${CHMOD} ${SHAREMODE} {} \;
 .endif
 
diff --git a/graphics/cimg/pkg-plist b/graphics/cimg/pkg-plist
index fa55ee1256e9..54abde743f90 100644
--- a/graphics/cimg/pkg-plist
+++ b/graphics/cimg/pkg-plist
@@ -183,71 +183,71 @@ include/CImg.h
 %%PORTDOCS%%%%DOCSDIR%%/reference/tab_r.gif
 %%PORTDOCS%%%%DOCSDIR%%/reference/tabs.css
 %%PORTDOCS%%%%DOCSDIR%%/screenshots.shtml
-%%PORTDOCS%%%%EXAMPLESDIR%%/CImg_demo.cpp
-%%PORTDOCS%%%%EXAMPLESDIR%%/Makefile
-%%PORTDOCS%%%%EXAMPLESDIR%%/cimgmatlab_cannyderiche.cpp
-%%PORTDOCS%%%%EXAMPLESDIR%%/cimgmatlab_cannyderiche.m
-%%PORTDOCS%%%%EXAMPLESDIR%%/curve_editor.cpp
-%%PORTDOCS%%%%EXAMPLESDIR%%/dtmri_view.cpp
-%%PORTDOCS%%%%EXAMPLESDIR%%/edge_explorer.cpp
-%%PORTDOCS%%%%EXAMPLESDIR%%/fade_images.cpp
-%%PORTDOCS%%%%EXAMPLESDIR%%/generate_loop_macros.cpp
-%%PORTDOCS%%%%EXAMPLESDIR%%/greycstoration.cpp
-%%PORTDOCS%%%%EXAMPLESDIR%%/greycstoration4gimp.cpp
-%%PORTDOCS%%%%EXAMPLESDIR%%/greycstoration4integration.cpp
-%%PORTDOCS%%%%EXAMPLESDIR%%/hough_transform.cpp
-%%PORTDOCS%%%%EXAMPLESDIR%%/image2ascii.cpp
-%%PORTDOCS%%%%EXAMPLESDIR%%/image_registration.cpp
-%%PORTDOCS%%%%EXAMPLESDIR%%/image_surface.cpp
-%%PORTDOCS%%%%EXAMPLESDIR%%/img/brain.bmp
-%%PORTDOCS%%%%EXAMPLESDIR%%/img/cdrom.bmp
-%%PORTDOCS%%%%EXAMPLESDIR%%/img/choose.bmp
-%%PORTDOCS%%%%EXAMPLESDIR%%/img/dynamite.bmp
-%%PORTDOCS%%%%EXAMPLESDIR%%/img/enemy.bmp
-%%PORTDOCS%%%%EXAMPLESDIR%%/img/enemy10.bmp
-%%PORTDOCS%%%%EXAMPLESDIR%%/img/enemy11.bmp
-%%PORTDOCS%%%%EXAMPLESDIR%%/img/enemy12.bmp
-%%PORTDOCS%%%%EXAMPLESDIR%%/img/enemy13.bmp
-%%PORTDOCS%%%%EXAMPLESDIR%%/img/enemy14.bmp
-%%PORTDOCS%%%%EXAMPLESDIR%%/img/enemy15.bmp
-%%PORTDOCS%%%%EXAMPLESDIR%%/img/enemy16.bmp
-%%PORTDOCS%%%%EXAMPLESDIR%%/img/enemy2.bmp
-%%PORTDOCS%%%%EXAMPLESDIR%%/img/enemy3.bmp
-%%PORTDOCS%%%%EXAMPLESDIR%%/img/enemy4.bmp
-%%PORTDOCS%%%%EXAMPLESDIR%%/img/enemy5.bmp
-%%PORTDOCS%%%%EXAMPLESDIR%%/img/enemy6.bmp
-%%PORTDOCS%%%%EXAMPLESDIR%%/img/enemy7.bmp
-%%PORTDOCS%%%%EXAMPLESDIR%%/img/enemy8.bmp
-%%PORTDOCS%%%%EXAMPLESDIR%%/img/enemy9.bmp
-%%PORTDOCS%%%%EXAMPLESDIR%%/img/foot.ppm
-%%PORTDOCS%%%%EXAMPLESDIR%%/img/heart.bmp
-%%PORTDOCS%%%%EXAMPLESDIR%%/img/lena.pgm
-%%PORTDOCS%%%%EXAMPLESDIR%%/img/light3d.ppm
-%%PORTDOCS%%%%EXAMPLESDIR%%/img/logo.ppm
-%%PORTDOCS%%%%EXAMPLESDIR%%/img/milla.ppm
-%%PORTDOCS%%%%EXAMPLESDIR%%/img/parrot_mask.pgm
-%%PORTDOCS%%%%EXAMPLESDIR%%/img/parrot_original.ppm
-%%PORTDOCS%%%%EXAMPLESDIR%%/img/sh0r.pgm
-%%PORTDOCS%%%%EXAMPLESDIR%%/img/sh1r.pgm
-%%PORTDOCS%%%%EXAMPLESDIR%%/img/title.bmp
-%%PORTDOCS%%%%EXAMPLESDIR%%/img/tomato.bmp
-%%PORTDOCS%%%%EXAMPLESDIR%%/inrcast.cpp
-%%PORTDOCS%%%%EXAMPLESDIR%%/jawbreaker.cpp
-%%PORTDOCS%%%%EXAMPLESDIR%%/jpeg_buffer.cpp
-%%PORTDOCS%%%%EXAMPLESDIR%%/mcf_levelsets.cpp
-%%PORTDOCS%%%%EXAMPLESDIR%%/mcf_levelsets3d.cpp
-%%PORTDOCS%%%%EXAMPLESDIR%%/nlmeans.cpp
-%%PORTDOCS%%%%EXAMPLESDIR%%/odykill.cpp
-%%PORTDOCS%%%%EXAMPLESDIR%%/pde_TschumperleDeriche2d.cpp
-%%PORTDOCS%%%%EXAMPLESDIR%%/pde_heatflow2d.cpp
-%%PORTDOCS%%%%EXAMPLESDIR%%/radon_transform.cpp
-%%PORTDOCS%%%%EXAMPLESDIR%%/tetris.cpp
-%%PORTDOCS%%%%EXAMPLESDIR%%/toolbox3d.cpp
-%%PORTDOCS%%%%EXAMPLESDIR%%/tron.cpp
-%%PORTDOCS%%%%EXAMPLESDIR%%/tutorial.cpp
-%%PORTDOCS%%%%EXAMPLESDIR%%/wavelet_atrous.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/CImg_demo.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Makefile
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cimgmatlab_cannyderiche.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cimgmatlab_cannyderiche.m
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/curve_editor.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dtmri_view.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/edge_explorer.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fade_images.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/generate_loop_macros.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/greycstoration.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/greycstoration4gimp.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/greycstoration4integration.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hough_transform.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/image2ascii.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/image_registration.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/image_surface.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/img/brain.bmp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/img/cdrom.bmp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/img/choose.bmp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/img/dynamite.bmp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/img/enemy.bmp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/img/enemy10.bmp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/img/enemy11.bmp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/img/enemy12.bmp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/img/enemy13.bmp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/img/enemy14.bmp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/img/enemy15.bmp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/img/enemy16.bmp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/img/enemy2.bmp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/img/enemy3.bmp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/img/enemy4.bmp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/img/enemy5.bmp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/img/enemy6.bmp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/img/enemy7.bmp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/img/enemy8.bmp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/img/enemy9.bmp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/img/foot.ppm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/img/heart.bmp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/img/lena.pgm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/img/light3d.ppm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/img/logo.ppm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/img/milla.ppm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/img/parrot_mask.pgm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/img/parrot_original.ppm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/img/sh0r.pgm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/img/sh1r.pgm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/img/title.bmp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/img/tomato.bmp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/inrcast.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/jawbreaker.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/jpeg_buffer.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mcf_levelsets.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mcf_levelsets3d.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/nlmeans.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/odykill.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pde_TschumperleDeriche2d.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pde_heatflow2d.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/radon_transform.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tetris.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/toolbox3d.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tron.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/wavelet_atrous.cpp
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/reference
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/img
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/img
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/img
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%