Update to gnome-vfs2-2.24.4.

Remove support for avahi and cdda -- gnomevfs is deprected and shouldn't be used. ok jasper@
2010-09-30 07:40:37 +00:00 · 2010-09-30 07:40:37 +00:00 · 20da3774f8
commit 20da3774f8
parent 5600064db9
4 changed files with 52 additions and 61 deletions
--- a/x11/gnome/vfs2/Makefile
+++ b/x11/gnome/vfs2/Makefile
@ -1,16 +1,14 @@
-# $OpenBSD: Makefile,v 1.60 2010/08/26 09:19:39 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.61 2010/09/30 07:40:37 ajacoutot Exp $

 SHARED_ONLY=		Yes

 COMMENT=		GNOME Virtual File System

 GNOME_PROJECT=		gnome-vfs
-GNOME_VERSION=		2.24.3
+GNOME_VERSION=		2.24.4

 PKGNAME=		gnome-vfs2-${VERSION}

-REVISION=		1
-
 SHARED_LIBS +=	gnomevfs-2           2400.0   # .2400.0

 # GPLv2/LGPLv2
@ -19,10 +17,9 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes

-WANTLIB=	crypto dbus-1 glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0 \
-		m pcre ssl util z avahi-client avahi-common avahi-glib \
-		ORBit-2 xml2 dbus-glib-1 c asn1 gssapi krb5 pthread \
-		cdda_interface cdda_paranoia bz2 fam
+WANTLIB += crypto dbus-1 glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0
+WANTLIB += m pcre ssl util z ORBit-2 xml2 dbus-glib-1 c asn1 gssapi krb5
+WANTLIB += pthread gio-2.0 bz2 fam

 MODULES=		devel/gettext \
 			x11/gnome \
@ -31,22 +28,21 @@ MODULES=		devel/gettext \
 BUILD_DEPENDS=		${RUN_DEPENDS}
 RUN_DEPENDS=		:gnome-mime-data->=2.0.0:x11/gnome/mime-data

-LIB_DEPENDS=		::net/avahi \
-			::x11/dbus-glib \
-			::audio/cdparanoia \
-			::archivers/bzip2 \
+LIB_DEPENDS=		::archivers/bzip2 \
 			::sysutils/gamin

 USE_X11=		Yes
 MODGCONF2_SCHEMAS_DIR=	gnome-vfs2

 CONFIGURE_ARGS+= 	${CONFIGURE_SHARED} \
-			--enable-cdda \
-			--enable-avahi \
+			--disable-gtk-doc \
+			--disable-cdda \
+			--disable-avahi \
 			--disable-howl \
 			--disable-samba
 CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib -pthread"
+			LDFLAGS="-L${LOCALBASE}/lib -pthread" \
+			ac_cv_header_sys_mount_h=yes

 FAKE_FLAGS=		sysconfdir=${PREFIX}/share/examples/gnome-vfs2

--- a/x11/gnome/vfs2/distinfo
+++ b/x11/gnome/vfs2/distinfo
@ -1,5 +1,5 @@
-MD5 (gnome/gnome-vfs-2.24.3.tar.bz2) = ZGomcsbn5Ov/anmLD7fMkA==
-RMD160 (gnome/gnome-vfs-2.24.3.tar.bz2) = ZSr7pHozsFEo01SSfSZIs5tQ81o=
-SHA1 (gnome/gnome-vfs-2.24.3.tar.bz2) = Vq7QZ+6nkXW8GGoAADwHpC5emqY=
-SHA256 (gnome/gnome-vfs-2.24.3.tar.bz2) = Ow80LnmBO/wR2OY225az/9FsnKSLBzBkEOCaP9EGW0o=
-SIZE (gnome/gnome-vfs-2.24.3.tar.bz2) = 1830456
+MD5 (gnome/gnome-vfs-2.24.4.tar.bz2) = oF+rA+7vEKR90Va3WJgvLg==
+RMD160 (gnome/gnome-vfs-2.24.4.tar.bz2) = allSvqAt/JZ4K28RKf52X1MTp1s=
+SHA1 (gnome/gnome-vfs-2.24.4.tar.bz2) = DcY0592Xn9IY83iQLAyhr4BziWE=
+SHA256 (gnome/gnome-vfs-2.24.4.tar.bz2) = Yt5ktbgE6wQQT/mPzWqLcnbVEKSfvZwP61aPiZZET6o=
+SIZE (gnome/gnome-vfs-2.24.4.tar.bz2) = 1890370
--- a/x11/gnome/vfs2/patches/patch-configure
+++ b/x11/gnome/vfs2/patches/patch-configure
@ -1,21 +1,21 @@
-$OpenBSD: patch-configure,v 1.15 2010/03/30 15:07:06 ajacoutot Exp $
--- configure.orig	Tue Mar 30 15:19:59 2010
-+++ configure	Tue Mar 30 16:48:57 2010
-@@ -26065,7 +26065,7 @@ if test "${openssl_libs+set}" = set; then
+$OpenBSD: patch-configure,v 1.16 2010/09/30 07:40:37 ajacoutot Exp $
+--- configure.orig	Tue Sep 28 11:35:20 2010
+++ configure	Tue Sep 28 12:15:12 2010
+@@ -17694,7 +17694,7 @@ if test "${openssl_libs+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
 -		LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcrypto -ldl"
 +		LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcrypto"
- 		cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -26360,7 +26360,7 @@ if test "${openssl_libs+set}" = set; then
+ 		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+@@ -17824,7 +17824,7 @@ if test "${openssl_libs+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
 -		LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcrypto -ldl"
 +		LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcrypto"
- 		cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
+ 		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
--- a/x11/gnome/vfs2/pkg/PLIST
+++ b/x11/gnome/vfs2/pkg/PLIST
@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.18 2010/08/26 09:19:39 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.19 2010/09/30 07:40:37 ajacoutot Exp $
@pkgpath x11/gnome/vfs2
@pkgpath x11/gnome/vfs2,-main
@pkgpath x11/gnome/vfs2,-smb
@ -69,44 +69,41 @@ lib/gnome-vfs-2.0/
 lib/gnome-vfs-2.0/include/
 lib/gnome-vfs-2.0/include/gnome-vfs-file-size.h
 lib/gnome-vfs-2.0/modules/
-lib/gnome-vfs-2.0/modules/libbzip2.a
-lib/gnome-vfs-2.0/modules/libbzip2.la
+@comment lib/gnome-vfs-2.0/modules/libbzip2.a
+@comment lib/gnome-vfs-2.0/modules/libbzip2.la
 lib/gnome-vfs-2.0/modules/libbzip2.so
-lib/gnome-vfs-2.0/modules/libcdda.a
-lib/gnome-vfs-2.0/modules/libcdda.la
-lib/gnome-vfs-2.0/modules/libcdda.so
-lib/gnome-vfs-2.0/modules/libcomputer.a
-lib/gnome-vfs-2.0/modules/libcomputer.la
+@comment lib/gnome-vfs-2.0/modules/libcomputer.a
+@comment lib/gnome-vfs-2.0/modules/libcomputer.la
 lib/gnome-vfs-2.0/modules/libcomputer.so
-lib/gnome-vfs-2.0/modules/libdns-sd.a
-lib/gnome-vfs-2.0/modules/libdns-sd.la
+@comment lib/gnome-vfs-2.0/modules/libdns-sd.a
+@comment lib/gnome-vfs-2.0/modules/libdns-sd.la
 lib/gnome-vfs-2.0/modules/libdns-sd.so
-lib/gnome-vfs-2.0/modules/libfile.a
-lib/gnome-vfs-2.0/modules/libfile.la
+@comment lib/gnome-vfs-2.0/modules/libfile.a
+@comment lib/gnome-vfs-2.0/modules/libfile.la
 lib/gnome-vfs-2.0/modules/libfile.so
-lib/gnome-vfs-2.0/modules/libftp.a
-lib/gnome-vfs-2.0/modules/libftp.la
+@comment lib/gnome-vfs-2.0/modules/libftp.a
+@comment lib/gnome-vfs-2.0/modules/libftp.la
 lib/gnome-vfs-2.0/modules/libftp.so
-lib/gnome-vfs-2.0/modules/libgzip.a
-lib/gnome-vfs-2.0/modules/libgzip.la
+@comment lib/gnome-vfs-2.0/modules/libgzip.a
+@comment lib/gnome-vfs-2.0/modules/libgzip.la
 lib/gnome-vfs-2.0/modules/libgzip.so
-lib/gnome-vfs-2.0/modules/libhttp.a
-lib/gnome-vfs-2.0/modules/libhttp.la
+@comment lib/gnome-vfs-2.0/modules/libhttp.a
+@comment lib/gnome-vfs-2.0/modules/libhttp.la
 lib/gnome-vfs-2.0/modules/libhttp.so
-lib/gnome-vfs-2.0/modules/libnetwork.a
-lib/gnome-vfs-2.0/modules/libnetwork.la
+@comment lib/gnome-vfs-2.0/modules/libnetwork.a
+@comment lib/gnome-vfs-2.0/modules/libnetwork.la
 lib/gnome-vfs-2.0/modules/libnetwork.so
-lib/gnome-vfs-2.0/modules/libnntp.a
-lib/gnome-vfs-2.0/modules/libnntp.la
+@comment lib/gnome-vfs-2.0/modules/libnntp.a
+@comment lib/gnome-vfs-2.0/modules/libnntp.la
 lib/gnome-vfs-2.0/modules/libnntp.so
-lib/gnome-vfs-2.0/modules/libsftp.a
-lib/gnome-vfs-2.0/modules/libsftp.la
+@comment lib/gnome-vfs-2.0/modules/libsftp.a
+@comment lib/gnome-vfs-2.0/modules/libsftp.la
 lib/gnome-vfs-2.0/modules/libsftp.so
-lib/gnome-vfs-2.0/modules/libtar.a
-lib/gnome-vfs-2.0/modules/libtar.la
+@comment lib/gnome-vfs-2.0/modules/libtar.a
+@comment lib/gnome-vfs-2.0/modules/libtar.la
 lib/gnome-vfs-2.0/modules/libtar.so
-lib/gnome-vfs-2.0/modules/libvfs-test.a
-lib/gnome-vfs-2.0/modules/libvfs-test.la
+@comment lib/gnome-vfs-2.0/modules/libvfs-test.a
+@comment lib/gnome-vfs-2.0/modules/libvfs-test.la
 lib/gnome-vfs-2.0/modules/libvfs-test.so
 lib/libgnomevfs-2.a
 lib/libgnomevfs-2.la
@ -121,8 +118,6 @@ share/examples/gnome-vfs2/gnome-vfs-2.0/
@sample ${SYSCONFDIR}/gnome/gnome-vfs-2.0/
 share/examples/gnome-vfs2/gnome-vfs-2.0/modules/
@sample ${SYSCONFDIR}/gnome/gnome-vfs-2.0/modules/
-share/examples/gnome-vfs2/gnome-vfs-2.0/modules/cdda-module.conf
-@sample ${SYSCONFDIR}/gnome/gnome-vfs-2.0/modules/cdda-module.conf
 share/examples/gnome-vfs2/gnome-vfs-2.0/modules/default-modules.conf
@sample ${SYSCONFDIR}/gnome/gnome-vfs-2.0/modules/default-modules.conf
 share/examples/gnome-vfs2/gnome-vfs-2.0/modules/ssl-modules.conf