From da887bceb3089fa985cf04272ca370ae95a6de44 Mon Sep 17 00:00:00 2001 From: drochner Date: Tue, 10 Apr 2007 17:58:10 +0000 Subject: update to 2.18.1 This moves this pkg to the new stable gnome branch, too much to list here. --- sysutils/gnome-vfs2/Makefile | 4 +-- sysutils/gnome-vfs2/Makefile.common | 6 ++-- sysutils/gnome-vfs2/PLIST | 3 +- sysutils/gnome-vfs2/distinfo | 14 ++++----- sysutils/gnome-vfs2/patches/patch-ae | 58 ++++++++++++++++++------------------ sysutils/gnome-vfs2/patches/patch-ap | 14 ++------- sysutils/gnome-vfs2/patches/patch-cb | 16 +++++----- 7 files changed, 52 insertions(+), 63 deletions(-) (limited to 'sysutils/gnome-vfs2') diff --git a/sysutils/gnome-vfs2/Makefile b/sysutils/gnome-vfs2/Makefile index e26bdf64409..c46e7431ca4 100644 --- a/sysutils/gnome-vfs2/Makefile +++ b/sysutils/gnome-vfs2/Makefile @@ -1,6 +1,4 @@ -# $NetBSD: Makefile,v 1.70 2007/02/09 19:06:54 drochner Exp $ - -PKGREVISION= 2 +# $NetBSD: Makefile,v 1.71 2007/04/10 17:58:10 drochner Exp $ 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 3dee613024f..a3ddae9f371 100644 --- a/sysutils/gnome-vfs2/Makefile.common +++ b/sysutils/gnome-vfs2/Makefile.common @@ -1,13 +1,13 @@ -# $NetBSD: Makefile.common,v 1.41 2007/02/15 21:25:04 rillig Exp $ +# $NetBSD: Makefile.common,v 1.42 2007/04/10 17:58:21 drochner Exp $ # -GNOME_VFS2_VERSION= 2.16.3 +GNOME_VFS2_VERSION= 2.18.1 DISTNAME= gnome-vfs-${GNOME_VFS2_VERSION} PKGNAME= ${DISTNAME:S/vfs/vfs2/} CATEGORIES?= sysutils CATEGORIES+= gnome -MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-vfs/2.16/} +MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-vfs/2.18/} EXTRACT_SUFX= .tar.bz2 MAINTAINER= jmmv@NetBSD.org diff --git a/sysutils/gnome-vfs2/PLIST b/sysutils/gnome-vfs2/PLIST index 25c5de03c52..d4e4a4d74d0 100644 --- a/sysutils/gnome-vfs2/PLIST +++ b/sysutils/gnome-vfs2/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.24 2006/11/24 17:30:22 drochner Exp $ +@comment $NetBSD: PLIST,v 1.25 2007/04/10 17:58:22 drochner Exp $ bin/gnomevfs-cat bin/gnomevfs-copy bin/gnomevfs-df @@ -183,6 +183,7 @@ share/locale/it/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/ja/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/ka/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/ko/LC_MESSAGES/gnome-vfs-2.0.mo +share/locale/ku/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/li/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/lt/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/lv/LC_MESSAGES/gnome-vfs-2.0.mo diff --git a/sysutils/gnome-vfs2/distinfo b/sysutils/gnome-vfs2/distinfo index c214ef1aecd..42fe1ba9ed6 100644 --- a/sysutils/gnome-vfs2/distinfo +++ b/sysutils/gnome-vfs2/distinfo @@ -1,16 +1,16 @@ -$NetBSD: distinfo,v 1.62 2007/02/09 19:06:54 drochner Exp $ +$NetBSD: distinfo,v 1.63 2007/04/10 17:58:22 drochner Exp $ -SHA1 (gnome-vfs-2.16.3.tar.bz2) = a4c97179e2c4abf8cfcf236e56f7d328feaef89b -RMD160 (gnome-vfs-2.16.3.tar.bz2) = 9600bb4f4630d48600c1469fa5077d8e969a10cc -Size (gnome-vfs-2.16.3.tar.bz2) = 1900424 bytes +SHA1 (gnome-vfs-2.18.1.tar.bz2) = e939fe4fe2e75516ae6c4d476f8fb44f59ec8bdc +RMD160 (gnome-vfs-2.18.1.tar.bz2) = ff2fc7a7c47b85a03d65964a8ad1d7d585698f3d +Size (gnome-vfs-2.18.1.tar.bz2) = 1916897 bytes SHA1 (patch-aa) = a5a3ac6be3e2a888eaaab108807d2aff651e62db SHA1 (patch-ab) = 6320180870f234a150dfe40f8f990deec7a2a0b5 -SHA1 (patch-ae) = 87fc8b003122d386f4adbeba436fc6ffc47cd0b0 +SHA1 (patch-ae) = 05b28610539d22491b8694ef3850b77be47c7c6c SHA1 (patch-af) = 6724c4a43d0d9525f5361ba7380c91adbf656e56 SHA1 (patch-ai) = 6afefb35bfe3fc37e84048b95ccc272a01542ec2 SHA1 (patch-am) = 4e037da71db0d3aae236475a0f2ead12738f35f9 SHA1 (patch-ao) = 0cc64574f6d430ca385f22d28690b9cea9181390 -SHA1 (patch-ap) = 98ad7700d01007510467e2ae4ee8554f54f15320 +SHA1 (patch-ap) = cf09ffdef9e1b03425d60e69302e8e589928d370 SHA1 (patch-aq) = 1d5ed4d6c1b3a282e68bedf6892fa8a9678ea39b SHA1 (patch-ar) = 33bac387ffe861141f9cd6564c24956d3e9e4cb4 SHA1 (patch-au) = e3c681dd445d0774981a50eb22ae14ff4db5902c @@ -19,7 +19,7 @@ SHA1 (patch-ba) = 5299eb32ff0c14eb98d8f7dd5e104cd931a02b51 SHA1 (patch-bb) = 0b8d12e9b44547a0262231a09d181f4ccde0c1f3 SHA1 (patch-bc) = d71be2e22ae3bb87c163a43ae457362a0e77cfe1 SHA1 (patch-ca) = c8d73a528d4a7260e4d976ba6c426ca92e7593e8 -SHA1 (patch-cb) = ec6b725e33aade30f593bc7f0986c21bcde29057 +SHA1 (patch-cb) = 370c75a72d8575051bb5f02d54fdd4a191ac00eb SHA1 (patch-cc) = 010674b9e7674cc4b84a57ac680a5769c5cffd29 SHA1 (patch-cd) = e32c32e4a9834cc3335d5192a1110bfed9c4fd4c SHA1 (patch-ce) = 718d7de318e85e58b7412345496263ca559e9a73 diff --git a/sysutils/gnome-vfs2/patches/patch-ae b/sysutils/gnome-vfs2/patches/patch-ae index daebeb76379..2a1baf5daad 100644 --- a/sysutils/gnome-vfs2/patches/patch-ae +++ b/sysutils/gnome-vfs2/patches/patch-ae @@ -1,8 +1,8 @@ -$NetBSD: patch-ae,v 1.13 2006/09/15 15:07:40 jmmv Exp $ +$NetBSD: patch-ae,v 1.14 2007/04/10 17:58:23 drochner Exp $ ---- configure.orig 2006-09-04 10:40:11.000000000 +0200 +--- configure.orig 2007-04-10 14:08:42.000000000 +0200 +++ configure -@@ -24331,7 +24331,7 @@ fi +@@ -24490,7 +24490,7 @@ fi @@ -11,7 +11,7 @@ $NetBSD: patch-ae,v 1.13 2006/09/15 15:07:40 jmmv Exp $ do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` echo "$as_me:$LINENO: checking for $ac_func" >&5 -@@ -25611,9 +25611,11 @@ cat >>conftest.$ac_ext <<_ACEOF +@@ -25772,9 +25772,11 @@ cat >>conftest.$ac_ext <<_ACEOF int main () { @@ -23,7 +23,7 @@ $NetBSD: patch-ae,v 1.13 2006/09/15 15:07:40 jmmv Exp $ return 0; } _ACEOF -@@ -32942,7 +32944,7 @@ _ACEOF +@@ -33097,7 +33099,7 @@ _ACEOF msg_samba="yes" if test x$with_samba_libs != x/usr/lib; then @@ -32,62 +32,62 @@ $NetBSD: patch-ae,v 1.13 2006/09/15 15:07:40 jmmv Exp $ else SAMBA_LIBS="-lsmbclient" fi -@@ -35979,12 +35981,12 @@ if test -n "$PKG_CONFIG"; then +@@ -36182,12 +36184,12 @@ if test -n "$PKG_CONFIG"; then pkg_cv_LIBGNOMEVFS_CFLAGS="$LIBGNOMEVFS_CFLAGS" else if test -n "$PKG_CONFIG" && \ -- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED gmodule-no-export-2.0 >= \$GLIB_REQUIRED gthread-2.0 >= \$GLIB_REQUIRED gobject-2.0 >= \$GLIB_REQUIRED gconf-2.0 >= \$GCONF_REQUIRED libxml-2.0 >= \$XML_REQUIRED gnome-mime-data-2.0 dbus-glib-1 >= 0.60\"") >&5 -- ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED gnome-mime-data-2.0 dbus-glib-1 >= 0.60") 2>&5 -+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED gmodule-no-export-2.0 >= \$GLIB_REQUIRED gthread-2.0 >= \$GLIB_REQUIRED gobject-2.0 >= \$GLIB_REQUIRED gconf-2.0 >= \$GCONF_REQUIRED libxml-2.0 >= \$XML_REQUIRED dbus-glib-1 >= 0.60\"") >&5 -+ ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED dbus-glib-1 >= 0.60") 2>&5 +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED gmodule-no-export-2.0 >= \$GLIB_REQUIRED gthread-2.0 >= \$GLIB_REQUIRED gobject-2.0 >= \$GLIB_REQUIRED gconf-2.0 >= \$GCONF_REQUIRED libxml-2.0 >= \$XML_REQUIRED gnome-mime-data-2.0 \$dbus_requirement\"") >&5 +- ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED gnome-mime-data-2.0 $dbus_requirement") 2>&5 ++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED gmodule-no-export-2.0 >= \$GLIB_REQUIRED gthread-2.0 >= \$GLIB_REQUIRED gobject-2.0 >= \$GLIB_REQUIRED gconf-2.0 >= \$GCONF_REQUIRED libxml-2.0 >= \$XML_REQUIRED \$dbus_requirement\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED $dbus_requirement") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then -- pkg_cv_LIBGNOMEVFS_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED gnome-mime-data-2.0 dbus-glib-1 >= 0.60" 2>/dev/null` -+ pkg_cv_LIBGNOMEVFS_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED dbus-glib-1 >= 0.60" 2>/dev/null` +- pkg_cv_LIBGNOMEVFS_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED gnome-mime-data-2.0 $dbus_requirement" 2>/dev/null` ++ pkg_cv_LIBGNOMEVFS_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED $dbus_requirement" 2>/dev/null` else pkg_failed=yes fi -@@ -35997,12 +35999,12 @@ if test -n "$PKG_CONFIG"; then +@@ -36200,12 +36202,12 @@ if test -n "$PKG_CONFIG"; then pkg_cv_LIBGNOMEVFS_LIBS="$LIBGNOMEVFS_LIBS" else if test -n "$PKG_CONFIG" && \ -- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED gmodule-no-export-2.0 >= \$GLIB_REQUIRED gthread-2.0 >= \$GLIB_REQUIRED gobject-2.0 >= \$GLIB_REQUIRED gconf-2.0 >= \$GCONF_REQUIRED libxml-2.0 >= \$XML_REQUIRED gnome-mime-data-2.0 dbus-glib-1 >= 0.60\"") >&5 -- ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED gnome-mime-data-2.0 dbus-glib-1 >= 0.60") 2>&5 -+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED gmodule-no-export-2.0 >= \$GLIB_REQUIRED gthread-2.0 >= \$GLIB_REQUIRED gobject-2.0 >= \$GLIB_REQUIRED gconf-2.0 >= \$GCONF_REQUIRED libxml-2.0 >= \$XML_REQUIRED dbus-glib-1 >= 0.60\"") >&5 -+ ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED dbus-glib-1 >= 0.60") 2>&5 +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED gmodule-no-export-2.0 >= \$GLIB_REQUIRED gthread-2.0 >= \$GLIB_REQUIRED gobject-2.0 >= \$GLIB_REQUIRED gconf-2.0 >= \$GCONF_REQUIRED libxml-2.0 >= \$XML_REQUIRED gnome-mime-data-2.0 \$dbus_requirement\"") >&5 +- ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED gnome-mime-data-2.0 $dbus_requirement") 2>&5 ++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED gmodule-no-export-2.0 >= \$GLIB_REQUIRED gthread-2.0 >= \$GLIB_REQUIRED gobject-2.0 >= \$GLIB_REQUIRED gconf-2.0 >= \$GCONF_REQUIRED libxml-2.0 >= \$XML_REQUIRED \$dbus_requirement\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED $dbus_requirement") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then -- pkg_cv_LIBGNOMEVFS_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED gnome-mime-data-2.0 dbus-glib-1 >= 0.60" 2>/dev/null` -+ pkg_cv_LIBGNOMEVFS_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED dbus-glib-1 >= 0.60" 2>/dev/null` +- pkg_cv_LIBGNOMEVFS_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED gnome-mime-data-2.0 $dbus_requirement" 2>/dev/null` ++ pkg_cv_LIBGNOMEVFS_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED $dbus_requirement" 2>/dev/null` else pkg_failed=yes fi -@@ -36021,14 +36023,14 @@ else +@@ -36224,14 +36226,14 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then -- LIBGNOMEVFS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED gnome-mime-data-2.0 dbus-glib-1 >= 0.60"` -+ LIBGNOMEVFS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED dbus-glib-1 >= 0.60"` +- LIBGNOMEVFS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED gnome-mime-data-2.0 $dbus_requirement"` ++ LIBGNOMEVFS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED $dbus_requirement"` else -- LIBGNOMEVFS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED gnome-mime-data-2.0 dbus-glib-1 >= 0.60"` -+ LIBGNOMEVFS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED dbus-glib-1 >= 0.60"` +- LIBGNOMEVFS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED gnome-mime-data-2.0 $dbus_requirement"` ++ LIBGNOMEVFS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED $dbus_requirement"` fi # Put the nasty error message in config.log where it belongs echo "$LIBGNOMEVFS_PKG_ERRORS" >&5 -- { { echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED gnome-mime-data-2.0 dbus-glib-1 >= 0.60) were not met: -+ { { echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED dbus-glib-1 >= 0.60) were not met: +- { { echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED gnome-mime-data-2.0 $dbus_requirement) were not met: ++ { { echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED $dbus_requirement) were not met: $LIBGNOMEVFS_PKG_ERRORS -@@ -36039,7 +36041,7 @@ Alternatively, you may set the environme +@@ -36242,7 +36244,7 @@ Alternatively, you may set the environme and LIBGNOMEVFS_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. " >&5 --echo "$as_me: error: Package requirements (glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED gnome-mime-data-2.0 dbus-glib-1 >= 0.60) were not met: -+echo "$as_me: error: Package requirements (glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED dbus-glib-1 >= 0.60) were not met: +-echo "$as_me: error: Package requirements (glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED gnome-mime-data-2.0 $dbus_requirement) were not met: ++echo "$as_me: error: Package requirements (glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED $dbus_requirement) were not met: $LIBGNOMEVFS_PKG_ERRORS diff --git a/sysutils/gnome-vfs2/patches/patch-ap b/sysutils/gnome-vfs2/patches/patch-ap index f576219be30..081521dde4c 100644 --- a/sysutils/gnome-vfs2/patches/patch-ap +++ b/sysutils/gnome-vfs2/patches/patch-ap @@ -1,16 +1,8 @@ -$NetBSD: patch-ap,v 1.2 2005/10/07 16:10:44 drochner Exp $ +$NetBSD: patch-ap,v 1.3 2007/04/10 17:58:23 drochner Exp $ ---- modules/file-method.c.orig 2005-07-15 15:46:53.000000000 +0200 +--- modules/file-method.c.orig 2007-03-13 11:50:03.000000000 +0100 +++ modules/file-method.c -@@ -66,6 +66,7 @@ - #if HAVE_SYS_VFS_H - #include - #elif HAVE_SYS_MOUNT_H -+#include - #include - #endif - -@@ -173,13 +174,13 @@ GET_PATH_MAX (void) +@@ -134,13 +134,13 @@ GET_PATH_MAX (void) } #endif diff --git a/sysutils/gnome-vfs2/patches/patch-cb b/sysutils/gnome-vfs2/patches/patch-cb index dc625ce1c7e..3e8c7b351f0 100644 --- a/sysutils/gnome-vfs2/patches/patch-cb +++ b/sysutils/gnome-vfs2/patches/patch-cb @@ -1,16 +1,14 @@ -$NetBSD: patch-cb,v 1.1 2007/01/28 15:39:27 rillig Exp $ +$NetBSD: patch-cb,v 1.2 2007/04/10 17:58:24 drochner Exp $ -PR: 35263 - ---- modules/file-method-acl.c.orig 2006-08-07 10:16:27.000000000 +0200 -+++ modules/file-method-acl.c 2007-01-28 16:34:35.000000000 +0100 -@@ -34,6 +34,9 @@ - #include +--- modules/file-method-acl.c.orig 2007-03-13 11:50:03.000000000 +0100 ++++ modules/file-method-acl.c +@@ -35,6 +35,9 @@ #include #include + #ifdef HAVE_SYS_RESOURCE_H +#ifdef HAVE_SYS_TIME_H -+#include /* needs this on MacOS X */ ++#include /* needs this on MacOS X */ +#endif #include + #endif - #ifdef HAVE_PWD_H -- cgit v1.2.3