[pkgsrc/trunk]: pkgsrc/chat/xchat2 Convert to use bsd.options.mk. Patches pr...

[minskim <minskim%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/53acf8c8c609
branches:  trunk
changeset: 482620:53acf8c8c609
user:      minskim <minskim%pkgsrc.org@localhost>
date:      Sat Oct 30 18:28:00 2004 +0000

description:
Convert to use bsd.options.mk.  Patches provided by adrianp@ with
slight modification by me.

diffstat:

 chat/xchat2/Makefile   |  21 ++-------------------
 chat/xchat2/options.mk |  45 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 47 insertions(+), 19 deletions(-)

diffs (84 lines):

diff -r cd4ee582c0a2 -r 53acf8c8c609 chat/xchat2/Makefile
--- a/chat/xchat2/Makefile      Sat Oct 30 18:22:35 2004 +0000
+++ b/chat/xchat2/Makefile      Sat Oct 30 18:28:00 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2004/10/30 18:22:35 minskim Exp $
+# $NetBSD: Makefile,v 1.40 2004/10/30 18:28:00 minskim Exp $
 #
 
 .include "Makefile.common"
@@ -24,24 +24,7 @@
 LDFLAGS.Darwin+=       -lX11
 
 .include "../../mk/bsd.prefs.mk"
-
-BUILD_DEFS+=            USE_INET6 USE_SOCKS XCHAT_USE_SSL
-
-# IPv6 support
-.if defined(USE_INET6) && !empty(USE_INET6:M[Yy][Ee][Ss])
-CONFIGURE_ARGS+=        --enable-ipv6
-.endif
-
-# Socks support
-.if defined(USE_SOCKS) && !empty(USE_SOCKS:M[Yy][Ee][Ss])
-CONFIGURE_ARGS+=        --enable-socks
-.endif
-
-# SSL support
-.if defined(XCHAT_USE_SSL) && !empty(XCHAT_USE_SSL:M[Yy][Ee][Ss])
-.  include "../../security/openssl/buildlink3.mk"
-CONFIGURE_ARGS+=        --enable-openssl=${SSLBASE}
-.endif
+.include "options.mk"
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
diff -r cd4ee582c0a2 -r 53acf8c8c609 chat/xchat2/options.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/chat/xchat2/options.mk    Sat Oct 30 18:28:00 2004 +0000
@@ -0,0 +1,45 @@
+# $NetBSD: options.mk,v 1.1 2004/10/30 18:28:00 minskim Exp $
+
+# Global and legacy options
+.if defined(USE_SOCKS) && !empty(USE_SOCKS:M[Yy][Ee][Ss])
+PKG_DEFAULT_OPTIONS+=  socks
+.endif
+.if defined(XCHAT_USE_SSL) && !empty(XCHAT_USE_SSL:M[Yy][Ee][Ss])
+PKG_DEFAULT_OPTIONS+=  ssl
+.endif
+.if defined(USE_INET6) && !empty(USE_INET6:M[yY][eE][sS])
+PKG_DEFAULT_OPTIONS+=  inet6
+.endif
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.xchat2
+PKG_SUPPORTED_OPTIONS= inet6 ssl socks
+
+.if !defined(PKG_OPTIONS.xchat2)
+PKG_DEFAULT_OPTIONS+=  inet6 ssl
+.endif
+
+.include "../../mk/bsd.options.mk"
+
+###
+### Use OpenSSL libraries for connecting to ircs servers
+###
+.if !empty(PKG_OPTIONS:Mssl)
+.      include "../../security/openssl/buildlink3.mk"
+CONFIGURE_ARGS+=       --enable-openssl=${SSLBASE}
+.else
+CONFIGURE_ARGS+=       --enable-openssl=no
+.endif
+
+###
+### Support for connecting thru SOCKS servers
+###
+.if !empty(PKG_OPTIONS:Msocks)
+CONFIGURE_ARGS+=       --enable-socks
+.endif
+
+###
+### IPv6 support.
+###
+.if !empty(PKG_OPTIONS:Minet6)
+CONFIGURE_ARGS+=       --enable-ipv6
+.endif