Date: Sun, 6 Apr 2014 09:58:29 +0000 (UTC) From: Pawel Pekala <pawel@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r350345 - branches/2014Q2/graphics/pvmpov Message-ID: <201404060958.s369wTcX012651@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pawel Date: Sun Apr 6 09:58:29 2014 New Revision: 350345 URL: http://svnweb.freebsd.org/changeset/ports/350345 QAT: https://qat.redports.org/buildarchive/r350345/ Log: MFH: r350342 - Fix build with clang by respecting CC, CXXFLAGS - Add staging support - Convert to new LIB_DEPENDS format - Define DOCS option Approved by: portmgr (erwin) Modified: branches/2014Q2/graphics/pvmpov/Makefile Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/graphics/pvmpov/Makefile ============================================================================== --- branches/2014Q2/graphics/pvmpov/Makefile Sun Apr 6 09:58:09 2014 (r350344) +++ branches/2014Q2/graphics/pvmpov/Makefile Sun Apr 6 09:58:29 2014 (r350345) @@ -14,7 +14,7 @@ COMMENT= Distributed rendering package f BUILD_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/graphics/povray31:configure \ aimk:${PORTSDIR}/net/pvm -LIB_DEPENDS= png15:${PORTSDIR}/graphics/png +LIB_DEPENDS= libpng15.so:${PORTSDIR}/graphics/png RUN_DEPENDS= povray31:${PORTSDIR}/graphics/povray31 \ pvmd:${PORTSDIR}/net/pvm @@ -26,33 +26,30 @@ WRKSRC= ${WRKDIR}/pvmpov3_1g_2 BUILDBASE= ${WRKSRC}/povray31/source/pvm PVM_ROOT= ${LOCALBASE}/lib/pvm -.if !defined(NOPORTDOCS) -PORTDOCS= * -.endif - PLIST_FILES= bin/x-pvmpov \ lib/pvm/bin/FREEBSD/x-pvmpov +PORTDOCS= * + +OPTIONS_DEFINE= DOCS -NO_STAGE= yes pre-configure: - @ (cd ${WRKDIRPREFIX}${.CURDIR}/../../graphics/povray31/work && \ - ${TAR} -c -f - povray31 ) \ - | (cd ${WRKSRC} && ${TAR} --unlink -x -f -) - @ cd ${WRKSRC} && ${PATCH} -p0 -s < pvmpov.patch - @${REINPLACE_CMD} -i '' -e 's|%LOCALBASE%|${LOCALBASE}|' \ + @ (cd ${WRKDIRPREFIX}${.CURDIR}/../../graphics/povray31/work && \ + ${TAR} -c -f - povray31 ) \ + | (cd ${WRKSRC} && ${TAR} --unlink -x -f -) + @ cd ${WRKSRC} && ${PATCH} -p0 -s < pvmpov.patch + @${REINPLACE_CMD} -i '' -e 's|%LOCALBASE%|${LOCALBASE}|' \ + -e '/^CC/ s|gcc|${CC}|' -e '/^CFLAGS/ s|-O6|${CXXFLAGS}|' \ ${BUILDBASE}/Makefile.aimk do-build: - @ cd ${BUILDBASE} && \ - ${SETENV} PVM_ROOT=${PVM_ROOT} aimk newxwin + @cd ${BUILDBASE} && ${SETENV} PVM_ROOT=${PVM_ROOT} aimk newxwin do-install: - @ ${MKDIR} ${PVM_ROOT}/bin/FREEBSD - @ ${INSTALL_PROGRAM} ${BUILDBASE}/FREEBSD/x-pvmpov ${PVM_ROOT}/bin/FREEBSD - @ ${LN} -sf ${PVM_ROOT}/bin/FREEBSD/x-pvmpov ${PREFIX}/bin/x-pvmpov -.if !defined(NOPORTDOCS) - @ ${MKDIR} ${DOCSDIR} - @ ${INSTALL_DATA} ${WRKSRC}/doc/PVMPOV-HOWTO.html ${DOCSDIR} -.endif + @${MKDIR} ${STAGEDIR}${PVM_ROOT}/bin/FREEBSD + ${INSTALL_PROGRAM} ${BUILDBASE}/FREEBSD/x-pvmpov \ + ${STAGEDIR}${PVM_ROOT}/bin/FREEBSD + ${LN} -sf ${PVM_ROOT}/bin/FREEBSD/x-pvmpov ${STAGEDIR}${PREFIX}/bin/x-pvmpov + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/doc/PVMPOV-HOWTO.html ${STAGEDIR}${DOCSDIR} .include <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404060958.s369wTcX012651>