[Midnightbsd-cvs] mports [17441] 0.6.31
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sat Sep 20 17:16:55 EDT 2014
Revision: 17441
http://svnweb.midnightbsd.org/mports/?rev=17441
Author: laffer1
Date: 2014-09-20 17:16:55 -0400 (Sat, 20 Sep 2014)
Log Message:
-----------
0.6.31
Modified Paths:
--------------
trunk/net/avahi-app/Makefile
trunk/net/avahi-app/distinfo
trunk/net/avahi-app/files/patch-avahi-daemon_Makefile.in
trunk/net/avahi-app/files/patch-avahi-ui_Makefile.in
trunk/net/avahi-app/files/patch-avahi-utils_Makefile.in
trunk/net/avahi-app/pkg-plist
Added Paths:
-----------
trunk/net/avahi-app/files/patch-avahi-client_check-nss.c
Removed Paths:
-------------
trunk/net/avahi-app/files/patch-check_nss.c
Property Changed:
----------------
trunk/net/avahi-app/files/org.freedesktop.Avahi.service
trunk/net/avahi-app/files/patch-Makefile.in
trunk/net/avahi-app/files/patch-avahi-autoipd_main.c
trunk/net/avahi-app/files/patch-avahi-client.pc.in
trunk/net/avahi-app/files/patch-avahi-compat-howl.pc.in
trunk/net/avahi-app/files/patch-avahi-compat-libdns_sd.pc.in
trunk/net/avahi-app/files/patch-avahi-compat-libdns_sd_Makefile.in
trunk/net/avahi-app/files/patch-avahi-core.pc.in
trunk/net/avahi-app/files/patch-avahi-daemon_Makefile.in
trunk/net/avahi-app/files/patch-avahi-daemon_main.c
trunk/net/avahi-app/files/patch-avahi-discover-standalone_Makefile.in
trunk/net/avahi-app/files/patch-avahi-glib.pc.in
trunk/net/avahi-app/files/patch-avahi-qt3.pc.in
trunk/net/avahi-app/files/patch-avahi-qt4.pc.in
trunk/net/avahi-app/files/patch-avahi-qt_Makefile.in
trunk/net/avahi-app/files/patch-avahi-ui_Makefile.in
trunk/net/avahi-app/files/patch-avahi-utils_Makefile.in
trunk/net/avahi-app/files/patch-configure
trunk/net/avahi-app/files/patch-dnsconfd_Makefile.in
trunk/net/avahi-app/files/patch-initscript_freebsd_Makefile.in
trunk/net/avahi-app/files/patch-initscript_freebsd_avahi-daemon.sh.in
trunk/net/avahi-app/files/patch-initscript_freebsd_avahi-dnsconfd.sh.in
Modified: trunk/net/avahi-app/Makefile
===================================================================
--- trunk/net/avahi-app/Makefile 2014-09-20 21:11:01 UTC (rev 17440)
+++ trunk/net/avahi-app/Makefile 2014-09-20 21:16:55 UTC (rev 17441)
@@ -1,8 +1,7 @@
# $MidnightBSD$
PORTNAME= avahi
-PORTVERSION= 0.6.29
-PORTREVISION= 2
+PORTVERSION= 0.6.31
CATEGORIES?= net dns
MASTER_SITES= http://www.avahi.org/download/
PKGNAMESUFFIX?= -app
@@ -12,6 +11,9 @@
LICENSE= lgpl
+AVAHI_SLAVE?= no
+
+.if ${AVAHI_SLAVE} != header
LIB_DEPENDS?= libexpat.so:${PORTSDIR}/textproc/expat2 \
libdaemon.so:${PORTSDIR}/devel/libdaemon \
libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
@@ -20,11 +22,10 @@
USERS?= ${PORTNAME}
GROUPS?= ${USERS}
+USES+= gettext gmake libtool:keepla pathfix pkgconfig
USE_GNOME+= glib20 intltool introspection
-USES+= gettext gmake libtool:keepla pathfix pkgconfig
USE_GNOME_SUBR= yes
USE_LDCONFIG= yes
-AVAHI_SLAVE?= no
GNU_CONFIGURE= yes
CONFIGURE_ARGS?=--with-distro=freebsd \
--with-dbus-system-socket=unix:path=/var/run/dbus/system_bus_socket \
@@ -31,64 +32,51 @@
--disable-monodoc \
--disable-doxygen-doc \
--disable-doxygen-dot \
+ --disable-qt3 \
--localstatedir=/var \
--enable-compat-howl
-CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
- PTHREAD_LIBS="${PTHREAD_LIBS}"
CPPFLAGS+= -I${LOCALBASE}/include -DHAVE_KQUEUE
LDFLAGS+= -L${LOCALBASE}/lib
+INSTALL_TARGET= install-strip
-.if ${AVAHI_SLAVE}=="no"
+.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
-.include <bsd.port.pre.mk>
+.include <bsd.mport.options.mk>
-.if ${AVAHI_SLAVE}=="autoipd"
+.if ${AVAHI_SLAVE} != header
+.if ${AVAHI_SLAVE} == autoipd
CONFIGURE_ARGS+=--enable-autoipd
.else
CONFIGURE_ARGS+=--disable-autoipd
.endif
-.if ${AVAHI_SLAVE}=="gtk"
+.if ${AVAHI_SLAVE} == gtk
CONFIGURE_ARGS+=--enable-gtk
.else
CONFIGURE_ARGS+=--disable-gtk
.endif
-.if ${AVAHI_SLAVE}=="gtk3"
+.if ${AVAHI_SLAVE} == gtk3
CONFIGURE_ARGS+=--enable-gtk3
.else
CONFIGURE_ARGS+=--disable-gtk3
.endif
-.if ${AVAHI_SLAVE}=="libdns"
+.if ${AVAHI_SLAVE} == libdns
CONFIGURE_ARGS+=--enable-compat-libdns_sd
.else
CONFIGURE_ARGS+=--disable-compat-libdns_sd
.endif
-.if ${AVAHI_SLAVE}=="python"
+.if ${AVAHI_SLAVE} == python
CONFIGURE_ARGS+=--enable-python
.else
CONFIGURE_ARGS+=--disable-python
.endif
-.if ${AVAHI_SLAVE}=="qt3"
-CONFIGURE_ARGS+=--enable-qt3
-.else
-CONFIGURE_ARGS+=--disable-qt3
-.endif
-.if ${AVAHI_SLAVE}=="qt4"
+.if ${AVAHI_SLAVE} == qt4
CONFIGURE_ARGS+=--enable-qt4 \
--disable-expat \
--disable-gdbm
@@ -95,11 +83,12 @@
.else
CONFIGURE_ARGS+=--disable-qt4
.endif
-.if ${AVAHI_SLAVE}=="sharp"
+.if ${AVAHI_SLAVE} == sharp
CONFIGURE_ARGS+=--enable-mono
.else
CONFIGURE_ARGS+=--disable-mono
.endif
+CONFIGURE_ARGS+=--disable-stack-protector
post-patch: avahi-post-patch
@@ -125,12 +114,14 @@
${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
avahi-post-build:
.for f in ${AVAHI_PKGCONFIG}
- @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} \
+ @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \
${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${f}
.endfor
@@ -145,28 +136,23 @@
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 !defined(PACKAGE_BUILDING) && (${AVAHI_SLAVE}=="no" || ${AVAHI_SLAVE}=="autoipd")
- @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+.if ${AVAHI_SLAVE}==no
${INSTALL_DATA} ${FILESDIR}/org.freedesktop.Avahi.service \
- ${LOCALBASE}/share/dbus-1/system-services
+ ${STAGEDIR}${PREFIX}/share/dbus-1/system-services
.endif
+.endif # ! avahi-header
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: trunk/net/avahi-app/distinfo
===================================================================
--- trunk/net/avahi-app/distinfo 2014-09-20 21:11:01 UTC (rev 17440)
+++ trunk/net/avahi-app/distinfo 2014-09-20 21:16:55 UTC (rev 17441)
@@ -1,2 +1,2 @@
-SHA256 (avahi-0.6.29.tar.gz) = 4eb1a6bdc93f1b245fc1b26ff6a79f5f958c1135c04bff60d36d374d98cc14d8
-SIZE (avahi-0.6.29.tar.gz) = 1244081
+SHA256 (avahi-0.6.31.tar.gz) = 8372719b24e2dd75de6f59bb1315e600db4fd092805bd1201ed0cb651a2dab48
+SIZE (avahi-0.6.31.tar.gz) = 1268686
Index: trunk/net/avahi-app/files/org.freedesktop.Avahi.service
===================================================================
--- trunk/net/avahi-app/files/org.freedesktop.Avahi.service 2014-09-20 21:11:01 UTC (rev 17440)
+++ trunk/net/avahi-app/files/org.freedesktop.Avahi.service 2014-09-20 21:16:55 UTC (rev 17441)
Property changes on: trunk/net/avahi-app/files/org.freedesktop.Avahi.service
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/net/avahi-app/files/patch-Makefile.in
===================================================================
--- trunk/net/avahi-app/files/patch-Makefile.in 2014-09-20 21:11:01 UTC (rev 17440)
+++ trunk/net/avahi-app/files/patch-Makefile.in 2014-09-20 21:16:55 UTC (rev 17441)
Property changes on: trunk/net/avahi-app/files/patch-Makefile.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Index: trunk/net/avahi-app/files/patch-avahi-autoipd_main.c
===================================================================
--- trunk/net/avahi-app/files/patch-avahi-autoipd_main.c 2014-09-20 21:11:01 UTC (rev 17440)
+++ trunk/net/avahi-app/files/patch-avahi-autoipd_main.c 2014-09-20 21:16:55 UTC (rev 17441)
Property changes on: trunk/net/avahi-app/files/patch-avahi-autoipd_main.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.5
\ No newline at end of property
Index: trunk/net/avahi-app/files/patch-avahi-client.pc.in
===================================================================
--- trunk/net/avahi-app/files/patch-avahi-client.pc.in 2014-09-20 21:11:01 UTC (rev 17440)
+++ trunk/net/avahi-app/files/patch-avahi-client.pc.in 2014-09-20 21:16:55 UTC (rev 17441)
Property changes on: trunk/net/avahi-app/files/patch-avahi-client.pc.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Added: trunk/net/avahi-app/files/patch-avahi-client_check-nss.c
===================================================================
--- trunk/net/avahi-app/files/patch-avahi-client_check-nss.c (rev 0)
+++ trunk/net/avahi-app/files/patch-avahi-client_check-nss.c 2014-09-20 21:16:55 UTC (rev 17441)
@@ -0,0 +1,10 @@
+--- avahi-client/check-nss.c.orig 2014-09-08 12:26:55.000000000 -0400
++++ avahi-client/check-nss.c 2014-09-08 12:27:24.000000000 -0400
+@@ -33,6 +33,7 @@ int avahi_nss_support(void) {
+
+ #ifdef HAVE_DLOPEN
+ static const char * const libs[] = {
++ "nss_mdns.so.1",
+ "libnss_mdns.so.2",
+ "libnss_mdns4.so.2",
+ "libnss_mdns6.so.2",
Property changes on: trunk/net/avahi-app/files/patch-avahi-client_check-nss.c
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/net/avahi-app/files/patch-avahi-compat-howl.pc.in
===================================================================
--- trunk/net/avahi-app/files/patch-avahi-compat-howl.pc.in 2014-09-20 21:11:01 UTC (rev 17440)
+++ trunk/net/avahi-app/files/patch-avahi-compat-howl.pc.in 2014-09-20 21:16:55 UTC (rev 17441)
Property changes on: trunk/net/avahi-app/files/patch-avahi-compat-howl.pc.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/net/avahi-app/files/patch-avahi-compat-libdns_sd.pc.in
===================================================================
--- trunk/net/avahi-app/files/patch-avahi-compat-libdns_sd.pc.in 2014-09-20 21:11:01 UTC (rev 17440)
+++ trunk/net/avahi-app/files/patch-avahi-compat-libdns_sd.pc.in 2014-09-20 21:16:55 UTC (rev 17441)
Property changes on: trunk/net/avahi-app/files/patch-avahi-compat-libdns_sd.pc.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/net/avahi-app/files/patch-avahi-compat-libdns_sd_Makefile.in
===================================================================
--- trunk/net/avahi-app/files/patch-avahi-compat-libdns_sd_Makefile.in 2014-09-20 21:11:01 UTC (rev 17440)
+++ trunk/net/avahi-app/files/patch-avahi-compat-libdns_sd_Makefile.in 2014-09-20 21:16:55 UTC (rev 17441)
Property changes on: trunk/net/avahi-app/files/patch-avahi-compat-libdns_sd_Makefile.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.3
\ No newline at end of property
Index: trunk/net/avahi-app/files/patch-avahi-core.pc.in
===================================================================
--- trunk/net/avahi-app/files/patch-avahi-core.pc.in 2014-09-20 21:11:01 UTC (rev 17440)
+++ trunk/net/avahi-app/files/patch-avahi-core.pc.in 2014-09-20 21:16:55 UTC (rev 17441)
Property changes on: trunk/net/avahi-app/files/patch-avahi-core.pc.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/net/avahi-app/files/patch-avahi-daemon_Makefile.in
===================================================================
--- trunk/net/avahi-app/files/patch-avahi-daemon_Makefile.in 2014-09-20 21:11:01 UTC (rev 17440)
+++ trunk/net/avahi-app/files/patch-avahi-daemon_Makefile.in 2014-09-20 21:16:55 UTC (rev 17441)
@@ -1,5 +1,5 @@
---- avahi-daemon/Makefile.in.orig 2013-01-01 13:29:10.000000000 -0600
-+++ avahi-daemon/Makefile.in 2013-01-01 13:31:10.000000000 -0600
+--- avahi-daemon/Makefile.in.orig 2013-01-01 13:45:35.000000000 -0600
++++ avahi-daemon/Makefile.in 2013-01-01 13:47:30.000000000 -0600
@@ -69,7 +69,7 @@
@ENABLE_CHROOT_TRUE@@HAVE_LIBDAEMON_TRUE@@HAVE_XML_TRUE@ caps.c caps.h
@@ -9,18 +9,18 @@
@HAVE_DBUS_TRUE@@HAVE_LIBDAEMON_TRUE@@HAVE_XML_TRUE at am__append_5 = \
@HAVE_DBUS_TRUE@@HAVE_LIBDAEMON_TRUE@@HAVE_XML_TRUE@ dbus-protocol.c dbus-protocol.h \
@HAVE_DBUS_TRUE@@HAVE_LIBDAEMON_TRUE@@HAVE_XML_TRUE@ dbus-util.c dbus-util.h \
-@@ -682,7 +682,7 @@
+@@ -688,7 +688,7 @@
rm -f $$list
- avahi-daemon$(EXEEXT): $(avahi_daemon_OBJECTS) $(avahi_daemon_DEPENDENCIES)
+ avahi-daemon$(EXEEXT): $(avahi_daemon_OBJECTS) $(avahi_daemon_DEPENDENCIES) $(EXTRA_avahi_daemon_DEPENDENCIES)
@rm -f avahi-daemon$(EXEEXT)
- $(AM_V_CCLD)$(avahi_daemon_LINK) $(avahi_daemon_OBJECTS) $(avahi_daemon_LDADD) $(LIBS)
+ $(AM_V_CCLD)$(avahi_daemon_LINK) $(avahi_daemon_OBJECTS) $(avahi_daemon_LDADD) $(LIBS) $(INTLLIBS)
- ini-file-parser-test$(EXEEXT): $(ini_file_parser_test_OBJECTS) $(ini_file_parser_test_DEPENDENCIES)
+ ini-file-parser-test$(EXEEXT): $(ini_file_parser_test_OBJECTS) $(ini_file_parser_test_DEPENDENCIES) $(EXTRA_ini_file_parser_test_DEPENDENCIES)
@rm -f ini-file-parser-test$(EXEEXT)
$(AM_V_CCLD)$(ini_file_parser_test_LINK) $(ini_file_parser_test_OBJECTS) $(ini_file_parser_test_LDADD) $(LIBS)
-@@ -1283,17 +1283,17 @@
- echo " ( cd '$(DESTDIR)$(servicedir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(servicedir)" && rm -f $$files
+@@ -1222,17 +1222,17 @@
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ dir='$(DESTDIR)$(servicedir)'; $(am__uninstall_files_from_dir)
install-pkgsysconfDATA: $(pkgsysconf_DATA)
- @$(NORMAL_INSTALL)
- test -z "$(pkgsysconfdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgsysconfdir)"
Property changes on: trunk/net/avahi-app/files/patch-avahi-daemon_Makefile.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.4
\ No newline at end of property
Index: trunk/net/avahi-app/files/patch-avahi-daemon_main.c
===================================================================
--- trunk/net/avahi-app/files/patch-avahi-daemon_main.c 2014-09-20 21:11:01 UTC (rev 17440)
+++ trunk/net/avahi-app/files/patch-avahi-daemon_main.c 2014-09-20 21:16:55 UTC (rev 17441)
Property changes on: trunk/net/avahi-app/files/patch-avahi-daemon_main.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/net/avahi-app/files/patch-avahi-discover-standalone_Makefile.in
===================================================================
--- trunk/net/avahi-app/files/patch-avahi-discover-standalone_Makefile.in 2014-09-20 21:11:01 UTC (rev 17440)
+++ trunk/net/avahi-app/files/patch-avahi-discover-standalone_Makefile.in 2014-09-20 21:16:55 UTC (rev 17441)
Property changes on: trunk/net/avahi-app/files/patch-avahi-discover-standalone_Makefile.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.3
\ No newline at end of property
Index: trunk/net/avahi-app/files/patch-avahi-glib.pc.in
===================================================================
--- trunk/net/avahi-app/files/patch-avahi-glib.pc.in 2014-09-20 21:11:01 UTC (rev 17440)
+++ trunk/net/avahi-app/files/patch-avahi-glib.pc.in 2014-09-20 21:16:55 UTC (rev 17441)
Property changes on: trunk/net/avahi-app/files/patch-avahi-glib.pc.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/net/avahi-app/files/patch-avahi-qt3.pc.in
===================================================================
--- trunk/net/avahi-app/files/patch-avahi-qt3.pc.in 2014-09-20 21:11:01 UTC (rev 17440)
+++ trunk/net/avahi-app/files/patch-avahi-qt3.pc.in 2014-09-20 21:16:55 UTC (rev 17441)
Property changes on: trunk/net/avahi-app/files/patch-avahi-qt3.pc.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/net/avahi-app/files/patch-avahi-qt4.pc.in
===================================================================
--- trunk/net/avahi-app/files/patch-avahi-qt4.pc.in 2014-09-20 21:11:01 UTC (rev 17440)
+++ trunk/net/avahi-app/files/patch-avahi-qt4.pc.in 2014-09-20 21:16:55 UTC (rev 17441)
Property changes on: trunk/net/avahi-app/files/patch-avahi-qt4.pc.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/net/avahi-app/files/patch-avahi-qt_Makefile.in
===================================================================
--- trunk/net/avahi-app/files/patch-avahi-qt_Makefile.in 2014-09-20 21:11:01 UTC (rev 17440)
+++ trunk/net/avahi-app/files/patch-avahi-qt_Makefile.in 2014-09-20 21:16:55 UTC (rev 17441)
Property changes on: trunk/net/avahi-app/files/patch-avahi-qt_Makefile.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Modified: trunk/net/avahi-app/files/patch-avahi-ui_Makefile.in
===================================================================
--- trunk/net/avahi-app/files/patch-avahi-ui_Makefile.in 2014-09-20 21:11:01 UTC (rev 17440)
+++ trunk/net/avahi-app/files/patch-avahi-ui_Makefile.in 2014-09-20 21:16:55 UTC (rev 17441)
@@ -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 at 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 at am_bssh_OBJECTS = bssh-bssh.$(OBJEXT)
bssh_OBJECTS = $(am_bssh_OBJECTS)
@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@@HAVE_GTK3_FALSE at 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 at 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 at 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 at 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 @@
+ at 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; \
Property changes on: trunk/net/avahi-app/files/patch-avahi-ui_Makefile.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.4
\ No newline at end of property
Modified: trunk/net/avahi-app/files/patch-avahi-utils_Makefile.in
===================================================================
--- trunk/net/avahi-app/files/patch-avahi-utils_Makefile.in 2014-09-20 21:11:01 UTC (rev 17440)
+++ trunk/net/avahi-app/files/patch-avahi-utils_Makefile.in 2014-09-20 21:16:55 UTC (rev 17441)
@@ -1,20 +1,20 @@
---- avahi-utils/Makefile.in.orig 2010-07-24 19:59:10.000000000 -0400
-+++ avahi-utils/Makefile.in 2010-07-24 20:00:07.000000000 -0400
-@@ -513,16 +513,16 @@ clean-binPROGRAMS:
+--- avahi-utils/Makefile.in.orig 2012-07-09 20:07:19.000000000 +0200
++++ avahi-utils/Makefile.in 2012-07-09 20:10:46.000000000 +0200
+@@ -518,16 +518,16 @@
rm -f $$list
- avahi-browse$(EXEEXT): $(avahi_browse_OBJECTS) $(avahi_browse_DEPENDENCIES)
+ avahi-browse$(EXEEXT): $(avahi_browse_OBJECTS) $(avahi_browse_DEPENDENCIES) $(EXTRA_avahi_browse_DEPENDENCIES)
@rm -f avahi-browse$(EXEEXT)
- $(AM_V_CCLD)$(avahi_browse_LINK) $(avahi_browse_OBJECTS) $(avahi_browse_LDADD) $(LIBS)
+ $(AM_V_CCLD)$(avahi_browse_LINK) $(avahi_browse_OBJECTS) $(avahi_browse_LDADD) $(LIBS) $(INTLLIBS)
- avahi-publish$(EXEEXT): $(avahi_publish_OBJECTS) $(avahi_publish_DEPENDENCIES)
+ avahi-publish$(EXEEXT): $(avahi_publish_OBJECTS) $(avahi_publish_DEPENDENCIES) $(EXTRA_avahi_publish_DEPENDENCIES)
@rm -f avahi-publish$(EXEEXT)
- $(AM_V_CCLD)$(avahi_publish_LINK) $(avahi_publish_OBJECTS) $(avahi_publish_LDADD) $(LIBS)
+ $(AM_V_CCLD)$(avahi_publish_LINK) $(avahi_publish_OBJECTS) $(avahi_publish_LDADD) $(LIBS) $(INTLLIBS)
- avahi-resolve$(EXEEXT): $(avahi_resolve_OBJECTS) $(avahi_resolve_DEPENDENCIES)
+ avahi-resolve$(EXEEXT): $(avahi_resolve_OBJECTS) $(avahi_resolve_DEPENDENCIES) $(EXTRA_avahi_resolve_DEPENDENCIES)
@rm -f avahi-resolve$(EXEEXT)
- $(AM_V_CCLD)$(avahi_resolve_LINK) $(avahi_resolve_OBJECTS) $(avahi_resolve_LDADD) $(LIBS)
+ $(AM_V_CCLD)$(avahi_resolve_LINK) $(avahi_resolve_OBJECTS) $(avahi_resolve_LDADD) $(LIBS) $(INTLLIBS)
- avahi-set-host-name$(EXEEXT): $(avahi_set_host_name_OBJECTS) $(avahi_set_host_name_DEPENDENCIES)
+ avahi-set-host-name$(EXEEXT): $(avahi_set_host_name_OBJECTS) $(avahi_set_host_name_DEPENDENCIES) $(EXTRA_avahi_set_host_name_DEPENDENCIES)
@rm -f avahi-set-host-name$(EXEEXT)
- $(AM_V_CCLD)$(avahi_set_host_name_LINK) $(avahi_set_host_name_OBJECTS) $(avahi_set_host_name_LDADD) $(LIBS)
+ $(AM_V_CCLD)$(avahi_set_host_name_LINK) $(avahi_set_host_name_OBJECTS) $(avahi_set_host_name_LDADD) $(LIBS) $(INTLLIBS)
Property changes on: trunk/net/avahi-app/files/patch-avahi-utils_Makefile.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.3
\ No newline at end of property
Deleted: trunk/net/avahi-app/files/patch-check_nss.c
===================================================================
--- trunk/net/avahi-app/files/patch-check_nss.c 2014-09-20 21:11:01 UTC (rev 17440)
+++ trunk/net/avahi-app/files/patch-check_nss.c 2014-09-20 21:16:55 UTC (rev 17441)
@@ -1,15 +0,0 @@
---- avahi-client/check-nss.c.orig 2010-06-29 12:30:33.000000000 +0900
-+++ avahi-client/check-nss.c 2012-03-13 14:32:57.000000000 +0900
-@@ -33,9 +33,9 @@
-
- #ifdef HAVE_DLOPEN
- static const char * const libs[] = {
-- "libnss_mdns.so.2",
-- "libnss_mdns4.so.2",
-- "libnss_mdns6.so.2",
-+ "nss_mdns.so",
-+ "nss_mdns4.so",
-+ "nss_mdns6.so",
- NULL };
-
- const char * const *l;
Index: trunk/net/avahi-app/files/patch-configure
===================================================================
--- trunk/net/avahi-app/files/patch-configure 2014-09-20 21:11:01 UTC (rev 17440)
+++ trunk/net/avahi-app/files/patch-configure 2014-09-20 21:16:55 UTC (rev 17441)
Property changes on: trunk/net/avahi-app/files/patch-configure
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/net/avahi-app/files/patch-dnsconfd_Makefile.in
===================================================================
--- trunk/net/avahi-app/files/patch-dnsconfd_Makefile.in 2014-09-20 21:11:01 UTC (rev 17440)
+++ trunk/net/avahi-app/files/patch-dnsconfd_Makefile.in 2014-09-20 21:16:55 UTC (rev 17441)
Property changes on: trunk/net/avahi-app/files/patch-dnsconfd_Makefile.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.3
\ No newline at end of property
Index: trunk/net/avahi-app/files/patch-initscript_freebsd_Makefile.in
===================================================================
--- trunk/net/avahi-app/files/patch-initscript_freebsd_Makefile.in 2014-09-20 21:11:01 UTC (rev 17440)
+++ trunk/net/avahi-app/files/patch-initscript_freebsd_Makefile.in 2014-09-20 21:16:55 UTC (rev 17441)
Property changes on: trunk/net/avahi-app/files/patch-initscript_freebsd_Makefile.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/net/avahi-app/files/patch-initscript_freebsd_avahi-daemon.sh.in
===================================================================
--- trunk/net/avahi-app/files/patch-initscript_freebsd_avahi-daemon.sh.in 2014-09-20 21:11:01 UTC (rev 17440)
+++ trunk/net/avahi-app/files/patch-initscript_freebsd_avahi-daemon.sh.in 2014-09-20 21:16:55 UTC (rev 17441)
Property changes on: trunk/net/avahi-app/files/patch-initscript_freebsd_avahi-daemon.sh.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Index: trunk/net/avahi-app/files/patch-initscript_freebsd_avahi-dnsconfd.sh.in
===================================================================
--- trunk/net/avahi-app/files/patch-initscript_freebsd_avahi-dnsconfd.sh.in 2014-09-20 21:11:01 UTC (rev 17440)
+++ trunk/net/avahi-app/files/patch-initscript_freebsd_avahi-dnsconfd.sh.in 2014-09-20 21:16:55 UTC (rev 17441)
Property changes on: trunk/net/avahi-app/files/patch-initscript_freebsd_avahi-dnsconfd.sh.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Modified: trunk/net/avahi-app/pkg-plist
===================================================================
--- trunk/net/avahi-app/pkg-plist 2014-09-20 21:11:01 UTC (rev 17440)
+++ trunk/net/avahi-app/pkg-plist 2014-09-20 21:16:55 UTC (rev 17441)
@@ -102,6 +102,21 @@
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
More information about the Midnightbsd-cvs
mailing list