From owner-svn-ports-all@FreeBSD.ORG Tue Oct 30 22:05:31 2012 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 267A5F6C; Tue, 30 Oct 2012 22:05:31 +0000 (UTC) (envelope-from jgh@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 0BB238FC08; Tue, 30 Oct 2012 22:05:31 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q9UM5Un4085751; Tue, 30 Oct 2012 22:05:30 GMT (envelope-from jgh@svn.freebsd.org) Received: (from jgh@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9UM5UEH085748; Tue, 30 Oct 2012 22:05:30 GMT (envelope-from jgh@svn.freebsd.org) Message-Id: <201210302205.q9UM5UEH085748@svn.freebsd.org> From: Jason Helfman Date: Tue, 30 Oct 2012 22:05:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r306720 - in head/graphics/deegree-csw: . files 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.14 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: Tue, 30 Oct 2012 22:05:31 -0000 Author: jgh Date: Tue Oct 30 22:05:30 2012 New Revision: 306720 URL: http://svn.freebsd.org/changeset/ports/306720 Log: - add additional support for tomcat7 and adjust pkg-message accordingly PR: 173125 Submitted by: nemysis@gmx.ch Patch by: jgh Approved by: maintainer, wen Feature safe: yes Added: head/graphics/deegree-csw/files/ head/graphics/deegree-csw/files/pkg-message.in - copied, changed from r306590, head/graphics/deegree-csw/pkg-message Deleted: head/graphics/deegree-csw/pkg-message Modified: head/graphics/deegree-csw/Makefile Modified: head/graphics/deegree-csw/Makefile ============================================================================== --- head/graphics/deegree-csw/Makefile Tue Oct 30 21:27:49 2012 (r306719) +++ head/graphics/deegree-csw/Makefile Tue Oct 30 22:05:30 2012 (r306720) @@ -13,36 +13,52 @@ DISTNAME= ${PKGNAMEPREFIX}${PORTNAME}_${ 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}/||} +SUB_FILES= pkg-message +SUB_LIST= TCPORT=${TCPORT} + +OPTIONS_SINGLE= AS +OPTIONS_SINGLE_AS= TOMCAT6 TOMCAT7 +OPTIONS_DEFAULT= TOMCAT6 + +.include + +.if ${PORT_OPTIONS:MTOMCAT6} +TOMCATVER= apache-tomcat-6.0 +TCPORT= 8180 +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 +TCPORT= 8080 +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} -.include - do-install: ${INSTALL} -d -o ${WWWOWN} -g ${WWWGRP} ${TOMCATDIR}/webapps/${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: @${CAT} ${PKGMESSAGE} .include Copied and modified: head/graphics/deegree-csw/files/pkg-message.in (from r306590, head/graphics/deegree-csw/pkg-message) ============================================================================== --- head/graphics/deegree-csw/pkg-message Mon Oct 29 04:56:14 2012 (r306590, copy source) +++ head/graphics/deegree-csw/files/pkg-message.in Tue Oct 30 22:05:30 2012 (r306720) @@ -4,7 +4,7 @@ To start DeeGree correctly, please set t setenv JAVA_OPTS "-server -Xms256m -Xmx512m" Now you should start your Tomcat server and browse with: - http://your-server:8180/deegree-csw + http://your-server:%%TCPORT%%/deegree-csw Enjoy it ! ==========================================================================