From nobody@FreeBSD.org  Wed May 18 19:44:57 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 5CEAF106564A
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 18 May 2011 19:44:57 +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 4E91C8FC1A
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 18 May 2011 19:44:57 +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 p4IJivgw032515
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 18 May 2011 19:44:57 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.4/8.14.4/Submit) id p4IJivBI032514;
	Wed, 18 May 2011 19:44:57 GMT
	(envelope-from nobody)
Message-Id: <201105181944.p4IJivBI032514@red.freebsd.org>
Date: Wed, 18 May 2011 19:44:57 GMT
From: Chris Rees <utisoft@gmail.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: Fix port: net/wowzamediaserverpro uses CONF_FILES internally
X-Send-Pr-Version: www-3.1
X-GNATS-Notify: meritus@innervision.pl

>Number:         157159
>Category:       ports
>Synopsis:       Fix port: net/wowzamediaserverpro uses CONF_FILES internally
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    culot
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed May 18 19:50:11 UTC 2011
>Closed-Date:    Sat May 28 08:12:10 UTC 2011
>Last-Modified:  Sat May 28 08:20:08 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/net/wowzamediaserverpro/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- Makefile	29 Dec 2010 20:04:26 -0000	1.3
+++ Makefile	18 May 2011 19:04:21 -0000
@@ -30,7 +30,7 @@
 STDOUT_LOG=	${LOG_DIR}/stdout.log
 STDERR_LOG=	${LOG_DIR}/stderr.log
 
-CONF_FILES=	Application.xml MediaCasters.xml RTP.xml VHost.xml jmxremote.password \
+WMP_CONF_FILES=	Application.xml MediaCasters.xml RTP.xml VHost.xml jmxremote.password \
 		Authentication.xml MediaReaders.xml Server.xml VHosts.xml log4j.properties \
 		MP3Tags.xml MediaWriters.xml Streams.xml jmxremote.access rtp.password
 CONF_EXT=	sample
@@ -56,7 +56,7 @@
 	${SH} ${WRKDIR}/wowza-licence.sh
 
 post-patch:
-.for f in ${CONF_FILES}
+.for f in ${WMP_CONF_FILES}
 	@${MV} ${WRKSRC}/conf/${f} ${WRKSRC}/conf/${f}.${CONF_EXT}
 .endfor
 
@@ -75,7 +75,7 @@
 	@${CP} -R ${WRKSRC}/bin ${APP_HOME}
 	@${CP} -R ${WRKSRC}/conf/*.${CONF_EXT} ${APP_HOME}/conf/
 
-.for f in ${CONF_FILES}
+.for f in ${WMP_CONF_FILES}
 .	if !exists(${APP_HOME}/conf/${f})
 		@${CP} ${APP_HOME}/conf/${f}.${CONF_EXT} ${APP_HOME}/conf/${f}
 .	else


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Wed May 18 19:50:36 UTC 2011 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

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

From: Edwin Groothuis <edwin@FreeBSD.org>
To: meritus@innervision.pl
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/157159: Fix port: net/wowzamediaserverpro uses CONF_FILES internally
Date: Wed, 18 May 2011 19:50:34 UT

 Maintainer of net/wowzamediaserverpro,
 
 Please note that PR ports/157159 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/157159
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org

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

 Sorry, forgot to include a commit message:
 
 - Rename CONF_FILES to avoid conflict with incoming feature
 
 PR: ports/157159
 Submitted by: Chris Rees (utisoft@gmail.com)

From: Piotr Rybicki <piotr.rybicki@innervision.pl>
To: bug-followup@FreeBSD.org
Cc: Edwin Groothuis <edwin@FreeBSD.org>, meritus@innervision.pl
Subject: Re: ports/157159: Fix port: net/wowzamediaserverpro uses CONF_FILES
 internally
Date: Wed, 18 May 2011 23:26:21 +0200

 Great! Please commit :-)
 
 Regards.
 -- 
 Piotr Rybicki, Prezes Zarządu
 InnerVision Sp. z o.o.
 http://www.innervision.pl
State-Changed-From-To: feedback->open 
State-Changed-By: linimon 
State-Changed-When: Thu May 19 11:20:27 UTC 2011 
State-Changed-Why:  
Maintainer approved. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=157159 
Responsible-Changed-From-To: freebsd-ports-bugs->culot 
Responsible-Changed-By: culot 
Responsible-Changed-When: Sat May 28 08:02:19 UTC 2011 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=157159 
State-Changed-From-To: open->closed 
State-Changed-By: culot 
State-Changed-When: Sat May 28 08:12:09 UTC 2011 
State-Changed-Why:  
Committed. Thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/157159: commit references a PR
Date: Sat, 28 May 2011 08:11:52 +0000 (UTC)

 culot       2011-05-28 08:11:39 UTC
 
   FreeBSD ports repository
 
   Modified files:
     net/wowzamediaserverpro Makefile 
   Log:
   - Rename CONF_FILES to avoid conflict with new variable to be introduced
     in bsd.port.mk
   
   PR:             ports/157159
   Submitted by:   Chris Rees <utisoft@gmail.com>
   Approved by:    Piotr Rybicki <piotr.rybicki@innervision.pl> (maintainer)
   
   Revision  Changes    Path
   1.4       +3 -3      ports/net/wowzamediaserverpro/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:
