- STAGE-clean

- Remove article from COMMENT line
- Use PLIST_FILES, PORTDOCS, PORTEXAMPLES. Get rid of pkg-plist

2 files changed, 13 insertions, 185 deletions

diff --git a/lang/cfortran/Makefile b/lang/cfortran/Makefile
index 61ac6839f355..1dab3f62dd13 100644
--- a/lang/cfortran/Makefile
+++ b/lang/cfortran/Makefile
@@ -13,12 +13,17 @@ DIST_SUBDIR=	${PORTNAME}
 EXTRACT_ONLY=	# none
 
 MAINTAINER=	gahr@FreeBSD.org
-COMMENT=	An easy-to-use powerful bridge between C and FORTRAN
+COMMENT=	Easy-to-use powerful bridge between C and FORTRAN
+
+OPTIONS_DEFINE=	DOCS EXAMPLES
 
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}
 
-NO_STAGE=	yes
+PLIST_FILES=	include/cfortran.h
+PORTDOCS=	*
+PORTEXAMPLES=	*
+
 post-extract:
 .for dfile in ${DISTFILES}
 	${CP} ${_DISTDIR}/${dfile} ${WRKSRC}
@@ -26,15 +31,11 @@ post-extract:
 	(cd ${WRKSRC} && ${TAR} -xf cfortran.examples.tar.gz)
 
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/cfortran.h ${PREFIX}/include
-.if !defined(NOPORTDOCS)
-	${INSTALL} -d ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/cfortran.html ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/cfortran.doc ${DOCSDIR}
-.endif
-.if !defined(NOPORTEXAMPLES)
-	${INSTALL} -d ${EXAMPLESDIR}
-	(cd ${WRKSRC}/eg && ${COPYTREE_SHARE} \* ${EXAMPLESDIR})
-.endif
+	${INSTALL_DATA} ${WRKSRC}/cfortran.h ${STAGEDIR}${PREFIX}/include
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/cfortran.html ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/cfortran.doc ${STAGEDIR}${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	cd ${WRKSRC}/eg && ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/lang/cfortran/pkg-plist b/lang/cfortran/pkg-plist
deleted file mode 100644
index 8e15327ca561..000000000000
--- a/lang/cfortran/pkg-plist
+++ /dev/null
@@ -1,173 +0,0 @@
-include/cfortran.h
-%%PORTDOCS%%%%DOCSDIR%%/cfortran.html
-%%PORTDOCS%%%%DOCSDIR%%/cfortran.doc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/abc/abc.C
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/abc/abc.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/abc/abc_f.f
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cf14/cf14.C
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cf14/cf14.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cf14/cf14_f.f
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/e2/e2.C
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/e2/e2.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/e2/e2_f.f
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/easy/easy.C
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/easy/easy.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/easy/easy_f.f
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/eq/eq.C
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/eq/eq.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/eq/eq_f.f
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/f0/f0.C
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/f0/f0.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/f0/f0_f.f
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/f20/f20.C
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/f20/f20.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/f20/f20_f.f
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/f27/f27.C
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/f27/f27.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/f27/f27_f.f
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fa/fa.C
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fa/fa.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fa/fa_f.f
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fand/fand.C
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fand/fand.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fand/fand_f.f
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fb/fb.C
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fb/fb.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fb/fb_f.f
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fc/fc.C
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fc/fc.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fc/fc_f.f
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fcb/fcb.C
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fcb/fcb.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fcb/fcb_f.f
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fd/fd.C
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fd/fd.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fd/fd_f.f
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fe/fe.C
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fe/fe.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fe/fe_f.f
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ff/ff.C
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ff/ff.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ff/ff_f.f
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fg/fg.C
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fg/fg.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fg/fg_f.f
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fh/fh.C
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fh/fh.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fh/fh_f.f
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fi/fi.C
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fi/fi.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fi/fi_f.f
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fj/fj.C
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fj/fj.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fj/fj_f.f
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fk/fk.C
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fk/fk.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fk/fk_f.f
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fl/fl.C
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fl/fl.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fl/fl_f.f
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fm/fm.C
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fm/fm.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fm/fm_f.f
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fn/fn.C
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fn/fn.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fn/fn_f.f
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/forr/forr.C
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/forr/forr.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/forr/forr_f.f
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fstr/fstr.C
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fstr/fstr.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fstr/fstr_f.f
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ft/ft.C
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ft/ft.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ft/ft_f.f
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fun/fun.C
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fun/fun.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fun/fun_f.f
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fz/fz.C
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fz/fz.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fz/fz_f.f
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pz/pz.C
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pz/pz.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pz/pz_f.f
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/q/q.C
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/q/q.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/q/q_f.f
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rev/rev.C
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rev/rev.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rev/rev_f.f
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rr/rr.C
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rr/rr.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rr/rr_f.f
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ss1/ss1.C
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ss1/ss1.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ss1/ss1_f.f
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/strtok/strtok.C
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/strtok/strtok.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/strtok/strtok_f.f
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sub/sub.C
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sub/sub.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sub/sub_f.f
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/subt/subt.C
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/subt/subt.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/subt/subt_f.f
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sz/sz.C
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sz/sz.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sz/sz_f.f
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sz1/sz1.C
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sz1/sz1.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sz1/sz1_f.f
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/user/user.C
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/user/user.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/user/user_f.f
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/v7/v7.C
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/v7/v7.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/v7/v7_f.f
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vv/vv.C
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vv/vv.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vv/vv_f.f
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/vv
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/v7
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/user
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/sz1
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/sz
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/subt
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/sub
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/strtok
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/ss1
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/rr
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/rev
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/q
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/pz
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/fz
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/fun
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/ft
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/fstr
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/forr
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/fn
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/fm
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/fl
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/fk
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/fj
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/fi
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/fh
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/fg
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/ff
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/fe
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/fd
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/fcb
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/fc
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/fb
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/fand
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/fa
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/f27
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/f20
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/f0
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/eq
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/easy
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/e2
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/cf14
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/abc
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%