7 files changed, 106 insertions, 5 deletions
diff --git a/net/avahi-app/Makefile b/net/avahi-app/Makefile
index 977a247ae..be8a9125a 100644
--- a/net/avahi-app/Makefile
+++ b/net/avahi-app/Makefile
@@ -3,7 +3,7 @@
 # Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD: ports/net/avahi-app/Makefile,v 1.29 2010/12/04 07:32:51 ade Exp $
-#   $MCom: ports/net/avahi-app/Makefile,v 1.16 2011/02/23 15:13:26 kwm Exp $
+#   $MCom: ports/net/avahi-app/Makefile,v 1.17 2011/03/13 17:23:19 kwm Exp $
 #
 
 PORTNAME=	avahi
@@ -16,6 +16,7 @@ PKGNAMESUFFIX?=	-app
 MAINTAINER?=	gnome@FreeBSD.org
 COMMENT?=	Service discovery on a local network
 
+.if ${AVAHI_SLAVE}!="header"
 BUILD_DEPENDS?=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
 LIB_DEPENDS?=	expat.6:${PORTSDIR}/textproc/expat2 \
 		daemon.0:${PORTSDIR}/devel/libdaemon \
@@ -59,9 +60,10 @@ DAEMON_CONFIG_FILES=	hosts avahi-daemon.conf
 .endif
 
 USE_RC_SUBR=yes
+.endif # avahi-header
 
 .include <bsd.port.pre.mk>
-
+.if ${AVAHI_SLAVE}!="header"
 .if ${AVAHI_SLAVE}=="autoipd"
 CONFIGURE_ARGS+=--enable-autoipd
 .else
@@ -127,6 +129,8 @@ avahi-post-patch:
 		${WRKSRC}/avahi-daemon/dbus-protocol.c
 	@${REINPLACE_CMD} -e 's|^_||g' \
 		${WRKSRC}/avahi-ui/*.desktop.in.in
+	@${REINPLACE_CMD} -e 's|am: install-avahiincludeHEADERS|am:|g' \
+			${WRKSRC}/avahi-ui/Makefile.in
 
 post-build: avahi-post-build
 
@@ -171,5 +175,5 @@ avahi-post-install:
 .if !defined(PACKAGE_BUILDING) && (${AVAHI_SLAVE}=="no" || ${AVAHI_SLAVE}=="autoipd")
 	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 .endif
-
+.endif # avahi-header
 .include <bsd.port.post.mk>
diff --git a/net/avahi-gtk/Makefile b/net/avahi-gtk/Makefile
new file mode 100644
index 000000000..d87daae6f
--- /dev/null
+++ b/net/avahi-gtk/Makefile
@@ -0,0 +1,41 @@
+# New ports collection makefile for:	avahi-gtk
+# Date created:				31 July 2007
+# Whom:					Michael Johnson <ahze@FreeBSD.org>
+#
+# $FreeBSD$
+#   $MCom$
+#
+
+PORTREVISION=	1
+CATEGORIES=	net
+PKGNAMESUFFIX=	-gtk
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	Gtk+ tools and bindings to the Avahi mDNS system
+
+LIB_DEPENDS=	avahi-common.3:${PORTSDIR}/net/avahi-app
+RUN_DEPENDS=	avahi-header>=0.6${PORTSDIR}/net/avahi-header
+
+MASTERDIR=	${.CURDIR}/../avahi-app
+BUILD_WRKSRC=	${WRKSRC}/avahi-ui
+INSTALL_WRKSRC=	${BUILD_WRKSRC}
+DESCR=		${.CURDIR}/pkg-descr
+PLIST=		${.CURDIR}/pkg-plist
+
+AVAHI_SLAVE=	gtk
+AVAHI_PKGCONFIG=avahi-ui.pc
+
+MAN1+=		bssh.1
+MLINKS+=	bssh.1 bvnc.1 \
+		bssh.1 bshell.1
+USE_GNOME=	gnomehack gnometarget ltverhack intltool libglade2
+
+post-build:
+	@(cd ${WRKSRC}/avahi-discover-standalone; \
+		${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET})
+
+post-install:
+	@(cd ${WRKSRC}/avahi-discover-standalone; \
+		${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})
+
+.include "${MASTERDIR}/Makefile"
diff --git a/net/avahi-gtk/pkg-descr b/net/avahi-gtk/pkg-descr
new file mode 100644
index 000000000..a19804145
--- /dev/null
+++ b/net/avahi-gtk/pkg-descr
@@ -0,0 +1,3 @@
+Gtk+ tools and bindings to the avahi mDNS service discovery system.
+
+WWW: http://www.avahi.org/
diff --git a/net/avahi-gtk/pkg-plist b/net/avahi-gtk/pkg-plist
new file mode 100644
index 000000000..a5b8a6671
--- /dev/null
+++ b/net/avahi-gtk/pkg-plist
@@ -0,0 +1,15 @@
+bin/avahi-discover-standalone
+bin/bshell
+bin/bssh
+bin/bvnc
+lib/libavahi-ui.a
+lib/libavahi-ui.la
+lib/libavahi-ui.so
+lib/libavahi-ui.so.0
+libdata/pkgconfig/avahi-ui.pc
+share/applications/bssh.desktop
+share/applications/bvnc.desktop
+%%DATADIR%%/interfaces/avahi-discover.ui
+@dirrm %%DATADIR%%/interfaces
+@dirrmtry share/applications
+@dirrm include/avahi-ui
diff --git a/net/avahi-gtk3/Makefile b/net/avahi-gtk3/Makefile
index 9ba1ae896..2b6fa1710 100644
--- a/net/avahi-gtk3/Makefile
+++ b/net/avahi-gtk3/Makefile
@@ -3,10 +3,10 @@
 # Whom:					Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/net/avahi-gtk/Makefile,v 1.2 2007/09/12 12:41:45 ahze Exp $
+#   $MCom: ports/net/avahi-gtk3/Makefile,v 1.1 2011/02/23 15:13:28 kwm Exp $
 #
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	net
 PKGNAMESUFFIX=	-gtk3
 
@@ -14,6 +14,7 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Gtk+ 3 library to the Avahi mDNS system
 
 LIB_DEPENDS=	avahi-common.3:${PORTSDIR}/net/avahi-app
+RUN_DEPENDS=	avahi-header>=0.6${PORTSDIR}/net/avahi-header
 
 MASTERDIR=	${.CURDIR}/../avahi-app
 BUILD_WRKSRC=	${WRKSRC}/avahi-ui
diff --git a/net/avahi-header/Makefile b/net/avahi-header/Makefile
new file mode 100644
index 000000000..1dfb76b52
--- /dev/null
+++ b/net/avahi-header/Makefile
@@ -0,0 +1,32 @@
+# New ports collection makefile for:	avahi-gtk
+# Date created:				31 July 2007
+# Whom:					Michael Johnson <ahze@FreeBSD.org>
+#
+# $FreeBSD$
+#   $MCom$
+#
+
+PORTNAME=	avahi-header
+PORTREVISION=	0
+CATEGORIES=	net
+
+MAINTAINER=	ports@FreeBSD.org
+COMMENT=	Install an avahi-gtk* header to avoid conflict
+
+MASTERDIR=	${.CURDIR}/../avahi-app
+BUILD_WRKSRC=	${WRKSRC}/avahi-ui
+INSTALL_WRKSRC=	${BUILD_WRKSRC}
+DESCR=		${.CURDIR}/pkg-descr
+PLIST_FILES=	include/avahi-ui/avahi-ui.h
+PLIST_DIRS=	include/avahi-ui
+
+AVAHI_SLAVE=	header
+
+NO_BUILD=	yes
+
+do-install:
+	${MKDIR} ${PREFIX}/include/avahi-ui
+	${INSTALL_DATA} ${BUILD_WRKSRC}/avahi-ui.h \
+		${PREFIX}/include/avahi-ui/
+
+.include "${MASTERDIR}/Makefile"
diff --git a/net/avahi-header/pkg-descr b/net/avahi-header/pkg-descr
new file mode 100644
index 000000000..e83ee0ebb
--- /dev/null
+++ b/net/avahi-header/pkg-descr
@@ -0,0 +1,5 @@
+The net/avahi-gtk and net/avahi-gtk3 install same header, avahi-ui.h. To
+avoid both ports to get conflict with the each others. Avoid both ports
+to install avahi-ui.h then have both ports to depend on here.
+
+WWW: http://www.avahi.org/