pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/chat/ircII Convert to options framework.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/2ca0901a8a50
branches:  trunk
changeset: 495130:2ca0901a8a50
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Thu Jun 02 22:21:18 2005 +0000

description:
Convert to options framework.

diffstat:

 chat/ircII/Makefile   |  19 ++++---------------
 chat/ircII/options.mk |  18 ++++++++++++++++++
 2 files changed, 22 insertions(+), 15 deletions(-)

diffs (59 lines):

diff -r fe27765927a9 -r 2ca0901a8a50 chat/ircII/Makefile
--- a/chat/ircII/Makefile       Thu Jun 02 22:20:37 2005 +0000
+++ b/chat/ircII/Makefile       Thu Jun 02 22:21:18 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2005/04/11 21:45:04 tv Exp $
+# $NetBSD: Makefile,v 1.38 2005/06/02 22:21:18 wiz Exp $
 
 DISTNAME=              ircii-${VERS}
 PKGNAME=               ircII-${VERS}
@@ -28,24 +28,13 @@
 CONFIGURE_ARGS+=       --with-default-server=${DEFAULT_IRC_SERVER}
 .endif
 
+# Note: this pkg auto-detects IPv6 without regarding USE_INET6.
+# (Leave the line in to still get it into the README-IPv6.html!)
 BUILD_DEFS+=           USE_INET6
 
-# Note: this pkg auto-detects IPv6 without regarding USE_INET6.
-# (Leave the above line in to still get it into the README-IPv6.html!)
-
 PLIST_SRC=             ${WRKDIR}/PLIST.tmp
-BUILD_DEFS+=           USE_SOCKS
 
-# Include SOCKS firewall support
-.if defined(USE_SOCKS) && (${USE_SOCKS} == 4 || ${USE_SOCKS} == 5)
-.  if ${USE_SOCKS} == 4
-.    include "../../net/socks4/buildlink3.mk"
-CONFIGURE_ARGS+=       --with-socks4=${BUILDLINK_PREFIX.socks4}
-.  elif ${USE_SOCKS} == 5
-.    include "../../net/socks5/buildlink3.mk"
-CONFIGURE_ARGS+=       --with-socks5=${BUILDLINK_PREFIX.socks5}
-.  endif
-.endif
+.include "options.mk"
 
 # Allow customizations from ${MAKECONF}
 CONFIGURE_ARGS+=       ${IRCII_CONFIGURE_ARGS}
diff -r fe27765927a9 -r 2ca0901a8a50 chat/ircII/options.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/chat/ircII/options.mk     Thu Jun 02 22:21:18 2005 +0000
@@ -0,0 +1,18 @@
+# $NetBSD: options.mk,v 1.1 2005/06/02 22:21:18 wiz Exp $
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.ircII
+PKG_SUPPORTED_OPTIONS= # only socks group
+PKG_OPTIONS_OPTIONAL_GROUPS=   socks
+PKG_OPTIONS_GROUP.socks=       socks4 socks5
+
+.include "../../mk/bsd.options.mk"
+
+# Include SOCKS firewall support
+.if !empty(PKG_OPTIONS:Msocks4)
+.include "../../net/socks4/buildlink3.mk"
+CONFIGURE_ARGS+=       --with-socks4=${BUILDLINK_PREFIX.socks4}
+.endif
+.if !empty(PKG_OPTIONS:Msocks5)
+.include "../../net/socks5/buildlink3.mk"
+CONFIGURE_ARGS+=       --with-socks5=${BUILDLINK_PREFIX.socks5}
+.endif



Home | Main Index | Thread Index | Old Index