Sat May 17 23:26:06 2008 UTC ()
Aggressively disable options in Makefile.common and selectively
enable them in options.mk, through overrides.


(tnn)
diff -r1.15 -r1.16 pkgsrc/chat/libpurple/Makefile.common
diff -r1.7 -r1.8 pkgsrc/chat/libpurple/options.mk
cvs diff -r1.15 -r1.16 pkgsrc/chat/libpurple/Makefile.common (expand / switch to unified diff)

--- pkgsrc/chat/libpurple/Makefile.common 2008/05/17 22:56:17 1.15
+++ pkgsrc/chat/libpurple/Makefile.common 2008/05/17 23:26:06 1.16
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.common,v 1.15 2008/05/17 22:56:17 tnn Exp $ 1# $NetBSD: Makefile.common,v 1.16 2008/05/17 23:26:06 tnn Exp $
2# 2#
3# used by chat/finch/Makefile 3# used by chat/finch/Makefile
4# used by chat/libpurple/Makefile 4# used by chat/libpurple/Makefile
5# used by chat/pidgin/Makefile 5# used by chat/pidgin/Makefile
6 6
7PIDGIN_VERSION= 2.4.2 7PIDGIN_VERSION= 2.4.2
8DISTNAME= pidgin-${PIDGIN_VERSION} 8DISTNAME= pidgin-${PIDGIN_VERSION}
9CATEGORIES= chat 9CATEGORIES= chat
10MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pidgin/} 10MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pidgin/}
11EXTRACT_SUFX= .tar.bz2 11EXTRACT_SUFX= .tar.bz2
12 12
13MAINTAINER= pkgsrc-users@NetBSD.org 13MAINTAINER= pkgsrc-users@NetBSD.org
14HOMEPAGE= http://www.pidgin.im/ 14HOMEPAGE= http://www.pidgin.im/
@@ -17,13 +17,20 @@ GNU_CONFIGURE= yes @@ -17,13 +17,20 @@ GNU_CONFIGURE= yes
17USE_LIBTOOL= yes 17USE_LIBTOOL= yes
18USE_TOOLS+= pkg-config gmake 18USE_TOOLS+= pkg-config gmake
19USE_PKGLOCALEDIR= yes 19USE_PKGLOCALEDIR= yes
20 20
21PATCHDIR= ${.CURDIR}/../../chat/libpurple/patches 21PATCHDIR= ${.CURDIR}/../../chat/libpurple/patches
22DISTINFO_FILE?= ${.CURDIR}/../../chat/libpurple/distinfo 22DISTINFO_FILE?= ${.CURDIR}/../../chat/libpurple/distinfo
23 23
24CONFIGURE_ARGS+= --disable-gevolution 24CONFIGURE_ARGS+= --disable-gevolution
25CONFIGURE_ARGS+= --disable-gtkui 25CONFIGURE_ARGS+= --disable-gtkui
26CONFIGURE_ARGS+= --disable-consoleui 26CONFIGURE_ARGS+= --disable-consoleui
27CONFIGURE_ARGS+= --disable-meanwhile 27CONFIGURE_ARGS+= --disable-meanwhile
28CONFIGURE_ARGS+= --disable-gstreamer 28CONFIGURE_ARGS+= --disable-gstreamer
29CONFIGURE_ARGS+= --disable-avahi 29CONFIGURE_ARGS+= --disable-avahi
 30CONFIGURE_ARGS+= --disable-perl
 31CONFIGURE_ARGS+= --disable-tcl
 32CONFIGURE_ARGS+= --disable-gnutls
 33CONFIGURE_ARGS+= --disable-nss
 34CONFIGURE_ARGS+= --disable-dbus
 35CONFIGURE_ARGS+= --disable-cyrus-sasl
 36CONFIGURE_ARGS+= --disable-debug
cvs diff -r1.7 -r1.8 pkgsrc/chat/libpurple/options.mk (expand / switch to unified diff)

--- pkgsrc/chat/libpurple/options.mk 2008/04/12 22:42:58 1.7
+++ pkgsrc/chat/libpurple/options.mk 2008/05/17 23:26:06 1.8
@@ -1,68 +1,59 @@ @@ -1,68 +1,59 @@
1# $NetBSD: options.mk,v 1.7 2008/04/12 22:42:58 jlam Exp $ 1# $NetBSD: options.mk,v 1.8 2008/05/17 23:26:06 tnn Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.libpurple 3PKG_OPTIONS_VAR= PKG_OPTIONS.libpurple
4PKG_SUPPORTED_OPTIONS+= gnutls perl tcl debug dbus sasl 4PKG_SUPPORTED_OPTIONS+= gnutls perl tcl debug dbus sasl
5PKG_SUGGESTED_OPTIONS+= gnutls 5PKG_SUGGESTED_OPTIONS+= gnutls
6 6
7.include "../../mk/bsd.options.mk" 7.include "../../mk/bsd.options.mk"
8 8
9PLIST_VARS+= dbus 9PLIST_VARS+= dbus
10 10
11.if !empty(PKG_OPTIONS:Mgnutls) 11.if !empty(PKG_OPTIONS:Mgnutls)
12CONFIGURE_ARGS+= --disable-nss 12CONFIGURE_ARGS+= --enable-gnutls
13CONFIGURE_ARGS+= --with-gnutls-includes=${BUILDLINK_PREFIX.gnutls}/include 13CONFIGURE_ARGS+= --with-gnutls-includes=${BUILDLINK_PREFIX.gnutls}/include
14CONFIGURE_ARGS+= --with-gnutls-libs=${BUILDLINK_PREFIX.gnutls}/lib 14CONFIGURE_ARGS+= --with-gnutls-libs=${BUILDLINK_PREFIX.gnutls}/lib
15 15
16. include "../../security/gnutls/buildlink3.mk" 16. include "../../security/gnutls/buildlink3.mk"
17.else 17.else
18CONFIGURE_ARGS+= --disable-gnutls 18CONFIGURE_ARGS+= --enable-nss
19CONFIGURE_ARGS+= --with-nspr-includes=${BUILDLINK_PREFIX.nspr}/include/nspr 19CONFIGURE_ARGS+= --with-nspr-includes=${BUILDLINK_PREFIX.nspr}/include/nspr
20CONFIGURE_ARGS+= --with-nspr-libs=${BUILDLINK_PREFIX.nspr}/lib/nspr 20CONFIGURE_ARGS+= --with-nspr-libs=${BUILDLINK_PREFIX.nspr}/lib/nspr
21CONFIGURE_ARGS+= --with-nss-includes=${BUILDLINK_PREFIX.nss}/include/nss/nss 21CONFIGURE_ARGS+= --with-nss-includes=${BUILDLINK_PREFIX.nss}/include/nss/nss
22CONFIGURE_ARGS+= --with-nss-libs=${BUILDLINK_PREFIX.nss}/lib/nss 22CONFIGURE_ARGS+= --with-nss-libs=${BUILDLINK_PREFIX.nss}/lib/nss
23 23
24. include "../../devel/nss/buildlink3.mk" 24. include "../../devel/nss/buildlink3.mk"
25.endif 25.endif
26 26
27.if !empty(PKG_OPTIONS:Mperl) 27.if !empty(PKG_OPTIONS:Mperl)
 28CONFIGURE_ARGS+= --enable-perl
28USE_TOOLS+= perl:run 29USE_TOOLS+= perl:run
29. include "../../lang/perl5/buildlink3.mk" 30. include "../../lang/perl5/buildlink3.mk"
30.else 
31CONFIGURE_ARGS+= --disable-perl 
32.endif 31.endif
33 32
34.if !empty(PKG_OPTIONS:Mtcl) 33.if !empty(PKG_OPTIONS:Mtcl)
35CONFIGURE_ARGS+= --with-tclconfig=${BUILDLINK_PREFIX.tcl}/lib 34CONFIGURE_ARGS+= --with-tclconfig=${BUILDLINK_PREFIX.tcl}/lib
36. include "../../lang/tcl/buildlink3.mk" 35. include "../../lang/tcl/buildlink3.mk"
37.else 
38CONFIGURE_ARGS+= --disable-tcl 
39.endif 36.endif
40 37
41.if !empty(PKG_OPTIONS:Mdbus) 38.if !empty(PKG_OPTIONS:Mdbus)
42CONFIGURE_ARGS+= --enable-dbus 39CONFIGURE_ARGS+= --enable-dbus
43CONFIGURE_ARGS+= --with-python=${PYTHONBIN} 40CONFIGURE_ARGS+= --with-python=${PYTHONBIN}
44PLIST.dbus= yes 41PLIST.dbus= yes
45REPLACE_SH+= libpurple/purple-send 42REPLACE_SH+= libpurple/purple-send
46REPLACE_SH+= libpurple/purple-send-async 43REPLACE_SH+= libpurple/purple-send-async
47REPLACE_PYTHON+= libpurple/purple-remote 44REPLACE_PYTHON+= libpurple/purple-remote
48REPLACE_PYTHON+= libpurple/purple-url-handler 45REPLACE_PYTHON+= libpurple/purple-url-handler
49. include "../../sysutils/py-dbus/buildlink3.mk" 46. include "../../sysutils/py-dbus/buildlink3.mk"
50. include "../../sysutils/dbus/buildlink3.mk" 47. include "../../sysutils/dbus/buildlink3.mk"
51. include "../../sysutils/dbus-glib/buildlink3.mk" 48. include "../../sysutils/dbus-glib/buildlink3.mk"
52. include "../../lang/python/application.mk" 49. include "../../lang/python/application.mk"
53.else 
54CONFIGURE_ARGS+= --disable-dbus 
55.endif 50.endif
56 51
57.if !empty(PKG_OPTIONS:Mdebug) 52.if !empty(PKG_OPTIONS:Mdebug)
58CONFIGURE_ARGS+= --enable-debug 53CONFIGURE_ARGS+= --enable-debug
59.else 
60CONFIGURE_ARGS+= --disable-debug 
61.endif 54.endif
62 55
63.if !empty(PKG_OPTIONS:Msasl) 56.if !empty(PKG_OPTIONS:Msasl)
64CONFIGURE_ARGS+= --enable-cyrus-sasl 57CONFIGURE_ARGS+= --enable-cyrus-sasl
65. include "../../security/cyrus-sasl/buildlink3.mk" 58. include "../../security/cyrus-sasl/buildlink3.mk"
66.else 
67CONFIGURE_ARGS+= --disable-cyrus-sasl 
68.endif 59.endif