pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/chat/libpurple Aggressively disable options in Makefil...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/c00f9df513fe
branches:  trunk
changeset: 542459:c00f9df513fe
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Sat May 17 23:26:06 2008 +0000

description:
Aggressively disable options in Makefile.common and selectively
enable them in options.mk, through overrides.

diffstat:

 chat/libpurple/Makefile.common |   9 ++++++++-
 chat/libpurple/options.mk      |  17 ++++-------------
 2 files changed, 12 insertions(+), 14 deletions(-)

diffs (84 lines):

diff -r 725bf9ac6af5 -r c00f9df513fe chat/libpurple/Makefile.common
--- a/chat/libpurple/Makefile.common    Sat May 17 22:56:17 2008 +0000
+++ b/chat/libpurple/Makefile.common    Sat May 17 23:26:06 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.15 2008/05/17 22:56:17 tnn Exp $
+# $NetBSD: Makefile.common,v 1.16 2008/05/17 23:26:06 tnn Exp $
 #
 # used by chat/finch/Makefile
 # used by chat/libpurple/Makefile
@@ -27,3 +27,10 @@
 CONFIGURE_ARGS+=       --disable-meanwhile
 CONFIGURE_ARGS+=       --disable-gstreamer
 CONFIGURE_ARGS+=       --disable-avahi
+CONFIGURE_ARGS+=       --disable-perl
+CONFIGURE_ARGS+=       --disable-tcl
+CONFIGURE_ARGS+=       --disable-gnutls
+CONFIGURE_ARGS+=       --disable-nss
+CONFIGURE_ARGS+=       --disable-dbus
+CONFIGURE_ARGS+=       --disable-cyrus-sasl
+CONFIGURE_ARGS+=       --disable-debug
diff -r 725bf9ac6af5 -r c00f9df513fe chat/libpurple/options.mk
--- a/chat/libpurple/options.mk Sat May 17 22:56:17 2008 +0000
+++ b/chat/libpurple/options.mk Sat May 17 23:26:06 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.7 2008/04/12 22:42:58 jlam Exp $
+# $NetBSD: options.mk,v 1.8 2008/05/17 23:26:06 tnn Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.libpurple
 PKG_SUPPORTED_OPTIONS+=                gnutls perl tcl debug dbus sasl
@@ -9,13 +9,13 @@
 PLIST_VARS+=           dbus
 
 .if !empty(PKG_OPTIONS:Mgnutls)
-CONFIGURE_ARGS+=       --disable-nss
+CONFIGURE_ARGS+=       --enable-gnutls
 CONFIGURE_ARGS+= --with-gnutls-includes=${BUILDLINK_PREFIX.gnutls}/include
 CONFIGURE_ARGS+= --with-gnutls-libs=${BUILDLINK_PREFIX.gnutls}/lib
 
 .  include "../../security/gnutls/buildlink3.mk"
 .else
-CONFIGURE_ARGS+=       --disable-gnutls
+CONFIGURE_ARGS+=       --enable-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
@@ -25,17 +25,14 @@
 .endif
 
 .if !empty(PKG_OPTIONS:Mperl)
+CONFIGURE_ARGS+=       --enable-perl
 USE_TOOLS+=            perl:run
 .  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:Mdbus)
@@ -50,19 +47,13 @@
 .  include "../../sysutils/dbus/buildlink3.mk"
 .  include "../../sysutils/dbus-glib/buildlink3.mk"
 .  include "../../lang/python/application.mk"
-.else
-CONFIGURE_ARGS+=       --disable-dbus
 .endif
 
 .if !empty(PKG_OPTIONS:Mdebug)
 CONFIGURE_ARGS+=       --enable-debug
-.else
-CONFIGURE_ARGS+=       --disable-debug
 .endif
 
 .if !empty(PKG_OPTIONS:Msasl)
 CONFIGURE_ARGS+=       --enable-cyrus-sasl
 .  include "../../security/cyrus-sasl/buildlink3.mk"
-.else
-CONFIGURE_ARGS+=       --disable-cyrus-sasl
 .endif



Home | Main Index | Thread Index | Old Index