Bug 180109 - [MAINTAINER] net/proxychains-ng: Fix preserve original *.conf files
[MAINTAINER] net/proxychains-ng: Fix preserve original *.conf files
Status: Closed FIXED
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s)
Latest
Any Any
: Normal Affects Only Me
Assigned To: William Grzybowski
:
Depends on:
Blocks:
  Show dependency treegraph
 
Reported: 2013-06-29 23:10 UTC by nemysis
Modified: 2013-07-03 12:40 UTC (History)
1 user (show)

See Also:


Attachments
proxychains-ng-4.6.patch (1018 bytes, patch)
2013-06-29 23:10 UTC, nemysis
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description nemysis 2013-06-29 23:10:00 UTC
- Trim REINPLACE_CMD
- Fix preserve original *.conf files

Generated and tested manually, tested with port test, sent with FreeBSD Port Tools 0.99_8 (mode: change, diff: ports)

How-To-Repeat: 
Port with patch self install proxychains.conf.sample
Comment 1 William Grzybowski freebsd_committer 2013-07-03 02:32:28 UTC
Responsible Changed
From-To: freebsd-ports-bugs->wg

I'll take it.
Comment 2 William Grzybowski freebsd_committer 2013-07-03 12:34:47 UTC
State Changed
From-To: open->closed

Committed. Thanks!
Comment 3 dfilter freebsd_committer 2013-07-03 12:34:54 UTC
Author: wg
Date: Wed Jul  3 11:34:41 2013
New Revision: 322219
URL: http://svnweb.freebsd.org/changeset/ports/322219

Log:
  net/proxychains-ng: preserve conf file
  
  - Fix preservation of .conf file
  
  PR:		ports/180109
  Submitted by:	nemysis <nemysis@gmx.ch> (maintainer)

Modified:
  head/net/proxychains-ng/Makefile

Modified: head/net/proxychains-ng/Makefile
==============================================================================
--- head/net/proxychains-ng/Makefile	Wed Jul  3 10:58:57 2013	(r322218)
+++ head/net/proxychains-ng/Makefile	Wed Jul  3 11:34:41 2013	(r322219)
@@ -34,7 +34,7 @@ post-configure:
 
 post-patch:
 	@${REINPLACE_CMD} \
-		-e 's|$$(DESTDIR)/$$(sysconfdir)/|$$(DESTDIR)/$$(sysconfdir)/proxychains.conf.sample|' \
+		-e 's|$$(DESTDIR)$$(sysconfdir)/|$$(DESTDIR)$$(sysconfdir)/proxychains.conf.sample|' \
 		${WRKSRC}/Makefile
 	@${REINPLACE_CMD} \
 		-e 's|libproxychains4.so|libproxychains-4.so|' \
@@ -42,10 +42,8 @@ post-patch:
 
 post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/src/proxyresolv ${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/src/proxychains.conf ${PREFIX}/etc/proxychains.conf.sample
-.if ! exists(${PREFIX}/etc/proxychains.conf)
-	${INSTALL_DATA} ${WRKSRC}/src/proxychains.conf ${PREFIX}/etc/proxychains.conf
-.endif
+	@[ -f ${PREFIX}/etc/proxychains.conf ] || \
+		${INSTALL_DATA} ${WRKSRC}/src/proxychains.conf ${PREFIX}/etc/proxychains.conf
 
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"