From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Oct 26 00:40:00 2012 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id DEB2DF29 for ; Fri, 26 Oct 2012 00:40:00 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.FreeBSD.org [8.8.178.135]) by mx1.freebsd.org (Postfix) with ESMTP id AEBF68FC17 for ; Fri, 26 Oct 2012 00:40:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q9Q0e0qv031144 for ; Fri, 26 Oct 2012 00:40:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q9Q0e0Dv031143; Fri, 26 Oct 2012 00:40:00 GMT (envelope-from gnats) Resent-Date: Fri, 26 Oct 2012 00:40:00 GMT Resent-Message-Id: <201210260040.q9Q0e0Dv031143@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, nemysis Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id BF48AE02 for ; Fri, 26 Oct 2012 00:35:55 +0000 (UTC) (envelope-from nemysis@gmx.ch) Received: from mailout-de.gmx.net (mailout-de.gmx.net [213.165.64.23]) by mx1.freebsd.org (Postfix) with SMTP id F145C8FC1B for ; Fri, 26 Oct 2012 00:35:54 +0000 (UTC) Received: (qmail invoked by alias); 26 Oct 2012 00:35:53 -0000 Received: from 201-230.4-85.cust.bluewin.ch (EHLO something.email.com) [85.4.230.201] by mail.gmx.net (mp031) with SMTP; 26 Oct 2012 02:35:53 +0200 Received: by something.email.com (sSMTP sendmail emulation); Fri, 26 Oct 2012 02:35:54 +0200 Message-Id: <20121026003555.BF48AE02@hub.freebsd.org> Date: Fri, 26 Oct 2012 02:35:54 +0200 From: nemysis To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/173093: [PATCH] graphics/deegree-wps: Changed to use Tomcat6 and Tomcat7, OptionsNG Cc: wenheping@gmail.com X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 Oct 2012 00:40:00 -0000 >Number: 173093 >Category: ports >Synopsis: [PATCH] graphics/deegree-wps: Changed to use Tomcat6 and Tomcat7, OptionsNG >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri Oct 26 00:40:00 UTC 2012 >Closed-Date: >Last-Modified: >Originator: nemysis >Release: FreeBSD 9.0-RELEASE amd64 >Organization: >Environment: System: FreeBSD FreeBSD_Ports 9.0-RELEASE FreeBSD 9.0-RELEASE #0: Tue Jan 3 07:46:30 UTC >Description: Makefile changed: +PORTDOCS= README.txt deegree_wps_documentation_en.pdf +OPTIONS_SINGLE= AS +.include +.if ${PORT_OPTIONS:MTOMCAT6} +.if ${PORT_OPTIONS:MTOMCAT7} pkg-plist changed to use %%WEBAPPS%%/deegree-wps %%TOMCAT%% Port maintainer (wenheping@gmail.com) is cc'd. Generated and tested manually, tested with port test and with RedPorts (all RELEASES, CLANG), sent with FreeBSD Port Tools 0.99_6 (mode: change, diff: ports) >How-To-Repeat: portlint -A WARN: Makefile: for new port, make $FreeBSD$ tag in comment section empty, to make SVN happy. WARN: Makefile: new ports should not set PORTREVISION. WARN: Makefile: only one MASTER_SITE configured. Consider adding additional mirrors. 0 fatal errors and 3 warnings found. >Fix: --- deegree-wps-2.5_1.patch begins here --- diff -ruN --exclude=CVS /usr/ports/graphics/deegree-wps/Makefile ./Makefile --- /usr/ports/graphics/deegree-wps/Makefile 2012-02-01 02:20:58.000000000 +0100 +++ ./Makefile 2012-10-26 01:14:20.000000000 +0200 @@ -7,44 +7,62 @@ PORTNAME= wps PORTVERSION= 2.5 +PORTREVISION= 1 CATEGORIES= graphics java MASTER_SITES= http://download.deegree.org/deegree${PORTVERSION}/ PKGNAMEPREFIX= deegree- DISTNAME= ${PKGNAMEPREFIX}${PORTNAME}_${PORTVERSION} +DIST_SUBDIR= java MAINTAINER= wenheping@gmail.com COMMENT= Deegree Web Processing Service(WPS) -RUN_DEPENDS= ${LOCALBASE}/${TOMCATVER}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat55 - USE_ZIP= yes USE_JAVA= 1.5+ - NO_BUILD= yes -TOMCATVER= tomcat5.5 -TOMCATDIR= ${PREFIX}/${TOMCATVER} -TOMCATOWN= www -TOMCATGRP= www -WEBAPPDIR= ${TOMCATDIR}/webapps -PORTDOCS= * + +PORTDOCS= README.txt deegree_wps_documentation_en.pdf DOCSDIR= ${PREFIX}/share/doc/deegree-wps -PLIST_SUB= TOMCATDIR=${TOMCATDIR:S|^${PREFIX}/||} + +OPTIONS_SINGLE= AS +OPTIONS_SINGLE_AS= TOMCAT6 TOMCAT7 +OPTIONS_DEFAULT= TOMCAT6 + +.include + +.if ${PORT_OPTIONS:MTOMCAT6} +TOMCATDIR= ${PREFIX}/apache-tomcat-6.0 +BUILD_DEPENDS+= ${LOCALBASE}/apache-tomcat-6.0/bin/bootstrap.jar:${PORTSDIR}/www/tomcat6 +RUN_DEPENDS+= ${LOCALBASE}/apache-tomcat-6.0/bin/bootstrap.jar:${PORTSDIR}/www/tomcat6 +.endif + +.if ${PORT_OPTIONS:MTOMCAT7} +TOMCATDIR= ${PREFIX}apache-tomcat-7.0 +BUILD_DEPENDS+= ${LOCALBASE}/apache-tomcat-7.0/bin/bootstrap.jar:${PORTSDIR}/www/tomcat7 +RUN_DEPENDS+= ${LOCALBASE}/apache-tomcat-7.0/bin/bootstrap.jar:${PORTSDIR}/www/tomcat7 +.endif + +WEBAPPDIR= ${TOMCATDIR}/webapps + +PLIST_SUB+= TOMCAT=${TOMCATDIR:S|^${PREFIX}/||} +PLIST_SUB+= WEBAPPS=${WEBAPPDIR:S|^${PREFIX}/||} post-extract: - @${MKDIR} ${WRKDIR}/${PORTDIRNAME} - @${TAR} xf ${WRKDIR}/deegree-wps.war -C ${WRKDIR}/${PORTDIRNAME} + ${MKDIR} ${WRKDIR}/${PORTDIRNAME} + ${TAR} xf ${WRKDIR}/deegree-wps.war -C ${WRKDIR}/${PORTDIRNAME} do-install: ${INSTALL} -d -o ${WWWOWN} -g ${WWWGRP} ${TOMCATDIR}/webapps/${PORTDIRNAME} - @cd ${WRKDIR}/${PORTDIRNAME} && ${COPYTREE_SHARE} \* ${WEBAPPDIR}/${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} + ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKDIR}/|} ${DOCSDIR} .endif post-install: + @${ECHO_CMD} @${CAT} ${PKGMESSAGE} + @${ECHO_CMD} .include diff -ruN --exclude=CVS /usr/ports/graphics/deegree-wps/distinfo ./distinfo --- /usr/ports/graphics/deegree-wps/distinfo 2012-02-01 02:20:58.000000000 +0100 +++ ./distinfo 2012-10-26 00:16:16.000000000 +0200 @@ -1,2 +1,2 @@ -SHA256 (deegree-wps_2.5.zip) = 5df734b337d9238d9675452320366bc9b441b9053aaeebf33d3fc63a7e334722 -SIZE (deegree-wps_2.5.zip) = 9355461 +SHA256 (java/deegree-wps_2.5.zip) = 5df734b337d9238d9675452320366bc9b441b9053aaeebf33d3fc63a7e334722 +SIZE (java/deegree-wps_2.5.zip) = 9355461 diff -ruN --exclude=CVS /usr/ports/graphics/deegree-wps/pkg-plist ./pkg-plist --- /usr/ports/graphics/deegree-wps/pkg-plist 2012-02-01 02:20:58.000000000 +0100 +++ ./pkg-plist 2012-10-26 00:20:06.000000000 +0200 @@ -1,57 +1,58 @@ -%%TOMCATDIR%%/webapps/deegree-wps/META-INF/MANIFEST.MF -%%TOMCATDIR%%/webapps/deegree-wps/WEB-INF/classes/log4j.properties -%%TOMCATDIR%%/webapps/deegree-wps/WEB-INF/conf/wps/processConfigs/buffer_process_config.xml -%%TOMCATDIR%%/webapps/deegree-wps/WEB-INF/conf/wps/wps_configuration.xml -%%TOMCATDIR%%/webapps/deegree-wps/WEB-INF/lib/commons-codec-1.3.jar -%%TOMCATDIR%%/webapps/deegree-wps/WEB-INF/lib/commons-httpclient-2.0.2-deegreeversion.jar -%%TOMCATDIR%%/webapps/deegree-wps/WEB-INF/lib/commons-logging.jar -%%TOMCATDIR%%/webapps/deegree-wps/WEB-INF/lib/deegree2.jar -%%TOMCATDIR%%/webapps/deegree-wps/WEB-INF/lib/ehcache-1.2.0_03.jar -%%TOMCATDIR%%/webapps/deegree-wps/WEB-INF/lib/jai_codec.jar -%%TOMCATDIR%%/webapps/deegree-wps/WEB-INF/lib/jai_core.jar -%%TOMCATDIR%%/webapps/deegree-wps/WEB-INF/lib/jaxen-1.1-beta-8.jar -%%TOMCATDIR%%/webapps/deegree-wps/WEB-INF/lib/jts-1.8.jar -%%TOMCATDIR%%/webapps/deegree-wps/WEB-INF/lib/log4j-1.2.13.jar -%%TOMCATDIR%%/webapps/deegree-wps/WEB-INF/lib/mlibwrapper_jai.jar -%%TOMCATDIR%%/webapps/deegree-wps/WEB-INF/lib/vecmath.jar -%%TOMCATDIR%%/webapps/deegree-wps/WEB-INF/web.xml -%%TOMCATDIR%%/webapps/deegree-wps/client/client.html -%%TOMCATDIR%%/webapps/deegree-wps/client/client.jsp -%%TOMCATDIR%%/webapps/deegree-wps/client/output.html -%%TOMCATDIR%%/webapps/deegree-wps/client/requestHandler.jsp -%%TOMCATDIR%%/webapps/deegree-wps/client/requests.jsp -%%TOMCATDIR%%/webapps/deegree-wps/client/requests/wps/examples/Execute/xml/buffer.xml -%%TOMCATDIR%%/webapps/deegree-wps/client/requests/wps/examples/Execute/xml/buffer_two_features.xml -%%TOMCATDIR%%/webapps/deegree-wps/client/requests/wps/examples/Execute/xml/buffer_two_geometries.xml -%%TOMCATDIR%%/webapps/deegree-wps/css/deegree.css -%%TOMCATDIR%%/webapps/deegree-wps/deegree_header.jsp -%%TOMCATDIR%%/webapps/deegree-wps/deegree_main.html -%%TOMCATDIR%%/webapps/deegree-wps/deegree_navi.jsp -%%TOMCATDIR%%/webapps/deegree-wps/error.jsp -%%TOMCATDIR%%/webapps/deegree-wps/images/OSGeo_project.png -%%TOMCATDIR%%/webapps/deegree-wps/images/logo-deegree.png -%%TOMCATDIR%%/webapps/deegree-wps/images/logo-latlon.png -%%TOMCATDIR%%/webapps/deegree-wps/images/logo-unibonn.png -%%TOMCATDIR%%/webapps/deegree-wps/images/portal_saltlake.jpg -%%TOMCATDIR%%/webapps/deegree-wps/index.jsp -%%TOMCATDIR%%/webapps/deegree-wps/wps.jsp -%%TOMCATDIR%%/webapps/deegree-wps/wps_basic.html -%%TOMCATDIR%%/webapps/deegree-wps/wps_main.html -%%TOMCATDIR%%/webapps/deegree-wps/wps_navi.jsp -@dirrm %%TOMCATDIR%%/webapps/deegree-wps/images -@dirrm %%TOMCATDIR%%/webapps/deegree-wps/css -@dirrm %%TOMCATDIR%%/webapps/deegree-wps/client/requests/wps/examples/Execute/xml -@dirrm %%TOMCATDIR%%/webapps/deegree-wps/client/requests/wps/examples/Execute -@dirrm %%TOMCATDIR%%/webapps/deegree-wps/client/requests/wps/examples -@dirrm %%TOMCATDIR%%/webapps/deegree-wps/client/requests/wps -@dirrm %%TOMCATDIR%%/webapps/deegree-wps/client/requests -@dirrm %%TOMCATDIR%%/webapps/deegree-wps/client -@dirrm %%TOMCATDIR%%/webapps/deegree-wps/WEB-INF/lib -@dirrm %%TOMCATDIR%%/webapps/deegree-wps/WEB-INF/conf/wps/processConfigs -@dirrm %%TOMCATDIR%%/webapps/deegree-wps/WEB-INF/conf/wps -@dirrm %%TOMCATDIR%%/webapps/deegree-wps/WEB-INF/conf -@dirrm %%TOMCATDIR%%/webapps/deegree-wps/WEB-INF/classes -@dirrm %%TOMCATDIR%%/webapps/deegree-wps/WEB-INF -@dirrm %%TOMCATDIR%%/webapps/deegree-wps/META-INF -@dirrm %%TOMCATDIR%%/webapps/deegree-wps -@dirrm %%TOMCATDIR%%/webapps +%%WEBAPPS%%/deegree-wps/META-INF/MANIFEST.MF +%%WEBAPPS%%/deegree-wps/WEB-INF/classes/log4j.properties +%%WEBAPPS%%/deegree-wps/WEB-INF/conf/wps/processConfigs/buffer_process_config.xml +%%WEBAPPS%%/deegree-wps/WEB-INF/conf/wps/wps_configuration.xml +%%WEBAPPS%%/deegree-wps/WEB-INF/lib/commons-codec-1.3.jar +%%WEBAPPS%%/deegree-wps/WEB-INF/lib/commons-httpclient-2.0.2-deegreeversion.jar +%%WEBAPPS%%/deegree-wps/WEB-INF/lib/commons-logging.jar +%%WEBAPPS%%/deegree-wps/WEB-INF/lib/deegree2.jar +%%WEBAPPS%%/deegree-wps/WEB-INF/lib/ehcache-1.2.0_03.jar +%%WEBAPPS%%/deegree-wps/WEB-INF/lib/jai_codec.jar +%%WEBAPPS%%/deegree-wps/WEB-INF/lib/jai_core.jar +%%WEBAPPS%%/deegree-wps/WEB-INF/lib/jaxen-1.1-beta-8.jar +%%WEBAPPS%%/deegree-wps/WEB-INF/lib/jts-1.8.jar +%%WEBAPPS%%/deegree-wps/WEB-INF/lib/log4j-1.2.13.jar +%%WEBAPPS%%/deegree-wps/WEB-INF/lib/mlibwrapper_jai.jar +%%WEBAPPS%%/deegree-wps/WEB-INF/lib/vecmath.jar +%%WEBAPPS%%/deegree-wps/WEB-INF/web.xml +%%WEBAPPS%%/deegree-wps/client/client.html +%%WEBAPPS%%/deegree-wps/client/client.jsp +%%WEBAPPS%%/deegree-wps/client/output.html +%%WEBAPPS%%/deegree-wps/client/requestHandler.jsp +%%WEBAPPS%%/deegree-wps/client/requests.jsp +%%WEBAPPS%%/deegree-wps/client/requests/wps/examples/Execute/xml/buffer.xml +%%WEBAPPS%%/deegree-wps/client/requests/wps/examples/Execute/xml/buffer_two_features.xml +%%WEBAPPS%%/deegree-wps/client/requests/wps/examples/Execute/xml/buffer_two_geometries.xml +%%WEBAPPS%%/deegree-wps/css/deegree.css +%%WEBAPPS%%/deegree-wps/deegree_header.jsp +%%WEBAPPS%%/deegree-wps/deegree_main.html +%%WEBAPPS%%/deegree-wps/deegree_navi.jsp +%%WEBAPPS%%/deegree-wps/error.jsp +%%WEBAPPS%%/deegree-wps/images/OSGeo_project.png +%%WEBAPPS%%/deegree-wps/images/logo-deegree.png +%%WEBAPPS%%/deegree-wps/images/logo-latlon.png +%%WEBAPPS%%/deegree-wps/images/logo-unibonn.png +%%WEBAPPS%%/deegree-wps/images/portal_saltlake.jpg +%%WEBAPPS%%/deegree-wps/index.jsp +%%WEBAPPS%%/deegree-wps/wps.jsp +%%WEBAPPS%%/deegree-wps/wps_basic.html +%%WEBAPPS%%/deegree-wps/wps_main.html +%%WEBAPPS%%/deegree-wps/wps_navi.jsp +@dirrm %%WEBAPPS%%/deegree-wps/images +@dirrm %%WEBAPPS%%/deegree-wps/css +@dirrm %%WEBAPPS%%/deegree-wps/client/requests/wps/examples/Execute/xml +@dirrm %%WEBAPPS%%/deegree-wps/client/requests/wps/examples/Execute +@dirrm %%WEBAPPS%%/deegree-wps/client/requests/wps/examples +@dirrm %%WEBAPPS%%/deegree-wps/client/requests/wps +@dirrm %%WEBAPPS%%/deegree-wps/client/requests +@dirrm %%WEBAPPS%%/deegree-wps/client +@dirrm %%WEBAPPS%%/deegree-wps/WEB-INF/lib +@dirrm %%WEBAPPS%%/deegree-wps/WEB-INF/conf/wps/processConfigs +@dirrm %%WEBAPPS%%/deegree-wps/WEB-INF/conf/wps +@dirrm %%WEBAPPS%%/deegree-wps/WEB-INF/conf +@dirrm %%WEBAPPS%%/deegree-wps/WEB-INF/classes +@dirrm %%WEBAPPS%%/deegree-wps/WEB-INF +@dirrm %%WEBAPPS%%/deegree-wps/META-INF +@dirrm %%WEBAPPS%%/deegree-wps +@dirrmtry %%WEBAPPS%% +@dirrmtry %%TOMCAT%% --- deegree-wps-2.5_1.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: