Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 11 Jun 2014 09:39:11 +0000 (UTC)
From:      Pawel Pekala <pawel@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r357447 - head/math/gri
Message-ID:  <201406110939.s5B9dB9M066359@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: pawel
Date: Wed Jun 11 09:39:10 2014
New Revision: 357447
URL: http://svnweb.freebsd.org/changeset/ports/357447
QAT: https://qat.redports.org/buildarchive/r357447/

Log:
  - Add staging support
  - Use MAKE_CMD instead of GMAKE
  - Fix perl shebangs, bump PORTREVISION

Modified:
  head/math/gri/Makefile

Modified: head/math/gri/Makefile
==============================================================================
--- head/math/gri/Makefile	Wed Jun 11 09:38:35 2014	(r357446)
+++ head/math/gri/Makefile	Wed Jun 11 09:39:10 2014	(r357447)
@@ -3,7 +3,7 @@
 
 PORTNAME=	gri
 PORTVERSION=	2.12.23
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 MASTER_SITES=	SF
 
@@ -12,18 +12,20 @@ COMMENT=	Extensible plotting language fo
 
 LIB_DEPENDS=	libnetcdf.so:${PORTSDIR}/science/netcdf
 
-USES=		readline gmake
+USES=		gmake readline shebangfix
+SHEBANG_FILES=	src/gri_merge src/gri_unpage
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-FreeBSD
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-MAN1=		gri.1 gri_merge.1 gri_unpage.1
 INFO=		gri
 PORTDOCS=	*
 PORTEXAMPLES=	*
 PLIST_FILES=	bin/gri bin/gri_merge bin/gri_unpage \
+		man/man1/gri.1.gz man/man1/gri_merge.1.gz \
+		man/man1/gri_unpage.1.gz \
 		share/emacs/site-lisp/gri-mode.el \
 		%%DATADIR%%/gri.cmd \
 		%%DATADIR%%/logo.dat \
@@ -31,8 +33,6 @@ PLIST_FILES=	bin/gri bin/gri_merge bin/g
 		%%DATADIR%%/startup.msg
 PLIST_DIRS=	%%DATADIR%%
 
-NO_STAGE=	yes
-
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 .include <bsd.port.options.mk>
@@ -51,7 +51,7 @@ post-patch:
 
 post-build:
 .if ${PORT_OPTIONS:MDOCS} || ${PORT_OPTIONS:MEXAMPLES}
-	(cd ${WRKSRC}/doc && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \
+	(cd ${WRKSRC}/doc && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \
 		${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET})
 .else
 	(cd ${WRKSRC}/doc && makeinfo gri.texi)
@@ -59,22 +59,23 @@ post-build:
 
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
-	(cd ${WRKSRC}/doc && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \
+	(cd ${WRKSRC}/doc && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \
 		${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})
 .else
-	(cd ${WRKSRC}/doc \
-		&& ${INSTALL_MAN} gri-manpage.1 ${MANPREFIX}/man/man1/gri.1 \
-		&& ${INSTALL_MAN} gri_merge.1-skel ${MANPREFIX}/man/man1/gri_merge.1 \
-		&& ${INSTALL_MAN} gri_unpage.1-skel ${MANPREFIX}/man/man1/gri_unpage.1)
-	(cd ${WRKSRC}/doc \
-		&& ${INSTALL_DATA} gri.info* ${PREFIX}/${INFO_PATH})
+	${INSTALL_MAN} ${WRKSRC}/doc/gri-manpage.1 \
+		${STAGEDIR}${MANPREFIX}/man/man1/gri.1 
+	${INSTALL_MAN} ${WRKSRC}/doc/gri_merge.1-skel \
+		${STAGEDIR}${MANPREFIX}/man/man1/gri_merge.1
+	${INSTALL_MAN} ${WRKSRC}/doc/gri_unpage.1-skel \
+		${STAGEDIR}${MANPREFIX}/man/man1/gri_unpage.1
+	${INSTALL_DATA} ${WRKSRC}/doc/gri.info* ${STAGEDIR}${PREFIX}/${INFO_PATH}
 .endif
 .if ${PORT_OPTIONS:MEXAMPLES}
-	@${MKDIR} ${EXAMPLESDIR}
-	(cd ${WRKSRC}/doc/examples \
-		&& ${INSTALL_DATA} model* *.dat *.gri e*.ps ${EXAMPLESDIR})
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	(cd ${WRKSRC}/doc/examples && ${INSTALL_DATA} model* *.dat *.gri e*.ps \
+		${STAGEDIR}${EXAMPLESDIR})
 	(cd ${WRKSRC}/doc/examples \
-		&& ${INSTALL_SCRIPT} FEM.pl ${EXAMPLESDIR})
+		&& ${INSTALL_SCRIPT} FEM.pl ${STAGEDIR}${EXAMPLESDIR})
 .endif
 
 .include <bsd.port.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201406110939.s5B9dB9M066359>