3 files changed, 56 insertions, 41 deletions

diff --git a/net/avahi-app/Makefile b/net/avahi-app/Makefile
index 55140954c593..29e0d5c1aa84 100644
--- a/net/avahi-app/Makefile
+++ b/net/avahi-app/Makefile
@@ -15,17 +15,15 @@ COMMENT?=	Service discovery on a local network
 AVAHI_SLAVE?=	no
 
 .if ${AVAHI_SLAVE} != header
-BUILD_DEPENDS?=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
-LIB_DEPENDS?=	expat:${PORTSDIR}/textproc/expat2 \
-		daemon.0:${PORTSDIR}/devel/libdaemon \
-		dbus-glib-1:${PORTSDIR}/devel/dbus-glib \
-		gdbm:${PORTSDIR}/databases/gdbm
-RUN_DEPENDS?=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
+LIB_DEPENDS?=	libexpat.so:${PORTSDIR}/textproc/expat2 \
+		libdaemon.so:${PORTSDIR}/devel/libdaemon \
+		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
+		libgdbm.so:${PORTSDIR}/databases/gdbm
 
 USERS?=		${PORTNAME}
 GROUPS?=	${USERS}
 
-USE_GNOME+=	ltverhack glib20 intltool
+USE_GNOME+=	ltverhack glib20 intltool introspection
 USES=		gettext gmake pathfix pkgconfig
 USE_GNOME_SUBR=	yes
 USE_AUTOTOOLS=	libtool
@@ -44,23 +42,12 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 .if ${AVAHI_SLAVE} == no
 CONFLICTS=	howl-[0-9]*
 
-MAN1=	avahi-browse.1 avahi-publish.1 avahi-resolve.1 avahi-set-host-name.1
-MAN5=	avahi-daemon.conf.5 avahi.service.5 avahi.hosts.5
-MAN8=	avahi-daemon.8 avahi-dnsconfd.8 avahi-dnsconfd.action.8
-
-MLINKS=	avahi-browse.1 avahi-browse-domains.1 \
-	avahi-publish.1 avahi-publish-address.1 \
-	avahi-publish.1 avahi-publish-service.1 \
-	avahi-resolve.1 avahi-resolve-address.1 \
-	avahi-resolve.1 avahi-resolve-host-name.1
-
 DAEMON_CONFIG_FILES=	hosts avahi-daemon.conf
 .endif
 
 USE_RC_SUBR=yes
 .endif # !avahi-header
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${AVAHI_SLAVE} != header
@@ -141,33 +128,36 @@ pre-su-install: avahi-pre-su-install
 
 avahi-pre-su-install:
 .if ${AVAHI_SLAVE}=="no"
-	@${MKDIR} ${PREFIX}/lib/avahi
-	@${TOUCH} -f ${PREFIX}/lib/avahi/.keep
+	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/avahi
+	@${TOUCH} -f ${STAGEDIR}${PREFIX}/lib/avahi/.keep
 .endif
 
 post-install: avahi-post-install
 
 avahi-post-install:
-.if ${AVAHI_SLAVE}!="no"
-.for f in ${MAN1} ${MAN2} ${MAN3} ${MAN4} ${MAN5} ${MAN6} ${MAN7} ${MAN8} ${MAN9}
-	${INSTALL_DATA} ${WRKSRC}/man/${f} ${PREFIX}/man/man${f:E}/${f}
+.if defined(MANPAGES)
+.for f in ${MANPAGES}
+	${INSTALL_DATA} ${WRKSRC}/man/${f} ${STAGEDIR}${PREFIX}/man/man${f:E}/${f}
 .endfor
 .endif
 .for f in ${AVAHI_PKGCONFIG}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/libdata/pkgconfig
+	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${PREFIX}/libdata/pkgconfig
 .endfor
-	${MKDIR} ${PREFIX}/etc/avahi
+	${MKDIR} ${STAGEDIR}${PREFIX}/etc/avahi
 .for f in ${DAEMON_CONFIG_FILES}
 	${INSTALL_DATA} ${WRKSRC}/avahi-daemon/${f} \
-	    	${PREFIX}/etc/avahi/${f}.dist
-	if [ ! -f ${PREFIX}/etc/avahi/${f} ]; then \
-	    	${INSTALL_DATA} ${WRKSRC}/avahi-daemon/${f} \
-			${PREFIX}/etc/avahi; \
-	fi
+		${STAGEDIR}${PREFIX}/etc/avahi/${f}.dist
 .endfor
-.if ${AVAHI_SLAVE}=="no"
+.if ${AVAHI_SLAVE}==no
 	${INSTALL_DATA} ${FILESDIR}/org.freedesktop.Avahi.service \
-		${LOCALBASE}/share/dbus-1/system-services
+		${STAGEDIR}${PREFIX}/share/dbus-1/system-services
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib*.so*
+.elif ${AVAHI_SLAVE}==gtk3
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libavahi-ui-gtk3.so.0
+.elif ${AVAHI_SLAVE}==libdns
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libdns_sd.so.1
+.elif ${AVAHI_SLAVE}==qt4
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libavahi-qt4.so.1
 .endif
 .endif # avahi-header
 
diff --git a/net/avahi-app/files/patch-avahi-ui_Makefile.in b/net/avahi-app/files/patch-avahi-ui_Makefile.in
index ac34b5bb05de..dda4713b1c86 100644
--- a/net/avahi-app/files/patch-avahi-ui_Makefile.in
+++ b/net/avahi-app/files/patch-avahi-ui_Makefile.in
@@ -1,6 +1,6 @@
---- avahi-ui/Makefile.in.orig	2012-04-03 18:30:32.000000000 +0200
-+++ avahi-ui/Makefile.in	2012-04-03 18:33:59.000000000 +0200
-@@ -119,9 +119,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" 
+--- avahi-ui/Makefile.in.orig	2013-12-11 12:03:44.000000000 +0100
++++ avahi-ui/Makefile.in	2013-12-11 12:05:00.000000000 +0100
+@@ -125,9 +125,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" 
  	"$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(avahiincludedir)"
  LTLIBRARIES = $(lib_LTLIBRARIES)
  am__DEPENDENCIES_1 =
@@ -11,7 +11,7 @@
  @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_gtk3_la_SOURCES_DIST = avahi-ui.h avahi-ui.c \
-@@ -142,9 +140,7 @@ libavahi_ui_gtk3_la_LINK = $(LIBTOOL) $(
+@@ -148,9 +146,7 @@ libavahi_ui_gtk3_la_LINK = $(LIBTOOL) $(
  	$(libavahi_ui_gtk3_la_LDFLAGS) $(LDFLAGS) -o $@
  @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@@HAVE_GTK3_TRUE@am_libavahi_ui_gtk3_la_rpath = -rpath \
  @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@@HAVE_GTK3_TRUE@	$(libdir)
@@ -22,7 +22,7 @@
  @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 \
-@@ -166,12 +162,8 @@ am__bssh_SOURCES_DIST = bssh.c
+@@ -172,12 +168,8 @@ 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) \
@@ -35,7 +35,17 @@
  @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@@HAVE_GTK3_TRUE@	libavahi-ui-gtk3.la
  bssh_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
  	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(bssh_CFLAGS) $(CFLAGS) \
-@@ -482,9 +474,7 @@ EXTRA_DIST = $(desktop_DATA_in_in)
+@@ -464,8 +456,7 @@ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ 
+ # This cool debug trap works on i386/gcc only
+-AM_CFLAGS = -I$(top_srcdir) -DG_DISABLE_DEPRECATED=1 \
+-	-DGDK_DISABLE_DEPRECATED=1 -DGTK_DISABLE_DEPRECATED=1 \
++AM_CFLAGS = -I$(top_srcdir) \
+ 	'-DDEBUG_TRAP=__asm__("int $$3")' $(am__append_1)
+ pkglibdatadir = $(libdir)/avahi
+ desktopdir = $(datadir)/applications
+@@ -489,9 +480,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) \
@@ -46,7 +56,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)
-@@ -494,17 +484,15 @@ EXTRA_DIST = $(desktop_DATA_in_in)
+@@ -501,17 +490,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) \
@@ -67,7 +77,7 @@
  CLEANFILES = $(desktop_DATA) $(desktop_DATA_in)
  all: all-am
  
-@@ -713,7 +701,7 @@ clean-libtool:
+@@ -711,7 +698,7 @@ clean-libtool:
  	-rm -rf .libs _libs
  install-desktopDATA: $(desktop_DATA)
  	@$(NORMAL_INSTALL)
@@ -75,4 +85,4 @@
 +@HAVE_GTK_TRUE@	test -z "$(desktopdir)" || $(MKDIR_P) "$(DESTDIR)$(desktopdir)"
  	@list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \
  	for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ 
diff --git a/net/avahi-app/pkg-plist b/net/avahi-app/pkg-plist
index 4f3dd83596f8..d56a940716c3 100644
--- a/net/avahi-app/pkg-plist
+++ b/net/avahi-app/pkg-plist
@@ -102,6 +102,21 @@ libdata/pkgconfig/avahi-compat-howl.pc
 libdata/pkgconfig/avahi-core.pc
 libdata/pkgconfig/avahi-glib.pc
 libdata/pkgconfig/avahi-gobject.pc
+man/man1/avahi-browse-domains.1.gz
+man/man1/avahi-browse.1.gz
+man/man1/avahi-publish-address.1.gz
+man/man1/avahi-publish-service.1.gz
+man/man1/avahi-publish.1.gz
+man/man1/avahi-resolve-address.1.gz
+man/man1/avahi-resolve-host-name.1.gz
+man/man1/avahi-resolve.1.gz
+man/man1/avahi-set-host-name.1.gz
+man/man5/avahi-daemon.conf.5.gz
+man/man5/avahi.hosts.5.gz
+man/man5/avahi.service.5.gz
+man/man8/avahi-daemon.8.gz
+man/man8/avahi-dnsconfd.8.gz
+man/man8/avahi-dnsconfd.action.8.gz
 sbin/avahi-daemon
 sbin/avahi-dnsconfd
 %%DATADIR%%/avahi-service.dtd