- Switch to options helpers

- Simplify installation
- Switch to PORTDOCS/PORTEXAMPLES

2 files changed, 24 insertions, 117 deletions

diff --git a/graphics/raster3d/Makefile b/graphics/raster3d/Makefile
index 0c13dc8947ff..6914576a541f 100644
--- a/graphics/raster3d/Makefile
+++ b/graphics/raster3d/Makefile
@@ -16,9 +16,6 @@ LICENSE=	ART20
 LIB_DEPENDS=	libgd.so:graphics/gd \
 		libtiff.so:graphics/tiff
 
-OPTIONS_DEFINE=	IMAGEMAGICK DOCS EXAMPLES
-OPTIONS_DEFAULT=IMAGEMAGICK
-
 USES=		fortran
 MAKE_ARGS=	INCDIRS="-I${LOCALBASE}/include" LIBDIRS="-L${LOCALBASE}/lib" \
 		CC="${CC}" CFLAGS="${CFLAGS}" FC="${FC}" FFLAGS="${FFLAGS}" \
@@ -29,36 +26,37 @@ MAKE_JOBS_UNSAFE=	yes
 CFLAGS+=	-DLINUX -DNETWORKBYTEORDER -Dgfortran
 FFLAGS+=	-fno-range-check -ffixed-line-length-132
 
-IMAGEMAGICK_RUN_DEPENDS=	convert:graphics/ImageMagick
+PORTDOCS=	*
+PORTEXAMPLES=	*
+
+OPTIONS_DEFINE=	IMAGEMAGICK DOCS EXAMPLES
+OPTIONS_DEFAULT=IMAGEMAGICK
 OPTIONS_SUB=		yes
 
-.include <bsd.port.options.mk>
+IMAGEMAGICK_RUN_DEPENDS=	convert:graphics/ImageMagick
 
 do-install:
-.for install_file in avs2ps balls normal3d rastep render ribbon rings3d rods
-	cd ${WRKSRC} && ${INSTALL_PROGRAM} ${install_file} ${STAGEDIR}${PREFIX}/bin
-.endfor
-.for install_file in worms
-	cd ${WRKSRC} && ${INSTALL_SCRIPT} ${install_file} ${STAGEDIR}${PREFIX}/bin
+.for f in avs2ps balls normal3d rastep render ribbon rings3d rods
+	${INSTALL_PROGRAM} ${WRKSRC}/${f} ${STAGEDIR}${PREFIX}/bin
 .endfor
-.if ${PORT_OPTIONS:MIMAGEMAGICK}
-.for install_file in label3d stereo3d
-	cd ${WRKSRC} && ${INSTALL_SCRIPT} ${install_file} ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/worms ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/doc/*.l ${STAGEDIR}${MANLPREFIX}/man/manl
+	@${MKDIR} ${STAGEDIR}${DATADIR}/materials
+	${INSTALL_DATA} ${WRKSRC}/materials/* ${STAGEDIR}${DATADIR}/materials
+
+do-install-IMAGEMAGICK-on:
+.for f in label3d stereo3d
+	${INSTALL_SCRIPT} ${WRKSRC}/${f} ${STAGEDIR}${PREFIX}/bin
 .endfor
-.endif
-	cd ${WRKSRC}/doc && ${INSTALL_MAN} *.l ${STAGEDIR}${MANLPREFIX}/man/manl
-	${MKDIR} ${STAGEDIR}${DATADIR}/materials
-	cd ${WRKSRC}/materials && ${INSTALL_DATA} * ${STAGEDIR}${DATADIR}/materials
-.if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
-	cd ${WRKSRC}/doc && ${INSTALL_DATA} R3D_manual.pdf ${STAGEDIR}${DOCSDIR}
-	${MKDIR} ${STAGEDIR}${DOCSDIR}/html
-	cd ${WRKSRC}/html && ${INSTALL_DATA} * ${STAGEDIR}${DOCSDIR}/html
-.endif
-.if ${PORT_OPTIONS:MEXAMPLES}
-	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+
+do-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}/html
+	${INSTALL_DATA} ${WRKSRC}/doc/R3D_manual.pdf ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/html/* ${STAGEDIR}${DOCSDIR}/html
+
+do-install-EXAMPLES-on:
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR})
 	${RM} -r ${STAGEDIR}${EXAMPLESDIR}/msms/CVS
-.endif
 
 .include <bsd.port.mk>
diff --git a/graphics/raster3d/pkg-plist b/graphics/raster3d/pkg-plist
index 1076ec845644..079b90f0dbc1 100644
--- a/graphics/raster3d/pkg-plist
+++ b/graphics/raster3d/pkg-plist
@@ -21,97 +21,6 @@ man/manl/ribbon.l.gz
 man/manl/rods.l.gz
 man/manl/normal3d.l.gz
 man/manl/stereo3d.l.gz
-%%PORTDOCS%%%%DOCSDIR%%/R3D_manual.pdf
-%%PORTDOCS%%%%DOCSDIR%%/html/README
-%%PORTDOCS%%%%DOCSDIR%%/html/avs2ps.html
-%%PORTDOCS%%%%DOCSDIR%%/html/balls.html
-%%PORTDOCS%%%%DOCSDIR%%/html/index_button.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/label3d.html
-%%PORTDOCS%%%%DOCSDIR%%/html/normal3d.html
-%%PORTDOCS%%%%DOCSDIR%%/html/pdb_anisou.html
-%%PORTDOCS%%%%DOCSDIR%%/html/r3d_animation.html
-%%PORTDOCS%%%%DOCSDIR%%/html/r3d_colorpicker.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/r3d_colorpicker.html
-%%PORTDOCS%%%%DOCSDIR%%/html/r3d_colors.html
-%%PORTDOCS%%%%DOCSDIR%%/html/r3d_docbkg.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/r3d_docstyle.css
-%%PORTDOCS%%%%DOCSDIR%%/html/r3d_example1.jpeg
-%%PORTDOCS%%%%DOCSDIR%%/html/r3d_example2.jpeg
-%%PORTDOCS%%%%DOCSDIR%%/html/r3d_example5.jpeg
-%%PORTDOCS%%%%DOCSDIR%%/html/r3d_example6.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/r3d_example6.jpeg
-%%PORTDOCS%%%%DOCSDIR%%/html/r3d_example7.jpeg
-%%PORTDOCS%%%%DOCSDIR%%/html/r3d_example8.jpeg
-%%PORTDOCS%%%%DOCSDIR%%/html/r3d_example9.jpeg
-%%PORTDOCS%%%%DOCSDIR%%/html/r3d_examples.html
-%%PORTDOCS%%%%DOCSDIR%%/html/r3d_filters.html
-%%PORTDOCS%%%%DOCSDIR%%/html/r3d_hints.html
-%%PORTDOCS%%%%DOCSDIR%%/html/r3d_icon.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/r3d_labels.html
-%%PORTDOCS%%%%DOCSDIR%%/html/r3d_msms.png
-%%PORTDOCS%%%%DOCSDIR%%/html/r3d_obj15.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/r3d_obj19.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/r3d_stereo7.jpeg
-%%PORTDOCS%%%%DOCSDIR%%/html/r3d_transparent.html
-%%PORTDOCS%%%%DOCSDIR%%/html/r3dtops.html
-%%PORTDOCS%%%%DOCSDIR%%/html/r3dtops_tex1.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/r3dtops_tex2.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/r3dtops_tex3.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/rastep.html
-%%PORTDOCS%%%%DOCSDIR%%/html/rastep_options.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/raster3d.html
-%%PORTDOCS%%%%DOCSDIR%%/html/render.html
-%%PORTDOCS%%%%DOCSDIR%%/html/rgb_black.jpeg
-%%PORTDOCS%%%%DOCSDIR%%/html/rgb_white.jpeg
-%%PORTDOCS%%%%DOCSDIR%%/html/rgbmap_black.html
-%%PORTDOCS%%%%DOCSDIR%%/html/rgbmap_white.html
-%%PORTDOCS%%%%DOCSDIR%%/html/rgbtext.html
-%%PORTDOCS%%%%DOCSDIR%%/html/ribbon.html
-%%PORTDOCS%%%%DOCSDIR%%/html/rings3d.html
-%%PORTDOCS%%%%DOCSDIR%%/html/rods.html
-%%PORTDOCS%%%%DOCSDIR%%/html/stereo3d.html
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/LT.pdb
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Makefile
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/README.examples
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/chaincolours.pdb
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/clip.r3d
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex5.jpeg
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex5_matrix.r3d
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex7_header.r3d
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex7_helix.r3d
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex7_labels.r3d
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex7_tex.r3d
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex7_titles.r3d
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example1.r3d
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example1.script
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example2.script
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example2.sgi
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example3.mol
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example3.r3d
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example3.script
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example4.script
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example5.r3d
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example5.script
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example6.r3d
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example6.script
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example7.jpeg
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example7.r3d
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example7.script
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example8.script
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example9.script
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gal_srf.r3d.gz
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/header1.r3d
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/header2.r3d
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/header4.r3d
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/header8.r3d
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/msms/README
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/msms/msms2r3d.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/msms/msms_example.script
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/plane.r3d
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sugarG.pdb
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sugarcolours.pdb
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sugars.pdb
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/transparent.r3d
 %%DATADIR%%/materials/2-sided.r3d
 %%DATADIR%%/materials/backdrop_1.r3d
 %%DATADIR%%/materials/backdrop_2.r3d