From 9b0d2dff10ae24ce4d5d251fb39c583b7863dae2 Mon Sep 17 00:00:00 2001 From: Joe Marcus Clarke Date: Sat, 9 Jun 2007 18:17:15 +0000 Subject: [PATCH] Update to 0.6.19. --- net/avahi/Makefile | 6 +++-- net/avahi/distinfo | 6 ++--- net/avahi/files/patch-avahi-daemon_main.c | 33 +++++++++-------------- net/avahi/files/patch-man_Makefile.in | 11 ++++++++ net/avahi/pkg-plist | 8 +++--- 5 files changed, 35 insertions(+), 29 deletions(-) create mode 100644 net/avahi/files/patch-man_Makefile.in diff --git a/net/avahi/Makefile b/net/avahi/Makefile index 5fadd5dbdb51..6b7932eeee58 100644 --- a/net/avahi/Makefile +++ b/net/avahi/Makefile @@ -6,8 +6,8 @@ # $MCom: ports/net/avahi/Makefile,v 1.19 2006/10/12 16:44:41 marcus Exp $ PORTNAME= avahi -PORTVERSION= 0.6.18 -PORTREVISION?= 1 +PORTVERSION= 0.6.19 +PORTREVISION?= 0 CATEGORIES?= net dns MASTER_SITES= http://www.avahi.org/download/ @@ -77,6 +77,8 @@ PLIST_SUB+= LIBDNS="@comment " .if defined(WITH_GTK2) USE_GNOME+= libglade2 PLIST_SUB+= GTK="" +MAN1+= bssh.1 +MLINKS+= bssh.1 bvnc.1 .else CONFIGURE_ARGS+=--disable-gtk PLIST_SUB+= GTK="@comment " diff --git a/net/avahi/distinfo b/net/avahi/distinfo index 4241e03e4d25..43035bdc4cae 100644 --- a/net/avahi/distinfo +++ b/net/avahi/distinfo @@ -1,3 +1,3 @@ -MD5 (avahi-0.6.18.tar.gz) = ab3d67cb743d16cf38ad69b4b76ca989 -SHA256 (avahi-0.6.18.tar.gz) = 11a0270cdf1220943ce8f3a79b705c6de6e57d94a058ee2efa9592037b4a4274 -SIZE (avahi-0.6.18.tar.gz) = 961748 +MD5 (avahi-0.6.19.tar.gz) = a06782435d1c994ecd00a66e95a5d9d4 +SHA256 (avahi-0.6.19.tar.gz) = a742dceda38f242f5eac72f2c3bc1bda76adf497d6913e88a9cbc624bf2dd68a +SIZE (avahi-0.6.19.tar.gz) = 973381 diff --git a/net/avahi/files/patch-avahi-daemon_main.c b/net/avahi/files/patch-avahi-daemon_main.c index 682927374476..cbd918e0ad71 100644 --- a/net/avahi/files/patch-avahi-daemon_main.c +++ b/net/avahi/files/patch-avahi-daemon_main.c @@ -1,26 +1,19 @@ ---- avahi-daemon/main.c.orig Sat Apr 14 20:34:33 2007 -+++ avahi-daemon/main.c Fri Apr 20 20:06:05 2007 -@@ -42,11 +42,19 @@ - #include - #include - -+#ifdef HAVE_INOTIFY - #ifdef HAVE_SYS_INOTIFY_H - #include - #else - #include "inotify-nosys.h" +--- avahi-daemon/main.c.orig Wed May 9 09:09:19 2007 ++++ avahi-daemon/main.c Sat Jun 9 13:56:02 2007 +@@ -50,6 +50,12 @@ #endif -+#endif -+ + #endif + +#ifdef HAVE_KQUEUE +#include +#include +#include +#endif - ++ #include #include -@@ -681,6 +689,53 @@ static void add_inotify_watches(void) { + #include +@@ -691,6 +697,53 @@ static void add_inotify_watches(void) { #endif @@ -74,7 +67,7 @@ static void reload_config(void) { #ifdef HAVE_INOTIFY -@@ -688,6 +743,10 @@ static void reload_config(void) { +@@ -698,6 +751,10 @@ static void reload_config(void) { add_inotify_watches(); #endif @@ -85,7 +78,7 @@ #ifdef ENABLE_CHROOT static_service_load(config.use_chroot); static_hosts_load(config.use_chroot); -@@ -736,6 +795,31 @@ static void inotify_callback(AvahiWatch +@@ -746,6 +803,31 @@ static void inotify_callback(AvahiWatch #endif @@ -117,7 +110,7 @@ static void signal_callback(AvahiWatch *watch, AVAHI_GCC_UNUSED int fd, AVAHI_GCC_UNUSED AvahiWatchEvent event, AVAHI_GCC_UNUSED void *userdata) { int sig; const AvahiPoll *poll_api; -@@ -791,6 +875,10 @@ static int run_server(DaemonConfig *c) { +@@ -801,6 +883,10 @@ static int run_server(DaemonConfig *c) { #ifdef HAVE_INOTIFY AvahiWatch *inotify_watch = NULL; #endif @@ -128,7 +121,7 @@ assert(c); -@@ -866,6 +954,19 @@ static int run_server(DaemonConfig *c) { +@@ -876,6 +962,19 @@ static int run_server(DaemonConfig *c) { } #endif @@ -148,7 +141,7 @@ load_resolv_conf(); #ifdef ENABLE_CHROOT static_service_load(config.use_chroot); -@@ -934,6 +1035,17 @@ finish: +@@ -944,6 +1043,17 @@ finish: poll_api->watch_free(inotify_watch); if (inotify_fd >= 0) close(inotify_fd); diff --git a/net/avahi/files/patch-man_Makefile.in b/net/avahi/files/patch-man_Makefile.in new file mode 100644 index 000000000000..b46557af681a --- /dev/null +++ b/net/avahi/files/patch-man_Makefile.in @@ -0,0 +1,11 @@ +--- man/Makefile.in.orig Sat Jun 9 14:04:44 2007 ++++ man/Makefile.in Sat Jun 9 14:05:41 2007 +@@ -861,7 +861,7 @@ uninstall-man: uninstall-man1 uninstall- + @HAVE_DBUS_TRUE@ $(LN_S) avahi-browse.1 avahi-browse-domains.1 && \ + @HAVE_DBUS_TRUE@ $(LN_S) avahi-publish.1 avahi-publish-address.1 && \ + @HAVE_DBUS_TRUE@ $(LN_S) avahi-publish.1 avahi-publish-service.1 && \ +-@HAVE_DBUS_TRUE@ $(LN_S) bssh.1 bvnc.1 ++@HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@ $(LN_S) bssh.1 bvnc.1 + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: diff --git a/net/avahi/pkg-plist b/net/avahi/pkg-plist index 6434e5db85b4..25d108d0a72a 100644 --- a/net/avahi/pkg-plist +++ b/net/avahi/pkg-plist @@ -8,8 +8,8 @@ bin/avahi-resolve bin/avahi-resolve-address bin/avahi-resolve-host-name bin/avahi-set-host-name -%%GTK%%bin/zssh -%%GTK%%bin/zvnc +%%GTK%%bin/bssh +%%GTK%%bin/bvnc etc/avahi/avahi-daemon.conf etc/avahi/avahi-dnsconfd.action etc/avahi/hosts @@ -100,8 +100,8 @@ libdata/pkgconfig/avahi-glib.pc %%GTK%%libdata/pkgconfig/avahi-ui.pc sbin/avahi-daemon sbin/avahi-dnsconfd -%%GTK%%share/applications/zssh.desktop -%%GTK%%share/applications/zvnc.desktop +%%GTK%%share/applications/bssh.desktop +%%GTK%%share/applications/bvnc.desktop %%DATADIR%%/avahi-service.dtd %%GTK%%%%DATADIR%%/interfaces/avahi-discover.glade %%DATADIR%%/introspection/AddressResolver.introspect