From nemysis@gmx.ch  Sat Jun 29 22:06:03 2013
Return-Path: <nemysis@gmx.ch>
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
	by hub.freebsd.org (Postfix) with ESMTP id B4113825
	for <freebsd-gnats-submit@freebsd.org>; Sat, 29 Jun 2013 22:06:03 +0000 (UTC)
	(envelope-from nemysis@gmx.ch)
Received: from mout.gmx.net (mout.gmx.net [212.227.15.19])
	by mx1.freebsd.org (Postfix) with ESMTP id 55CAE17E7
	for <freebsd-gnats-submit@freebsd.org>; Sat, 29 Jun 2013 22:06:02 +0000 (UTC)
Received: from mailout-de.gmx.net ([10.1.76.20]) by mrigmx.server.lan
 (mrigmx002) with ESMTP (Nemesis) id 0Llskg-1UJzZq0DLs-00ZO2n for
 <FreeBSD-gnats-submit@freebsd.org>; Sun, 30 Jun 2013 00:06:02 +0200
Received: (qmail invoked by alias); 29 Jun 2013 22:06:00 -0000
Received: from 5-80.77-83.cust.bluewin.ch (EHLO something.email.com) [83.77.80.5]
  by mail.gmx.net (mp020) with SMTP; 30 Jun 2013 00:06:00 +0200
Received: by something.email.com (sSMTP sendmail emulation); Sun, 30 Jun 2013 00:05:58 +0200
Message-Id: <20130629220603.B4113825@hub.freebsd.org>
Date: Sun, 30 Jun 2013 00:05:58 +0200
From: nemysis <nemysis@gmx.ch>
To: FreeBSD-gnats-submit@freebsd.org
Cc: jpaetzel@FreeBSD.org
Subject: [MAINTAINER] net/proxychains-ng: Fix preserve original *.conf files
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         180109
>Category:       ports
>Synopsis:       [MAINTAINER] net/proxychains-ng: Fix preserve original *.conf files
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    wg
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jun 29 22:10:00 UTC 2013
>Closed-Date:    Wed Jul 03 11:34:48 UTC 2013
>Last-Modified:  Wed Jul  3 11:40:00 UTC 2013
>Originator:     nemysis
>Release:        FreeBSD 9.1-RELEASE-p8 amd64
>Organization:
>Environment:
System: FreeBSD FreeBSD_Ports 9.1-RELEASE-p8 FreeBSD 9.1-RELEASE-p8 #0: Tue Jun 18 15:25:28 UTC 2013
>Description:

- 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

>Fix:

--- proxychains-ng-4.6.patch begins here ---
diff -ruN /usr/ports/net/proxychains-ng/Makefile ./Makefile
--- /usr/ports/net/proxychains-ng/Makefile	2013-06-27 21:01:46.000000000 +0200
+++ ./Makefile	2013-06-29 23:44:26.000000000 +0200
@@ -34,7 +34,7 @@
 
 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-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}
--- proxychains-ng-4.6.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->wg 
Responsible-Changed-By: wg 
Responsible-Changed-When: Wed Jul 3 01:32:28 UTC 2013 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=180109 
State-Changed-From-To: open->closed 
State-Changed-By: wg 
State-Changed-When: Wed Jul 3 11:34:47 UTC 2013 
State-Changed-Why:  
Committed. Thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/180109: commit references a PR
Date: Wed,  3 Jul 2013 11:34:54 +0000 (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"
 
>Unformatted:
