From owner-svn-ports-all@FreeBSD.ORG Mon Jul 7 17:46:05 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 569D234C; Mon, 7 Jul 2014 17:46:05 +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 2A4472E46; Mon, 7 Jul 2014 17:46:05 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s67Hk5CS009449; Mon, 7 Jul 2014 17:46:05 GMT (envelope-from bf@svn.freebsd.org) Received: (from bf@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s67Hk5R2009448; Mon, 7 Jul 2014 17:46:05 GMT (envelope-from bf@svn.freebsd.org) Message-Id: <201407071746.s67Hk5R2009448@svn.freebsd.org> From: Brendan Fabeny Date: Mon, 7 Jul 2014 17:46:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r361108 - head/graphics/pgplot 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.18 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: Mon, 07 Jul 2014 17:46:05 -0000 Author: bf Date: Mon Jul 7 17:46:04 2014 New Revision: 361108 URL: http://svnweb.freebsd.org/changeset/ports/361108 QAT: https://qat.redports.org/buildarchive/r361108/ Log: Use staging Modified: head/graphics/pgplot/Makefile Modified: head/graphics/pgplot/Makefile ============================================================================== --- head/graphics/pgplot/Makefile Mon Jul 7 17:14:29 2014 (r361107) +++ head/graphics/pgplot/Makefile Mon Jul 7 17:46:04 2014 (r361108) @@ -11,7 +11,7 @@ DISTNAME= ${PORTNAME}${PORTVERSION:R} MAINTAINER= bf@FreeBSD.org COMMENT= C/FORTRAN library for drawing graphs on a variety of display devices -LIB_DEPENDS= png15:${PORTSDIR}/graphics/png +LIB_DEPENDS= libpng15.so:${PORTSDIR}/graphics/png MAKE_JOBS_UNSAFE= yes @@ -24,8 +24,6 @@ SHEBANG_FILES= makehtml maketex SUFFIXES= flib clib bin WRKSRC= ${WRKDIR}/${PORTNAME} -NO_STAGE= yes - OPTIONS_DEFINE= DOCS EXAMPLES .include @@ -34,9 +32,7 @@ OPTIONS_DEFINE= DOCS EXAMPLES EXTRA_PATCHES += ${FILESDIR}/drivers_64bit_patch .endif -.ifndef(NOPORTDATA) PORTDATA= grfont.dat -.endif .if ${PORT_OPTIONS:MDOCS} DOCS= cpg/cpgplot.doc pgplot-routines.tex pgplot.doc pgplot.html \ @@ -68,24 +64,22 @@ do-build: do-install: @cd ${WRKSRC}; \ - ${INSTALL_PROGRAM} pgxwin_server pgdisp ${PREFIX}/bin; \ - ${INSTALL_LIB} *.a *.so.5* ${PREFIX}/lib; \ - ${INSTALL_DATA} cpgplot.h ${PREFIX}/include + ${INSTALL_PROGRAM} pgxwin_server pgdisp ${STAGEDIR}${PREFIX}/bin; \ + ${INSTALL_LIB} *.a *.so.5* ${STAGEDIR}${PREFIX}/lib; \ + ${INSTALL_DATA} cpgplot.h ${STAGEDIR}${PREFIX}/include .for f in libcpgplot.so libpgplot.so - @${LN} -sf ${f}.5 ${PREFIX}/lib/${f} + @${LN} -sf ${f}.5 ${STAGEDIR}${PREFIX}/lib/${f} .endfor -.ifndef(NOPORTDATA) - @${MKDIR} ${DATADIR} - @cd ${WRKSRC}; ${INSTALL_DATA} ${PORTDATA} ${DATADIR} -.endif + @${MKDIR} ${STAGEDIR}${DATADIR} + @cd ${WRKSRC}; ${INSTALL_DATA} ${PORTDATA} ${STAGEDIR}${DATADIR} .if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} @cd ${WRKSRC}; ${CP} pgdispd/aaaread.me readme.pgdisp; \ - ${INSTALL_DATA} ${DOCS} ${DOCSDIR} + ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR} .endif .if ${PORT_OPTIONS:MEXAMPLES} - @${MKDIR} ${EXAMPLESDIR} - @cd ${WRKSRC}; ${INSTALL_DATA} ${EXAMPLES} ${EXAMPLESDIR} + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + @cd ${WRKSRC}; ${INSTALL_DATA} ${EXAMPLES} ${STAGEDIR}${EXAMPLESDIR} .endif .if defined(MAINTAINER_MODE) && !defined(BATCH)