From owner-svn-ports-all@FreeBSD.ORG Mon Apr 21 09:58:07 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 065D8447; Mon, 21 Apr 2014 09:58:07 +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 D8F7B13AB; Mon, 21 Apr 2014 09:58:06 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3L9w6im056214; Mon, 21 Apr 2014 09:58:06 GMT (envelope-from thierry@svn.freebsd.org) Received: (from thierry@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3L9w6kj056211; Mon, 21 Apr 2014 09:58:06 GMT (envelope-from thierry@svn.freebsd.org) Message-Id: <201404210958.s3L9w6kj056211@svn.freebsd.org> From: Thierry Thomas Date: Mon, 21 Apr 2014 09:58:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r351673 - in head/graphics/xd3d: . files 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Apr 2014 09:58:07 -0000 Author: thierry Date: Mon Apr 21 09:58:05 2014 New Revision: 351673 URL: http://svnweb.freebsd.org/changeset/ports/351673 QAT: https://qat.redports.org/buildarchive/r351673/ Log: - Support staging - Define license - Use NOPORTEXAMPLES. Modified: head/graphics/xd3d/Makefile head/graphics/xd3d/files/patch-RULES.freeBSD head/graphics/xd3d/pkg-plist Modified: head/graphics/xd3d/Makefile ============================================================================== --- head/graphics/xd3d/Makefile Mon Apr 21 09:57:02 2014 (r351672) +++ head/graphics/xd3d/Makefile Mon Apr 21 09:58:05 2014 (r351673) @@ -10,8 +10,9 @@ MASTER_SITES= http://www.cmap.polytechni MAINTAINER= thierry@FreeBSD.org COMMENT= A simple scientific visualization tool +LICENSE= GPLv2 + #-------------------------------------------------------------------------- -NO_STAGE= yes # You may define these options: # # - WITHOUT_IMAGEMAGICK : if you don't need to export bitmap images @@ -35,7 +36,7 @@ RUN_DEPENDS+= gifsicle:${PORTSDIR}/graph MASTER_SITES_BACKUP= http://pompo.net/ports/ REINPLACE_ARGS= -i "" -FETCH_CMD= /usr/bin/fetch +FETCH_ARGS= FETCH_BEFORE_ARGS= -R -o ${DISTDIR}/${DISTFILES} USES= fortran @@ -61,11 +62,11 @@ do-fetch: || ${FETCH_CMD} ${FETCH_BEFORE_ARGS} ${MASTER_SITES_BACKUP}${DISTFILES} .endif -post-patch: - @${CP} ${WRKSRC}/RULES.freeBSD ${WRKSRC}/RULES - @${REINPLACE_CMD} -e "s|%%WRKSRC%%|${WRKSRC}|" \ +pre-configure: + ${CP} ${WRKSRC}/RULES.freeBSD ${WRKSRC}/RULES + ${REINPLACE_CMD} -e "s|%%WRKSRC%%|${WRKSRC}|" \ -e "s|%%PREFIX%%|${PREFIX}|" \ - -e "s|%%X11BASE%%|${LOCALBASE}|" \ + -e "s|%%X11BASE%%|${LOCALBASE}|" \ -e "s|%%LANG%%|${XD3D_LANG}|" \ -e "s|%%MEMORY_XD3D%%|${MEMORY_XD3D}|" \ -e "s|%%F77%%|${F77}|" \ @@ -76,15 +77,14 @@ post-patch: post-install: .if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} -.for FILE in ${DOCS} - @${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR} -.endfor - @${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}." - @${MKDIR} ${EXAMPLESDIR} - @${CP} -Rp ${WRKSRC}/Examples/* ${EXAMPLESDIR} - @${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${EXAMPLESDIR} - @${ECHO_MSG} "===> Examples installed in ${EXAMPLESDIR}." + ${MKDIR} ${STAGEDIR}${DOCSDIR} +. for FILE in ${DOCS} + ${INSTALL_DATA} ${WRKSRC}/${FILE} ${STAGEDIR}${DOCSDIR} +. endfor +.endif +.if !defined(NOPORTEXAMPLES) + ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + ${CP} -Rp ${WRKSRC}/Examples/* ${STAGEDIR}${EXAMPLESDIR} .endif .include Modified: head/graphics/xd3d/files/patch-RULES.freeBSD ============================================================================== --- head/graphics/xd3d/files/patch-RULES.freeBSD Mon Apr 21 09:57:02 2014 (r351672) +++ head/graphics/xd3d/files/patch-RULES.freeBSD Mon Apr 21 09:58:05 2014 (r351673) @@ -1,5 +1,14 @@ ---- RULES.freeBSD.orig Mon Dec 1 14:55:58 2003 -+++ RULES.freeBSD Thu Jan 29 21:43:28 2004 +--- RULES.freeBSD.orig 2005-03-14 15:22:08.000000000 +0100 ++++ RULES.freeBSD 2014-04-21 11:45:00.000000000 +0200 +@@ -17,7 +17,7 @@ + # Install directory + # + #INSTALL_DIR = /usr/local/bin +-INSTALL_DIR = %%PREFIX%%/bin ++INSTALL_DIR = $(DESTDIR)%%PREFIX%%/bin + + # + # Location of the X11 lib (libX11.a) @@ -54,11 +54,11 @@ # # Options for the Fortran compiler Modified: head/graphics/xd3d/pkg-plist ============================================================================== --- head/graphics/xd3d/pkg-plist Mon Apr 21 09:57:02 2014 (r351672) +++ head/graphics/xd3d/pkg-plist Mon Apr 21 09:58:05 2014 (r351673) @@ -19,57 +19,57 @@ bin/xgraphic %%PORTDOCS%%%%DOCSDIR%%/formats.txt %%PORTDOCS%%%%DOCSDIR%%/xd3d_doc.pdf %%PORTDOCS%%%%DOCSDIR%%/xgraphic_doc.pdf -%%PORTDOCS%%%%EXAMPLESDIR%%/README_EXAMPLES -%%PORTDOCS%%%%EXAMPLESDIR%%/Xgraphic/sinus.g -%%PORTDOCS%%%%EXAMPLESDIR%%/Xgraphic/solh010 -%%PORTDOCS%%%%EXAMPLESDIR%%/Xgraphic/solh020 -%%PORTDOCS%%%%EXAMPLESDIR%%/Xgraphic/solh030 -%%PORTDOCS%%%%EXAMPLESDIR%%/Xgraphic/solh040 -%%PORTDOCS%%%%EXAMPLESDIR%%/Xgraphic/solh050 -%%PORTDOCS%%%%EXAMPLESDIR%%/Xgraphic/solh060 -%%PORTDOCS%%%%EXAMPLESDIR%%/Xgraphic/solh070 -%%PORTDOCS%%%%EXAMPLESDIR%%/Xgraphic/solh080 -%%PORTDOCS%%%%EXAMPLESDIR%%/Xgraphic/solh090 -%%PORTDOCS%%%%EXAMPLESDIR%%/Xgraphic/solh100 -%%PORTDOCS%%%%EXAMPLESDIR%%/Xgraphic/solh110 -%%PORTDOCS%%%%EXAMPLESDIR%%/Xgraphic/solh120 -%%PORTDOCS%%%%EXAMPLESDIR%%/Xgraphic/solh130 -%%PORTDOCS%%%%EXAMPLESDIR%%/Xgraphic/solh140 -%%PORTDOCS%%%%EXAMPLESDIR%%/example.c3d -%%PORTDOCS%%%%EXAMPLESDIR%%/example.xyz -%%PORTDOCS%%%%EXAMPLESDIR%%/example_cartesian.c3d -%%PORTDOCS%%%%EXAMPLESDIR%%/example_cyl.c3d -%%PORTDOCS%%%%EXAMPLESDIR%%/example_sph.c3d -%%PORTDOCS%%%%EXAMPLESDIR%%/home.pgm -%%PORTDOCS%%%%EXAMPLESDIR%%/mesh3.am -%%PORTDOCS%%%%EXAMPLESDIR%%/mesh3.am_fmt -%%PORTDOCS%%%%EXAMPLESDIR%%/mesh3.amdba -%%PORTDOCS%%%%EXAMPLESDIR%%/mesh3.avoir2D -%%PORTDOCS%%%%EXAMPLESDIR%%/mesh3.msh -%%PORTDOCS%%%%EXAMPLESDIR%%/mesh3.nopo -%%PORTDOCS%%%%EXAMPLESDIR%%/piece.msh -%%PORTDOCS%%%%EXAMPLESDIR%%/quadsd.avoir2D -%%PORTDOCS%%%%EXAMPLESDIR%%/quadsd.depl -%%PORTDOCS%%%%EXAMPLESDIR%%/quadsd.eldata -%%PORTDOCS%%%%EXAMPLESDIR%%/quadsd.mises -%%PORTDOCS%%%%EXAMPLESDIR%%/ref27nodes.avoir3D -%%PORTDOCS%%%%EXAMPLESDIR%%/ref8nodes.avoir3D -%%PORTDOCS%%%%EXAMPLESDIR%%/ref9nodes.avoir2D -%%PORTDOCS%%%%EXAMPLESDIR%%/sphere.avoir3D -%%PORTDOCS%%%%EXAMPLESDIR%%/sphere.depl -%%PORTDOCS%%%%EXAMPLESDIR%%/sphere.msh -%%PORTDOCS%%%%EXAMPLESDIR%%/spiral.xyz -%%PORTDOCS%%%%EXAMPLESDIR%%/tetra_gmsh.msh -%%PORTDOCS%%%%EXAMPLESDIR%%/tower.avoir3D -%%PORTDOCS%%%%EXAMPLESDIR%%/tower_001.mode -%%PORTDOCS%%%%EXAMPLESDIR%%/tower_002.mode -%%PORTDOCS%%%%EXAMPLESDIR%%/tower_003.mode -%%PORTDOCS%%%%EXAMPLESDIR%%/tower_004.mode -%%PORTDOCS%%%%EXAMPLESDIR%%/tower_005.mode -%%PORTDOCS%%%%EXAMPLESDIR%%/tower_006.mode -%%PORTDOCS%%%%EXAMPLESDIR%%/tower_007.mode -%%PORTDOCS%%%%EXAMPLESDIR%%/tower_008.mode -%%PORTDOCS%%%%EXAMPLESDIR%%/tower.facext +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/README_EXAMPLES +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Xgraphic/sinus.g +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Xgraphic/solh010 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Xgraphic/solh020 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Xgraphic/solh030 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Xgraphic/solh040 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Xgraphic/solh050 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Xgraphic/solh060 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Xgraphic/solh070 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Xgraphic/solh080 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Xgraphic/solh090 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Xgraphic/solh100 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Xgraphic/solh110 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Xgraphic/solh120 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Xgraphic/solh130 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Xgraphic/solh140 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example.c3d +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example.xyz +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example_cartesian.c3d +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example_cyl.c3d +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example_sph.c3d +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/home.pgm +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mesh3.am +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mesh3.am_fmt +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mesh3.amdba +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mesh3.avoir2D +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mesh3.msh +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mesh3.nopo +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/piece.msh +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/quadsd.avoir2D +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/quadsd.depl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/quadsd.eldata +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/quadsd.mises +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ref27nodes.avoir3D +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ref8nodes.avoir3D +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ref9nodes.avoir2D +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sphere.avoir3D +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sphere.depl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sphere.msh +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/spiral.xyz +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tetra_gmsh.msh +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tower.avoir3D +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tower_001.mode +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tower_002.mode +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tower_003.mode +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tower_004.mode +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tower_005.mode +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tower_006.mode +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tower_007.mode +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tower_008.mode +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tower.facext %%PORTDOCS%%@dirrm %%DOCSDIR%% -%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/Xgraphic -%%PORTDOCS%%@dirrm %%EXAMPLESDIR%% +%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/Xgraphic +%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%