Bug 165890
| Summary: | [PATCH] net/ushare should copy over sample config file | ||
|---|---|---|---|
| Product: | Ports & Packages | Reporter: | Chris Rees <crees> |
| Component: | Individual Port(s) | Assignee: | Chris Rees <crees> |
| Status: | Closed FIXED | ||
| Severity: | Affects Only Me | ||
| Priority: | Normal | ||
| Version: | Latest | ||
| Hardware: | Any | ||
| OS: | Any | ||
Responsible Changed From-To: freebsd-ports-bugs->crees Submitter has GNATS access (via the GNATS Auto Assign Tool) 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: open->feedback Awaiting maintainers feedback (via the GNATS Auto Assign Tool) State Changed From-To: feedback->closed Committed after timeout. 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"
|
- Copy over sample config file on install - Use bsd.port.options.mk Fix: -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.--pVFIbKs2QmV0Q0PQSmQYbeDGoqHgUsX6TpdetdXWykoNY5wM Content-Type: text/plain; name="patch.txt" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="patch.txt" ? 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