Added two patches that correct the localedir on Solaris.

5 files changed, 38 insertions, 3 deletions

diff --git a/sysutils/gnome-vfs2/Makefile b/sysutils/gnome-vfs2/Makefile
index beb12b43cf5..e2a3bd1373b 100644
--- a/sysutils/gnome-vfs2/Makefile
+++ b/sysutils/gnome-vfs2/Makefile
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile,v 1.68 2006/11/24 17:30:22 drochner Exp $
+# $NetBSD: Makefile,v 1.69 2006/12/01 21:16:02 rillig Exp $
+
+PKGREVISION=		1
 
 PKGCONFIG_OVERRIDE=	gnome-vfs-2.0.pc.in
 PKGCONFIG_OVERRIDE+=	gnome-vfs-module-2.0.pc.in
diff --git a/sysutils/gnome-vfs2/Makefile.common b/sysutils/gnome-vfs2/Makefile.common
index d516dac2af4..1f2bd2684de 100644
--- a/sysutils/gnome-vfs2/Makefile.common
+++ b/sysutils/gnome-vfs2/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.39 2006/11/24 17:30:22 drochner Exp $
+# $NetBSD: Makefile.common,v 1.40 2006/12/01 21:16:02 rillig Exp $
 #
 
 GNOME_VFS2_VERSION=	2.16.3
@@ -34,6 +34,7 @@ CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASEDIR:Q}
 
 CPPFLAGS+=		-DPREFIX="\"${PREFIX}\""
 CPPFLAGS+=		-DPKG_SYSCONFDIR="\"${PKG_SYSCONFDIR}\""
+MAKE_FLAGS+=		localedir=${PREFIX}/${PKGLOCALEDIR}/locale
 
 INSTALL_MAKE_FLAGS+=	${MAKE_FLAGS}
 INSTALL_MAKE_FLAGS+=	modulesconfdir=${PREFIX}/share/examples/gnome-vfs-2.0/modules
diff --git a/sysutils/gnome-vfs2/distinfo b/sysutils/gnome-vfs2/distinfo
index 803f5c635bb..703dfd27a7d 100644
--- a/sysutils/gnome-vfs2/distinfo
+++ b/sysutils/gnome-vfs2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.59 2006/11/24 17:30:22 drochner Exp $
+$NetBSD: distinfo,v 1.60 2006/12/01 21:16:02 rillig Exp $
 
 SHA1 (gnome-vfs-2.16.3.tar.bz2) = a4c97179e2c4abf8cfcf236e56f7d328feaef89b
 RMD160 (gnome-vfs-2.16.3.tar.bz2) = 9600bb4f4630d48600c1469fa5077d8e969a10cc
@@ -16,4 +16,6 @@ SHA1 (patch-ar) = 33bac387ffe861141f9cd6564c24956d3e9e4cb4
 SHA1 (patch-au) = e3c681dd445d0774981a50eb22ae14ff4db5902c
 SHA1 (patch-ax) = 6b9b11df5d530b7b3aa6a3997feb7c1c93e7b2db
 SHA1 (patch-ba) = 5299eb32ff0c14eb98d8f7dd5e104cd931a02b51
+SHA1 (patch-bb) = 0b8d12e9b44547a0262231a09d181f4ccde0c1f3
+SHA1 (patch-bc) = d71be2e22ae3bb87c163a43ae457362a0e77cfe1
 SHA1 (patch-ca) = c8d73a528d4a7260e4d976ba6c426ca92e7593e8
diff --git a/sysutils/gnome-vfs2/patches/patch-bb b/sysutils/gnome-vfs2/patches/patch-bb
new file mode 100644
index 00000000000..9711c70975d
--- /dev/null
+++ b/sysutils/gnome-vfs2/patches/patch-bb
@@ -0,0 +1,15 @@
+$NetBSD: patch-bb,v 1.1 2006/12/01 21:16:02 rillig Exp $
+
+Stick to the pkgsrc conventions for the locale directory.
+
+--- daemon/Makefile.in.orig	2006-05-30 12:21:17.000000000 +0200
++++ daemon/Makefile.in	2006-06-25 23:35:21.000000000 +0200
+@@ -359,7 +359,7 @@ INCLUDES = \
+ 	-DGNOME_VFS_PREFIX=\"$(prefix)\"	\
+ 	-DGNOME_VFS_DATADIR=\"$(datadir)\"	\
+ 	-DGNOME_VFS_LIBDIR=\"$(libdir)\"	\
+-	-DGNOMEVFS_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\" \
++	-DGNOMEVFS_LOCALEDIR="\"$(localedir)\"" \
+ 	-DGNOME_VFS_SYSCONFDIR=\"$(sysconfdir)\"\
+ 	-DG_LOG_DOMAIN=\"libgnomevfs\"		\
+ 	-I$(top_srcdir)				\
diff --git a/sysutils/gnome-vfs2/patches/patch-bc b/sysutils/gnome-vfs2/patches/patch-bc
new file mode 100644
index 00000000000..46408fbaa47
--- /dev/null
+++ b/sysutils/gnome-vfs2/patches/patch-bc
@@ -0,0 +1,15 @@
+$NetBSD: patch-bc,v 1.1 2006/12/01 21:16:02 rillig Exp $
+
+Stick to the pkgsrc conventions of the locale directory.
+
+--- libgnomevfs/Makefile.in.orig	2006-05-30 12:21:20.000000000 +0200
++++ libgnomevfs/Makefile.in	2006-06-25 23:34:58.000000000 +0200
+@@ -459,7 +459,7 @@ INCLUDES = \
+ 	-DGNOME_VFS_BINDIR=\"$(bindir)\"	\
+ 	-DGNOME_VFS_DATADIR=\"$(datadir)\"	\
+ 	-DGNOME_VFS_LIBDIR=\"$(libdir)\"	\
+-	-DGNOME_VFS_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\" \
++	-DGNOME_VFS_LOCALEDIR="\"$(localedir)\"" \
+ 	-DGNOME_VFS_SYSCONFDIR=\"$(sysconfdir)\"\
+ 	-DG_LOG_DOMAIN=\"libgnomevfs\"		\
+ 	$(NULL)