Date: Fri, 26 Oct 2012 17:35:52 +0200 From: nemysis <nemysis@gmx.ch> To: FreeBSD-gnats-submit@FreeBSD.org Cc: wenheping@gmail.com Subject: ports/173125: [PATCH] graphics/deegree-csw: Changed to use Tomcat6 and Tomcat7 Message-ID: <20121026153557.28D185D3@hub.freebsd.org> Resent-Message-ID: <201210261540.q9QFe0KN017304@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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 <bsd.port.options.mk>
+.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 <bsd.port.mk>
--- deegree-csw-2.5_1.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20121026153557.28D185D3>