Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 7 Nov 2013 21:16:16 +0000 (UTC)
From:      Rusmir Dusko <nemysis@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r333155 - head/net/proxychains-ng
Message-ID:  <201311072116.rA7LGGaK060582@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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



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