From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Mar 9 20:40:10 2012 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C92771065672 for ; Fri, 9 Mar 2012 20:40:10 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 9DA558FC12 for ; Fri, 9 Mar 2012 20:40:10 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q29KeAmr092376 for ; Fri, 9 Mar 2012 20:40:10 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q29KeAsq092375; Fri, 9 Mar 2012 20:40:10 GMT (envelope-from gnats) Resent-Date: Fri, 9 Mar 2012 20:40:10 GMT Resent-Message-Id: <201203092040.q29KeAsq092375@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Chris Rees Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5031C106566B for ; 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 ; 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 ; 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 To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/165890: [PATCH] net/ushare should copy over sample config file X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Chris Rees List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 Mar 2012 20:40:11 -0000 >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@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 +.include .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 +post-install: + ${CP} -np ${PREFIX}/etc/${PORTNAME}.conf.sample \ + ${PREFIX}/etc/${PORTNAME}.conf + +.include 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: >Unformatted: