Update to 2.7.2.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@2404 df743ca5-7f9a-e211-a948-0013205c9059

10 files changed, 84 insertions, 6 deletions

diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile
index 206fb307b..8e415789a 100644
--- a/devel/gnome-vfs/Makefile
+++ b/devel/gnome-vfs/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnomevfs2
-PORTVERSION=	2.7.1
+PORTVERSION=	2.7.2
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-vfs/2.7
@@ -40,8 +40,10 @@ OPTIONS=	KDE_MENUS "Integrated KDE menu picks" on
 .if defined(PACKAGE_BUILDING) || defined(PARALLEL_PACKAGE_BUILD)
 .undef WITHOUT_CDPARANOIA
 .undef WITHOUT_SAMBA
+#.undef WITHOUT_MDNS
 WITH_CDPARANOIA=	yes
 WITH_SAMBA=		yes
+#WITH_MDNS=		yes
 .endif
 
 .if !defined(WITHOUT_KDE_MENUS)
@@ -59,6 +61,10 @@ WITH_CDPARANOIA=	yes
 WITH_SAMBA=		yes
 .endif
 
+#.if exists(${LOCALBASE}/lib/libhowl.so)
+#WITH_MDNS=		yes
+#.endif
+
 .if defined(WITH_CDPARANOIA)
 LIB_DEPENDS+=	cdda_paranoia.0:${PORTSDIR}/audio/cdparanoia
 PLIST_SUB+=	CDPARANOIA=""
@@ -77,6 +83,10 @@ PLIST_SUB+=	SAMBA=""
 PLIST_SUB+=	SAMBA="@comment "
 .endif
 
+#.if defined(WITH_MDNS)
+#LIB_DEPENDS+=	howl:${PORTSDIR}/net/howl
+#.endif
+
 post-patch:
 	@${FIND} ${WRKSRC} -name "*info.in" | ${XARGS} ${REINPLACE_CMD} -e \
 		's|\@datadir\@/gnome|\@datadir\@|g'
diff --git a/devel/gnome-vfs/distinfo b/devel/gnome-vfs/distinfo
index 677c8096a..aca553826 100644
--- a/devel/gnome-vfs/distinfo
+++ b/devel/gnome-vfs/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-vfs-2.7.1.tar.bz2) = 00108485cd8956882388d0c0e63d5b39
-SIZE (gnome2/gnome-vfs-2.7.1.tar.bz2) = 1499764
+MD5 (gnome2/gnome-vfs-2.7.2.tar.bz2) = 6a2381f341f315f893540adf3b641907
+SIZE (gnome2/gnome-vfs-2.7.2.tar.bz2) = 1512798
diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-dns-sd.c b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-dns-sd.c
new file mode 100644
index 000000000..6246bc911
--- /dev/null
+++ b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-dns-sd.c
@@ -0,0 +1,12 @@
+--- libgnomevfs/gnome-vfs-dns-sd.c.orig	Fri Jun 18 13:20:41 2004
++++ libgnomevfs/gnome-vfs-dns-sd.c	Fri Jun 18 13:21:20 2004
+@@ -24,6 +24,9 @@
+ #include <config.h>
+ 
+ #include <sys/time.h>
++#include <sys/types.h>
++#include <netinet/in.h>
++#include <arpa/nameser.h>
+ #include <resolv.h>
+ #include <string.h>
+ #include "gnome-vfs-dns-sd.h"
diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-dns-sd.h b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-dns-sd.h
new file mode 100644
index 000000000..0c785453b
--- /dev/null
+++ b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-dns-sd.h
@@ -0,0 +1,10 @@
+--- libgnomevfs/gnome-vfs-dns-sd.h.orig	Fri Jun 18 13:26:28 2004
++++ libgnomevfs/gnome-vfs-dns-sd.h	Fri Jun 18 13:26:45 2004
+@@ -24,6 +24,7 @@
+ #ifndef GNOME_VFS_DNS_SD_H
+ #define GNOME_VFS_DSN_SD_H
+ 
++#include <sys/types.h>
+ #include <sys/socket.h>
+ #include <glib.h>
+ #include <libgnomevfs/gnome-vfs-result.h>
diff --git a/devel/gnome-vfs/pkg-plist b/devel/gnome-vfs/pkg-plist
index 380b179e3..ffb567fda 100644
--- a/devel/gnome-vfs/pkg-plist
+++ b/devel/gnome-vfs/pkg-plist
@@ -36,15 +36,18 @@ etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/mailto/%gconf.xm
 etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/man/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/trash/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/system/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/system/dns_sd/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/system/http_proxy/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/system/proxy/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/system/smb/%gconf.xml
 etc/gconf/gconf.xml.defaults/system/%gconf.xml
+etc/gconf/gconf.xml.defaults/system/dns_sd/%gconf.xml
 etc/gconf/gconf.xml.defaults/system/http_proxy/%gconf.xml
 etc/gconf/gconf.xml.defaults/system/proxy/%gconf.xml
 etc/gconf/gconf.xml.defaults/system/smb/%gconf.xml
 etc/gconf/schemas/desktop_default_applications.schemas
 etc/gconf/schemas/desktop_gnome_url_handlers.schemas
+etc/gconf/schemas/system_dns_sd.schemas
 etc/gconf/schemas/system_http_proxy.schemas
 etc/gconf/schemas/system_smb.schemas
 %%CDPARANOIA%%etc/gnome-vfs-2.0/modules/cdda-module.conf
@@ -63,6 +66,7 @@ include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-async-ops.h
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-cancellation.h
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-context.h
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-directory.h
+include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-dns-sd.h
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-drive.h
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-enum-types.h
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-file-info.h
@@ -103,6 +107,7 @@ lib/bonobo/monikers/libmoniker_gnome_vfs_std.so
 lib/gnome-vfs-2.0/modules/libbzip2.so
 %%CDPARANOIA%%lib/gnome-vfs-2.0/modules/libcdda.so
 lib/gnome-vfs-2.0/modules/libcomputer.so
+lib/gnome-vfs-2.0/modules/libdns-sd.so
 lib/gnome-vfs-2.0/modules/libextfs.so
 lib/gnome-vfs-2.0/modules/libfile.so
 lib/gnome-vfs-2.0/modules/libftp.so
@@ -278,10 +283,12 @@ share/locale/zh_TW/LC_MESSAGES/gnome-vfs-2.0.mo
 @dirrm etc/gconf/gconf.xml.defaults/system/smb
 @dirrm etc/gconf/gconf.xml.defaults/system/proxy
 @dirrm etc/gconf/gconf.xml.defaults/system/http_proxy
+@dirrm etc/gconf/gconf.xml.defaults/system/dns_sd
 @dirrm etc/gconf/gconf.xml.defaults/system
 @dirrm etc/gconf/gconf.xml.defaults/schemas/system/smb
 @dirrm etc/gconf/gconf.xml.defaults/schemas/system/proxy
 @dirrm etc/gconf/gconf.xml.defaults/schemas/system/http_proxy
+@dirrm etc/gconf/gconf.xml.defaults/schemas/system/dns_sd
 @dirrm etc/gconf/gconf.xml.defaults/schemas/system
 @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/trash
 @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/man
diff --git a/devel/gnomevfs2/Makefile b/devel/gnomevfs2/Makefile
index 206fb307b..8e415789a 100644
--- a/devel/gnomevfs2/Makefile
+++ b/devel/gnomevfs2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnomevfs2
-PORTVERSION=	2.7.1
+PORTVERSION=	2.7.2
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-vfs/2.7
@@ -40,8 +40,10 @@ OPTIONS=	KDE_MENUS "Integrated KDE menu picks" on
 .if defined(PACKAGE_BUILDING) || defined(PARALLEL_PACKAGE_BUILD)
 .undef WITHOUT_CDPARANOIA
 .undef WITHOUT_SAMBA
+#.undef WITHOUT_MDNS
 WITH_CDPARANOIA=	yes
 WITH_SAMBA=		yes
+#WITH_MDNS=		yes
 .endif
 
 .if !defined(WITHOUT_KDE_MENUS)
@@ -59,6 +61,10 @@ WITH_CDPARANOIA=	yes
 WITH_SAMBA=		yes
 .endif
 
+#.if exists(${LOCALBASE}/lib/libhowl.so)
+#WITH_MDNS=		yes
+#.endif
+
 .if defined(WITH_CDPARANOIA)
 LIB_DEPENDS+=	cdda_paranoia.0:${PORTSDIR}/audio/cdparanoia
 PLIST_SUB+=	CDPARANOIA=""
@@ -77,6 +83,10 @@ PLIST_SUB+=	SAMBA=""
 PLIST_SUB+=	SAMBA="@comment "
 .endif
 
+#.if defined(WITH_MDNS)
+#LIB_DEPENDS+=	howl:${PORTSDIR}/net/howl
+#.endif
+
 post-patch:
 	@${FIND} ${WRKSRC} -name "*info.in" | ${XARGS} ${REINPLACE_CMD} -e \
 		's|\@datadir\@/gnome|\@datadir\@|g'
diff --git a/devel/gnomevfs2/distinfo b/devel/gnomevfs2/distinfo
index 677c8096a..aca553826 100644
--- a/devel/gnomevfs2/distinfo
+++ b/devel/gnomevfs2/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-vfs-2.7.1.tar.bz2) = 00108485cd8956882388d0c0e63d5b39
-SIZE (gnome2/gnome-vfs-2.7.1.tar.bz2) = 1499764
+MD5 (gnome2/gnome-vfs-2.7.2.tar.bz2) = 6a2381f341f315f893540adf3b641907
+SIZE (gnome2/gnome-vfs-2.7.2.tar.bz2) = 1512798
diff --git a/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-dns-sd.c b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-dns-sd.c
new file mode 100644
index 000000000..6246bc911
--- /dev/null
+++ b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-dns-sd.c
@@ -0,0 +1,12 @@
+--- libgnomevfs/gnome-vfs-dns-sd.c.orig	Fri Jun 18 13:20:41 2004
++++ libgnomevfs/gnome-vfs-dns-sd.c	Fri Jun 18 13:21:20 2004
+@@ -24,6 +24,9 @@
+ #include <config.h>
+ 
+ #include <sys/time.h>
++#include <sys/types.h>
++#include <netinet/in.h>
++#include <arpa/nameser.h>
+ #include <resolv.h>
+ #include <string.h>
+ #include "gnome-vfs-dns-sd.h"
diff --git a/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-dns-sd.h b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-dns-sd.h
new file mode 100644
index 000000000..0c785453b
--- /dev/null
+++ b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-dns-sd.h
@@ -0,0 +1,10 @@
+--- libgnomevfs/gnome-vfs-dns-sd.h.orig	Fri Jun 18 13:26:28 2004
++++ libgnomevfs/gnome-vfs-dns-sd.h	Fri Jun 18 13:26:45 2004
+@@ -24,6 +24,7 @@
+ #ifndef GNOME_VFS_DNS_SD_H
+ #define GNOME_VFS_DSN_SD_H
+ 
++#include <sys/types.h>
+ #include <sys/socket.h>
+ #include <glib.h>
+ #include <libgnomevfs/gnome-vfs-result.h>
diff --git a/devel/gnomevfs2/pkg-plist b/devel/gnomevfs2/pkg-plist
index 380b179e3..ffb567fda 100644
--- a/devel/gnomevfs2/pkg-plist
+++ b/devel/gnomevfs2/pkg-plist
@@ -36,15 +36,18 @@ etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/mailto/%gconf.xm
 etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/man/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/trash/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/system/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/system/dns_sd/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/system/http_proxy/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/system/proxy/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/system/smb/%gconf.xml
 etc/gconf/gconf.xml.defaults/system/%gconf.xml
+etc/gconf/gconf.xml.defaults/system/dns_sd/%gconf.xml
 etc/gconf/gconf.xml.defaults/system/http_proxy/%gconf.xml
 etc/gconf/gconf.xml.defaults/system/proxy/%gconf.xml
 etc/gconf/gconf.xml.defaults/system/smb/%gconf.xml
 etc/gconf/schemas/desktop_default_applications.schemas
 etc/gconf/schemas/desktop_gnome_url_handlers.schemas
+etc/gconf/schemas/system_dns_sd.schemas
 etc/gconf/schemas/system_http_proxy.schemas
 etc/gconf/schemas/system_smb.schemas
 %%CDPARANOIA%%etc/gnome-vfs-2.0/modules/cdda-module.conf
@@ -63,6 +66,7 @@ include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-async-ops.h
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-cancellation.h
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-context.h
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-directory.h
+include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-dns-sd.h
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-drive.h
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-enum-types.h
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-file-info.h
@@ -103,6 +107,7 @@ lib/bonobo/monikers/libmoniker_gnome_vfs_std.so
 lib/gnome-vfs-2.0/modules/libbzip2.so
 %%CDPARANOIA%%lib/gnome-vfs-2.0/modules/libcdda.so
 lib/gnome-vfs-2.0/modules/libcomputer.so
+lib/gnome-vfs-2.0/modules/libdns-sd.so
 lib/gnome-vfs-2.0/modules/libextfs.so
 lib/gnome-vfs-2.0/modules/libfile.so
 lib/gnome-vfs-2.0/modules/libftp.so
@@ -278,10 +283,12 @@ share/locale/zh_TW/LC_MESSAGES/gnome-vfs-2.0.mo
 @dirrm etc/gconf/gconf.xml.defaults/system/smb
 @dirrm etc/gconf/gconf.xml.defaults/system/proxy
 @dirrm etc/gconf/gconf.xml.defaults/system/http_proxy
+@dirrm etc/gconf/gconf.xml.defaults/system/dns_sd
 @dirrm etc/gconf/gconf.xml.defaults/system
 @dirrm etc/gconf/gconf.xml.defaults/schemas/system/smb
 @dirrm etc/gconf/gconf.xml.defaults/schemas/system/proxy
 @dirrm etc/gconf/gconf.xml.defaults/schemas/system/http_proxy
+@dirrm etc/gconf/gconf.xml.defaults/schemas/system/dns_sd
 @dirrm etc/gconf/gconf.xml.defaults/schemas/system
 @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/trash
 @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/man