From owner-svn-ports-all@FreeBSD.ORG Wed Jun 11 09:39:11 2014 Return-Path: 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 994175FD; Wed, 11 Jun 2014 09:39:11 +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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 79DC421C3; Wed, 11 Jun 2014 09:39:11 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5B9dBcq066360; Wed, 11 Jun 2014 09:39:11 GMT (envelope-from pawel@svn.freebsd.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5B9dB9M066359; Wed, 11 Jun 2014 09:39:11 GMT (envelope-from pawel@svn.freebsd.org) Message-Id: <201406110939.s5B9dB9M066359@svn.freebsd.org> From: Pawel Pekala Date: Wed, 11 Jun 2014 09:39:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r357447 - head/math/gri 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.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Jun 2014 09:39:11 -0000 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 @@ -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