diff options
| author | wiz <wiz@pkgsrc.org> | 2005-12-02 17:06:03 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2005-12-02 17:06:03 +0000 |
| commit | cf2bdd45787554652535ceba77d78fe2ca147c1d (patch) | |
| tree | 6a6ce528df7a0f0811fdcbe62cf183e74fcac8e8 /www | |
| parent | f6210738c358902d2b36080d263168fe6fbe2974 (diff) | |
| download | pkgsrc-cf2bdd45787554652535ceba77d78fe2ca147c1d.tar.gz | |
Convert to options framework.
Fix socks option (USE_SOCKS previously could not have worked for various
reasons).
Fix a few pkglint quoting warnings.
Diffstat (limited to 'www')
| -rw-r--r-- | www/tinyproxy/Makefile | 13 | ||||
| -rw-r--r-- | www/tinyproxy/options.mk | 14 |
2 files changed, 19 insertions, 8 deletions
diff --git a/www/tinyproxy/Makefile b/www/tinyproxy/Makefile index 89caa6c469c..69dc31c8b37 100644 --- a/www/tinyproxy/Makefile +++ b/www/tinyproxy/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2005/08/23 11:48:52 rillig Exp $ +# $NetBSD: Makefile,v 1.17 2005/12/02 17:06:03 wiz Exp $ # DISTNAME= tinyproxy-1.6.2 @@ -20,19 +20,16 @@ TINYPROXY_USER?= tinyproxy TINYPROXY_GROUP?= tinyproxy PKG_GROUPS= ${TINYPROXY_GROUP} PKG_USERS= ${TINYPROXY_USER}:${TINYPROXY_GROUP}::Tinyproxy\ user -FILES_SUBST+= TINYPROXY_USER="${TINYPROXY_USER}" -FILES_SUBST+= TINYPROXY_GROUP="${TINYPROXY_GROUP}" +FILES_SUBST+= TINYPROXY_USER=${TINYPROXY_USER:Q} +FILES_SUBST+= TINYPROXY_GROUP=${TINYPROXY_GROUP:Q} CONFIGURE_ARGS+= --with-config=${PKG_SYSCONFDIR}/tinyproxy.conf CONFIGURE_ARGS+= --enable-transparent-proxy # Avoid an ICE in gcc2 on sparc64 -CONFIGURE_ENV+= F77=${FALSE} +CONFIGURE_ENV+= F77=${FALSE:Q} -# Socks support -.if defined(USE_SOCKS) && ${USE_SOCKS} == YES -CONFIGURE_ARGS+= --enable-socks -.endif +.include "options.mk" EGDIR= ${PREFIX}/share/examples/tinyproxy diff --git a/www/tinyproxy/options.mk b/www/tinyproxy/options.mk new file mode 100644 index 00000000000..ab055b9c4d3 --- /dev/null +++ b/www/tinyproxy/options.mk @@ -0,0 +1,14 @@ +# $NetBSD: options.mk,v 1.1 2005/12/02 17:06:04 wiz Exp $ + +PKG_OPTIONS_VAR= PKG_OPTIONS.tinyproxy +PKG_SUPPORTED_OPTIONS+= socks5 + +PKG_SUGGESTED_OPTIONS+= socks5 + +.include "../../mk/bsd.options.mk" + +.if !empty(PKG_OPTIONS:Msocks5) +CONFIGURE_ARGS+= --enable-socks +BUILDLINK_TRANSFORM+= l:socks:socks5 +.include "../../net/socks5/buildlink3.mk" +.endif |