Date: Sun, 21 Oct 2012 21:41:07 +0000 (UTC) From: Jason Helfman <jgh@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r306246 - in head/graphics: deegree-csw deegree-igeoportal deegree-wcs deegree-wfs deegree-wms deegree-wps deegree-wpvs Message-ID: <201210212141.q9LLf7Vq062468@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jgh Date: Sun Oct 21 21:41:06 2012 New Revision: 306246 URL: http://svn.freebsd.org/changeset/ports/306246 Log: - move graphics/deegree-* suite to tomcat6 - move DOCS to optionsNG while here, and trim Makefile headers Submitted by: jgh@ Approved by: wen@ (private mail) Feature safe: yes Modified: head/graphics/deegree-csw/Makefile head/graphics/deegree-igeoportal/Makefile head/graphics/deegree-wcs/Makefile head/graphics/deegree-wfs/Makefile head/graphics/deegree-wms/Makefile head/graphics/deegree-wps/Makefile head/graphics/deegree-wpvs/Makefile Modified: head/graphics/deegree-csw/Makefile ============================================================================== --- head/graphics/deegree-csw/Makefile Sun Oct 21 20:37:26 2012 (r306245) +++ head/graphics/deegree-csw/Makefile Sun Oct 21 21:41:06 2012 (r306246) @@ -1,12 +1,10 @@ -# New ports collection makefile for: deegree-csw -# Date created: 17 April, 2009 -# Whom: wenheping@gmail.com +# Created by: wenheping@gmail.com # # $FreeBSD$ -# PORTNAME= csw PORTVERSION= 2.5 +PORTREVISION= 1 CATEGORIES= graphics java MASTER_SITES= http://download.deegree.org/deegree${PORTVERSION}/ PKGNAMEPREFIX= deegree- @@ -15,13 +13,13 @@ DISTNAME= ${PKGNAMEPREFIX}${PORTNAME}_${ MAINTAINER= wenheping@gmail.com COMMENT= Deegree Catalogue Service(CSW) -RUN_DEPENDS= ${LOCALBASE}/${TOMCATVER}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat55 +RUN_DEPENDS= ${LOCALBASE}/${TOMCATVER}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat6 USE_ZIP= yes USE_JAVA= 1.5+ NO_BUILD= yes -TOMCATVER= tomcat5.5 +TOMCATVER= apache-tomcat-6.0 TOMCATDIR= ${PREFIX}/${TOMCATVER} WEBAPPDIR= ${TOMCATDIR}/webapps PORTDOCS= * @@ -32,11 +30,13 @@ post-extract: @${MKDIR} ${WRKDIR}/${PORTDIRNAME} @${TAR} xf ${WRKDIR}/deegree-csw.war -C ${WRKDIR}/${PORTDIRNAME} +.include <bsd.port.options.mk> + do-install: ${INSTALL} -d -o ${WWWOWN} -g ${WWWGRP} ${TOMCATDIR}/webapps/${PORTDIRNAME} @cd ${WRKDIR}/${PORTDIRNAME} && ${COPYTREE_SHARE} \* ${WEBAPPDIR}/${PORTDIRNAME} -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKDIR}/README.txt ${DOCSDIR} ${INSTALL_DATA} ${WRKDIR}/deegree_csw_2.0.2_documentation_en.pdf ${DOCSDIR} Modified: head/graphics/deegree-igeoportal/Makefile ============================================================================== --- head/graphics/deegree-igeoportal/Makefile Sun Oct 21 20:37:26 2012 (r306245) +++ head/graphics/deegree-igeoportal/Makefile Sun Oct 21 21:41:06 2012 (r306246) @@ -1,12 +1,10 @@ -# New ports collection makefile for: deegree-igeoportal -# Date created: 17 April, 2009 -# Whom: wenheping@gmail.com +# Created by: wenheping@gmail.com # # $FreeBSD$ -# PORTNAME= igeoportal PORTVERSION= 2.5 +PORTREVISION= 1 CATEGORIES= graphics java MASTER_SITES= http://download.deegree.org/deegree${PORTVERSION}/ PKGNAMEPREFIX= deegree- @@ -15,13 +13,13 @@ DISTNAME= ${PORTNAME}-std_${PORTVERSION} MAINTAINER= wenheping@gmail.com COMMENT= Browser based client handling WMS, WFS, and proxy service -RUN_DEPENDS= ${LOCALBASE}/${TOMCATVER}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat55 +RUN_DEPENDS= ${LOCALBASE}/${TOMCATVER}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat6 USE_ZIP= yes USE_JAVA= 1.5+ NO_BUILD= yes -TOMCATVER= tomcat5.5 +TOMCATVER= apache-tomcat-6.0 TOMCATDIR= ${PREFIX}/${TOMCATVER} WEBAPPDIR= ${TOMCATDIR}/webapps PORTDOCS= * @@ -32,11 +30,13 @@ post-extract: @${MKDIR} ${WRKDIR}/${PORTDIRNAME} @${TAR} xf ${WRKDIR}/igeoportal-std.war -C ${WRKDIR}/${PORTDIRNAME} +.include <bsd.port.options.mk> + do-install: ${INSTALL} -d -o ${WWWOWN} -g ${WWWGRP} ${TOMCATDIR}/webapps/${PORTDIRNAME} @cd ${WRKDIR}/${PORTDIRNAME} && ${COPYTREE_SHARE} \* ${WEBAPPDIR}/${PORTDIRNAME} -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKDIR}/README.txt ${DOCSDIR} ${INSTALL_DATA} ${WRKDIR}/deegree_igeoportal_documentation_en.pdf ${DOCSDIR} Modified: head/graphics/deegree-wcs/Makefile ============================================================================== --- head/graphics/deegree-wcs/Makefile Sun Oct 21 20:37:26 2012 (r306245) +++ head/graphics/deegree-wcs/Makefile Sun Oct 21 21:41:06 2012 (r306246) @@ -1,12 +1,10 @@ -# New ports collection makefile for: deegree-wcs -# Date created: 17 April, 2009 -# Whom: wenheping@gmail.com +# Created by: wenheping@gmail.com # # $FreeBSD$ -# PORTNAME= wcs PORTVERSION= 2.5 +PORTREVISION= 1 CATEGORIES= graphics java MASTER_SITES= http://download.deegree.org/deegree${PORTVERSION}/ PKGNAMEPREFIX= deegree- @@ -15,13 +13,13 @@ DISTNAME= ${PKGNAMEPREFIX}${PORTNAME}_${ MAINTAINER= wenheping@gmail.com COMMENT= Deegree Web Coverage Service(WCS) -RUN_DEPENDS= ${LOCALBASE}/${TOMCATVER}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat55 +RUN_DEPENDS= ${LOCALBASE}/${TOMCATVER}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat6 USE_ZIP= yes USE_JAVA= 1.5+ NO_BUILD= yes -TOMCATVER= tomcat5.5 +TOMCATVER= apache-tomcat-6.0 TOMCATDIR= ${PREFIX}/${TOMCATVER} WEBAPPDIR= ${TOMCATDIR}/webapps PORTDOCS= * @@ -32,12 +30,14 @@ post-extract: @${MKDIR} ${WRKDIR}/${PORTDIRNAME} @${TAR} xf ${WRKDIR}/deegree-wcs.war -C ${WRKDIR}/${PORTDIRNAME} +.include <bsd.port.options.mk> + do-install: cd ${WRKDIR} && \ ${INSTALL} -d -o ${WWWOWN} -g ${WWWGRP} ${TOMCATDIR}/webapps/${PORTDIRNAME} @cd ${WRKDIR}/${PORTDIRNAME} && ${COPYTREE_SHARE} \* ${WEBAPPDIR}/${PORTDIRNAME} -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKDIR}/README.txt ${DOCSDIR} ${INSTALL_DATA} ${WRKDIR}/deegree_wcs_documentation_en.pdf ${DOCSDIR} Modified: head/graphics/deegree-wfs/Makefile ============================================================================== --- head/graphics/deegree-wfs/Makefile Sun Oct 21 20:37:26 2012 (r306245) +++ head/graphics/deegree-wfs/Makefile Sun Oct 21 21:41:06 2012 (r306246) @@ -1,12 +1,10 @@ -# New ports collection makefile for: deegree-wfs -# Date created: 17 April, 2009 -# Whom: wenheping@gmail.com +# Created by: wenheping@gmail.com # # $FreeBSD$ -# PORTNAME= wfs PORTVERSION= 2.5 +PORTREVISION= 1 CATEGORIES= graphics java MASTER_SITES= http://download.deegree.org/deegree${PORTVERSION}/ PKGNAMEPREFIX= deegree- @@ -15,13 +13,13 @@ DISTNAME= ${PKGNAMEPREFIX}${PORTNAME}_${ MAINTAINER= wenheping@gmail.com COMMENT= Deegree Web Feature Service(WFS) -RUN_DEPENDS= ${LOCALBASE}/${TOMCATVER}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat55 +RUN_DEPENDS= ${LOCALBASE}/${TOMCATVER}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat6 USE_ZIP= yes USE_JAVA= 1.5+ NO_BUILD= yes -TOMCATVER= tomcat5.5 +TOMCATVER= apache-tomcat-6.0 TOMCATDIR= ${PREFIX}/${TOMCATVER} WEBAPPDIR= ${TOMCATDIR}/webapps PORTDOCS= * @@ -32,12 +30,14 @@ post-extract: @${MKDIR} ${WRKDIR}/${PORTDIRNAME} @${TAR} xf ${WRKDIR}/deegree-wfs.war -C ${WRKDIR}/${PORTDIRNAME} +.include <bsd.port.options.mk> + do-install: cd ${WRKDIR} && \ ${INSTALL} -d -o ${WWWOWN} -g ${WWWGRP} ${TOMCATDIR}/webapps/${PORTDIRNAME} @cd ${WRKDIR}/${PORTDIRNAME} && ${COPYTREE_SHARE} \* ${WEBAPPDIR}/${PORTDIRNAME} -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKDIR}/README.txt ${DOCSDIR} ${INSTALL_DATA} ${WRKDIR}/deegree_wfs_documentation_en.pdf ${DOCSDIR} Modified: head/graphics/deegree-wms/Makefile ============================================================================== --- head/graphics/deegree-wms/Makefile Sun Oct 21 20:37:26 2012 (r306245) +++ head/graphics/deegree-wms/Makefile Sun Oct 21 21:41:06 2012 (r306246) @@ -1,12 +1,10 @@ -# New ports collection makefile for: deegree-wms -# Date created: 17 April, 2009 -# Whom: wenheping@gmail.com +# Created by: wenheping@gmail.com # # $FreeBSD$ -# PORTNAME= wms PORTVERSION= 2.5 +PORTREVISION= 1 CATEGORIES= graphics java MASTER_SITES= http://download.deegree.org/deegree${PORTVERSION}/ PKGNAMEPREFIX= deegree- @@ -15,13 +13,13 @@ DISTNAME= ${PKGNAMEPREFIX}${PORTNAME}_${ MAINTAINER= wenheping@gmail.com COMMENT= Deegree Web Map Service(WMS) -RUN_DEPENDS= ${LOCALBASE}/${TOMCATVER}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat55 +RUN_DEPENDS= ${LOCALBASE}/${TOMCATVER}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat6 USE_ZIP= yes USE_JAVA= 1.5+ NO_BUILD= yes -TOMCATVER= tomcat5.5 +TOMCATVER= apache-tomcat-6.0 TOMCATDIR= ${PREFIX}/${TOMCATVER} WEBAPPDIR= ${TOMCATDIR}/webapps PORTDOCS= * @@ -32,11 +30,13 @@ post-extract: @${MKDIR} ${WRKDIR}/${PORTDIRNAME} @${TAR} xf ${WRKDIR}/deegree-wms.war -C ${WRKDIR}/${PORTDIRNAME} +.include <bsd.port.options.mk> + do-install: ${INSTALL} -d -o ${WWWOWN} -g ${WWWGRP} ${TOMCATDIR}/webapps/${PORTDIRNAME} @cd ${WRKDIR}/${PORTDIRNAME} && ${COPYTREE_SHARE} \* ${WEBAPPDIR}/${PORTDIRNAME} -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKDIR}/README.txt ${DOCSDIR} ${INSTALL_DATA} ${WRKDIR}/deegree_wms_documentation_en.pdf ${DOCSDIR} Modified: head/graphics/deegree-wps/Makefile ============================================================================== --- head/graphics/deegree-wps/Makefile Sun Oct 21 20:37:26 2012 (r306245) +++ head/graphics/deegree-wps/Makefile Sun Oct 21 21:41:06 2012 (r306246) @@ -1,12 +1,10 @@ -# New ports collection makefile for: deegree-wps -# Date created: 17 April, 2009 -# Whom: wenheping@gmail.com +# Created by: wenheping@gmail.com # # $FreeBSD$ -# PORTNAME= wps PORTVERSION= 2.5 +PORTREVISION= 1 CATEGORIES= graphics java MASTER_SITES= http://download.deegree.org/deegree${PORTVERSION}/ PKGNAMEPREFIX= deegree- @@ -15,13 +13,13 @@ DISTNAME= ${PKGNAMEPREFIX}${PORTNAME}_${ MAINTAINER= wenheping@gmail.com COMMENT= Deegree Web Processing Service(WPS) -RUN_DEPENDS= ${LOCALBASE}/${TOMCATVER}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat55 +RUN_DEPENDS= ${LOCALBASE}/${TOMCATVER}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat6 USE_ZIP= yes USE_JAVA= 1.5+ NO_BUILD= yes -TOMCATVER= tomcat5.5 +TOMCATVER= apache-tomcat-6.0 TOMCATDIR= ${PREFIX}/${TOMCATVER} TOMCATOWN= www TOMCATGRP= www @@ -34,11 +32,13 @@ post-extract: @${MKDIR} ${WRKDIR}/${PORTDIRNAME} @${TAR} xf ${WRKDIR}/deegree-wps.war -C ${WRKDIR}/${PORTDIRNAME} +.include <bsd.port.options.mk> + do-install: ${INSTALL} -d -o ${WWWOWN} -g ${WWWGRP} ${TOMCATDIR}/webapps/${PORTDIRNAME} @cd ${WRKDIR}/${PORTDIRNAME} && ${COPYTREE_SHARE} \* ${WEBAPPDIR}/${PORTDIRNAME} -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKDIR}/README.txt ${DOCSDIR} ${INSTALL_DATA} ${WRKDIR}/deegree_wps_documentation_en.pdf ${DOCSDIR} Modified: head/graphics/deegree-wpvs/Makefile ============================================================================== --- head/graphics/deegree-wpvs/Makefile Sun Oct 21 20:37:26 2012 (r306245) +++ head/graphics/deegree-wpvs/Makefile Sun Oct 21 21:41:06 2012 (r306246) @@ -1,12 +1,11 @@ -# New ports collection makefile for: deegree-wpvs -# Date created: 17 April, 2009 -# Whom: wenheping@gmail.com +# Created by: wenheping@gmail.com # # $FreeBSD$ # PORTNAME= wpvs PORTVERSION= 2.5 +PORTREVISION= 1 CATEGORIES= graphics java MASTER_SITES= http://download.deegree.org/deegree${PORTVERSION}/ PKGNAMEPREFIX= deegree- @@ -15,13 +14,13 @@ DISTNAME= ${PKGNAMEPREFIX}${PORTNAME}_${ MAINTAINER= wenheping@gmail.com COMMENT= Deegree Web Terrain Service(WTS)/Web Perspective View Service(WPVS) -RUN_DEPENDS= ${LOCALBASE}/${TOMCATVER}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat55 +RUN_DEPENDS= ${LOCALBASE}/${TOMCATVER}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat6 USE_ZIP= yes USE_JAVA= 1.5+ NO_BUILD= yes -TOMCATVER= tomcat5.5 +TOMCATVER= apache-tomcat-6.0 TOMCATDIR= ${PREFIX}/${TOMCATVER} WEBAPPDIR= ${TOMCATDIR}/webapps PORTDOCS= * @@ -32,11 +31,13 @@ post-extract: @${MKDIR} ${WRKDIR}/${PORTDIRNAME} @${TAR} xf ${WRKDIR}/deegree-wpvs.war -C ${WRKDIR}/${PORTDIRNAME} +.include <bsd.port.options.mk> + do-install: ${INSTALL} -d -o ${WWWOWN} -g ${WWWGRP} ${TOMCATDIR}/webapps/${PORTDIRNAME} @cd ${WRKDIR}/${PORTDIRNAME} && ${COPYTREE_SHARE} \* ${WEBAPPDIR}/${PORTDIRNAME} -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKDIR}/README.txt ${DOCSDIR} ${INSTALL_DATA} ${WRKDIR}/deegree_wpvs_documentation_en.pdf ${DOCSDIR}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201210212141.q9LLf7Vq062468>