ports/165890: [PATCH] net/ushare should copy over sample config file

[Chris Rees]

>Number:         165890
>Category:       ports
>Synopsis:       [PATCH] net/ushare should copy over sample config file
>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 Mar 09 20:40:10 UTC 2012
>Closed-Date:
>Last-Modified:
>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 at 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
+ at unexec cmp -s %D/etc/ushare.conf.sample %D/etc/ushare.conf && rm %D/etc/ushare.conf || true
+etc/ushare.conf.sample
+ at 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:
>Unformatted: