Fix avahi-ui build.

2 files changed, 10 insertions, 25 deletions

diff --git a/net/avahi-app/files/patch-avahi-ui_Makefile.in b/net/avahi-app/files/patch-avahi-ui_Makefile.in
index 0e5577719ef..c4408f918d2 100644
--- a/net/avahi-app/files/patch-avahi-ui_Makefile.in
+++ b/net/avahi-app/files/patch-avahi-ui_Makefile.in
@@ -1,19 +1,5 @@
---- avahi-ui/Makefile.in.orig	2010-07-24 19:55:07.000000000 -0400
-+++ avahi-ui/Makefile.in	2010-07-24 19:58:44.000000000 -0400
-@@ -55,11 +55,9 @@ POST_UNINSTALL = :
- build_triplet = @build@
- host_triplet = @host@
- @HAVE_GTK2OR3_TRUE@am__append_1 = -DGNOMELOCALEDIR=\"$(datadir)/locale\"
--@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@@HAVE_GTK_TRUE@am__append_2 = \
--@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@@HAVE_GTK_TRUE@	libavahi-ui.la
-+@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@@HAVE_GTK_TRUE@am__append_2 =
- 
--@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@@HAVE_GTK3_TRUE@am__append_3 = \
--@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@@HAVE_GTK3_TRUE@	libavahi-ui-gtk3.la
-+@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@@HAVE_GTK3_TRUE@am__append_3 =
- 
- @HAVE_DBUS_TRUE@@HAVE_GDBM_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@am__append_4 = ../avahi-utils/stdb.h ../avahi-utils/stdb.c
- @HAVE_DBUS_TRUE@@HAVE_GDBM_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@am__append_5 = -DDATABASE_FILE=\"$(pkglibdir)/service-types.db\"
+--- avahi-ui/Makefile.in.orig	2010-07-25 00:35:38.000000000 -0400
++++ avahi-ui/Makefile.in	2010-07-25 02:52:46.000000000 -0400
 @@ -119,9 +117,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" 
  	"$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(avahiincludedir)"
  LTLIBRARIES = $(lib_LTLIBRARIES)
@@ -36,24 +22,23 @@
  @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@	$(am__DEPENDENCIES_1) \
  @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@	$(am__DEPENDENCIES_1)
  am__libavahi_ui_la_SOURCES_DIST = avahi-ui.h avahi-ui.c \
-@@ -165,14 +159,8 @@ PROGRAMS = $(bin_PROGRAMS)
- am__bssh_SOURCES_DIST = bssh.c
+@@ -166,13 +160,9 @@ am__bssh_SOURCES_DIST = bssh.c
  @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@am_bssh_OBJECTS = bssh-bssh.$(OBJEXT)
  bssh_OBJECTS = $(am_bssh_OBJECTS)
--@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@@HAVE_GTK3_FALSE@bssh_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+ @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@@HAVE_GTK3_FALSE@bssh_DEPENDENCIES = $(am__DEPENDENCIES_1) \
 -@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@@HAVE_GTK3_FALSE@	../avahi-client/libavahi-client.la \
 -@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@@HAVE_GTK3_FALSE@	../avahi-common/libavahi-common.la \
 -@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@@HAVE_GTK3_FALSE@	libavahi-ui.la
--@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@@HAVE_GTK3_TRUE@bssh_DEPENDENCIES = $(am__DEPENDENCIES_1) \
++    	libavahi-ui.la
+ @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@@HAVE_GTK3_TRUE@bssh_DEPENDENCIES = $(am__DEPENDENCIES_1) \
 -@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@@HAVE_GTK3_TRUE@	../avahi-client/libavahi-client.la \
 -@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@@HAVE_GTK3_TRUE@	../avahi-common/libavahi-common.la \
 -@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@@HAVE_GTK3_TRUE@	libavahi-ui-gtk3.la
-+@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@@HAVE_GTK3_FALSE@bssh_DEPENDENCIES = $(am__DEPENDENCIES_1)
-+@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@@HAVE_GTK3_TRUE@bssh_DEPENDENCIES = $(am__DEPENDENCIES_1)
++    	libavahi-ui.la
  bssh_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
  	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(bssh_CFLAGS) $(CFLAGS) \
  	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-@@ -478,9 +466,7 @@ EXTRA_DIST = $(desktop_DATA_in_in)
+@@ -478,9 +468,7 @@ EXTRA_DIST = $(desktop_DATA_in_in)
  @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@	$(am__append_5) \
  @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@	$(am__append_10)
  @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@libavahi_ui_la_LIBADD = $(AM_LDADD) \
@@ -64,7 +49,7 @@
  @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@	$(GTK20_LIBS) \
  @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@	$(am__append_6)
  @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@libavahi_ui_la_LDFLAGS = $(AM_LDFLAGS)  -version-info $(LIBAVAHI_UI_VERSION_INFO)
-@@ -490,17 +476,15 @@ EXTRA_DIST = $(desktop_DATA_in_in)
+@@ -490,17 +478,15 @@ EXTRA_DIST = $(desktop_DATA_in_in)
  @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@	$(am__append_7) \
  @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@	$(am__append_11)
  @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@libavahi_ui_gtk3_la_LIBADD = $(AM_LDADD) \
diff --git a/net/avahi-gtk/pkg-plist b/net/avahi-gtk/pkg-plist
index 2f78e5981eb..bba24f81d35 100644
--- a/net/avahi-gtk/pkg-plist
+++ b/net/avahi-gtk/pkg-plist
@@ -10,7 +10,7 @@ lib/libavahi-ui.so.0
 libdata/pkgconfig/avahi-ui.pc
 share/applications/bssh.desktop
 share/applications/bvnc.desktop
-%%DATADIR%%/interfaces/avahi-discover.glade
+%%DATADIR%%/interfaces/avahi-discover.ui
 @dirrm %%DATADIR%%/interfaces
 @dirrmtry share/applications
 @dirrm include/avahi-ui