From owner-svn-ports-all@FreeBSD.ORG  Sun Dec 22 11:42:12 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 97954ECB;
 Sun, 22 Dec 2013 11:42:12 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 6990A16BD;
 Sun, 22 Dec 2013 11:42:12 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBMBgC4t024670;
 Sun, 22 Dec 2013 11:42:12 GMT (envelope-from tijl@svn.freebsd.org)
Received: (from tijl@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBMBgCAt024668;
 Sun, 22 Dec 2013 11:42:12 GMT (envelope-from tijl@svn.freebsd.org)
Message-Id: <201312221142.rBMBgCAt024668@svn.freebsd.org>
From: Tijl Coosemans <tijl@FreeBSD.org>
Date: Sun, 22 Dec 2013 11:42:12 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r337184 - head/graphics/gplot
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 22 Dec 2013 11:42:12 -0000

Author: tijl
Date: Sun Dec 22 11:42:11 2013
New Revision: 337184
URL: http://svnweb.freebsd.org/changeset/ports/337184

Log:
  - Add DOCS option.
  - USES=fortran and fix build with Clang (-Wno-return-type).
  - Staging.

Modified:
  head/graphics/gplot/Makefile   (contents, props changed)
  head/graphics/gplot/pkg-plist   (contents, props changed)

Modified: head/graphics/gplot/Makefile
==============================================================================
--- head/graphics/gplot/Makefile	Sun Dec 22 10:17:01 2013	(r337183)
+++ head/graphics/gplot/Makefile	Sun Dec 22 11:42:11 2013	(r337184)
@@ -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>

Modified: head/graphics/gplot/pkg-plist
==============================================================================
--- head/graphics/gplot/pkg-plist	Sun Dec 22 10:17:01 2013	(r337183)
+++ head/graphics/gplot/pkg-plist	Sun Dec 22 11:42:11 2013	(r337184)
@@ -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