- Make Fortran support conditional

- Pass maintainership to submitter

PR:		ports/130121
Submitted by:	Pedro F. Giffuni <giffunip@tutopia.com>

2 files changed, 89 insertions, 81 deletions

diff --git a/math/plplot/Makefile b/math/plplot/Makefile
index 4e3df8ff5bef..6dc264b87efc 100644
--- a/math/plplot/Makefile
+++ b/math/plplot/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	5.8.0
 CATEGORIES=	math science
 MASTER_SITES=	SF
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	giffunip@tutopia.com
 COMMENT=	A scientific plotting package
 
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
@@ -18,25 +18,32 @@ LIB_DEPENDS=	unicode.0:${PORTSDIR}/devel/libunicode \
 		gd.4:${PORTSDIR}/graphics/gd \
 		qhull.5:${PORTSDIR}/math/qhull
 
-USE_FORTRAN=	yes
-
 USE_AUTOTOOLS=	libltdl:15
 USE_PERL5_BUILD=yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib" \
-		M4="${LOCALBASE}/bin/gm4" \
-		FC="${FC}" F77="${F77}" FFLAGS="${FFLAGS}"
+		M4="${LOCALBASE}/bin/gm4"
 CONFIGURE_ARGS=	--disable-cgm --disable-java --disable-octave \
 		--with-gd-incdir=${LOCALBASE}/include \
 		--with-gd-libdir=${LOCALBASE}/lib \
-		--with-freetype-font-dir=${LOCALBASE} \
-		--enable-f95
+		--with-freetype-font-dir=${LOCALBASE}
 USE_LDCONFIG=	yes
 PLIST_SUB=	VERSION="${PORTVERSION}"
 
 MAN1=		plm2gif.1 plplot_libtool.1 plpr.1 pltek.1 pstex2eps.1
 
+.if defined(WITH_FORTRAN)
+PKGNAMESUFFIX=	-fortran
+USE_FORTRAN=	yes
+CONFIGURE_ENV+= FC="${FC}" F77="${F77}" FFLAGS="${FFLAGS}"
+CONFIGURE_ARGS+=	--enable-f95
+PLIST_SUB+=	FORTRAN=""
+.else
+CONFIGURE_ARGS+=	--disable-f77
+PLIST_SUB+=	FORTRAN="@comment "
+.endif
+
 .if defined(WITHOUT_X11)
 PKGNAMESUFFIX=	-nox11
 CONFIGURE_ARGS+=	--without-x
@@ -104,6 +111,7 @@ pre-everything::
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "	WITHOUT_X11=yes		Turns off X11 support"
 	@${ECHO_MSG} "	WITHOUT_PTHREAD=yes	Turns off pthread support"
+	@${ECHO_MSG} "	WITH_FORTRAN=yes	Turns on Fortran support"
 	@${ECHO_MSG} "	WITH_SVGALIB=yes	Turns on SVGAlib support"
 	@${ECHO_MSG} "	WITH_GNOME=yes		Turns on GNOME driver support"
 	@${ECHO_MSG} "	WITH_PYTHON=yes		Turns on Python support"
diff --git a/math/plplot/pkg-plist b/math/plplot/pkg-plist
index a34937557955..632a774f1aa5 100644
--- a/math/plplot/pkg-plist
+++ b/math/plplot/pkg-plist
@@ -41,28 +41,28 @@ lib/libplplotd.a
 lib/libplplotd.la
 lib/libplplotd.so
 lib/libplplotd.so.11
-lib/libplplotf77cd.a
-lib/libplplotf77cd.la
-lib/libplplotf77cd.so
-lib/libplplotf77cd.so.10
-lib/libplplotf77d.a
-lib/libplplotf77d.la
-lib/libplplotf77d.so
-lib/libplplotf77d.so.10
-lib/libplplotf95cd.so
-lib/libplplotf95cd.so.0
-lib/libplplotf95cd.la
-lib/libplplotf95cd.a
-lib/libplplotf95d.so
-lib/libplplotf95d.so.0
-lib/libplplotf95d.la
-lib/libplplotf95d.a
-lib/fortran/modules/plplot/plplot.mod
-lib/fortran/modules/plplot/plplotp.mod
-lib/fortran/modules/plplot/plplot_flt.mod
-@dirrm lib/fortran/modules/plplot
-@dirrm lib/fortran/modules
-@dirrm lib/fortran
+%%FORTRAN%%lib/libplplotf77cd.a
+%%FORTRAN%%lib/libplplotf77cd.la
+%%FORTRAN%%lib/libplplotf77cd.so
+%%FORTRAN%%lib/libplplotf77cd.so.10
+%%FORTRAN%%lib/libplplotf77d.a
+%%FORTRAN%%lib/libplplotf77d.la
+%%FORTRAN%%lib/libplplotf77d.so
+%%FORTRAN%%lib/libplplotf77d.so.10
+%%FORTRAN%%lib/libplplotf95cd.so
+%%FORTRAN%%lib/libplplotf95cd.so.0
+%%FORTRAN%%lib/libplplotf95cd.la
+%%FORTRAN%%lib/libplplotf95cd.a
+%%FORTRAN%%lib/libplplotf95d.so
+%%FORTRAN%%lib/libplplotf95d.so.0
+%%FORTRAN%%lib/libplplotf95d.la
+%%FORTRAN%%lib/libplplotf95d.a
+%%FORTRAN%%lib/fortran/modules/plplot/plplot.mod
+%%FORTRAN%%lib/fortran/modules/plplot/plplotp.mod
+%%FORTRAN%%lib/fortran/modules/plplot/plplot_flt.mod
+%%FORTRAN%%@dirrm lib/fortran/modules/plplot
+%%FORTRAN%%@dirrm lib/fortran/modules
+%%FORTRAN%%@dirrm lib/fortran
 %%TCLTK%%lib/libplplottcltkd.a
 %%TCLTK%%lib/libplplottcltkd.la
 %%TCLTK%%lib/libplplottcltkd.so
@@ -119,8 +119,8 @@ lib/plplot%%VERSION%%/driversd/xfig.so
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/plplotc.py
 libdata/pkgconfig/plplotd.pc
 libdata/pkgconfig/plplotd-c++.pc
-libdata/pkgconfig/plplotd-f77.pc
-libdata/pkgconfig/plplotd-f95.pc
+%%FORTRAN%%libdata/pkgconfig/plplotd-f77.pc
+%%FORTRAN%%libdata/pkgconfig/plplotd-f95.pc
 %%TCLTK%%libdata/pkgconfig/plplotd-tcl.pc
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
@@ -196,57 +196,57 @@ libdata/pkgconfig/plplotd-f95.pc
 %%DATADIR%%%%VERSION%%/examples/c++/x23.cc
 %%DATADIR%%%%VERSION%%/examples/c++/x24.cc
 %%DATADIR%%%%VERSION%%/examples/c++/x26.cc
-%%DATADIR%%%%VERSION%%/examples/f77/Makefile
-%%DATADIR%%%%VERSION%%/examples/f77/x01f.f
-%%DATADIR%%%%VERSION%%/examples/f77/x02f.f
-%%DATADIR%%%%VERSION%%/examples/f77/x03f.f
-%%DATADIR%%%%VERSION%%/examples/f77/x04f.f
-%%DATADIR%%%%VERSION%%/examples/f77/x05f.f
-%%DATADIR%%%%VERSION%%/examples/f77/x06f.f
-%%DATADIR%%%%VERSION%%/examples/f77/x07f.f
-%%DATADIR%%%%VERSION%%/examples/f77/x08f.f
-%%DATADIR%%%%VERSION%%/examples/f77/x09f.f
-%%DATADIR%%%%VERSION%%/examples/f77/x10f.f
-%%DATADIR%%%%VERSION%%/examples/f77/x11f.f
-%%DATADIR%%%%VERSION%%/examples/f77/x12f.f
-%%DATADIR%%%%VERSION%%/examples/f77/x13f.f
-%%DATADIR%%%%VERSION%%/examples/f77/x14f.f
-%%DATADIR%%%%VERSION%%/examples/f77/x15f.f
-%%DATADIR%%%%VERSION%%/examples/f77/x16af.f
-%%DATADIR%%%%VERSION%%/examples/f77/x16f.f
-%%DATADIR%%%%VERSION%%/examples/f77/x17f.f
-%%DATADIR%%%%VERSION%%/examples/f77/x18f.f
-%%DATADIR%%%%VERSION%%/examples/f77/x19f.f
-%%DATADIR%%%%VERSION%%/examples/f77/x22f.f
-%%DATADIR%%%%VERSION%%/examples/f77/x23f.f
-%%DATADIR%%%%VERSION%%/examples/f95/x01f.f90
-%%DATADIR%%%%VERSION%%/examples/f95/x02f.f90
-%%DATADIR%%%%VERSION%%/examples/f95/x03f.f90
-%%DATADIR%%%%VERSION%%/examples/f95/x04f.f90
-%%DATADIR%%%%VERSION%%/examples/f95/x05f.f90
-%%DATADIR%%%%VERSION%%/examples/f95/x06f.f90
-%%DATADIR%%%%VERSION%%/examples/f95/x07f.f90
-%%DATADIR%%%%VERSION%%/examples/f95/x08f.f90
-%%DATADIR%%%%VERSION%%/examples/f95/x09f.f90
-%%DATADIR%%%%VERSION%%/examples/f95/x10f.f90
-%%DATADIR%%%%VERSION%%/examples/f95/x11f.f90
-%%DATADIR%%%%VERSION%%/examples/f95/x12f.f90
-%%DATADIR%%%%VERSION%%/examples/f95/x13f.f90
-%%DATADIR%%%%VERSION%%/examples/f95/x14f.f90
-%%DATADIR%%%%VERSION%%/examples/f95/x15f.f90
-%%DATADIR%%%%VERSION%%/examples/f95/x16af.f90
-%%DATADIR%%%%VERSION%%/examples/f95/x16f.f90
-%%DATADIR%%%%VERSION%%/examples/f95/x17f.f90
-%%DATADIR%%%%VERSION%%/examples/f95/x18f.f90
-%%DATADIR%%%%VERSION%%/examples/f95/x19f.f90
-%%DATADIR%%%%VERSION%%/examples/f95/x22f.f90
-%%DATADIR%%%%VERSION%%/examples/f95/x23f.f90
-%%DATADIR%%%%VERSION%%/examples/f95/Makefile
-%%DATADIR%%%%VERSION%%/examples/test_f95.sh
+%%FORTRAN%%%%DATADIR%%%%VERSION%%/examples/f77/Makefile
+%%FORTRAN%%%%DATADIR%%%%VERSION%%/examples/f77/x01f.f
+%%FORTRAN%%%%DATADIR%%%%VERSION%%/examples/f77/x02f.f
+%%FORTRAN%%%%DATADIR%%%%VERSION%%/examples/f77/x03f.f
+%%FORTRAN%%%%DATADIR%%%%VERSION%%/examples/f77/x04f.f
+%%FORTRAN%%%%DATADIR%%%%VERSION%%/examples/f77/x05f.f
+%%FORTRAN%%%%DATADIR%%%%VERSION%%/examples/f77/x06f.f
+%%FORTRAN%%%%DATADIR%%%%VERSION%%/examples/f77/x07f.f
+%%FORTRAN%%%%DATADIR%%%%VERSION%%/examples/f77/x08f.f
+%%FORTRAN%%%%DATADIR%%%%VERSION%%/examples/f77/x09f.f
+%%FORTRAN%%%%DATADIR%%%%VERSION%%/examples/f77/x10f.f
+%%FORTRAN%%%%DATADIR%%%%VERSION%%/examples/f77/x11f.f
+%%FORTRAN%%%%DATADIR%%%%VERSION%%/examples/f77/x12f.f
+%%FORTRAN%%%%DATADIR%%%%VERSION%%/examples/f77/x13f.f
+%%FORTRAN%%%%DATADIR%%%%VERSION%%/examples/f77/x14f.f
+%%FORTRAN%%%%DATADIR%%%%VERSION%%/examples/f77/x15f.f
+%%FORTRAN%%%%DATADIR%%%%VERSION%%/examples/f77/x16af.f
+%%FORTRAN%%%%DATADIR%%%%VERSION%%/examples/f77/x16f.f
+%%FORTRAN%%%%DATADIR%%%%VERSION%%/examples/f77/x17f.f
+%%FORTRAN%%%%DATADIR%%%%VERSION%%/examples/f77/x18f.f
+%%FORTRAN%%%%DATADIR%%%%VERSION%%/examples/f77/x19f.f
+%%FORTRAN%%%%DATADIR%%%%VERSION%%/examples/f77/x22f.f
+%%FORTRAN%%%%DATADIR%%%%VERSION%%/examples/f77/x23f.f
+%%FORTRAN%%%%DATADIR%%%%VERSION%%/examples/f95/x01f.f90
+%%FORTRAN%%%%DATADIR%%%%VERSION%%/examples/f95/x02f.f90
+%%FORTRAN%%%%DATADIR%%%%VERSION%%/examples/f95/x03f.f90
+%%FORTRAN%%%%DATADIR%%%%VERSION%%/examples/f95/x04f.f90
+%%FORTRAN%%%%DATADIR%%%%VERSION%%/examples/f95/x05f.f90
+%%FORTRAN%%%%DATADIR%%%%VERSION%%/examples/f95/x06f.f90
+%%FORTRAN%%%%DATADIR%%%%VERSION%%/examples/f95/x07f.f90
+%%FORTRAN%%%%DATADIR%%%%VERSION%%/examples/f95/x08f.f90
+%%FORTRAN%%%%DATADIR%%%%VERSION%%/examples/f95/x09f.f90
+%%FORTRAN%%%%DATADIR%%%%VERSION%%/examples/f95/x10f.f90
+%%FORTRAN%%%%DATADIR%%%%VERSION%%/examples/f95/x11f.f90
+%%FORTRAN%%%%DATADIR%%%%VERSION%%/examples/f95/x12f.f90
+%%FORTRAN%%%%DATADIR%%%%VERSION%%/examples/f95/x13f.f90
+%%FORTRAN%%%%DATADIR%%%%VERSION%%/examples/f95/x14f.f90
+%%FORTRAN%%%%DATADIR%%%%VERSION%%/examples/f95/x15f.f90
+%%FORTRAN%%%%DATADIR%%%%VERSION%%/examples/f95/x16af.f90
+%%FORTRAN%%%%DATADIR%%%%VERSION%%/examples/f95/x16f.f90
+%%FORTRAN%%%%DATADIR%%%%VERSION%%/examples/f95/x17f.f90
+%%FORTRAN%%%%DATADIR%%%%VERSION%%/examples/f95/x18f.f90
+%%FORTRAN%%%%DATADIR%%%%VERSION%%/examples/f95/x19f.f90
+%%FORTRAN%%%%DATADIR%%%%VERSION%%/examples/f95/x22f.f90
+%%FORTRAN%%%%DATADIR%%%%VERSION%%/examples/f95/x23f.f90
+%%FORTRAN%%%%DATADIR%%%%VERSION%%/examples/f95/Makefile
 %%DATADIR%%%%VERSION%%/examples/plplot-test.sh
 %%DATADIR%%%%VERSION%%/examples/test_c.sh
 %%DATADIR%%%%VERSION%%/examples/test_cxx.sh
-%%DATADIR%%%%VERSION%%/examples/test_f77.sh
+%%FORTRAN%%%%DATADIR%%%%VERSION%%/examples/test_f77.sh
+%%FORTRAN%%%%DATADIR%%%%VERSION%%/examples/test_f95.sh
 %%DATADIR%%%%VERSION%%/globe.map
 %%DATADIR%%%%VERSION%%/plstnd5.fnt
 %%DATADIR%%%%VERSION%%/plxtnd5.fnt
@@ -415,8 +415,8 @@ libdata/pkgconfig/plplotd-f95.pc
 %%GNOME%%%%DATADIR%%%%VERSION%%/examples/c/README.plplotcanvas
 %%GNOME%%%%DATADIR%%%%VERSION%%/examples/c/plplotcanvas_animation.c
 %%GNOME%%%%DATADIR%%%%VERSION%%/examples/c/plplotcanvas_demo.c
-@dirrm %%DATADIR%%%%VERSION%%/examples/f95
-@dirrm %%DATADIR%%%%VERSION%%/examples/f77
+%%FORTRAN%%@dirrm %%DATADIR%%%%VERSION%%/examples/f95
+%%FORTRAN%%@dirrm %%DATADIR%%%%VERSION%%/examples/f77
 @dirrm %%DATADIR%%%%VERSION%%/examples/c++
 @dirrm %%DATADIR%%%%VERSION%%/examples/c
 @dirrm %%DATADIR%%%%VERSION%%/examples