From owner-svn-ports-head@FreeBSD.ORG  Thu Nov  7 21:16:16 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id B992D1AB;
 Thu,  7 Nov 2013 21:16:16 +0000 (UTC)
 (envelope-from nemysis@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 97AC32EB4;
 Thu,  7 Nov 2013 21:16:16 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA7LGG6D060584;
 Thu, 7 Nov 2013 21:16:16 GMT (envelope-from nemysis@svn.freebsd.org)
Received: (from nemysis@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA7LGGaK060582;
 Thu, 7 Nov 2013 21:16:16 GMT (envelope-from nemysis@svn.freebsd.org)
Message-Id: <201311072116.rA7LGGaK060582@svn.freebsd.org>
From: Rusmir Dusko <nemysis@FreeBSD.org>
Date: Thu, 7 Nov 2013 21:16:16 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r333155 - 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-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 07 Nov 2013 21:16:16 -0000

Author: nemysis
Date: Thu Nov  7 21:16:15 2013
New Revision: 333155
URL: http://svnweb.freebsd.org/changeset/ports/333155

Log:
  - Change maintainer email to @FreeBSD.org
  - USES gmake instead of USE_GMAKE
  - Remove install-config and obsolete REINPLACE_CMD
  - Support STAGEDIR
  
  Approved by:	pawel / wg (mentors, implicit)

Modified:
  head/net/proxychains-ng/Makefile
  head/net/proxychains-ng/pkg-plist

Modified: head/net/proxychains-ng/Makefile
==============================================================================
--- head/net/proxychains-ng/Makefile	Thu Nov  7 20:32:18 2013	(r333154)
+++ head/net/proxychains-ng/Makefile	Thu Nov  7 21:16:15 2013	(r333155)
@@ -7,17 +7,17 @@ CATEGORIES=	net security
 MASTER_SITES=	SF/${PORTNAME}
 DISTNAME=	${PORTNAME:S/-ng//}-${PORTVERSION}
 
-MAINTAINER=	nemysis@gmx.ch
+MAINTAINER=	nemysis@FreeBSD.org
 COMMENT=	Redirect connection through proxy servers
 
 LICENSE=	GPLv2
 
 USE_BZIP2=	yes
+USES=		gmake
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX}
-USE_GMAKE=	yes
 ALL_TARGET=	all
-INSTALL_TARGET=	install install-config
+INSTALL_TARGET=	install
 USE_LDCONFIG=	yes
 
 CONFLICTS=	proxychains-[0-9]*
@@ -26,29 +26,21 @@ PORTDOCS=	AUTHORS ChangeLog README TODO
 
 OPTIONS_DEFINE=	DOCS
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
 post-configure:
 	@${ECHO_CMD} "PXCHAINS=proxychains" >> ${WRKSRC}/config.mak
 	@${ECHO_CMD} "LDSO_PATHNAME=libproxychains-4.so" >> ${WRKSRC}/config.mak
 
 post-patch:
 	@${REINPLACE_CMD} \
-		-e 's|$$(DESTDIR)$$(sysconfdir)/|$$(DESTDIR)$$(sysconfdir)/proxychains.conf.sample|' \
-		${WRKSRC}/Makefile
-	@${REINPLACE_CMD} \
 		-e 's|libproxychains4.so|libproxychains-4.so|' \
 		${WRKSRC}/src/proxyresolv
 
 post-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/src/proxyresolv ${PREFIX}/bin
-	@[ -f ${PREFIX}/etc/proxychains.conf ] || \
-		${INSTALL_DATA} ${WRKSRC}/src/proxychains.conf ${PREFIX}/etc/proxychains.conf
-
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
-.endif
+	${INSTALL_SCRIPT} ${WRKSRC}/src/proxyresolv ${STAGEDIR}${PREFIX}/bin/
+	${INSTALL_DATA} ${WRKSRC}/src/proxychains.conf \
+		${STAGEDIR}${PREFIX}/etc/proxychains.conf.sample
+
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>

Modified: head/net/proxychains-ng/pkg-plist
==============================================================================
--- head/net/proxychains-ng/pkg-plist	Thu Nov  7 20:32:18 2013	(r333154)
+++ head/net/proxychains-ng/pkg-plist	Thu Nov  7 21:16:15 2013	(r333155)
@@ -2,5 +2,5 @@ bin/proxychains
 bin/proxyresolv
 @unexec if cmp -s %D/etc/proxychains.conf %D/etc/proxychains.conf.sample; then rm -f %D/etc/proxychains.conf; fi
 etc/proxychains.conf.sample
-@exec [ -f %D/etc/proxychains.conf ] ; then cp -p %D/%F %B/proxychains.conf; fi
+@exec if [ -f %D/etc/proxychains.conf ] ; then cp -p %D/%F %B/proxychains.conf; fi
 lib/libproxychains-4.so