From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Oct 26 15: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 C7220616 for ; Fri, 26 Oct 2012 15: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 9C6278FC0C for ; Fri, 26 Oct 2012 15: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 q9QFe0Bx017305 for ; Fri, 26 Oct 2012 15: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 q9QFe0KN017304; Fri, 26 Oct 2012 15:40:00 GMT (envelope-from gnats) Resent-Date: Fri, 26 Oct 2012 15:40:00 GMT Resent-Message-Id: <201210261540.q9QFe0KN017304@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 28D185D3 for ; Fri, 26 Oct 2012 15:35:57 +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 919AA8FC0C for ; Fri, 26 Oct 2012 15:35:56 +0000 (UTC) Received: (qmail invoked by alias); 26 Oct 2012 15:35:53 -0000 Received: from 201-230.4-85.cust.bluewin.ch (EHLO something.email.com) [85.4.230.201] by mail.gmx.net (mp027) with SMTP; 26 Oct 2012 17:35:53 +0200 Received: by something.email.com (sSMTP sendmail emulation); Fri, 26 Oct 2012 17:35:52 +0200 Message-Id: <20121026153557.28D185D3@hub.freebsd.org> Date: Fri, 26 Oct 2012 17:35:52 +0200 From: nemysis To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/173125: [PATCH] graphics/deegree-csw: Changed to use Tomcat6 and Tomcat7 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 15:40:00 -0000 >Number: 173125 >Category: ports >Synopsis: [PATCH] graphics/deegree-csw: Changed to use Tomcat6 and Tomcat7 >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 15: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: -RUN_DEPENDS= ${LOCALBASE}/${TOMCATVER}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat6 -TOMCATVER= apache-tomcat-6.0 +APPHOME= ${LOCALBASE}/${TOMCATVER} +PORTDOCS= README.txt deegree_csw_2.0.2_documentation_en.pdf \ + deegree_csw_documentation_de.pdf deegree_csw_documentation_en.pdf +OPTIONS_SINGLE= AS +.if ${PORT_OPTIONS:MTOMCAT6} +.if ${PORT_OPTIONS:MTOMCAT7} +post-extract: 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. port test: clean Build log https://redports.org/buildarchive/20121026140409-47252/ >Fix: --- deegree-csw-2.5_1.patch begins here --- diff -ruN --exclude=CVS /usr/ports/graphics/deegree-csw/Makefile ./Makefile --- /usr/ports/graphics/deegree-csw/Makefile 2012-10-21 23:41:06.000000000 +0200 +++ ./Makefile 2012-10-26 16:03:02.000000000 +0200 @@ -13,36 +13,54 @@ MAINTAINER= wenheping@gmail.com COMMENT= Deegree Catalogue Service(CSW) -RUN_DEPENDS= ${LOCALBASE}/${TOMCATVER}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat6 - USE_ZIP= yes USE_JAVA= 1.5+ - NO_BUILD= yes -TOMCATVER= apache-tomcat-6.0 + TOMCATDIR= ${PREFIX}/${TOMCATVER} +APPHOME= ${LOCALBASE}/${TOMCATVER} WEBAPPDIR= ${TOMCATDIR}/webapps -PORTDOCS= * + +PORTDOCS= README.txt deegree_csw_2.0.2_documentation_en.pdf \ + deegree_csw_documentation_de.pdf deegree_csw_documentation_en.pdf DOCSDIR= ${PREFIX}/share/doc/${DISTNAME} + PLIST_SUB= TOMCATDIR=${TOMCATDIR:S|^${PREFIX}/||} -post-extract: - @${MKDIR} ${WRKDIR}/${PORTDIRNAME} - @${TAR} xf ${WRKDIR}/deegree-csw.war -C ${WRKDIR}/${PORTDIRNAME} +OPTIONS_SINGLE= AS +OPTIONS_SINGLE_AS= TOMCAT6 TOMCAT7 +OPTIONS_DEFAULT= TOMCAT6 .include +.if ${PORT_OPTIONS:MTOMCAT6} +TOMCATVER= apache-tomcat-6.0 +BUILD_DEPENDS+= ${APPHOME}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat6 +RUN_DEPENDS+= ${APPHOME}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat6 +.endif + +.if ${PORT_OPTIONS:MTOMCAT7} +TOMCATVER= apache-tomcat-7.0 +BUILD_DEPENDS+= ${APPHOME}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat7 +RUN_DEPENDS+= ${APPHOME}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat7 +.endif + +post-extract: + ${MKDIR} ${WRKDIR}/${PORTDIRNAME} + ${TAR} xf ${WRKDIR}/deegree-csw.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 ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKDIR}/README.txt ${DOCSDIR} - ${INSTALL_DATA} ${WRKDIR}/deegree_csw_2.0.2_documentation_en.pdf ${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKDIR}/|} ${DOCSDIR} .endif post-install: + @${ECHO_CMD} @${CAT} ${PKGMESSAGE} + @${ECHO_CMD} .include --- deegree-csw-2.5_1.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: