From nobody@FreeBSD.org  Wed May 18 19:48:03 2011
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 541951065675
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 18 May 2011 19:48:03 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22])
	by mx1.freebsd.org (Postfix) with ESMTP id 460FD8FC12
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 18 May 2011 19:48:03 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.4/8.14.4) with ESMTP id p4IJm30R032969
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 18 May 2011 19:48:03 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.4/8.14.4/Submit) id p4IJm3bx032968;
	Wed, 18 May 2011 19:48:03 GMT
	(envelope-from nobody)
Message-Id: <201105181948.p4IJm3bx032968@red.freebsd.org>
Date: Wed, 18 May 2011 19:48:03 GMT
From: Chris Rees <utisoft@gmail.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: Fix port: www/tomcat6 uses CONF_FILES internally
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         157165
>Category:       ports
>Synopsis:       Fix port: www/tomcat6 uses CONF_FILES internally
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    crees
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed May 18 19:50:13 UTC 2011
>Closed-Date:    Sun Jun 12 13:57:48 UTC 2011
>Last-Modified:  Sun Jun 12 14:00:22 UTC 2011
>Originator:     Chris Rees
>Release:        
>Organization:
>Environment:
>Description:
As discussed on ports@ and with bapt, new variables CONF_FILES and CONF_DIRS are to be introduced to bsd.port.mk.

This causes problems in some ports, of which this is one.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Index: Makefile
===================================================================
RCS file: /exports/cvsroot-freebsd/ports/www/tomcat6/Makefile,v
retrieving revision 1.62
diff -u -r1.62 Makefile
--- Makefile	4 May 2011 07:41:56 -0000	1.62
+++ Makefile	18 May 2011 18:46:41 -0000
@@ -37,7 +37,8 @@
 STDOUT_LOG=	${LOG_DIR}/stdout.log
 STDERR_LOG=	${LOG_DIR}/stderr.log
 JAR_FILE=	bin/bootstrap.jar
-CONF_FILES=	catalina.policy catalina.properties context.xml logging.properties server.xml tomcat-users.xml web.xml
+TOMCAT_CONF_FILES=	catalina.policy catalina.properties context.xml \
+			logging.properties server.xml tomcat-users.xml web.xml
 CONF_EXT=	sample
 PLIST_SUB=	T=${APP_HOME:S/^${PREFIX}\///} CONF_EXT=${CONF_EXT} \
 		WWWOWN=${TOMCAT_USER} WWWGRP=${TOMCAT_GROUP}
@@ -73,7 +74,7 @@
 post-patch:
 	@${REINPLACE_CMD} ${SUB_LIST:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} ${WRKSRC}/conf/server.xml
 	@${FIND} ${WRKSRC} -type f \( -name '*.bak' -or -name '*.bat' -or -name '*.dll' -or -name '*.exe' -or -name '*.orig' \) -delete
-.for f in ${CONF_FILES}
+.for f in ${TOMCAT_CONF_FILES}
 	@${MV} ${WRKSRC}/conf/${f} ${WRKSRC}/conf/${f}.${CONF_EXT}
 .endfor
 
@@ -91,7 +92,7 @@
 	@${CP} -R ${WRKSRC}/* ${APP_HOME}
 	@${ECHO_MSG} " [ DONE ]"
 
-.for f in ${CONF_FILES}
+.for f in ${TOMCAT_CONF_FILES}
 .	if !exists(${APP_HOME}/conf/${f})
 		@${CP} ${APP_HOME}/conf/${f}.${CONF_EXT} ${APP_HOME}/conf/${f}
 .	else


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->ale 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Wed May 18 19:51:14 UTC 2011 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

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

From: Chris Rees <utisoft@gmail.com>
To: bug-followup@freebsd.org
Cc:  
Subject: Re: ports/157165: Fix port: www/tomcat6 uses CONF_FILES internally
Date: Wed, 18 May 2011 21:33:57 +0100

 Sorry, forgot to include a commit message:
 
 - Rename CONF_FILES to avoid conflict with incoming feature
 
 PR: ports/157165
 Submitted by: Chris Rees (utisoft@gmail.com)
Responsible-Changed-From-To: ale->crees 
Responsible-Changed-By: crees 
Responsible-Changed-When: Sun Jun 12 07:30:35 UTC 2011 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=157165 
State-Changed-From-To: open->closed 
State-Changed-By: crees 
State-Changed-When: Sun Jun 12 13:57:47 UTC 2011 
State-Changed-Why:  
Committed. 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/157165: commit references a PR
Date: Sun, 12 Jun 2011 13:55:53 +0000 (UTC)

 crees       2011-06-12 13:55:39 UTC
 
   FreeBSD ports repository
 
   Modified files:
     www/tomcat6          Makefile 
   Log:
   - Rename CONF_FILES variables to avoid conflict with incoming feature
   
   PR:             157165
   Approved by:    rene (mentor), maintainer timeout (ale, 25 days)
   
   Revision  Changes    Path
   1.63      +4 -3      ports/www/tomcat6/Makefile
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
