From nemysis@gmx.ch  Fri Oct 26 15:46:22 2012
Return-Path: <nemysis@gmx.ch>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id DA1D09DF
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 26 Oct 2012 15:46:22 +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 4862E8FC12
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 26 Oct 2012 15:46:21 +0000 (UTC)
Received: (qmail invoked by alias); 26 Oct 2012 15:45:10 -0000
Received: from 201-230.4-85.cust.bluewin.ch (EHLO something.email.com) [85.4.230.201]
  by mail.gmx.net (mp035) with SMTP; 26 Oct 2012 17:45:10 +0200
Received: by something.email.com (sSMTP sendmail emulation); Fri, 26 Oct 2012 17:45:10 +0200
Message-Id: <20121026154622.DA1D09DF@hub.freebsd.org>
Date: Fri, 26 Oct 2012 17:45:10 +0200
From: nemysis <nemysis@gmx.ch>
To: FreeBSD-gnats-submit@freebsd.org
Cc: wenheping@gmail.com
Subject: [PATCH] graphics/deegree-wfs: Changed to use Tomcat6 and Tomcat7
X-Send-Pr-Version: 3.113
X-GNATS-Notify: wenheping@gmail.com

>Number:         173126
>Category:       ports
>Synopsis:       [PATCH] graphics/deegree-wfs: Changed to use Tomcat6 and Tomcat7
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    jgh
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Oct 26 15:50:00 UTC 2012
>Closed-Date:    Tue Oct 30 22:12:43 UTC 2012
>Last-Modified:  Tue Oct 30 22:12:43 UTC 2012
>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:

+APPHOME=<----->${LOCALBASE}/${TOMCATVER}
+PORTDOCS=	README.txt deegree_wfs_documentation_en.pdf
+OPTIONS_SINGLE=	AS
+.if ${PORT_OPTIONS:MTOMCAT6}
+.if ${PORT_OPTIONS:MTOMCAT7}

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/20121026141244-17846/

>Fix:

--- deegree-wfs-2.5_1.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/graphics/deegree-wfs/Makefile ./Makefile
--- /usr/ports/graphics/deegree-wfs/Makefile	2012-10-21 23:41:06.000000000 +0200
+++ ./Makefile	2012-10-26 16:11:10.000000000 +0200
@@ -13,37 +13,54 @@
 MAINTAINER=	wenheping@gmail.com
 COMMENT=	Deegree Web Feature Service(WFS)
 
-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_wfs_documentation_en.pdf
 DOCSDIR=	${PREFIX}/share/doc/deegree-wfs
+
 PLIST_SUB=	TOMCATDIR=${TOMCATDIR:S|^${PREFIX}/||}
 
-post-extract:
-	@${MKDIR} ${WRKDIR}/${PORTDIRNAME}
-	@${TAR} xf ${WRKDIR}/deegree-wfs.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-wfs.war -C ${WRKDIR}/${PORTDIRNAME}
+
 do-install:
-	cd ${WRKDIR} && \
-	${INSTALL} -d -o ${WWWOWN} -g ${WWWGRP} ${TOMCATDIR}/webapps/${PORTDIRNAME}
-	@cd ${WRKDIR}/${PORTDIRNAME} && ${COPYTREE_SHARE} \* ${WEBAPPDIR}/${PORTDIRNAME}
+	@(cd ${WRKDIR} && \
+		${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_wfs_documentation_en.pdf ${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKDIR}/|} ${DOCSDIR}
 .endif
 
 post-install:
+	@${ECHO_CMD}
 	@${CAT} ${PKGMESSAGE}
+	@${ECHO_CMD}
 
 .include <bsd.port.mk>
--- deegree-wfs-2.5_1.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->wen 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Fri Oct 26 15:50:08 UTC 2012 
Responsible-Changed-Why:  
wenheping@gmail.com => wen@ (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=173126 
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Fri Oct 26 15:50:09 UTC 2012 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=173126 

From: Edwin Groothuis <edwin@FreeBSD.org>
To: wenheping@gmail.com
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/173126: [PATCH] graphics/deegree-wfs: Changed to use Tomcat6 and Tomcat7
Date: Fri, 26 Oct 2012 15:50:08 UT

 Maintainer of graphics/deegree-wfs,
 
 Please note that PR ports/173126 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/173126
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org
Responsible-Changed-From-To: wen->jgh 
Responsible-Changed-By: jgh 
Responsible-Changed-When: Fri Oct 26 18:31:23 UTC 2012 
Responsible-Changed-Why:  
based on my patch, i'll take it 

http://www.freebsd.org/cgi/query-pr.cgi?pr=173126 
State-Changed-From-To: feedback->closed 
State-Changed-By: jgh 
State-Changed-When: Tue Oct 30 22:12:43 UTC 2012 
State-Changed-Why:  
Committed, with minor changes. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=173126 
>Unformatted:
