pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/www/tinyproxy Convert to options framework.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/2ac9a8d466e7
branches:  trunk
changeset: 503972:2ac9a8d466e7
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Fri Dec 02 17:06:03 2005 +0000

description:
Convert to options framework.
Fix socks option (USE_SOCKS previously could not have worked for various
reasons).
Fix a few pkglint quoting warnings.

diffstat:

 www/tinyproxy/Makefile   |  13 +++++--------
 www/tinyproxy/options.mk |  14 ++++++++++++++
 2 files changed, 19 insertions(+), 8 deletions(-)

diffs (51 lines):

diff -r 299ffbd4f303 -r 2ac9a8d466e7 www/tinyproxy/Makefile
--- a/www/tinyproxy/Makefile    Fri Dec 02 17:05:04 2005 +0000
+++ b/www/tinyproxy/Makefile    Fri Dec 02 17:06:03 2005 +0000
@@ -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_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 -r 299ffbd4f303 -r 2ac9a8d466e7 www/tinyproxy/options.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/tinyproxy/options.mk  Fri Dec 02 17:06:03 2005 +0000
@@ -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



Home | Main Index | Thread Index | Old Index