. introduce optionsNG;

. create EXAMPLES option;
. bump PORTREVISION (EXAMPLES are on by default now);
. use PLIST_FILES, PORTDOCS and PORTEXAMPLES at Makefile;
. remove pkg-plist;
. unmute install and cp commands;
. trim Makefile headers.

2 files changed, 21 insertions, 94 deletions

diff --git a/science/isaac-cfd/Makefile b/science/isaac-cfd/Makefile
index 476b2548680a..9a72669cdb56 100644
--- a/science/isaac-cfd/Makefile
+++ b/science/isaac-cfd/Makefile
@@ -1,22 +1,12 @@
-# New ports collection makefile for:	isaac-cfd
-# Date created:		19 October 2004
-# Whom:			Pedro F. Giffuni
-#
+# Created by: Pedro F. Giffuni
 # $FreeBSD$
-#
 
 PORTNAME=	isaac
 PORTVERSION=	4.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	science
 MASTER_SITES=	SF/${PORTNAME}-cfd/${PORTNAME}-cfd/ISAAC%20Version%20${PORTVERSION}
 DISTFILES=	${PORTNAME}src.4_2${EXTRACT_SUFX} ${PORTNAME}mk.4_2${EXTRACT_SUFX}
-.ifndef NOPORTDOCS
-DISTFILES+=	man.4_2.ps.gz
-.endif
-.ifdef WITH_EXAMPLES
-DISTFILES+=	example_cases${EXTRACT_SUFX}
-.endif
 DIST_SUBDIR=	isaac-cfd
 EXTRACT_ONLY=	${PORTNAME}src.4_2${EXTRACT_SUFX} ${PORTNAME}mk.4_2${EXTRACT_SUFX}
 
@@ -29,15 +19,15 @@ MAKEFILE=	makefile
 MAKE_FLAGS+=	CPPFLAGS=-I.
 USE_FORTRAN=	yes
 
-.if !defined(WITH_EXAMPLES)
-PLIST_SUB=	WITH_EXAMPLES="@comment "
-.else
-PLIST_SUB=	WITH_EXAMPLES=""
-.endif
+PLIST_FILES+=	bin/isaac
+PORTDOCS=	man.4_2.ps.gz
+PORTEXAMPLES=	*
 
-.if defined(WITH_OPTIMIZED_FLAGS)
-FFLAGS+=	-O2 -ffast-math
-.endif
+OPTIONS_DEFINE=	DOCS EXAMPLES OPTIMIZED_FFLAGS
+OPTIMIZED_FFLAGS_DESC=	Use extra compiler (fortran) optimizations
+
+DOCS_DISTFILES+=	man.4_2.ps.gz
+EXAMPLES_DISTFILES+=	example_cases${EXTRACT_SUFX}
 
 pre-configure:
 	@${REINPLACE_CMD} -e 's+%%FC%%+${FC}+g ; s+%%FFLAGS%%+${FFLAGS}+;' \
@@ -46,15 +36,21 @@ pre-configure:
 		${REINPLACE_CMD} -e 's|SRC= $$(HOME)/ISAAC/src|SRC= ${WRKSRC}|; \
 			s|$$(FFLAGS)|${FFLAGS} -I.|' {} \;
 
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MOPTIMIZED_FFLAGS}
+FFLAGS+=	-O2 -ffast-math
+.endif
+
 do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/isaac ${PREFIX}/bin/isaac
-.ifndef NOPORTDOCS
+	${INSTALL_PROGRAM} ${WRKSRC}/isaac ${PREFIX}/bin/isaac
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
-	@${CP} ${DISTDIR}/${DIST_SUBDIR}/man.4_2.ps.gz ${DOCSDIR}
+	${CP} ${DISTDIR}/${DIST_SUBDIR}/${PORTDOCS} ${DOCSDIR}
 .endif
-.ifdef WITH_EXAMPLES
+.if ${PORT_OPTIONS:MEXAMPLES}
 	@${MKDIR} ${EXAMPLESDIR}
-	@${TAR} -xzf ${DISTDIR}/${DIST_SUBDIR}/example_cases${EXTRACT_SUFX} \
+	${TAR} -xzf ${DISTDIR}/${DIST_SUBDIR}/example_cases${EXTRACT_SUFX} \
 		-C ${EXAMPLESDIR}/
 .endif
 
diff --git a/science/isaac-cfd/pkg-plist b/science/isaac-cfd/pkg-plist
deleted file mode 100644
index b6fdbb97c3c6..000000000000
--- a/science/isaac-cfd/pkg-plist
+++ /dev/null
@@ -1,69 +0,0 @@
-bin/isaac
-%%PORTDOCS%%%%DOCSDIR%%/man.4_2.ps.gz
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/Klebanoff/Experimental_Data/klebanoff.data
-%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/Klebanoff/Experimental_Data/klebanoff.wall
-%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/Klebanoff/Experimental_Data/klebwall.f
-%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/Klebanoff/Grid/flatplate.f
-%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/Klebanoff/Grid/flatplate.grd
-%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/Klebanoff/Results/asm.dat
-%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/Klebanoff/Results/asm.dat2
-%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/Klebanoff/Results/asm.dat3
-%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/Klebanoff/Results/asm.out1
-%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/Klebanoff/Results/asm.out2
-%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/Klebanoff/Results/asm.out3
-%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/Klebanoff/Results/flatplate.grd
-%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/Klebanoff/Results/ke.dat
-%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/Klebanoff/Results/ke.dat2
-%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/Klebanoff/Results/ke.dat3
-%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/Klebanoff/Results/ke.out1
-%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/Klebanoff/Results/ke.out2
-%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/Klebanoff/Results/ke.out3
-%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/Klebanoff/Results/kw.dat
-%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/Klebanoff/Results/kw.dat2
-%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/Klebanoff/Results/kw.dat3
-%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/Klebanoff/Results/kw.out1
-%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/Klebanoff/Results/kw.out2
-%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/Klebanoff/Results/kw.out3
-%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/Klebanoff/Results/rs.dat
-%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/Klebanoff/Results/rs.dat2
-%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/Klebanoff/Results/rs.dat3
-%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/Klebanoff/Results/rs.out1
-%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/Klebanoff/Results/rs.out2
-%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/Klebanoff/Results/rs.out3
-%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/NACA0012/Grid/cnvrtgrd.f
-%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/NACA0012/Grid/gr224n20
-%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/NACA0012/Results/n12_225_33.grd
-%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/NACA0012/Results/naca0012.g.fmt
-%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/NACA0012/Results/naca0012.q.fmt
-%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/NACA0012/Results/naca0012.rst1
-%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/NACA0012/Results/naca0012_mg.cl
-%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/NACA0012/Results/naca0012_mg.dat
-%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/NACA0012/Results/naca0012_mg.out1
-%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/NACA0012/Results/naca0012_mg.resid
-%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/NACA0012/Results/naca0012_nomg.cl
-%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/NACA0012/Results/naca0012_nomg.dat
-%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/NACA0012/Results/naca0012_nomg.out1
-%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/NACA0012/Results/naca0012_nomg.resid
-%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/RAE2822/Case_9/Data/rae2822_case9.cf
-%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/RAE2822/Case_9/Data/rae2822_case9.up
-%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/RAE2822/Case_9/Results/saa.profs
-%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/RAE2822/Case_9/Results/saa.surf
-%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/RAE2822/Case_9/Results/saa.vel
-%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/RAE2822/Grid/cbin2fmt.f
-%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/RAE2822/Grid/rae2822_grd.ps
-%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/RAE2822/Grid/rae9_257.grd
-%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/RAE2822/Grid/rae_257x97.fmt
-%%WITH_EXAMPLES%%@dirrm %%EXAMPLESDIR%%/Klebanoff/Experimental_Data
-%%WITH_EXAMPLES%%@dirrm %%EXAMPLESDIR%%/Klebanoff/Grid
-%%WITH_EXAMPLES%%@dirrm %%EXAMPLESDIR%%/Klebanoff/Results
-%%WITH_EXAMPLES%%@dirrm %%EXAMPLESDIR%%/Klebanoff
-%%WITH_EXAMPLES%%@dirrm %%EXAMPLESDIR%%/NACA0012/Grid
-%%WITH_EXAMPLES%%@dirrm %%EXAMPLESDIR%%/NACA0012/Results
-%%WITH_EXAMPLES%%@dirrm %%EXAMPLESDIR%%/NACA0012
-%%WITH_EXAMPLES%%@dirrm %%EXAMPLESDIR%%/RAE2822/Case_9/Data
-%%WITH_EXAMPLES%%@dirrm %%EXAMPLESDIR%%/RAE2822/Case_9/Results
-%%WITH_EXAMPLES%%@dirrm %%EXAMPLESDIR%%/RAE2822/Case_9
-%%WITH_EXAMPLES%%@dirrm %%EXAMPLESDIR%%/RAE2822/Grid
-%%WITH_EXAMPLES%%@dirrm %%EXAMPLESDIR%%/RAE2822
-%%WITH_EXAMPLES%%@dirrm %%EXAMPLESDIR%%