[pkgsrc/trunk]: pkgsrc/chat/gaim Convert more options to bsd.options.mk. The ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e6445a447745
branches:  trunk
changeset: 498656:e6445a447745
user:      xtraeme <xtraeme%pkgsrc.org@localhost>
date:      Mon Aug 29 13:31:14 2005 +0000

description:
Convert more options to bsd.options.mk. The following options are
available now:

gnutls gtkspell silc audio perl tcl nas

By default the package will use:

gtkspell silc audio

As before, this closes PR pkg/28815.

diffstat:

 chat/gaim/Makefile   |  10 +---------
 chat/gaim/PLIST      |   4 ++--
 chat/gaim/options.mk |  52 +++++++++++++++++++++++++++++++++++++++++++++-------
 3 files changed, 48 insertions(+), 18 deletions(-)

diffs (125 lines):

diff -r 9e0ab3dd933e -r e6445a447745 chat/gaim/Makefile
--- a/chat/gaim/Makefile        Mon Aug 29 13:15:34 2005 +0000
+++ b/chat/gaim/Makefile        Mon Aug 29 13:31:14 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.100 2005/08/29 11:35:51 xtraeme Exp $
+# $NetBSD: Makefile,v 1.101 2005/08/29 13:31:14 xtraeme Exp $
 
 DISTNAME=      gaim-1.5.0
 PKGREVISION=   1
@@ -23,12 +23,7 @@
 SHLIBTOOL_OVERRIDE=    libtool
 
 CONFIGURE_ARGS+=       --disable-binreloc
-CONFIGURE_ARGS+=       --disable-nas
-CONFIGURE_ARGS+=       --disable-perl
-CONFIGURE_ARGS+=       --disable-tcl
 CONFIGURE_ARGS+=       --disable-gevolution
-CONFIGURE_ARGS+=       --with-silc-includes=${BUILDLINK_PREFIX.silc-toolkit}/include/silc
-CONFIGURE_ARGS+=       --with-silc-libs=${BUILDLINK_PREFIX.silc-toolkit}/lib/silc
 CONFIGURE_ENV+=                DLLIB=${BUILDLINK_LDADD.dl}
 
 .include "options.mk"
@@ -39,12 +34,9 @@
 CONFIGURE_ARGS+=       --disable-screensaver
 .endif
 
-.include "../../audio/libao/buildlink3.mk"
-.include "../../audio/libaudiofile/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/silc-toolkit/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/startup-notification/buildlink3.mk"
 
diff -r 9e0ab3dd933e -r e6445a447745 chat/gaim/PLIST
--- a/chat/gaim/PLIST   Mon Aug 29 13:15:34 2005 +0000
+++ b/chat/gaim/PLIST   Mon Aug 29 13:31:14 2005 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.42 2005/08/12 17:52:16 reed Exp $
+@comment $NetBSD: PLIST,v 1.43 2005/08/29 13:31:14 xtraeme Exp $
 bin/gaim
 bin/gaim-remote
 include/gaim/account.h
@@ -86,7 +86,7 @@
 lib/gaim/libnapster.la
 lib/gaim/libnovell.la
 lib/gaim/liboscar.la
-lib/gaim/libsilcgaim.la
+${SILC}lib/gaim/libsilcgaim.la
 lib/gaim/libyahoo.la
 lib/gaim/libzephyr.la
 lib/gaim/notify.la
diff -r 9e0ab3dd933e -r e6445a447745 chat/gaim/options.mk
--- a/chat/gaim/options.mk      Mon Aug 29 13:15:34 2005 +0000
+++ b/chat/gaim/options.mk      Mon Aug 29 13:31:14 2005 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.3 2005/08/29 11:37:08 xtraeme Exp $
+# $NetBSD: options.mk,v 1.4 2005/08/29 13:31:14 xtraeme Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.gaim
-PKG_SUPPORTED_OPTIONS+=                gnutls gtkspell
-PKG_SUGGESTED_OPTIONS+=                gtkspell
+PKG_SUPPORTED_OPTIONS+=                gnutls gtkspell silc audio perl tcl nas
+PKG_SUGGESTED_OPTIONS+=                gtkspell silc audio
 
 .include "../../mk/bsd.options.mk"
 
@@ -14,10 +14,10 @@
 .  include "../../security/gnutls/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=       --disable-gnutls
-CONFIGURE_ARGS+=       --with-nspr-includes=${BUILDLINK_PREFIX.nspr}/include/nspr
-CONFIGURE_ARGS+=       --with-nspr-libs=${BUILDLINK_PREFIX.nspr}/lib/nspr
-CONFIGURE_ARGS+=       --with-nss-includes=${BUILDLINK_PREFIX.nss}/include/nss/nss
-CONFIGURE_ARGS+=       --with-nss-libs=${BUILDLINK_PREFIX.nss}/lib/nss
+CONFIGURE_ARGS+= --with-nspr-includes=${BUILDLINK_PREFIX.nspr}/include/nspr
+CONFIGURE_ARGS+= --with-nspr-libs=${BUILDLINK_PREFIX.nspr}/lib/nspr
+CONFIGURE_ARGS+= --with-nss-includes=${BUILDLINK_PREFIX.nss}/include/nss/nss
+CONFIGURE_ARGS+= --with-nss-libs=${BUILDLINK_PREFIX.nss}/lib/nss
 
 .  include "../../devel/nss/buildlink3.mk"
 .endif
@@ -27,3 +27,41 @@
 .else
 CONFIGURE_ARGS+=       --disable-gtkspell
 .endif
+
+.if !empty(PKG_OPTIONS:Msilc)
+PLIST_SUBST+=          SILC=
+CONFIGURE_ARGS+= --with-silc-includes=${BUILDLINK_PREFIX.silc-toolkit}/include/silc
+CONFIGURE_ARGS+= --with-silc-libs=${BUILDLINK_PREFIX.silc-toolkit}/lib/silc
+. include "../../devel/silc-toolkit/buildlink3.mk"
+.else
+PLIST_SUBST+=          SILC="@comment "
+CONFIGURE_ARGS+=       --disable-silc
+.endif
+
+.if !empty(PKG_OPTIONS:Maudio)
+.  include "../../audio/libao/buildlink3.mk"
+.  include "../../audio/libaudiofile/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       --disable-audio
+.endif
+
+.if !empty(PKG_OPTIONS:Mperl)
+USE_PERL5=     yes
+.  include "../../lang/perl5/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       --disable-perl
+.endif
+
+.if !empty(PKG_OPTIONS:Mtcl)
+CONFIGURE_ARGS+=       --with-tclconfig=${BUILDLINK_PREFIX.tcl}/lib
+.  include "../../lang/tcl/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       --disable-tcl
+.endif
+
+.if !empty(PKG_OPTIONS:Mnas)
+CONFIGURE_ARGS+=       --enable-nas
+.  include "../../audio/nas/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       --disable-nas
+.endif