From 695375e230f6d26a9ae042da6cf82917010c8b47 Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Fri, 31 May 2013 21:12:02 +0000 Subject: [PATCH] Bump to unbreak and remove now uneeded chunck. --- net/avahi/Makefile | 10 +++++----- .../patches/patch-avahi-compat-libdns_sd_warn_c | 16 +++------------- 2 files changed, 8 insertions(+), 18 deletions(-) diff --git a/net/avahi/Makefile b/net/avahi/Makefile index 345c4c47935..a1bf1874cbe 100755 --- a/net/avahi/Makefile +++ b/net/avahi/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.93 2013/05/31 15:35:25 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.94 2013/05/31 21:12:02 ajacoutot Exp $ ONLY_FOR_ARCHS-mono= ${MONO_ARCHS} @@ -24,10 +24,10 @@ PKGNAME-qt3= avahi-qt3-${V} PKGNAME-qt4= avahi-qt4-${V} PKGNAME-ui= avahi-ui-${V} -REVISION-main= 9 -REVISION-gtk= 4 -REVISION-gtk3= 4 -REVISION-gui= 4 +REVISION-main= 10 +REVISION-gtk= 5 +REVISION-gtk3= 5 +REVISION-gui= 5 REVISION-mono= 2 REVISION-qt3= 2 REVISION-qt4= 3 diff --git a/net/avahi/patches/patch-avahi-compat-libdns_sd_warn_c b/net/avahi/patches/patch-avahi-compat-libdns_sd_warn_c index 973d5125c3b..8dd2878c18e 100644 --- a/net/avahi/patches/patch-avahi-compat-libdns_sd_warn_c +++ b/net/avahi/patches/patch-avahi-compat-libdns_sd_warn_c @@ -1,20 +1,10 @@ -$OpenBSD: patch-avahi-compat-libdns_sd_warn_c,v 1.4 2013/05/23 13:40:38 ajacoutot Exp $ +$OpenBSD: patch-avahi-compat-libdns_sd_warn_c,v 1.5 2013/05/31 21:12:02 ajacoutot Exp $ Stop polluting syslog(3). --- avahi-compat-libdns_sd/warn.c.orig Thu Aug 26 02:51:38 2010 -+++ avahi-compat-libdns_sd/warn.c Thu May 23 15:27:58 2013 -@@ -75,6 +75,9 @@ const char *avahi_exe_name(void) { - pthread_mutex_unlock(&mutex); - - return exe_name; -+#elif defined(__OpenBSD__) -+ extern const char* __progname; -+ return __progname; - #else - #ifdef __GNUC__ - #warning "avahi_exe_name() needs to be implemented for your operating system" -@@ -110,11 +113,13 @@ void avahi_warn_linkage(void) { ++++ avahi-compat-libdns_sd/warn.c Fri May 31 23:11:19 2013 +@@ -110,11 +110,13 @@ void avahi_warn_linkage(void) { linkage_warning = 1; pthread_mutex_unlock(&linkage_mutex);