svn commit: r398960 - in head/net: avahi-app avahi-gtk avahi-gtk3 avahi-libdns avahi-qt4 avahi-sharp py-avahi

[Dmitry Marakasov]

Author: amdmi3
Date: Fri Oct  9 21:09:08 2015
New Revision: 398960
URL: https://svnweb.freebsd.org/changeset/ports/398960

Log:
  - Fix plist issue in py-avahi: comment out file which is installed by avahi-app port
  - Fix plist issues in many *avahi* ports: only create etc/avahi in avahi-app
  - Switch to @sample
  
  PR:		203283
  Submitted by:	amdmi3
  Approved by:	gnome (kwm)

Modified:
  head/net/avahi-app/Makefile
  head/net/avahi-app/pkg-plist
  head/net/avahi-gtk/pkg-plist
  head/net/avahi-gtk3/Makefile
  head/net/avahi-libdns/Makefile
  head/net/avahi-qt4/Makefile
  head/net/avahi-sharp/Makefile
  head/net/py-avahi/pkg-plist

Modified: head/net/avahi-app/Makefile
==============================================================================
--- head/net/avahi-app/Makefile	Fri Oct  9 20:59:28 2015	(r398959)
+++ head/net/avahi-app/Makefile	Fri Oct  9 21:09:08 2015	(r398960)
@@ -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 \

Modified: head/net/avahi-app/pkg-plist
==============================================================================
--- head/net/avahi-app/pkg-plist	Fri Oct  9 20:59:28 2015	(r398959)
+++ head/net/avahi-app/pkg-plist	Fri Oct  9 21:09:08 2015	(r398960)
@@ -7,13 +7,9 @@ bin/avahi-resolve
 bin/avahi-resolve-address
 bin/avahi-resolve-host-name
 bin/avahi-set-host-name
- at 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
- at exec [ -f %B/avahi-daemon.conf ] || cp %B/%f %B/avahi-daemon.conf
+ at sample etc/avahi/avahi-daemon.conf.sample
 etc/avahi/avahi-dnsconfd.action
- at 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
- at exec [ -f %B/hosts ] || cp %B/%f %B/hosts
+ at sample etc/avahi/hosts.sample
 etc/avahi/services/sftp-ssh.service
 etc/avahi/services/ssh.service
 etc/dbus-1/system.d/avahi-dbus.conf

Modified: head/net/avahi-gtk/pkg-plist
==============================================================================
--- head/net/avahi-gtk/pkg-plist	Fri Oct  9 20:59:28 2015	(r398959)
+++ head/net/avahi-gtk/pkg-plist	Fri Oct  9 21:09:08 2015	(r398960)
@@ -13,4 +13,3 @@ man/man1/bvnc.1.gz
 share/applications/bssh.desktop
 share/applications/bvnc.desktop
 %%DATADIR%%/interfaces/avahi-discover.ui
- at comment @dir etc/avahi

Modified: head/net/avahi-gtk3/Makefile
==============================================================================
--- head/net/avahi-gtk3/Makefile	Fri Oct  9 20:59:28 2015	(r398959)
+++ head/net/avahi-gtk3/Makefile	Fri Oct  9 21:09:08 2015	(r398960)
@@ -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"

Modified: head/net/avahi-libdns/Makefile
==============================================================================
--- head/net/avahi-libdns/Makefile	Fri Oct  9 20:59:28 2015	(r398959)
+++ head/net/avahi-libdns/Makefile	Fri Oct  9 21:09:08 2015	(r398960)
@@ -21,7 +21,4 @@ AVAHI_PKGCONFIG=avahi-compat-libdns_sd.p
 
 CONFLICTS=	mDNSResponder-[0-9]*
 
-post-install:
-	@${RMDIR} ${STAGEDIR}${PREFIX}/etc/avahi
-
 .include "${MASTERDIR}/Makefile"

Modified: head/net/avahi-qt4/Makefile
==============================================================================
--- head/net/avahi-qt4/Makefile	Fri Oct  9 20:59:28 2015	(r398959)
+++ head/net/avahi-qt4/Makefile	Fri Oct  9 21:09:08 2015	(r398960)
@@ -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"

Modified: head/net/avahi-sharp/Makefile
==============================================================================
--- head/net/avahi-sharp/Makefile	Fri Oct  9 20:59:28 2015	(r398959)
+++ head/net/avahi-sharp/Makefile	Fri Oct  9 21:09:08 2015	(r398960)
@@ -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"

Modified: head/net/py-avahi/pkg-plist
==============================================================================
--- head/net/py-avahi/pkg-plist	Fri Oct  9 20:59:28 2015	(r398959)
+++ head/net/py-avahi/pkg-plist	Fri Oct  9 21:09:08 2015	(r398960)
@@ -1,6 +1,8 @@
 bin/avahi-bookmarks
 bin/avahi-discover
 lib/avahi/service-types.db
+ at comment Installed by avahi-app
+ at comment %%DATADIR%%/service-types
 %%PYTHON_SITELIBDIR%%/avahi/ServiceTypeDatabase.py
 %%PYTHON_SITELIBDIR%%/avahi/ServiceTypeDatabase.pyc
 %%PYTHON_SITELIBDIR%%/avahi/ServiceTypeDatabase.pyo