8 files changed, 6 insertions, 21 deletions
diff --git a/net/avahi-app/Makefile b/net/avahi-app/Makefile
index f7f270207957..50aeae56a6cd 100644
--- a/net/avahi-app/Makefile
+++ b/net/avahi-app/Makefile
@@ -144,10 +144,10 @@ avahi-post-install:
 .for f in ${AVAHI_PKGCONFIG}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${PREFIX}/libdata/pkgconfig
 .endfor
-	${MKDIR} ${STAGEDIR}${PREFIX}/etc/avahi
 .for f in ${DAEMON_CONFIG_FILES}
+	${MKDIR} ${STAGEDIR}${PREFIX}/etc/avahi
 	${INSTALL_DATA} ${WRKSRC}/avahi-daemon/${f} \
-		${STAGEDIR}${PREFIX}/etc/avahi/${f}.dist
+		${STAGEDIR}${PREFIX}/etc/avahi/${f}.sample
 .endfor
 .if ${AVAHI_SLAVE}==no
 	${INSTALL_DATA} ${FILESDIR}/org.freedesktop.Avahi.service \
diff --git a/net/avahi-app/pkg-plist b/net/avahi-app/pkg-plist
index 26557a9150a7..c276143b9718 100644
--- a/net/avahi-app/pkg-plist
+++ b/net/avahi-app/pkg-plist
@@ -7,13 +7,9 @@ bin/avahi-resolve
 bin/avahi-resolve-address
 bin/avahi-resolve-host-name
 bin/avahi-set-host-name
-@unexec if cmp -s %D/etc/avahi/avahi-daemon.conf %D/etc/avahi/avahi-daemon.conf.dist; then rm -f %D/etc/avahi/avahi-daemon.conf; fi
-etc/avahi/avahi-daemon.conf.dist
-@exec [ -f %B/avahi-daemon.conf ] || cp %B/%f %B/avahi-daemon.conf
+@sample etc/avahi/avahi-daemon.conf.sample
 etc/avahi/avahi-dnsconfd.action
-@unexec if cmp -s %D/etc/avahi/hosts %D/etc/avahi/hosts.dist; then rm -f %D/etc/avahi/hosts; fi
-etc/avahi/hosts.dist
-@exec [ -f %B/hosts ] || cp %B/%f %B/hosts
+@sample etc/avahi/hosts.sample
 etc/avahi/services/sftp-ssh.service
 etc/avahi/services/ssh.service
 etc/dbus-1/system.d/avahi-dbus.conf
diff --git a/net/avahi-gtk/pkg-plist b/net/avahi-gtk/pkg-plist
index ba8c3ee86fc4..1d05de8f7fd0 100644
--- a/net/avahi-gtk/pkg-plist
+++ b/net/avahi-gtk/pkg-plist
@@ -13,4 +13,3 @@ man/man1/bvnc.1.gz
 share/applications/bssh.desktop
 share/applications/bvnc.desktop
 %%DATADIR%%/interfaces/avahi-discover.ui
-@comment @dir etc/avahi
diff --git a/net/avahi-gtk3/Makefile b/net/avahi-gtk3/Makefile
index c3c439513be5..152b84e71c1a 100644
--- a/net/avahi-gtk3/Makefile
+++ b/net/avahi-gtk3/Makefile
@@ -28,7 +28,4 @@ do-build:
 do-install:
 	@(cd ${WRKSRC}/avahi-ui; ${MAKE_CMD} ${MAKE_ARGS} install-libLTLIBRARIES)
 
-post-install:
-	@${RMDIR} ${STAGEDIR}${PREFIX}/etc/avahi
-
 .include "${MASTERDIR}/Makefile"
diff --git a/net/avahi-libdns/Makefile b/net/avahi-libdns/Makefile
index 829877a7f79d..06593afa212a 100644
--- a/net/avahi-libdns/Makefile
+++ b/net/avahi-libdns/Makefile
@@ -21,7 +21,4 @@ AVAHI_PKGCONFIG=avahi-compat-libdns_sd.pc
 
 CONFLICTS=	mDNSResponder-[0-9]*
 
-post-install:
-	@${RMDIR} ${STAGEDIR}${PREFIX}/etc/avahi
-
 .include "${MASTERDIR}/Makefile"
diff --git a/net/avahi-qt4/Makefile b/net/avahi-qt4/Makefile
index 8af856cb48a8..10e3aded552b 100644
--- a/net/avahi-qt4/Makefile
+++ b/net/avahi-qt4/Makefile
@@ -20,7 +20,4 @@ AVAHI_SLAVE=	qt4
 USE_QT4=	corelib moc_build
 AVAHI_PKGCONFIG=	avahi-qt4.pc
 
-post-install:
-	@${RMDIR} ${STAGEDIR}${PREFIX}/etc/avahi
-
 .include "${MASTERDIR}/Makefile"
diff --git a/net/avahi-sharp/Makefile b/net/avahi-sharp/Makefile
index e0749fb070bb..d867b5312df4 100644
--- a/net/avahi-sharp/Makefile
+++ b/net/avahi-sharp/Makefile
@@ -27,7 +27,4 @@ post-patch:
 		${BUILD_WRKSRC}/avahi-sharp.dll.config.in
 	@${CP} ${WRKSRC}/avahi-sharp/avahi-sharp.dll.config.in ${WRKSRC}/avahi-sharp/avahi-sharp.dll.config
 
-post-install:
-	@${RMDIR} ${STAGEDIR}${PREFIX}/etc/avahi
-
 .include "${MASTERDIR}/Makefile"
diff --git a/net/py-avahi/pkg-plist b/net/py-avahi/pkg-plist
index cbdb4069ed99..afccb44aac27 100644
--- a/net/py-avahi/pkg-plist
+++ b/net/py-avahi/pkg-plist
@@ -1,6 +1,8 @@
 bin/avahi-bookmarks
 bin/avahi-discover
 lib/avahi/service-types.db
+@comment Installed by avahi-app
+@comment %%DATADIR%%/service-types
 %%PYTHON_SITELIBDIR%%/avahi/ServiceTypeDatabase.py
 %%PYTHON_SITELIBDIR%%/avahi/ServiceTypeDatabase.pyc
 %%PYTHON_SITELIBDIR%%/avahi/ServiceTypeDatabase.pyo