From 13c8106d8b8fbc29ecf19c068a7a8d5baebd184e Mon Sep 17 00:00:00 2001 From: Jason Helfman Date: Tue, 30 Oct 2012 22:06:40 +0000 Subject: [PATCH] - add additional support for tomcat7 and adjust pkg-message accordingly PR: 173091 Submitted by: nemysis@gmx.ch Patch by: jgh Approved by: maintainer, wen Feature safe: yes --- graphics/deegree-igeoportal/Makefile | 41 +++++++++++++------ .../{pkg-message => files/pkg-message.in} | 2 +- 2 files changed, 29 insertions(+), 14 deletions(-) rename graphics/deegree-igeoportal/{pkg-message => files/pkg-message.in} (86%) diff --git a/graphics/deegree-igeoportal/Makefile b/graphics/deegree-igeoportal/Makefile index 9c40f70752a9..9937369fc6cd 100644 --- a/graphics/deegree-igeoportal/Makefile +++ b/graphics/deegree-igeoportal/Makefile @@ -1,4 +1,4 @@ -# Created by: wenheping@gmail.com +# Created by: wenheping@gmail.com # # $FreeBSD$ @@ -13,36 +13,51 @@ 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/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 README_owswatch.txt deegree_igeoportal_documentation_en.pdf DOCSDIR= ${PREFIX}/share/doc/deegree-igeoportal 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}/igeoportal-std.war -C ${WRKDIR}/${PORTDIRNAME} -.include - do-install: - ${INSTALL} -d -o ${WWWOWN} -g ${WWWGRP} ${TOMCATDIR}/webapps/${PORTDIRNAME} - @cd ${WRKDIR}/${PORTDIRNAME} && ${COPYTREE_SHARE} \* ${WEBAPPDIR}/${PORTDIRNAME} + ${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_igeoportal_documentation_en.pdf ${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKDIR}/|} ${DOCSDIR} .endif - -post-install: @${CAT} ${PKGMESSAGE} .include diff --git a/graphics/deegree-igeoportal/pkg-message b/graphics/deegree-igeoportal/files/pkg-message.in similarity index 86% rename from graphics/deegree-igeoportal/pkg-message rename to graphics/deegree-igeoportal/files/pkg-message.in index f352845f2de7..c2555f83df04 100644 --- a/graphics/deegree-igeoportal/pkg-message +++ b/graphics/deegree-igeoportal/files/pkg-message.in @@ -4,7 +4,7 @@ To start DeeGree correctly, please set the variable JAVA_OPTS with: setenv JAVA_OPTS "-server -Xms256m -Xmx512m" Now you should start your Tomcat server and browse with: - http://your-server:8180/deegree-igeoportal + http://your-server:%%TCPORT%%/deegree-igeoportal Enjoy it ! ==========================================================================