Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 28 Apr 2014 10:14:20 +0000 (UTC)
From:      Pawel Pekala <pawel@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r352479 - head/graphics/phplot
Message-ID:  <201404281014.s3SAEKdU069071@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: pawel
Date: Mon Apr 28 10:14:19 2014
New Revision: 352479
URL: http://svnweb.freebsd.org/changeset/ports/352479
QAT: https://qat.redports.org/buildarchive/r352479/

Log:
  - Add staging support
  - Convert to new LIB_DEPENDS format
  - Use option helper
  - Define DOCS option
  - Unmute install commands

Modified:
  head/graphics/phplot/Makefile

Modified: head/graphics/phplot/Makefile
==============================================================================
--- head/graphics/phplot/Makefile	Mon Apr 28 09:57:02 2014	(r352478)
+++ head/graphics/phplot/Makefile	Mon Apr 28 10:14:19 2014	(r352479)
@@ -13,35 +13,26 @@ DISTFILES=	${PORTNAME}-${PORTVERSION}${E
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	PHP class for creating scientific and business charts
 
-LIB_DEPENDS+=	gd:${PORTSDIR}/graphics/gd
+LIB_DEPENDS=	libgd.so:${PORTSDIR}/graphics/gd
 
 USES=		zip
 USE_PHP=	yes
 DEFAULT_PHP_VER=	5
 NO_BUILD=	YES
 
-PHPLOT_DIR=	${PREFIX}/include/php/phplot
+PHPLOT_DIR=	${STAGEDIR}${PREFIX}/include/php/phplot
 
 LIBS=		phplot.php rgb.inc.php
 
-OPTIONS_DEFINE=		FONTS
+OPTIONS_DEFINE=		DOCS FONTS
 OPTIONS_DEFAULT=	FONTS
 FONTS_DESC=		install TrueType fonts
-
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MFONTS}
-LIB_DEPENDS+=	libfreetype.so:${PORTSDIR}/print/freetype2
-.endif
+FONTS_LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2
 
 do-install:
 	@${MKDIR} ${PHPLOT_DIR}
-	@${INSTALL_DATA} ${LIBS:S,^,${WRKSRC}/,} ${PHPLOT_DIR}/
-
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	@cd ${WRKDIR}/phplotdocs && ${COPYTREE_SHARE} . ${DOCSDIR}/
-.endif
+	${INSTALL_DATA} ${LIBS:S,^,${WRKSRC}/,} ${PHPLOT_DIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	(cd ${WRKDIR}/phplotdocs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404281014.s3SAEKdU069071>