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

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6e27444b6315
branches:  trunk
changeset: 494871:6e27444b6315
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Tue May 31 16:28:54 2005 +0000

description:
Convert to options framework.

diffstat:

 audio/xmms/Makefile.common |  15 +++++++++------
 chat/bitchx/Makefile       |  17 +++--------------
 chat/bitchx/options.mk     |  20 ++++++++++++++++++++
 3 files changed, 32 insertions(+), 20 deletions(-)

diffs (101 lines):

diff -r fa85a21c7e5e -r 6e27444b6315 audio/xmms/Makefile.common
--- a/audio/xmms/Makefile.common        Tue May 31 16:28:29 2005 +0000
+++ b/audio/xmms/Makefile.common        Tue May 31 16:28:54 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.17 2005/05/22 20:07:40 jlam Exp $
+# $NetBSD: Makefile.common,v 1.18 2005/05/31 16:28:54 wiz Exp $
 #
 
 DISTNAME=      xmms-1.2.10
@@ -21,8 +21,6 @@
 FILESDIR=              ${.CURDIR}/../../audio/xmms/files
 PATCHDIR=              ${.CURDIR}/../../audio/xmms/patches
 
-BUILD_DEFS+=           USE_INET6
-
 CONFIGURE_ARGS+=       --without-gnome
 SHLIBTOOL_OVERRIDE=    libtool
 
@@ -31,14 +29,19 @@
 CONFIGURE_ENV+=                ac_cv_func_iconv_open=yes
 LDFLAGS+=              ${BUILDLINK_LDADD.iconv}
 
-.include "../../mk/bsd.prefs.mk"
-
 PTHREAD_OPTS+=         require
 
-.if defined(USE_INET6) && ${USE_INET6} == YES
+PKG_OPTIONS_VAR=        PKG_OPTIONS.xmms
+PKG_SUPPORTED_OPTIONS=  inet6
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Minet6)
 CONFIGURE_ARGS+=       --enable-ipv6
 .endif
 
+.include "../../mk/bsd.prefs.mk"
+
 .if ${OPSYS} == "NetBSD"
 RAWPART_cmd=           /sbin/sysctl -n kern.rawpartition | ${TR} 0-9 a-j
 CONFIGURE_ARGS+=       --with-dev-dsp=${DEVOSSSOUND}                   \
diff -r fa85a21c7e5e -r 6e27444b6315 chat/bitchx/Makefile
--- a/chat/bitchx/Makefile      Tue May 31 16:28:29 2005 +0000
+++ b/chat/bitchx/Makefile      Tue May 31 16:28:54 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2005/04/11 21:45:03 tv Exp $
+# $NetBSD: Makefile,v 1.36 2005/05/31 16:36:40 wiz Exp $
 
 DISTNAME=      ircii-pana-1.1-final
 PKGNAME=       bitchx-1.1
@@ -19,24 +19,13 @@
 GNU_CONFIGURE=         YES
 CONFIGURE_ARGS=                --with-ssl
 
+.include "options.mk"
 .include "../../mk/bsd.prefs.mk"
+
 .if ${OPSYS} == "Darwin"
 CFLAGS+=       -DBIND_8_COMPAT
 .endif
 
-.if defined(BITCHX_WITH_GTK) && !empty(BITCHX_WITH_GTK:M[Yy][Ee][Ss])
-.include "../../graphics/imlib/buildlink3.mk"
-.include "../../x11/gnome-libs/buildlink3.mk"
-.include "../../x11/gtk/buildlink3.mk"
-CONFIGURE_ARGS+=       --with-gtk
-CFLAGS+=               -I${PREFIX}/include/gnome-1.0
-PLIST_SUBST+=          GTK="gtk"
-PLIST_SUBST+=          NOT_GTK="@comment "
-.else
-PLIST_SUBST+=          GTK=
-PLIST_SUBST+=          NOT_GTK=
-.endif
-
 post-patch:
        @${MV} ${WRKSRC}/doc/BitchX.1 ${WRKSRC}/doc/BitchX.1.orig
        @${SED} ${FILES_SUBST_SED} \
diff -r fa85a21c7e5e -r 6e27444b6315 chat/bitchx/options.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/chat/bitchx/options.mk    Tue May 31 16:28:54 2005 +0000
@@ -0,0 +1,20 @@
+# $NetBSD: options.mk,v 1.1 2005/05/31 16:36:40 wiz Exp $
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.bitchx
+PKG_SUPPORTED_OPTIONS= gtk
+PKG_OPTIONS_LEGACY_VARS+=      BITCHX_WITH_GTK:gtk
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mgtk)
+.include "../../graphics/imlib/buildlink3.mk"
+.include "../../x11/gnome-libs/buildlink3.mk"
+.include "../../x11/gtk/buildlink3.mk"
+CONFIGURE_ARGS+=       --with-gtk
+CFLAGS+=               -I${PREFIX}/include/gnome-1.0
+PLIST_SUBST+=          GTK="gtk"
+PLIST_SUBST+=          NOT_GTK="@comment "
+.else
+PLIST_SUBST+=          GTK=
+PLIST_SUBST+=          NOT_GTK=
+.endif