From owner-svn-ports-all@FreeBSD.ORG Fri Apr 4 19:50:25 2014 Return-Path: Delivered-To: svn-ports-all@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 D77B22F2; Fri, 4 Apr 2014 19:50:25 +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 B9393A27; Fri, 4 Apr 2014 19:50:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s34JoPDw062274; Fri, 4 Apr 2014 19:50:25 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s34JoPl1062271; Fri, 4 Apr 2014 19:50:25 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201404041950.s34JoPl1062271@svn.freebsd.org> From: Baptiste Daroussin Date: Fri, 4 Apr 2014 19:50:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r350157 - head/astro/openmap 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.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: Fri, 04 Apr 2014 19:50:25 -0000 Author: bapt Date: Fri Apr 4 19:50:25 2014 New Revision: 350157 URL: http://svnweb.freebsd.org/changeset/ports/350157 QAT: https://qat.redports.org/buildarchive/r350157/ Log: Support stage Fix plist Modified: head/astro/openmap/Makefile head/astro/openmap/pkg-plist Modified: head/astro/openmap/Makefile ============================================================================== --- head/astro/openmap/Makefile Fri Apr 4 19:42:32 2014 (r350156) +++ head/astro/openmap/Makefile Fri Apr 4 19:50:25 2014 (r350157) @@ -2,6 +2,7 @@ PORTNAME= openmap PORTVERSION= 4.6.4 +PORTREVISION= 1 CATEGORIES= astro java devel graphics geography MASTER_SITES= http://openmap.bbn.com/src/ @@ -15,7 +16,6 @@ JAVA_VERSION= 1.6+ PKGMESSAGE= ${WRKSRC}/LICENSE -NO_STAGE= yes USE_ANT= yes MAKE_ARGS+= -Dopenmap.home=${WRKSRC} \ -Didl2java.compiler=${JAVA_HOME}/bin/idlj @@ -24,8 +24,6 @@ SUB_FILES= openmap.sh OPTIONS_DEFINE= DOCS -.include - do-configure: (cd ${WRKSRC} && ${FIND} . -type f -print0 | ${XARGS} -0 \ ${REINPLACE_CMD} -e 's,/usr/local/openmap,${DATADIR},g') @@ -33,22 +31,20 @@ do-configure: do-install: (cd ${WRKSRC}/lib && \ - ${INSTALL_DATA} -o ${SHAREOWN} -g ${SHAREGRP} *.jar ${JAVAJARDIR}) - ${MKDIR} ${DATADIR} + ${INSTALL_DATA} *.jar ${STAGEDIR}${JAVAJARDIR}) + @${MKDIR} ${STAGEDIR}${DATADIR} (cd ${WRKSRC}/share && ${FIND} . -type f -print | \ - ${CPIO} -pdmu -R${SHAREOWN}:${SHAREGRP} ${DATADIR}) - ${FIND} ${DATADIR} -type d -print0 | ${XARGS} -0 ${CHMOD} 0555 - ${FIND} ${DATADIR} -type f -print0 | ${XARGS} -0 ${CHMOD} 0444 - ${INSTALL_SCRIPT} -o ${BINOWN} -g ${BINGRP} \ - ${WRKDIR}/openmap.sh ${PREFIX}/bin/openmap - ${MKDIR} ${DOCSDIR} - (cd ${WRKSRC} && ${INSTALL_DATA} -o ${SHAREOWN} -g ${SHAREGRP} \ - AUTHORS LICENSE README ${DOCSDIR}) -.if ${PORT_OPTIONS:MDOCS} + ${CPIO} -pdmu -R${SHAREOWN}:${SHAREGRP} ${STAGEDIR}${DATADIR}) + ${FIND} ${STAGEDIR}${DATADIR} -type d -print0 | ${XARGS} -0 ${CHMOD} 0755 + ${FIND} ${STAGEDIR}${DATADIR} -type f -print0 | ${XARGS} -0 ${CHMOD} 0644 + ${INSTALL_SCRIPT} \ + ${WRKDIR}/openmap.sh ${STAGEDIR}${PREFIX}/bin/openmap + @${MKDIR} ${STAGEDIR}${DOCSDIR} + (cd ${WRKSRC} && ${INSTALL_DATA} \ + AUTHORS LICENSE README ${STAGEDIR}${DOCSDIR}) (cd ${WRKSRC}/doc && ${FIND} . -type f -print | \ - ${CPIO} -pdmu -R${SHAREOWN}:${SHAREGRP} ${DOCSDIR}) - ${FIND} ${DOCSDIR} -type d -print0 | ${XARGS} -0 ${CHMOD} 0555 - ${FIND} ${DOCSDIR} -type f -print0 | ${XARGS} -0 ${CHMOD} 0444 -.endif + ${CPIO} -pdmu -R${SHAREOWN}:${SHAREGRP} ${STAGEDIR}${DOCSDIR}) + ${FIND} ${STAGEDIR}${DOCSDIR} -type d -print0 | ${XARGS} -0 ${CHMOD} 0755 + ${FIND} ${STAGEDIR}${DOCSDIR} -type f -print0 | ${XARGS} -0 ${CHMOD} 0644 .include Modified: head/astro/openmap/pkg-plist ============================================================================== --- head/astro/openmap/pkg-plist Fri Apr 4 19:42:32 2014 (r350156) +++ head/astro/openmap/pkg-plist Fri Apr 4 19:50:25 2014 (r350157) @@ -2939,13 +2939,12 @@ bin/openmap @dirrm %%DATADIR%% %%PORTDOCS%%@dirrm %%DOCSDIR%%/sgml %%PORTDOCS%%@dirrm %%DOCSDIR%%/images +%%PORTDOCS%%@dirrm %%DOCSDIR%%/api/resources %%PORTDOCS%%@dirrm %%DOCSDIR%%/api/images %%PORTDOCS%%@dirrm %%DOCSDIR%%/api/edu/stanford/ejalbert/class-use %%PORTDOCS%%@dirrm %%DOCSDIR%%/api/edu/stanford/ejalbert %%PORTDOCS%%@dirrm %%DOCSDIR%%/api/edu/stanford %%PORTDOCS%%@dirrm %%DOCSDIR%%/api/edu -%%PORTDOCS%%@dirrm %%DOCSDIR%%/api/com/bbn/openmap/util/cacheHandler/class-use -%%PORTDOCS%%@dirrm %%DOCSDIR%%/api/com/bbn/openmap/util/cacheHandler %%PORTDOCS%%@dirrm %%DOCSDIR%%/api/com/bbn/openmap/util/wanderer/class-use %%PORTDOCS%%@dirrm %%DOCSDIR%%/api/com/bbn/openmap/util/wanderer %%PORTDOCS%%@dirrm %%DOCSDIR%%/api/com/bbn/openmap/util/quadtree/class-use @@ -2953,6 +2952,8 @@ bin/openmap %%PORTDOCS%%@dirrm %%DOCSDIR%%/api/com/bbn/openmap/util/propertyEditor/class-use %%PORTDOCS%%@dirrm %%DOCSDIR%%/api/com/bbn/openmap/util/propertyEditor %%PORTDOCS%%@dirrm %%DOCSDIR%%/api/com/bbn/openmap/util/class-use +%%PORTDOCS%%@dirrm %%DOCSDIR%%/api/com/bbn/openmap/util/cacheHandler/class-use +%%PORTDOCS%%@dirrm %%DOCSDIR%%/api/com/bbn/openmap/util/cacheHandler %%PORTDOCS%%@dirrm %%DOCSDIR%%/api/com/bbn/openmap/util %%PORTDOCS%%@dirrm %%DOCSDIR%%/api/com/bbn/openmap/tools/terrain/class-use %%PORTDOCS%%@dirrm %%DOCSDIR%%/api/com/bbn/openmap/tools/terrain @@ -3048,12 +3049,14 @@ bin/openmap %%PORTDOCS%%@dirrm %%DOCSDIR%%/api/com/bbn/openmap/layer/link/shape %%PORTDOCS%%@dirrm %%DOCSDIR%%/api/com/bbn/openmap/layer/link/draw/class-use %%PORTDOCS%%@dirrm %%DOCSDIR%%/api/com/bbn/openmap/layer/link/draw/ +%%PORTDOCS%%@dirrm %%DOCSDIR%%/api/com/bbn/openmap/layer/link/draw %%PORTDOCS%%@dirrm %%DOCSDIR%%/api/com/bbn/openmap/layer/link/class-use %%PORTDOCS%%@dirrm %%DOCSDIR%%/api/com/bbn/openmap/layer/link/amp/class-use %%PORTDOCS%%@dirrm %%DOCSDIR%%/api/com/bbn/openmap/layer/link/amp %%PORTDOCS%%@dirrm %%DOCSDIR%%/api/com/bbn/openmap/layer/link %%PORTDOCS%%@dirrm %%DOCSDIR%%/api/com/bbn/openmap/layer/learn/class-use %%PORTDOCS%%@dirrm %%DOCSDIR%%/api/com/bbn/openmap/layer/learn/ +%%PORTDOCS%%@dirrm %%DOCSDIR%%/api/com/bbn/openmap/layer/learn %%PORTDOCS%%@dirrm %%DOCSDIR%%/api/com/bbn/openmap/layer/imageTile/class-use %%PORTDOCS%%@dirrm %%DOCSDIR%%/api/com/bbn/openmap/layer/imageTile %%PORTDOCS%%@dirrm %%DOCSDIR%%/api/com/bbn/openmap/layer/etopo/class-use @@ -3133,6 +3136,5 @@ bin/openmap %%PORTDOCS%%@dirrm %%DOCSDIR%%/api/Acme/JPM/Encoders %%PORTDOCS%%@dirrm %%DOCSDIR%%/api/Acme/JPM %%PORTDOCS%%@dirrm %%DOCSDIR%%/api/Acme -%%PORTDOCS%%@dirrm %%DOCSDIR%%/api/resources %%PORTDOCS%%@dirrm %%DOCSDIR%%/api @dirrm %%DOCSDIR%%