Skip site navigation (1)Skip section navigation (2)
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:   ports/180109: [MAINTAINER] net/proxychains-ng: Fix preserve original *.conf files
Message-ID:  <20130629220603.B4113825@hub.freebsd.org>
Resent-Message-ID: <201306292210.r5TMA0iR048470@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         180109
>Category:       ports
>Synopsis:       [MAINTAINER] net/proxychains-ng: Fix preserve original *.conf files
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jun 29 22:10:00 UTC 2013
>Closed-Date:
>Last-Modified:
>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:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20130629220603.B4113825>