Wed Nov 17 14:35:33 2010 UTC ()
deal with giomodule.cache, should fix PRs pkg/43578 and pkg/44104
by Robert Elz


(drochner)
diff -r1.71 -r1.72 pkgsrc/devel/GConf/Makefile
diff -r1.1.1.1 -r1.2 pkgsrc/devel/dconf/Makefile
diff -r1.1.1.1 -r1.2 pkgsrc/sysutils/gio-fam/Makefile
diff -r1.30 -r1.31 pkgsrc/sysutils/gvfs/Makefile
cvs diff -r1.71 -r1.72 pkgsrc/devel/GConf/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/GConf/Makefile 2010/11/16 15:12:19 1.71
+++ pkgsrc/devel/GConf/Makefile 2010/11/17 14:35:32 1.72
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.71 2010/11/16 15:12:19 drochner Exp $ 1# $NetBSD: Makefile,v 1.72 2010/11/17 14:35:32 drochner Exp $
2# 2#
3 3
4.include "../../devel/GConf/Makefile.common" 4.include "../../devel/GConf/Makefile.common"
5 5
6CONFIGURE_ARGS+= --disable-gtk 6CONFIGURE_ARGS+= --disable-gtk
7CONFIGURE_ARGS+= ac_cv_header_ldap_h=no 7CONFIGURE_ARGS+= ac_cv_header_ldap_h=no
8CONFIGURE_ARGS+= --disable-defaults-service 8CONFIGURE_ARGS+= --disable-defaults-service
9 9
10CONFLICTS+= GConf2-[0-9]* 10CONFLICTS+= GConf2-[0-9]*
11 11
12OWN_DIRS= ${PKG_SYSCONFDIR}/2 12OWN_DIRS= ${PKG_SYSCONFDIR}/2
13OWN_DIRS+= ${PKG_SYSCONFDIR}/gconf.xml.defaults 13OWN_DIRS+= ${PKG_SYSCONFDIR}/gconf.xml.defaults
14OWN_DIRS+= ${PKG_SYSCONFDIR}/gconf.xml.mandatory 14OWN_DIRS+= ${PKG_SYSCONFDIR}/gconf.xml.mandatory
@@ -23,14 +23,15 @@ REPLACE_PYTHON= gsettings/gsettings-sche @@ -23,14 +23,15 @@ REPLACE_PYTHON= gsettings/gsettings-sche
23# But we have to wait until a public identifier is choosen for it. 23# But we have to wait until a public identifier is choosen for it.
24 24
25post-install: 25post-install:
26 ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/gconf/schemas 26 ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/gconf/schemas
27 27
28BUILDLINK_ABI_DEPENDS.dbus-glib+= dbus-glib>=0.74 28BUILDLINK_ABI_DEPENDS.dbus-glib+= dbus-glib>=0.74
29.include "../../lang/python/application.mk" 29.include "../../lang/python/application.mk"
30.include "../../devel/gettext-lib/buildlink3.mk" 30.include "../../devel/gettext-lib/buildlink3.mk"
31.include "../../net/ORBit2/buildlink3.mk" 31.include "../../net/ORBit2/buildlink3.mk"
32.include "../../sysutils/dbus/buildlink3.mk" 32.include "../../sysutils/dbus/buildlink3.mk"
33.include "../../sysutils/dbus-glib/buildlink3.mk" 33.include "../../sysutils/dbus-glib/buildlink3.mk"
34.include "../../textproc/libxml2/buildlink3.mk" 34.include "../../textproc/libxml2/buildlink3.mk"
35.include "../../textproc/xmlcatmgr/buildlink3.mk" 35.include "../../textproc/xmlcatmgr/buildlink3.mk"
 36.include "../../devel/glib2/modules.mk"
36.include "../../mk/bsd.pkg.mk" 37.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1.1.1 -r1.2 pkgsrc/devel/dconf/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/dconf/Makefile 2010/11/16 19:47:07 1.1.1.1
+++ pkgsrc/devel/dconf/Makefile 2010/11/17 14:35:32 1.2
@@ -1,24 +1,24 @@ @@ -1,24 +1,24 @@
1# $NetBSD: Makefile,v 1.1.1.1 2010/11/16 19:47:07 drochner Exp $ 1# $NetBSD: Makefile,v 1.2 2010/11/17 14:35:32 drochner Exp $
2# 2#
3 3
4DISTNAME= dconf-0.5.1 4DISTNAME= dconf-0.5.1
5CATEGORIES= devel 5CATEGORIES= devel
6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/dconf/0.5/} 6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/dconf/0.5/}
7EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://live.gnome.org/dconf 10HOMEPAGE= http://live.gnome.org/dconf
11COMMENT= Backend for gsettings 11COMMENT= Backend for gsettings
12#LICENSE= # TODO: (see mk/license.mk) 12#LICENSE= # TODO: (see mk/license.mk)
13 13
14PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
15 15
16GNU_CONFIGURE= yes 16GNU_CONFIGURE= yes
17CONFIGURE_ARGS+= --disable-editor 17CONFIGURE_ARGS+= --disable-editor
18USE_LIBTOOL= yes 18USE_LIBTOOL= yes
19USE_TOOLS+= pkg-config 19USE_TOOLS+= pkg-config
20 20
21PKGCONFIG_OVERRIDE+= client/dconf.pc.in 21PKGCONFIG_OVERRIDE+= client/dconf.pc.in
22 22
23.include "../../devel/glib2/buildlink3.mk" 23.include "../../devel/glib2/modules.mk"
24.include "../../mk/bsd.pkg.mk" 24.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1.1.1 -r1.2 pkgsrc/sysutils/gio-fam/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/gio-fam/Attic/Makefile 2010/04/20 17:44:26 1.1.1.1
+++ pkgsrc/sysutils/gio-fam/Attic/Makefile 2010/11/17 14:35:32 1.2
@@ -1,30 +1,30 @@ @@ -1,30 +1,30 @@
1# $NetBSD: Makefile,v 1.1.1.1 2010/04/20 17:44:26 jmmv Exp $ 1# $NetBSD: Makefile,v 1.2 2010/11/17 14:35:32 drochner Exp $
2# 2#
3 3
4.include "../../devel/glib2/Makefile.common" 4.include "../../devel/glib2/Makefile.common"
5 5
6PKGNAME:= ${PKGNAME:S/glib2/gio-fam/} 6PKGNAME:= ${PKGNAME:S/glib2/gio-fam/}
7CATEGORIES= sysutils 7CATEGORIES= sysutils
8 8
9COMMENT= FAM backend for GIO, the glib VFS API 9COMMENT= FAM backend for GIO, the glib VFS API
10 10
11NOT_FOR_PLATFORM= HPUX-*-* OSF1-*-* 11NOT_FOR_PLATFORM= HPUX-*-* OSF1-*-*
12 12
13FAM_ACCEPTED= fam gamin 13FAM_ACCEPTED= fam gamin
14FAM_SERVER= no 14FAM_SERVER= no
15 15
16CONFIGURE_ARGS+= --enable-fam 16CONFIGURE_ARGS+= --enable-fam
17 17
18BUILD_DIRS= gio/fam 18BUILD_DIRS= gio/fam
19INSTALL_DIRS= ${BUILD_DIRS} 19INSTALL_DIRS= ${BUILD_DIRS}
20 20
21.include "../../mk/bsd.prefs.mk" 21.include "../../mk/bsd.prefs.mk"
22 22
23.if ${OPSYS} == "IRIX" 23.if ${OPSYS} == "IRIX"
24MAKE_FLAGS+= FAM_LIBS="-lfam -lC" 24MAKE_FLAGS+= FAM_LIBS="-lfam -lC"
25BUILDLINK_TRANSFORM+= l:fam:fam:C 25BUILDLINK_TRANSFORM+= l:fam:fam:C
26.endif 26.endif
27 27
28.include "../../devel/glib2/buildlink3.mk" 28.include "../../devel/glib2/modules.mk"
29.include "../../mk/fam.buildlink3.mk" 29.include "../../mk/fam.buildlink3.mk"
30.include "../../mk/bsd.pkg.mk" 30.include "../../mk/bsd.pkg.mk"
cvs diff -r1.30 -r1.31 pkgsrc/sysutils/gvfs/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/gvfs/Makefile 2010/11/16 13:57:28 1.30
+++ pkgsrc/sysutils/gvfs/Makefile 2010/11/17 14:35:33 1.31
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.30 2010/11/16 13:57:28 drochner Exp $ 1# $NetBSD: Makefile,v 1.31 2010/11/17 14:35:33 drochner Exp $
2# 2#
3 3
4DISTNAME= gvfs-1.6.6 4DISTNAME= gvfs-1.6.6
5CATEGORIES= sysutils 5CATEGORIES= sysutils
6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gvfs/1.6/} 6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gvfs/1.6/}
7EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.gnome.org/ 10HOMEPAGE= http://www.gnome.org/
11COMMENT= Userspace virtual filesystem 11COMMENT= Userspace virtual filesystem
12 12
13PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
14 14
@@ -59,22 +59,22 @@ PLIST.hal= yes @@ -59,22 +59,22 @@ PLIST.hal= yes
59CONFIGURE_ARGS+= --disable-hal 59CONFIGURE_ARGS+= --disable-hal
60CONFIGURE_ARGS+= --disable-cdda 60CONFIGURE_ARGS+= --disable-cdda
61.endif 61.endif
62 62
63.if !empty(PKG_OPTIONS:Mfuse) 63.if !empty(PKG_OPTIONS:Mfuse)
64.include "../../mk/fuse.buildlink3.mk" 64.include "../../mk/fuse.buildlink3.mk"
65CONFIGURE_ARGS+= --enable-fuse 65CONFIGURE_ARGS+= --enable-fuse
66PLIST.fuse= yes 66PLIST.fuse= yes
67.else 67.else
68CONFIGURE_ARGS+= --disable-fuse 68CONFIGURE_ARGS+= --disable-fuse
69.endif 69.endif
70 70
71BUILDLINK_API_DEPENDS.glib2+= glib2>=2.17.6 71BUILDLINK_API_DEPENDS.glib2+= glib2>=2.17.6
72.include "../../devel/glib2/buildlink3.mk" 72.include "../../devel/glib2/modules.mk"
73.include "../../sysutils/dbus/buildlink3.mk" 73.include "../../sysutils/dbus/buildlink3.mk"
74.include "../../archivers/libarchive/buildlink3.mk" 74.include "../../archivers/libarchive/buildlink3.mk"
75BUILDLINK_API_DEPENDS.libsoup24+= libsoup24>=2.25.1 75BUILDLINK_API_DEPENDS.libsoup24+= libsoup24>=2.25.1
76.include "../../net/libsoup24/buildlink3.mk" 76.include "../../net/libsoup24/buildlink3.mk"
77.include "../../textproc/libxml2/buildlink3.mk" 77.include "../../textproc/libxml2/buildlink3.mk"
78.include "../../devel/GConf/buildlink3.mk" 78.include "../../devel/GConf/buildlink3.mk"
79.include "../../security/libgnome-keyring/buildlink3.mk" 79.include "../../security/libgnome-keyring/buildlink3.mk"
80.include "../../mk/bsd.pkg.mk" 80.include "../../mk/bsd.pkg.mk"