From crees@pegasus.bayofrum.net  Fri Mar  9 20:30:08 2012
Return-Path: <crees@pegasus.bayofrum.net>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5031C106566B
	for <FreeBSD-gnats-submit@freebsd.org>; Fri,  9 Mar 2012 20:30:08 +0000 (UTC)
	(envelope-from crees@pegasus.bayofrum.net)
Received: from mk-outboundfilter-6.mail.uk.tiscali.com (mk-outboundfilter-6.mail.uk.tiscali.com [212.74.114.14])
	by mx1.freebsd.org (Postfix) with ESMTP id C5E728FC0A
	for <FreeBSD-gnats-submit@freebsd.org>; Fri,  9 Mar 2012 20:30:07 +0000 (UTC)
Received: from host-2-102-107-151.as13285.net (HELO pegasus.bayofrum.net) ([2.102.107.151])
  by smtp.pipex.tiscali.co.uk with ESMTP; 09 Mar 2012 20:29:59 +0000
Received: from pegasus.bayofrum.net (localhost [127.0.0.1])
	by pegasus.bayofrum.net (8.14.5/8.14.5) with ESMTP id q29KTiwT043650
	(version=TLSv1/SSLv3 cipher=DHE-DSS-AES256-SHA bits=256 verify=NO)
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 9 Mar 2012 20:29:44 GMT
	(envelope-from crees@pegasus.bayofrum.net)
Received: (from crees@localhost)
	by pegasus.bayofrum.net (8.14.5/8.14.5/Submit) id q29KTit1043649;
	Fri, 9 Mar 2012 20:29:44 GMT
	(envelope-from crees)
Message-Id: <201203092029.q29KTit1043649@pegasus.bayofrum.net>
Date: Fri, 9 Mar 2012 20:29:44 GMT
From: Chris Rees <crees@freebsd.org>
Reply-To: Chris Rees <crees@freebsd.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [PATCH] net/ushare should copy over sample config file
X-Send-Pr-Version: 3.113
X-GNATS-Notify: votdev@gmx.de

>Number:         165890
>Category:       ports
>Synopsis:       [PATCH] net/ushare should copy over sample config file
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    crees
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Mar 09 20:40:10 UTC 2012
>Closed-Date:    Fri Mar 23 19:32:02 UTC 2012
>Last-Modified:  Fri Mar 23 19:40:08 UTC 2012
>Originator:     Chris Rees
>Release:        FreeBSD 9.0-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD pegasus.bayofrum.net 9.0-RELEASE FreeBSD 9.0-RELEASE #0: Sat Jan 28 15:45:27 GMT 2012 root@pegasus.bayofrum.net:/usr/obj/usr/src/sys/PEGASUS amd64


	
>Description:
	- Copy over sample config file on install
	- Use bsd.port.options.mk
>How-To-Repeat:
	
>Fix:

	

--- patch.txt begins here ---
? patch.txt
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/net/ushare/Makefile,v
retrieving revision 1.23
diff -u -r1.23 Makefile
--- Makefile	18 Jan 2012 18:32:07 -0000	1.23
+++ Makefile	9 Mar 2012 20:27:37 -0000
@@ -25,12 +25,11 @@
 
 CFLAGS+=	-I${LOCALBASE}/include -I${WRKSRC}
 
-PLIST_FILES=	bin/${PORTNAME} etc/${PORTNAME}.conf.sample etc/rc.d/${PORTNAME}
 MAN1=		${PORTNAME}.1
 
 OPTIONS=	LIBDLNA "Enable DLNA (PS3) support" off
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if defined(WITH_LIBDLNA)
 LIB_DEPENDS+=	dlna:${PORTSDIR}/devel/libdlna
@@ -39,8 +38,13 @@
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/src/${PORTNAME} ${PREFIX}/bin
-	${CP} ${WRKSRC}/scripts/${PORTNAME}.conf ${PREFIX}/etc/${PORTNAME}.conf.sample
+	${CP} ${WRKSRC}/scripts/${PORTNAME}.conf \
+		${PREFIX}/etc/${PORTNAME}.conf.sample
 	${INSTALL_SCRIPT} ${WRKSRC}/scripts/${PORTNAME} ${PREFIX}/etc/rc.d
 	${INSTALL_MAN} ${WRKSRC}/src/${PORTNAME}.1 ${PREFIX}/man/man1
 
-.include <bsd.port.post.mk>
+post-install:
+	${CP} -np ${PREFIX}/etc/${PORTNAME}.conf.sample \
+		${PREFIX}/etc/${PORTNAME}.conf
+
+.include <bsd.port.mk>
Index: pkg-plist
===================================================================
RCS file: pkg-plist
diff -N pkg-plist
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ pkg-plist	9 Mar 2012 20:27:37 -0000
@@ -0,0 +1,5 @@
+bin/ushare
+etc/rc.d/ushare
+@unexec cmp -s %D/etc/ushare.conf.sample %D/etc/ushare.conf && rm %D/etc/ushare.conf || true
+etc/ushare.conf.sample
+@exec cp -np %D/%F %B/ushare.conf
--- patch.txt ends here ---



-- 
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->crees 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Fri Mar 9 20:40:54 UTC 2012 
Responsible-Changed-Why:  
Submitter has GNATS access (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=165890 
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Fri Mar 9 20:40:58 UTC 2012 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

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

From: Edwin Groothuis <edwin@FreeBSD.org>
To: votdev@gmx.de
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/165890: [PATCH] net/ushare should copy over sample config file
Date: Fri, 9 Mar 2012 20:40:56 UT

 Maintainer of net/ushare,
 
 Please note that PR ports/165890 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/165890
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org
State-Changed-From-To: feedback->closed 
State-Changed-By: crees 
State-Changed-When: Fri Mar 23 19:32:00 UTC 2012 
State-Changed-Why:  
Committed after timeout. 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/165890: commit references a PR
Date: Fri, 23 Mar 2012 19:32:10 +0000 (UTC)

 crees       2012-03-23 19:31:49 UTC
 
   FreeBSD ports repository
 
   Modified files:
     net/ushare           Makefile 
   Added files:
     net/ushare           pkg-plist 
   Log:
   - Copy over sample config file on install
   
   - Use bsd.port.options.mk to avoid bsd.port.pre.mk nastiness
   
   PR:             ports/165890
   Submitted by:   crees
   Approved by:    maintainer timeout (votdev@gmx.de), 14 days
   Feature safe:   yes
   
   Revision  Changes    Path
   1.24      +9 -5      ports/net/ushare/Makefile
   1.1       +5 -0      ports/net/ushare/pkg-plist (new)
 _______________________________________________
 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:
