Skip site navigation (1)Skip section navigation (2) 
Date:      Tue, 30 Oct 2012 22:08:53 +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: r306724 - in head/graphics/deegree-wms: . files
Message-ID:  <201210302208.q9UM8rnC086616@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: jgh
Date: Tue Oct 30 22:08:53 2012
New Revision: 306724
URL: http://svn.freebsd.org/changeset/ports/306724

Log:
  - add additional support for tomcat7 and adjust pkg-message accordingly
  
  PR:		173094
  Submitted by:	nemysis@gmx.ch
  Patch by:	jgh
  Approved by:	maintainer, wen
  Feature safe:	yes

Added:
  head/graphics/deegree-wms/files/
  head/graphics/deegree-wms/files/pkg-message.in
     - copied, changed from r306590, head/graphics/deegree-wms/pkg-message
Deleted:
  head/graphics/deegree-wms/pkg-message
Modified:
  head/graphics/deegree-wms/Makefile

Modified: head/graphics/deegree-wms/Makefile
==============================================================================
--- head/graphics/deegree-wms/Makefile	Tue Oct 30 22:08:14 2012	(r306723)
+++ head/graphics/deegree-wms/Makefile	Tue Oct 30 22:08:53 2012	(r306724)
@@ -13,36 +13,51 @@ DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}_${
 MAINTAINER=	wenheping@gmail.com
 COMMENT=	Deegree Web Map Service(WMS)
 
-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_charts_documentation_en.pdf deegree_wms_documentation_en.pdf
 DOCSDIR=	${PREFIX}/share/doc/deegree-wms
 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 <bsd.port.options.mk>
+
+.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-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 ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKDIR}/README.txt ${DOCSDIR}
-	${INSTALL_DATA} ${WRKDIR}/deegree_wms_documentation_en.pdf ${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKDIR}/|} ${DOCSDIR}
 .endif
-
-post-install:
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>

Copied and modified: head/graphics/deegree-wms/files/pkg-message.in (from r306590, head/graphics/deegree-wms/pkg-message)
==============================================================================
--- head/graphics/deegree-wms/pkg-message	Mon Oct 29 04:56:14 2012	(r306590, copy source)
+++ head/graphics/deegree-wms/files/pkg-message.in	Tue Oct 30 22:08:53 2012	(r306724)
@@ -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-wms
+   http://your-server:%%TCPORT%%/deegree-wms
 
 Enjoy it !
 ==========================================================================

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201210302208.q9UM8rnC086616>