Sat Apr 3 21:00:42 2010 UTC ()
Don't require farsight option for enabling PLIST.gnome, because the
gnome-specific file is installed even w/o farsight.  PKGREVISION++.

ok wiz@


(gdt)
diff -r1.19 -r1.20 pkgsrc/chat/libpurple/Makefile
diff -r1.14 -r1.15 pkgsrc/chat/libpurple/options.mk
cvs diff -r1.19 -r1.20 pkgsrc/chat/libpurple/Makefile (expand / switch to unified diff)

--- pkgsrc/chat/libpurple/Makefile 2010/02/26 09:48:56 1.19
+++ pkgsrc/chat/libpurple/Makefile 2010/04/03 21:00:42 1.20
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.19 2010/02/26 09:48:56 wiz Exp $ 1# $NetBSD: Makefile,v 1.20 2010/04/03 21:00:42 gdt Exp $
2# 2#
3 3
4PKGNAME= libpurple-${PIDGIN_VERSION} 4PKGNAME= libpurple-${PIDGIN_VERSION}
5PKGREVISION= 2 5PKGREVISION= 3
6COMMENT= Multi-protocol Instant Messaging client backend 6COMMENT= Multi-protocol Instant Messaging client backend
7 7
8PKG_DESTDIR_SUPPORT= user-destdir 8PKG_DESTDIR_SUPPORT= user-destdir
9 9
10.include "../../chat/libpurple/Makefile.common" 10.include "../../chat/libpurple/Makefile.common"
11 11
12CONFIGURE_ENV+= GCONF_SCHEMA_FILE_DIR=${PREFIX}/share/gconf/schemas/ 12CONFIGURE_ENV+= GCONF_SCHEMA_FILE_DIR=${PREFIX}/share/gconf/schemas/
13MAKE_ENV+= GCONF_SCHEMA_FILE_DIR=${PREFIX}/share/gconf/schemas/ 13MAKE_ENV+= GCONF_SCHEMA_FILE_DIR=${PREFIX}/share/gconf/schemas/
14 14
15USE_TOOLS+= msgfmt intltool 15USE_TOOLS+= msgfmt intltool
16 16
17PKGCONFIG_OVERRIDE+= gaim.pc.in 17PKGCONFIG_OVERRIDE+= gaim.pc.in
18PKGCONFIG_OVERRIDE+= libpurple/purple.pc.in 18PKGCONFIG_OVERRIDE+= libpurple/purple.pc.in
cvs diff -r1.14 -r1.15 pkgsrc/chat/libpurple/options.mk (expand / switch to unified diff)

--- pkgsrc/chat/libpurple/options.mk 2010/02/26 10:31:10 1.14
+++ pkgsrc/chat/libpurple/options.mk 2010/04/03 21:00:42 1.15
@@ -1,31 +1,31 @@ @@ -1,31 +1,31 @@
1# $NetBSD: options.mk,v 1.14 2010/02/26 10:31:10 wiz Exp $ 1# $NetBSD: options.mk,v 1.15 2010/04/03 21:00:42 gdt Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.libpurple 3PKG_OPTIONS_VAR= PKG_OPTIONS.libpurple
4PKG_SUPPORTED_OPTIONS+= avahi dbus debug farsight gnome gnutls 4PKG_SUPPORTED_OPTIONS+= avahi dbus debug farsight gnome gnutls
5PKG_SUPPORTED_OPTIONS+= gstreamer perl sasl tcl 5PKG_SUPPORTED_OPTIONS+= gstreamer perl sasl tcl
6PKG_SUGGESTED_OPTIONS+= avahi dbus farsight gnome gnutls gstreamer 6PKG_SUGGESTED_OPTIONS+= avahi dbus farsight gnome gnutls gstreamer
7 7
8.include "../../mk/bsd.options.mk" 8.include "../../mk/bsd.options.mk"
9 9
10PLIST_VARS+= avahi dbus gnome gnutls nss perl tcl 10PLIST_VARS+= avahi dbus gnome gnutls nss perl tcl
11 11
12.if !empty(PKG_OPTIONS:Mavahi) 12.if !empty(PKG_OPTIONS:Mavahi)
13PLIST.avahi= yes 13PLIST.avahi= yes
14CONFIGURE_ARGS+= --enable-avahi 14CONFIGURE_ARGS+= --enable-avahi
15. include "../../net/avahi/buildlink3.mk" 15. include "../../net/avahi/buildlink3.mk"
16.endif 16.endif
17 17
18.if !empty(PKG_OPTIONS:Mgnome) && !empty(PKG_OPTIONS:Mfarsight) 18.if !empty(PKG_OPTIONS:Mgnome)
19PLIST.gnome= yes 19PLIST.gnome= yes
20. include "../../devel/GConf/schemas.mk" 20. include "../../devel/GConf/schemas.mk"
21GCONF_SCHEMAS+= purple.schemas 21GCONF_SCHEMAS+= purple.schemas
22.endif 22.endif
23 23
24.if !empty(PKG_OPTIONS:Mgnutls) 24.if !empty(PKG_OPTIONS:Mgnutls)
25PLIST.gnutls= yes 25PLIST.gnutls= yes
26CONFIGURE_ARGS+= --enable-gnutls 26CONFIGURE_ARGS+= --enable-gnutls
27CONFIGURE_ARGS+= --with-gnutls-includes=${BUILDLINK_PREFIX.gnutls}/include 27CONFIGURE_ARGS+= --with-gnutls-includes=${BUILDLINK_PREFIX.gnutls}/include
28CONFIGURE_ARGS+= --with-gnutls-libs=${BUILDLINK_PREFIX.gnutls}/lib 28CONFIGURE_ARGS+= --with-gnutls-libs=${BUILDLINK_PREFIX.gnutls}/lib
29 29
30. include "../../security/gnutls/buildlink3.mk" 30. include "../../security/gnutls/buildlink3.mk"
31.else 31.else