From owner-svn-ports-all@FreeBSD.ORG Sun Dec 22 13:15:24 2013 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 5CB6322E; Sun, 22 Dec 2013 13:15:24 +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 3D2461CC0; Sun, 22 Dec 2013 13:15:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBMDFOkI057738; Sun, 22 Dec 2013 13:15:24 GMT (envelope-from tijl@svn.freebsd.org) Received: (from tijl@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBMDFN9X057736; Sun, 22 Dec 2013 13:15:23 GMT (envelope-from tijl@svn.freebsd.org) Message-Id: <201312221315.rBMDFN9X057736@svn.freebsd.org> From: Tijl Coosemans Date: Sun, 22 Dec 2013 13:15:23 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r337187 - head/graphics/raster3d 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: Sun, 22 Dec 2013 13:15:24 -0000 Author: tijl Date: Sun Dec 22 13:15:23 2013 New Revision: 337187 URL: http://svnweb.freebsd.org/changeset/ports/337187 Log: - New LIB_DEPENDS syntax. - Fix IMAGEMAGICK option. - USES=fortran. - Staging. Modified: head/graphics/raster3d/Makefile (contents, props changed) head/graphics/raster3d/pkg-plist (contents, props changed) Modified: head/graphics/raster3d/Makefile ============================================================================== --- head/graphics/raster3d/Makefile Sun Dec 22 12:00:45 2013 (r337186) +++ head/graphics/raster3d/Makefile Sun Dec 22 13:15:23 2013 (r337187) @@ -3,7 +3,7 @@ PORTNAME= raster3d PORTVERSION= 3.0.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics biology MASTER_SITES= http://skuld.bmsc.washington.edu/${PORTNAME}/ DISTNAME= Raster3D_${PORTVERSION:R}-${PORTVERSION:E} @@ -13,64 +13,54 @@ COMMENT= Set of tools for generating ras LICENSE= ART20 -LIB_DEPENDS= gd:${PORTSDIR}/graphics/gd \ - tiff:${PORTSDIR}/graphics/tiff +LIB_DEPENDS= libgd.so:${PORTSDIR}/graphics/gd \ + libtiff.so:${PORTSDIR}/graphics/tiff -OPTIONS_DEFINE= MAGICK DOCS EXAMPLES -OPTIONS_DEFAULT= MAGICK +OPTIONS_DEFINE= IMAGEMAGICK DOCS EXAMPLES +OPTIONS_DEFAULT=IMAGEMAGICK -USE_FORTRAN= yes +USES= fortran MAKE_ARGS= INCDIRS="-I${LOCALBASE}/include" LIBDIRS="-L${LOCALBASE}/lib" \ CC="${CC}" CFLAGS="${CFLAGS}" FC="${FC}" FFLAGS="${FFLAGS}" \ RM="${RM}" OS="${OPSYS}" ALL_TARGET= linux all MAKE_JOBS_UNSAFE= yes -MANL= avs2ps.l balls.l label3d.l r3d_objects.l r3dtops.l rastep.l \ - raster3d.l render.l ribbon.l rods.l normal3d.l stereo3d.l - CFLAGS+= -DLINUX -DNETWORKBYTEORDER -Dgfortran FFLAGS+= -fno-range-check -ffixed-line-length-132 -MAGICK_RUN_DEPENDS= convert:${PORTSDIR}/graphics/ImageMagick -MAGICK_CFLAGS= -DIMAGEPIPE +IMAGEMAGICK_RUN_DEPENDS= convert:${PORTSDIR}/graphics/ImageMagick OPTIONS_SUB= yes -NO_STAGE= yes -.include +BROKEN_sparc64= Does not compile with GCC 4.2: internal compiler error -.if ${ARCH} == "sparc64" -BROKEN= Does not compile with GCC 4.2: internal compiler error -.endif +.include do-install: .for file in avs2ps balls normal3d rastep render ribbon rings3d rods - cd ${WRKSRC} && ${INSTALL_PROGRAM} ${file} ${PREFIX}/bin + cd ${WRKSRC} && ${INSTALL_PROGRAM} ${file} ${STAGEDIR}${PREFIX}/bin .endfor .for file in worms - cd ${WRKSRC} && ${INSTALL_SCRIPT} ${file} ${PREFIX}/bin + cd ${WRKSRC} && ${INSTALL_SCRIPT} ${file} ${STAGEDIR}${PREFIX}/bin .endfor .if ${PORT_OPTIONS:MIMAGEMAGICK} .for file in label3d stereo3d - cd ${WRKSRC} && ${INSTALL_SCRIPT} ${file} ${PREFIX}/bin + cd ${WRKSRC} && ${INSTALL_SCRIPT} ${file} ${STAGEDIR}${PREFIX}/bin .endfor .endif - cd ${WRKSRC}/doc && ${INSTALL_MAN} ${MANL} ${MANLPREFIX}/man/manl - @${MKDIR} ${DATADIR}/materials - cd ${WRKSRC}/materials && ${INSTALL_DATA} * ${DATADIR}/materials + cd ${WRKSRC}/doc && ${INSTALL_MAN} *.l ${STAGEDIR}${MANLPREFIX}/man/manl + ${MKDIR} ${STAGEDIR}${DATADIR}/materials + cd ${WRKSRC}/materials && ${INSTALL_DATA} * ${STAGEDIR}${DATADIR}/materials .if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} - cd ${WRKSRC}/doc && ${INSTALL_DATA} R3D_manual.pdf ${DOCSDIR} - @${MKDIR} ${DOCSDIR}/html - cd ${WRKSRC}/html && ${INSTALL_DATA} * ${DOCSDIR}/html + ${MKDIR} ${STAGEDIR}${DOCSDIR} + cd ${WRKSRC}/doc && ${INSTALL_DATA} R3D_manual.pdf ${STAGEDIR}${DOCSDIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR}/html + cd ${WRKSRC}/html && ${INSTALL_DATA} * ${STAGEDIR}${DOCSDIR}/html .endif .if ${PORT_OPTIONS:MEXAMPLES} - @${MKDIR} ${EXAMPLESDIR} - @(cd ${WRKSRC}/examples && ${TAR} --exclude "CVS" -cf - . | \ - ${TAR} -C ${EXAMPLESDIR} --unlink -xf -) - @${FIND} ${EXAMPLESDIR} | ${XARGS} ${CHOWN} ${SHAREOWN}:${SHAREGRP} - @${FIND} ${EXAMPLESDIR} -type d | ${XARGS} ${CHMOD} a+rx - @${FIND} ${EXAMPLESDIR} -type f | ${XARGS} ${CHMOD} ${SHAREMODE} + ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + (cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}) + ${RM} -rf ${STAGEDIR}${EXAMPLESDIR}/msms/CVS .endif -.include +.include Modified: head/graphics/raster3d/pkg-plist ============================================================================== --- head/graphics/raster3d/pkg-plist Sun Dec 22 12:00:45 2013 (r337186) +++ head/graphics/raster3d/pkg-plist Sun Dec 22 13:15:23 2013 (r337187) @@ -9,6 +9,18 @@ bin/normal3d %%IMAGEMAGICK%%bin/label3d %%IMAGEMAGICK%%bin/stereo3d bin/worms +man/manl/avs2ps.l.gz +man/manl/balls.l.gz +man/manl/label3d.l.gz +man/manl/r3d_objects.l.gz +man/manl/r3dtops.l.gz +man/manl/rastep.l.gz +man/manl/raster3d.l.gz +man/manl/render.l.gz +man/manl/ribbon.l.gz +man/manl/rods.l.gz +man/manl/normal3d.l.gz +man/manl/stereo3d.l.gz %%PORTDOCS%%%%DOCSDIR%%/R3D_manual.pdf %%PORTDOCS%%%%DOCSDIR%%/html/README %%PORTDOCS%%%%DOCSDIR%%/html/avs2ps.html