Attachment 161305 Details for Bug 203283 – Patch

[patch] Patch

avahi.patch (text/plain), 3.75 KB, created by Dmitry Marakasov on 2015-09-23 13:41:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dmitry Marakasov

Created: 2015-09-23 13:41:38 UTC

Size: 3.75 KB

patch

obsolete

>Index: avahi-app/Makefile
>===================================================================
>--- avahi-app/Makefile	(revision 397612)
>+++ avahi-app/Makefile	(working copy)
>@@ -144,10 +144,10 @@
> .for f in ${AVAHI_PKGCONFIG}
> 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${PREFIX}/libdata/pkgconfig
> .endfor
>+.for f in ${DAEMON_CONFIG_FILES}
> 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/avahi
>-.for f in ${DAEMON_CONFIG_FILES}
> 	${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 \
>Index: avahi-app/pkg-plist
>===================================================================
>--- avahi-app/pkg-plist	(revision 397612)
>+++ avahi-app/pkg-plist	(working copy)
>@@ -7,13 +7,9 @@
> 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
>Index: avahi-gtk/pkg-plist
>===================================================================
>--- avahi-gtk/pkg-plist	(revision 397613)
>+++ avahi-gtk/pkg-plist	(working copy)
>@@ -13,4 +13,3 @@
> share/applications/bssh.desktop
> share/applications/bvnc.desktop
> %%DATADIR%%/interfaces/avahi-discover.ui
>-@comment @dir etc/avahi
>Index: avahi-gtk3/Makefile
>===================================================================
>--- avahi-gtk3/Makefile	(revision 397613)
>+++ avahi-gtk3/Makefile	(working copy)
>@@ -28,7 +28,4 @@
> do-install:
> 	@(cd ${WRKSRC}/avahi-ui; ${MAKE_CMD} ${MAKE_ARGS} install-libLTLIBRARIES)
> 
>-post-install:
>-	@${RMDIR} ${STAGEDIR}${PREFIX}/etc/avahi
>-
> .include "${MASTERDIR}/Makefile"
>Index: avahi-libdns/Makefile
>===================================================================
>--- avahi-libdns/Makefile	(revision 397613)
>+++ avahi-libdns/Makefile	(working copy)
>@@ -21,7 +21,4 @@
> 
> CONFLICTS=	mDNSResponder-[0-9]*
> 
>-post-install:
>-	@${RMDIR} ${STAGEDIR}${PREFIX}/etc/avahi
>-
> .include "${MASTERDIR}/Makefile"
>Index: avahi-qt4/Makefile
>===================================================================
>--- avahi-qt4/Makefile	(revision 397613)
>+++ avahi-qt4/Makefile	(working copy)
>@@ -20,7 +20,4 @@
> USE_QT4=	corelib moc_build
> AVAHI_PKGCONFIG=	avahi-qt4.pc
> 
>-post-install:
>-	@${RMDIR} ${STAGEDIR}${PREFIX}/etc/avahi
>-
> .include "${MASTERDIR}/Makefile"
>Index: avahi-sharp/Makefile
>===================================================================
>--- avahi-sharp/Makefile	(revision 397613)
>+++ avahi-sharp/Makefile	(working copy)
>@@ -27,7 +27,4 @@
> 		${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"
>Index: py-avahi/pkg-plist
>===================================================================
>--- py-avahi/pkg-plist	(revision 397612)
>+++ py-avahi/pkg-plist	(working copy)
>@@ -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

Actions: View | Diff

Attachments on bug 203283: 161305