[66638] trunk/dports/net/avahi

[elelay at macports.org]

Revision: 66638
          http://trac.macports.org/changeset/66638
Author:   elelay at macports.org
Date:     2010-04-18 08:43:45 -0700 (Sun, 18 Apr 2010)
Log Message:
-----------
fix 10.4 build (see  #24437)

Modified Paths:
--------------
    trunk/dports/net/avahi/Portfile

Added Paths:
-----------
    trunk/dports/net/avahi/files/patch-avahi-daemon-Makefile.in-nls.diff
    trunk/dports/net/avahi/files/patch-avahi-dnsconfd-Makefile.in-nls.diff

Modified: trunk/dports/net/avahi/Portfile
===================================================================
--- trunk/dports/net/avahi/Portfile	2010-04-18 15:39:24 UTC (rev 66637)
+++ trunk/dports/net/avahi/Portfile	2010-04-18 15:43:45 UTC (rev 66638)
@@ -4,7 +4,7 @@
 
 name            avahi
 version         0.6.25
-revision	1
+revision	2
 categories      net devel
 maintainers     nomaintainer
 platforms       darwin
@@ -29,6 +29,8 @@
                 rmd160  3025f774360a8ea3b9de87e2df0b00387569aaf2
 
 patchfiles      patch-avahi-utils-Makefile.in-nls.diff \
+                patch-avahi-daemon-Makefile.in-nls.diff \
+                patch-avahi-dnsconfd-Makefile.in-nls.diff \
                 patch-initscript_darwin_org.freedesktop.avahi-daemon.plist.in \
                 patch-initscript_darwin_org.freedesktop.avahi-dnsconfd.plist.in
 

Added: trunk/dports/net/avahi/files/patch-avahi-daemon-Makefile.in-nls.diff
===================================================================
--- trunk/dports/net/avahi/files/patch-avahi-daemon-Makefile.in-nls.diff	                        (rev 0)
+++ trunk/dports/net/avahi/files/patch-avahi-daemon-Makefile.in-nls.diff	2010-04-18 15:43:45 UTC (rev 66638)
@@ -0,0 +1,20 @@
+--- avahi-daemon/Makefile.in.orig	2010-04-11 16:58:34.000000000 +0200
++++ avahi-daemon/Makefile.in	2010-04-11 16:55:28.000000000 +0200
+@@ -472,7 +472,7 @@
+ @HAVE_LIBDAEMON_TRUE@@HAVE_XML_TRUE@	../avahi-common/libavahi-common.la \
+ @HAVE_LIBDAEMON_TRUE@@HAVE_XML_TRUE@	../avahi-core/libavahi-core.la \
+ @HAVE_LIBDAEMON_TRUE@@HAVE_XML_TRUE@	$(LIBDAEMON_LIBS) \
+- at HAVE_LIBDAEMON_TRUE@@HAVE_XML_TRUE@	$(XML_LIBS) \
++ at HAVE_LIBDAEMON_TRUE@@HAVE_XML_TRUE@	$(XML_LIBS) $(INTLLIBS)\
+ @HAVE_LIBDAEMON_TRUE@@HAVE_XML_TRUE@	$(am__append_3) \
+ @HAVE_LIBDAEMON_TRUE@@HAVE_XML_TRUE@	$(am__append_4) \
+ @HAVE_LIBDAEMON_TRUE@@HAVE_XML_TRUE@	$(am__append_6)
+@@ -481,7 +481,7 @@
+ @HAVE_LIBDAEMON_TRUE@@HAVE_XML_TRUE@	ini-file-parser-test.c
+ 
+ @HAVE_LIBDAEMON_TRUE@@HAVE_XML_TRUE at ini_file_parser_test_CFLAGS = $(AM_CFLAGS)
+- at HAVE_LIBDAEMON_TRUE@@HAVE_XML_TRUE at ini_file_parser_test_LDADD = $(AM_LDADD) ../avahi-common/libavahi-common.la ../avahi-core/libavahi-core.la 
++ at HAVE_LIBDAEMON_TRUE@@HAVE_XML_TRUE at ini_file_parser_test_LDADD = $(AM_LDADD) ../avahi-common/libavahi-common.la ../avahi-core/libavahi-core.la $(INTLLIBS)
+ @HAVE_LIBDAEMON_TRUE@@HAVE_XML_TRUE at pkgsysconf_DATA = \
+ @HAVE_LIBDAEMON_TRUE@@HAVE_XML_TRUE@	avahi-daemon.conf \
+ @HAVE_LIBDAEMON_TRUE@@HAVE_XML_TRUE@	hosts

Added: trunk/dports/net/avahi/files/patch-avahi-dnsconfd-Makefile.in-nls.diff
===================================================================
--- trunk/dports/net/avahi/files/patch-avahi-dnsconfd-Makefile.in-nls.diff	                        (rev 0)
+++ trunk/dports/net/avahi/files/patch-avahi-dnsconfd-Makefile.in-nls.diff	2010-04-18 15:43:45 UTC (rev 66638)
@@ -0,0 +1,11 @@
+--- avahi-dnsconfd/Makefile.in.orig	2010-04-11 17:00:59.000000000 +0200
++++ avahi-dnsconfd/Makefile.in	2010-04-11 17:01:15.000000000 +0200
+@@ -344,7 +344,7 @@
+ @HAVE_LIBDAEMON_TRUE@@HAVE_XML_TRUE@	$$3")'
+ @HAVE_LIBDAEMON_TRUE@@HAVE_XML_TRUE at avahi_dnsconfd_SOURCES = main.c 
+ @HAVE_LIBDAEMON_TRUE@@HAVE_XML_TRUE at avahi_dnsconfd_CFLAGS = $(AM_CFLAGS) $(LIBDAEMON_CFLAGS)
+- at HAVE_LIBDAEMON_TRUE@@HAVE_XML_TRUE at avahi_dnsconfd_LDADD = $(AM_LDADD) ../avahi-common/libavahi-common.la $(LIBDAEMON_LIBS)
++ at HAVE_LIBDAEMON_TRUE@@HAVE_XML_TRUE at avahi_dnsconfd_LDADD = $(AM_LDADD) ../avahi-common/libavahi-common.la $(LIBDAEMON_LIBS) $(INTLLIBS)
+ @HAVE_LIBDAEMON_TRUE@@HAVE_XML_TRUE at pkgsysconf_SCRIPTS = avahi-dnsconfd.action
+ EXTRA_DIST = avahi-dnsconfd.action
+ all: all-am
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100418/6a85582b/attachment-0001.html>