- Add DOCS option.

- USES=fortran and fix build with Clang (-Wno-return-type).
- Staging.

graphics/gplot/Makefile

@@ -3,7 +3,7 @@
 
 PORTNAME=	gplot
 PORTVERSION=	4.3
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.psc.edu/pub/gplot/
 DISTNAME=	${PORTNAME}
@@ -12,26 +12,22 @@ EXTRACT_SUFX=	.tar.Z
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Graphic utilities for the processing of CGM metafiles
 
+OPTIONS_DEFINE=	DOCS
+
+CFLAGS+=	-Wno-return-type
 NO_WRKSUBDIR=	yes
 ALL_TARGET=	drawcgm gtex gplot
-MAN1=		gplot.1
-DOCS=		gplot.hlp gplot.txt gtex.doc
-USE_FORTRAN=	yes
-
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
+PORTDOCS=	gplot.hlp gplot.txt gtex.doc
+USES=		fortran
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/gplot ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/gtex ${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/drawcgm/drawcgm.a ${PREFIX}/lib/libcgm.a
-	${INSTALL_MAN} ${WRKSRC}/gplot.man ${PREFIX}/man/man1/gplot.1
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/Gplot
-.for f in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/$f ${PREFIX}/share/doc/Gplot
-	${GZIP_CMD} ${PREFIX}/share/doc/Gplot/$f
+	${INSTALL_PROGRAM} ${WRKSRC}/gplot ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/gtex ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/drawcgm/drawcgm.a ${STAGEDIR}${PREFIX}/lib/libcgm.a
+	${INSTALL_MAN} ${WRKSRC}/gplot.man ${STAGEDIR}${PREFIX}/man/man1/gplot.1
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+.for f in ${PORTDOCS}
+	${INSTALL_DATA} ${WRKSRC}/$f ${STAGEDIR}${DOCSDIR}
 .endfor
-.endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

graphics/gplot/pkg-plist

@@ -1,7 +1,4 @@
 bin/gplot
 bin/gtex
 lib/libcgm.a
-%%PORTDOCS%%share/doc/Gplot/gplot.hlp.gz
-%%PORTDOCS%%share/doc/Gplot/gplot.txt.gz
-%%PORTDOCS%%share/doc/Gplot/gtex.doc.gz
-%%PORTDOCS%%@dirrm share/doc/Gplot
+man/man1/gplot.1.gz