From owner-svn-ports-all@FreeBSD.ORG Sun Apr 6 09:58:29 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 D415F286; Sun, 6 Apr 2014 09:58:29 +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 A6B2DC88; Sun, 6 Apr 2014 09:58:29 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s369wTh8012652; Sun, 6 Apr 2014 09:58:29 GMT (envelope-from pawel@svn.freebsd.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s369wTcX012651; Sun, 6 Apr 2014 09:58:29 GMT (envelope-from pawel@svn.freebsd.org) Message-Id: <201404060958.s369wTcX012651@svn.freebsd.org> From: Pawel Pekala Date: Sun, 6 Apr 2014 09:58:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r350345 - branches/2014Q2/graphics/pvmpov X-SVN-Group: ports-branches 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, 06 Apr 2014 09:58:29 -0000 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