From owner-svn-ports-head@FreeBSD.ORG  Sun Apr  6 09:26:16 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@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 B71F6BCA;
 Sun,  6 Apr 2014 09:26:16 +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 8A149A8E;
 Sun,  6 Apr 2014 09:26:16 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s369QGct099638;
 Sun, 6 Apr 2014 09:26:16 GMT (envelope-from pawel@svn.freebsd.org)
Received: (from pawel@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s369QGAg099637;
 Sun, 6 Apr 2014 09:26:16 GMT (envelope-from pawel@svn.freebsd.org)
Message-Id: <201404060926.s369QGAg099637@svn.freebsd.org>
From: Pawel Pekala <pawel@FreeBSD.org>
Date: Sun, 6 Apr 2014 09:26:16 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r350342 - head/graphics/pvmpov
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 06 Apr 2014 09:26:16 -0000

Author: pawel
Date: Sun Apr  6 09:26:16 2014
New Revision: 350342
URL: http://svnweb.freebsd.org/changeset/ports/350342
QAT: https://qat.redports.org/buildarchive/r350342/

Log:
  - Fix build with clang by respecting CC, CXXFLAGS
  - Add staging support
  - Convert to new LIB_DEPENDS format
  - Define DOCS option
  
  MFH:		2014Q2

Modified:
  head/graphics/pvmpov/Makefile

Modified: head/graphics/pvmpov/Makefile
==============================================================================
--- head/graphics/pvmpov/Makefile	Sun Apr  6 07:45:03 2014	(r350341)
+++ head/graphics/pvmpov/Makefile	Sun Apr  6 09:26:16 2014	(r350342)
@@ -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>