Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 12 Apr 2017 10:00:14 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r438345 - head/net/dante
Message-ID:  <201704121000.v3CA0E18062485@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Wed Apr 12 10:00:14 2017
New Revision: 438345
URL: https://svnweb.freebsd.org/changeset/ports/438345

Log:
  - Switch to USES=localbase
  - Switch to options helpers

Modified:
  head/net/dante/Makefile

Modified: head/net/dante/Makefile
==============================================================================
--- head/net/dante/Makefile	Wed Apr 12 09:56:35 2017	(r438344)
+++ head/net/dante/Makefile	Wed Apr 12 10:00:14 2017	(r438345)
@@ -18,35 +18,31 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 CONFLICTS=	socks5-[0-9]*
 
+USES=		libtool localbase
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-socks-conf=${PREFIX}/etc/socks.conf \
 		--with-sockd-conf=${PREFIX}/etc/sockd.conf
-CPPFLAGS+=	-I${LOCALBASE}/include
-LIBS+=		-L${LOCALBASE}/lib
-
-USES=		libtool
+INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
+
 USE_RC_SUBR=	sockd
-INSTALL_TARGET=	install-strip
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
-.include <bsd.port.options.mk>
-
-.if ${OSVERSION} >= 1000044
-CONFIGURE_ARGS+=	--with-libc=libc.so.7
-.endif
-
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/example/socks.conf ${STAGEDIR}${PREFIX}/etc/socks.conf.sample
 	${INSTALL_DATA} ${WRKSRC}/example/sockd.conf ${STAGEDIR}${PREFIX}/etc/sockd.conf.sample
-	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+
+post-install-EXAMPLES-on:
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/example/sockd-basic.conf ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/example/sockd-chaining.conf ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/example/socks-simple-withoutnameserver.conf ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/example/socks-simple.conf ${STAGEDIR}${EXAMPLESDIR}
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${MKDIR} ${STAGEDIR}${DOCSDIR}/contrib
+
+post-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}/contrib
 	${INSTALL_DATA} ${WRKSRC}/doc/README* ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/rfc* ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/SOCKS4*.protocol ${STAGEDIR}${DOCSDIR}



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