From owner-svn-ports-head@FreeBSD.ORG Fri May 16 15:54:19 2014 Return-Path: Delivered-To: svn-ports-head@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 3FF002EF; Fri, 16 May 2014 15:54:19 +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 1381D2DA1; Fri, 16 May 2014 15:54:19 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4GFsIPk019560; Fri, 16 May 2014 15:54:18 GMT (envelope-from wen@svn.freebsd.org) Received: (from wen@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4GFsIFH019558; Fri, 16 May 2014 15:54:18 GMT (envelope-from wen@svn.freebsd.org) Message-Id: <201405161554.s4GFsIFH019558@svn.freebsd.org> From: Wen Heping Date: Fri, 16 May 2014 15:54:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r354241 - head/graphics/mapserver 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.18 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 16 May 2014 15:54:19 -0000 Author: wen Date: Fri May 16 15:54:18 2014 New Revision: 354241 URL: http://svnweb.freebsd.org/changeset/ports/354241 QAT: https://qat.redports.org/buildarchive/r354241/ Log: - Stage support Modified: head/graphics/mapserver/Makefile Modified: head/graphics/mapserver/Makefile ============================================================================== --- head/graphics/mapserver/Makefile Fri May 16 15:49:35 2014 (r354240) +++ head/graphics/mapserver/Makefile Fri May 16 15:54:18 2014 (r354241) @@ -35,7 +35,6 @@ WFS_DESC= WFS Server support WCS_DESC= WCS Server support MAPSERV_DESC= Mapserv cgi interface support -NO_STAGE= yes .include .if ${PORT_OPTIONS:MMAPSERV} @@ -176,31 +175,31 @@ PROG_FILES= legend scalebar shp2img shp do-install: .for f in ${PROG_FILES} - ${INSTALL_SCRIPT} ${WRKSRC}/${f} ${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKSRC}/${f} ${STAGEDIR}${PREFIX}/bin .endfor - ${INSTALL_PROGRAM} ${WRKSRC}/libmapserver.so.${PORTVERSION} ${PREFIX}/lib + ${INSTALL_PROGRAM} ${WRKSRC}/libmapserver.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib .if ${PORT_OPTIONS:MMAPSERV} - ${MKDIR} ${LOCALBASE}/www/apache${APACHE_VERSION}/cgi-bin/ - ${INSTALL_SCRIPT} ${WRKSRC}/mapserv ${LOCALBASE}/www/apache${APACHE_VERSION}/cgi-bin/mapserv + ${MKDIR} ${STAGEDIR}${LOCALBASE}/www/apache${APACHE_VERSION}/cgi-bin/ + ${INSTALL_SCRIPT} ${WRKSRC}/mapserv ${STAGEDIR}${PREFIX}/www/apache${APACHE_VERSION}/cgi-bin/mapserv .endif .if ${PORT_OPTIONS:MPHP} - @${MKDIR} ${LOCALBASE}/${PHP_EXTENSION_DIR} + @${MKDIR} ${STAGEDIR}${LOCALBASE}/${PHP_EXTENSION_DIR} ${INSTALL_PROGRAM} ${WRKSRC}/mapscript/php/php_mapscript.so \ - ${LOCALBASE}/${PHP_EXTENSION_DIR}/ + ${STAGEDIR}${PREFIX}/${PHP_EXTENSION_DIR}/ .endif .if ${PORT_OPTIONS:MPYTHON} - (cd ${WRKSRC}/mapscript/python && ${CP} mapscript.py _mapscript.so ${PYTHON_SITELIBDIR}/) + (cd ${WRKSRC}/mapscript/python && ${CP} mapscript.py _mapscript.so ${STAGEDIR}${PYTHON_SITELIBDIR}/) .endif post-install: - @${LN} -s ${PREFIX}/lib/libmapserver.so.6.4.0 ${PREFIX}/lib/libmapserver.so.1 - @${LN} -s ${PREFIX}/lib/libmapserver.so.1 ${PREFIX}/lib/libmapserver.so + @${LN} -s ${PREFIX}/lib/libmapserver.so.6.4.0 ${STAGEDIR}${PREFIX}/lib/libmapserver.so.1 + @${LN} -s ${PREFIX}/lib/libmapserver.so.1 ${STAGEDIR}${PREFIX}/lib/libmapserver.so .if ${PORT_OPTIONS:MPHP} - @${ECHO_MSG} "Please add the line extension=php_mapscript.so to ${LOCALBASE}/etc/php/extensions.ini" + @${ECHO_MSG} "Please add the line extension=php_mapscript.so to ${PREFIX}/etc/php/extensions.ini" .endif .include