From owner-svn-ports-all@FreeBSD.ORG Wed Jul 3 11:34:42 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 02EF5DE5; Wed, 3 Jul 2013 11:34:42 +0000 (UTC) (envelope-from wg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id E9E5E10A2; Wed, 3 Jul 2013 11:34:41 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r63BYfa9044522; Wed, 3 Jul 2013 11:34:41 GMT (envelope-from wg@svn.freebsd.org) Received: (from wg@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r63BYfOL044521; Wed, 3 Jul 2013 11:34:41 GMT (envelope-from wg@svn.freebsd.org) Message-Id: <201307031134.r63BYfOL044521@svn.freebsd.org> From: William Grzybowski Date: Wed, 3 Jul 2013 11:34:41 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r322219 - head/net/proxychains-ng X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Jul 2013 11:34:42 -0000 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 (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}