[packages] avahi: update to v0.6.29

SVN-Revision: 25973

diff --git a/libs/avahi/Makefile b/libs/avahi/Makefile
index 647166afc4eabb8ebab72bcd9fbc94916a35133f..539d7a92c250e47918977a1461cc6128707c3075 100644 (file)
--- a/libs/avahi/Makefile
+++ b/libs/avahi/Makefile
@@ -8,16 +8,16 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=avahi
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=avahi

-PKG_VERSION:=0.6.28
+PKG_VERSION:=0.6.29

 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://avahi.org/download/
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://avahi.org/download/

-PKG_MD5SUM:=d0143a5aa3265019072e53ab497818d0
+PKG_MD5SUM:=bb9d326770689610d1dbaceab5a787fc

 
 PKG_BUILD_DEPENDS:=libexpat libdaemon libgdbm intltool/host
 
 
 PKG_BUILD_DEPENDS:=libexpat libdaemon libgdbm intltool/host
 

-PKG_FIXUP:=libtool
+PKG_FIXUP:=autoreconf

 PKG_REMOVE_FILES:=autogen.sh
 
 PKG_INSTALL:=1
 PKG_REMOVE_FILES:=autogen.sh
 
 PKG_INSTALL:=1

diff --git a/libs/avahi/patches/010-step_back_autotools-no-gettext.patch b/libs/avahi/patches/010-step_back_autotools-no-gettext.patch
index 03827138421727abeb543cae91603963ac2d5f8c..fab87aaef55dc93a6b502e67944add85da455f3c 100644 (file)
--- a/libs/avahi/patches/010-step_back_autotools-no-gettext.patch
+++ b/libs/avahi/patches/010-step_back_autotools-no-gettext.patch
@@ -47,31 +47,25 @@
  CLEANFILES = $(desktop_DATA) $(desktop_DATA_in)
 --- a/configure.ac
 +++ b/configure.ac
  CLEANFILES = $(desktop_DATA) $(desktop_DATA_in)
 --- a/configure.ac
 +++ b/configure.ac

-@@ -18,12 +18,12 @@
- # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- # USA.
- 
--AC_PREREQ(2.63)
-+AC_PREREQ(2.62)
- AC_INIT([avahi],[0.6.28],[avahi (at) lists (dot) freedesktop (dot) org])
+@@ -23,7 +23,7 @@ AC_INIT([avahi],[0.6.29],[avahi (at) lis

  AC_CONFIG_SRCDIR([avahi-core/server.c])
  AC_CONFIG_MACRO_DIR([common])
  AC_CONFIG_HEADERS([config.h])
 -AM_INIT_AUTOMAKE([foreign 1.11 -Wall -Wno-portability silent-rules tar-pax])
  AC_CONFIG_SRCDIR([avahi-core/server.c])
  AC_CONFIG_MACRO_DIR([common])
  AC_CONFIG_HEADERS([config.h])
 -AM_INIT_AUTOMAKE([foreign 1.11 -Wall -Wno-portability silent-rules tar-pax])

-+AM_INIT_AUTOMAKE([foreign 1.10 -Wall -Wno-portability tar-pax])
++AM_INIT_AUTOMAKE([foreign 1.11 -Wall -Wno-portability tar-pax])

  
  AC_SUBST(PACKAGE_URL, [http://avahi.org/])
  
  
  AC_SUBST(PACKAGE_URL, [http://avahi.org/])
  

-@@ -43,7 +43,7 @@ AC_SUBST(HOWL_COMPAT_VERSION, [0.9.8])
+@@ -43,8 +43,6 @@ AC_SUBST(HOWL_COMPAT_VERSION, [0.9.8])

  
  AC_CANONICAL_HOST
  
 -AM_SILENT_RULES([yes])
  
  AC_CANONICAL_HOST
  
 -AM_SILENT_RULES([yes])

-+#AM_SILENT_RULES([yes])
- 
+-

  AC_CHECK_PROG([STOW], [stow], [yes], [no])
  
  AC_CHECK_PROG([STOW], [stow], [yes], [no])
  

-@@ -412,12 +412,6 @@ if test "x$have_kqueue" = "xyes" ; then
+ AS_IF([test "x$STOW" = "xyes" && test -d /usr/local/stow], [
+@@ -412,12 +410,6 @@ if test "x$have_kqueue" = "xyes" ; then

      AC_DEFINE([HAVE_KQUEUE], 1, [Enable BSD kqueue() usage])
  fi
  
      AC_DEFINE([HAVE_KQUEUE], 1, [Enable BSD kqueue() usage])
  fi