2 files changed, 22 insertions, 15 deletions
diff --git a/chat/ircII/Makefile b/chat/ircII/Makefile
index 36ce538ac54..59f82f8806f 100644
--- a/chat/ircII/Makefile
+++ b/chat/ircII/Makefile
@@ -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 @@ GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-default-server=${DEFAULT_IRC_SERVER}
 .endif
 
-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!)
+# (Leave the line in to still get it into the README-IPv6.html!)
+BUILD_DEFS+=		USE_INET6
 
 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 --git a/chat/ircII/options.mk b/chat/ircII/options.mk
new file mode 100644
index 00000000000..9500bbde06a
--- /dev/null
+++ b/chat/ircII/options.mk
@@ -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