Index: head/net/avahi/Makefile =================================================================== --- head/net/avahi/Makefile (revision 477045) +++ head/net/avahi/Makefile (revision 477046) @@ -1,30 +1,30 @@ # Created by: Joe Marcus Clarke # $FreeBSD$ # $MCom: ports/net/avahi/Makefile,v 1.30 2011/03/13 17:23:19 kwm Exp $ PORTNAME= avahi -PORTVERSION= 0.6.31 -PORTREVISION?= 1 +PORTVERSION= 0.7 +PORTREVISION?= 0 CATEGORIES?= net dns MAINTAINER= gnome@FreeBSD.org COMMENT= "meta-port" for the Avahi service discovery suite -RUN_DEPENDS= avahi-app>=0.6.31:net/avahi-app +RUN_DEPENDS= avahi-app>=0.7:net/avahi-app USES= metaport OPTIONS_DEFINE= AUTOIPD GTK MONO QT4 PYTHON OPTIONS_DEFAULT=AUTOIPD GTK AUTOIPD_DESC= IPv4LL network address configuration daemon GTK_DESC= Gtk+ tools and bindings LIBDNS_DESC= Apple's mDNSResponder compatibility library AUTOIPD_RUN_DEPENDS= avahi-autoipd:net/avahi-autoipd GTK_RUN_DEPENDS= avahi-discover-standalone:net/avahi-gtk #LIBDNS_RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/avahi-compat-libdns_sd.pc:net/avahi-libdns MONO_RUN_DEPENDS= ${LOCALBASE}/lib/mono/avahi-sharp/avahi-sharp.dll:net/avahi-sharp QT4_RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/avahi-qt4.pc:net/avahi-qt4 PYTHON_RUN_DEPENDS= avahi-bookmarks:net/py-avahi .include Index: head/net/avahi-app/Makefile =================================================================== --- head/net/avahi-app/Makefile (revision 477045) +++ head/net/avahi-app/Makefile (revision 477046) @@ -1,159 +1,163 @@ # Created by: Joe Marcus Clarke # $FreeBSD$ PORTNAME= avahi -PORTVERSION= 0.6.31 -PORTREVISION?= 6 +PORTVERSION= 0.7 +PORTREVISION?= 0 CATEGORIES?= net dns MASTER_SITES= http://www.avahi.org/download/ PKGNAMESUFFIX?= -app MAINTAINER?= gnome@FreeBSD.org COMMENT?= Service discovery on a local network LICENSE= LGPL21+ LICENSE_FILE= ${WRKSRC}/LICENSE AVAHI_SLAVE?= no .if ${AVAHI_SLAVE} != header LIB_DEPENDS?= libexpat.so:textproc/expat2 \ libdaemon.so:devel/libdaemon \ libdbus-glib-1.so:devel/dbus-glib \ + libdbus-1.so:devel/dbus \ libgdbm.so:databases/gdbm USERS?= ${PORTNAME} GROUPS?= ${USERS} USES+= alias gettext gmake libtool pathfix pkgconfig USE_GNOME+= glib20 intltool introspection USE_GNOME_SUBR= yes USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS?=--with-distro=freebsd \ --with-dbus-system-socket=unix:path=/var/run/dbus/system_bus_socket \ --disable-monodoc \ --disable-doxygen-doc \ --disable-doxygen-dot \ --disable-qt3 \ --localstatedir=/var \ --enable-compat-howl CPPFLAGS+= -I${LOCALBASE}/include -DHAVE_KQUEUE -LDFLAGS+= -L${LOCALBASE}/lib +LDFLAGS+= -L${LOCALBASE}/lib -lintl INSTALL_TARGET= install-strip .if ${AVAHI_SLAVE} == no CONFLICTS= howl-[0-9]* DAEMON_CONFIG_FILES= hosts avahi-daemon.conf .endif .endif # !avahi-header .include .if ${AVAHI_SLAVE} != header .if ${AVAHI_SLAVE} == autoipd CONFIGURE_ARGS+=--enable-autoipd .else CONFIGURE_ARGS+=--disable-autoipd .endif .if ${AVAHI_SLAVE} == gtk CONFIGURE_ARGS+=--enable-gtk .else CONFIGURE_ARGS+=--disable-gtk .endif .if ${AVAHI_SLAVE} == gtk3 CONFIGURE_ARGS+=--enable-gtk3 .else CONFIGURE_ARGS+=--disable-gtk3 .endif .if ${AVAHI_SLAVE} == libdns CONFIGURE_ARGS+=--enable-compat-libdns_sd .else CONFIGURE_ARGS+=--disable-compat-libdns_sd .endif .if ${AVAHI_SLAVE} == python CONFIGURE_ARGS+=--enable-python .else CONFIGURE_ARGS+=--disable-python .endif .if ${AVAHI_SLAVE} == qt4 CONFIGURE_ARGS+=--enable-qt4 \ --disable-expat \ --disable-gdbm .else CONFIGURE_ARGS+=--disable-qt4 .endif .if ${AVAHI_SLAVE} == sharp CONFIGURE_ARGS+=--enable-mono .else CONFIGURE_ARGS+=--disable-mono .endif CONFIGURE_ARGS+=--disable-stack-protector post-patch: avahi-post-patch avahi-post-patch: + @${REINPLACE_CMD} -e 's|avahi_runtime_dir="/run"|avahi_runtime_dir="/var/run"|' \ + ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|/etc|${PREFIX}/etc|' \ ${WRKSRC}/man/*.* @${RM} ${WRKSRC}/man/*.bak @${REINPLACE_CMD} -e 's|-ldl||g ; s|netdev|network|g' \ ${WRKSRC}/configure \ ${WRKSRC}/avahi-client/Makefile.in \ ${WRKSRC}/avahi-daemon/Makefile.in @${REINPLACE_CMD} -e 's|have_inotify=yes|have_inotify=no|' \ ${WRKSRC}/configure @${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} \ ${REINPLACE_CMD} -e 's|(LIBINTL)|(INTLLIBS)|g ; \ s|(LIBICONV)|(LTLIBICONV)|g' @${REINPLACE_CMD} -e 's|%%RC_SUBR%%|/etc/rc.subr| ; \ s|%%GNOME_SUBR%%|${GNOME_SUBR}|' \ ${WRKSRC}/initscript/freebsd/avahi-dnsconfd.sh.in \ ${WRKSRC}/initscript/freebsd/avahi-daemon.sh.in @${REINPLACE_CMD} -e 's|dbus_connection_disconnect|dbus_connection_close|g' \ ${WRKSRC}/avahi-client/client.c \ ${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} ${MAKE_CMD} \ ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${f} .endfor pre-su-install: avahi-pre-su-install avahi-pre-su-install: .if ${AVAHI_SLAVE}=="no" @${MKDIR} ${STAGEDIR}${PREFIX}/lib/avahi @${TOUCH} -f ${STAGEDIR}${PREFIX}/lib/avahi/.keep .endif post-install: avahi-post-install avahi-post-install: .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} ${STAGEDIR}${PREFIX}/libdata/pkgconfig .endfor .for f in ${DAEMON_CONFIG_FILES} ${MKDIR} ${STAGEDIR}${PREFIX}/etc/avahi ${INSTALL_DATA} ${WRKSRC}/avahi-daemon/${f} \ ${STAGEDIR}${PREFIX}/etc/avahi/${f}.sample .endfor .if ${AVAHI_SLAVE}==no + ${MKDIR} ${STAGEDIR}${PREFIX}/share/dbus-1/system-services ${INSTALL_DATA} ${FILESDIR}/org.freedesktop.Avahi.service \ ${STAGEDIR}${PREFIX}/share/dbus-1/system-services .endif .endif # ! avahi-header .include Index: head/net/avahi-app/distinfo =================================================================== --- head/net/avahi-app/distinfo (revision 477045) +++ head/net/avahi-app/distinfo (revision 477046) @@ -1,2 +1,3 @@ -SHA256 (avahi-0.6.31.tar.gz) = 8372719b24e2dd75de6f59bb1315e600db4fd092805bd1201ed0cb651a2dab48 -SIZE (avahi-0.6.31.tar.gz) = 1268686 +TIMESTAMP = 1534080439 +SHA256 (avahi-0.7.tar.gz) = 57a99b5dfe7fdae794e3d1ee7a62973a368e91e414bd0dfa5d84434de5b14804 +SIZE (avahi-0.7.tar.gz) = 1333400 Index: head/net/avahi-app/files/patch-avahi-ui_Makefile.in =================================================================== --- head/net/avahi-app/files/patch-avahi-ui_Makefile.in (revision 477045) +++ head/net/avahi-app/files/patch-avahi-ui_Makefile.in (nonexistent) @@ -1,88 +0,0 @@ ---- avahi-ui/Makefile.in.orig 2017-09-15 01:20:16 UTC -+++ avahi-ui/Makefile.in -@@ -125,9 +125,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" - "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(avahiincludedir)" - LTLIBRARIES = $(lib_LTLIBRARIES) - am__DEPENDENCIES_1 = --@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@libavahi_ui_gtk3_la_DEPENDENCIES = ../avahi-common/libavahi-common.la \ --@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@ ../avahi-client/libavahi-client.la \ --@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@ ../avahi-glib/libavahi-glib.la \ -+@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@libavahi_ui_gtk3_la_DEPENDENCIES = \ - @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 \ -@@ -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@am_libavahi_ui_gtk3_la_rpath = -rpath \ - @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@@HAVE_GTK3_TRUE@ $(libdir) --@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@libavahi_ui_la_DEPENDENCIES = ../avahi-common/libavahi-common.la \ --@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@ ../avahi-client/libavahi-client.la \ --@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@ ../avahi-glib/libavahi-glib.la \ -+@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@libavahi_ui_la_DEPENDENCIES = \ - @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 \ -@@ -172,12 +168,8 @@ am__bssh_SOURCES_DIST = bssh.c - @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@am_bssh_OBJECTS = bssh-bssh.$(OBJEXT) - bssh_OBJECTS = $(am_bssh_OBJECTS) - @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@@HAVE_GTK3_FALSE@bssh_DEPENDENCIES = $(am__DEPENDENCIES_1) \ --@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@@HAVE_GTK3_FALSE@ ../avahi-client/libavahi-client.la \ --@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@@HAVE_GTK3_FALSE@ ../avahi-common/libavahi-common.la \ - @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@@HAVE_GTK3_FALSE@ libavahi-ui.la - @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@@HAVE_GTK3_TRUE@bssh_DEPENDENCIES = $(am__DEPENDENCIES_1) \ --@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@@HAVE_GTK3_TRUE@ ../avahi-client/libavahi-client.la \ --@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@@HAVE_GTK3_TRUE@ ../avahi-common/libavahi-common.la \ - @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) \ -@@ -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@libavahi_ui_la_LIBADD = $(AM_LDADD) \ --@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@ ../avahi-common/libavahi-common.la \ --@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@ ../avahi-client/libavahi-client.la \ --@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@ ../avahi-glib/libavahi-glib.la \ -+@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@ `$(PKG_CONFIG) --cflags --libs avahi-client avahi-core avahi-glib` \ - @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@libavahi_ui_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LIBAVAHI_UI_VERSION_INFO) -@@ -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@libavahi_ui_gtk3_la_LIBADD = $(AM_LDADD) \ --@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@ ../avahi-common/libavahi-common.la \ --@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@ ../avahi-client/libavahi-client.la \ --@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@ ../avahi-glib/libavahi-glib.la \ -+@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@ `$(PKG_CONFIG) --cflags --libs avahi-client avahi-core avahi-glib` \ - @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@ $(GTK30_LIBS) \ - @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@ $(am__append_8) - @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@libavahi_ui_gtk3_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LIBAVAHI_UI_VERSION_INFO) - @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@bssh_SOURCES = bssh.c - @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@@HAVE_GTK3_FALSE@bssh_CFLAGS = $(AM_CFLAGS) $(GTK20_CFLAGS) - @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@@HAVE_GTK3_TRUE@bssh_CFLAGS = $(AM_CFLAGS) $(GTK30_CFLAGS) --@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@@HAVE_GTK3_FALSE@bssh_LDADD = $(AM_LDADD) $(GTK20_LIBS) ../avahi-client/libavahi-client.la ../avahi-common/libavahi-common.la libavahi-ui.la --@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@@HAVE_GTK3_TRUE@bssh_LDADD = $(AM_LDADD) $(GTK30_LIBS) ../avahi-client/libavahi-client.la ../avahi-common/libavahi-common.la libavahi-ui-gtk3.la -+@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@@HAVE_GTK3_FALSE@bssh_LDADD = $(AM_LDADD) $(GTK20_LIBS) `$(PKG_CONFIG) --cflags --libs avahi-client avahi-core` libavahi-ui.la -+@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@@HAVE_GTK3_TRUE@bssh_LDADD = $(AM_LDADD) $(GTK30_LIBS) `$(PKG_CONFIG) --cflags --libs avahi-client avahi-core` libavahi-ui-gtk3.la - CLEANFILES = $(desktop_DATA) $(desktop_DATA_in) - all: all-am - -@@ -711,7 +698,7 @@ clean-libtool: - -rm -rf .libs _libs - install-desktopDATA: $(desktop_DATA) - @$(NORMAL_INSTALL) -- test -z "$(desktopdir)" || $(MKDIR_P) "$(DESTDIR)$(desktopdir)" -+@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; \ Property changes on: head/net/avahi-app/files/patch-avahi-ui_Makefile.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/avahi-app/files/patch-avahi-utils_Makefile.in =================================================================== --- head/net/avahi-app/files/patch-avahi-utils_Makefile.in (revision 477045) +++ head/net/avahi-app/files/patch-avahi-utils_Makefile.in (nonexistent) @@ -1,23 +0,0 @@ ---- avahi-utils/Makefile.in.orig 2017-09-15 01:20:16 UTC -+++ avahi-utils/Makefile.in -@@ -518,16 +518,16 @@ clean-binPROGRAMS: - rm -f $$list - 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) $(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) $(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) $(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) - - mostlyclean-compile: - -rm -f *.$(OBJEXT) Property changes on: head/net/avahi-app/files/patch-avahi-utils_Makefile.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/avahi-app/files/patch-avahi-daemon_Makefile.in =================================================================== --- head/net/avahi-app/files/patch-avahi-daemon_Makefile.in (revision 477045) +++ head/net/avahi-app/files/patch-avahi-daemon_Makefile.in (nonexistent) @@ -1,49 +0,0 @@ ---- avahi-daemon/Makefile.in.orig 2017-09-15 01:20:16 UTC -+++ avahi-daemon/Makefile.in -@@ -69,7 +69,7 @@ host_triplet = @host@ - @ENABLE_CHROOT_TRUE@@HAVE_LIBDAEMON_TRUE@@HAVE_XML_TRUE@ caps.c caps.h - - @ENABLE_CHROOT_TRUE@@HAVE_LIBDAEMON_TRUE@@HAVE_XML_TRUE@am__append_3 = -lcap --@HAVE_DLOPEN_TRUE@@HAVE_LIBDAEMON_TRUE@@HAVE_XML_TRUE@am__append_4 = -ldl -+@HAVE_DLOPEN_TRUE@@HAVE_LIBDAEMON_TRUE@@HAVE_XML_TRUE@am__append_4 = - @HAVE_DBUS_TRUE@@HAVE_LIBDAEMON_TRUE@@HAVE_XML_TRUE@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 \ -@@ -688,7 +688,7 @@ clean-sbinPROGRAMS: - rm -f $$list - 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) $(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) -@@ -1222,17 +1222,17 @@ uninstall-dist_serviceDATA: - 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)" -- @list='$(pkgsysconf_DATA)'; test -n "$(pkgsysconfdir)" || list=; \ -- for p in $$list; do \ -- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- echo "$$d$$p"; \ -- done | $(am__base_list) | \ -- while read files; do \ -- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgsysconfdir)'"; \ -- $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgsysconfdir)" || exit $$?; \ -- done -+# @$(NORMAL_INSTALL) -+# test -z "$(pkgsysconfdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgsysconfdir)" -+# @list='$(pkgsysconf_DATA)'; test -n "$(pkgsysconfdir)" || list=; \ -+# for p in $$list; do \ -+# if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -+# echo "$$d$$p"; \ -+# done | $(am__base_list) | \ -+# while read files; do \ -+# echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgsysconfdir)'"; \ -+# $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgsysconfdir)" || exit $$?; \ -+# done - - uninstall-pkgsysconfDATA: - @$(NORMAL_UNINSTALL) Property changes on: head/net/avahi-app/files/patch-avahi-daemon_Makefile.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/avahi-app/files/patch-avahi-autoipd_main.c =================================================================== --- head/net/avahi-app/files/patch-avahi-autoipd_main.c (revision 477045) +++ head/net/avahi-app/files/patch-avahi-autoipd_main.c (nonexistent) @@ -1,13 +0,0 @@ ---- avahi-autoipd/main.c.orig 2010-08-26 00:51:38 UTC -+++ avahi-autoipd/main.c -@@ -62,8 +62,8 @@ - #include - - /* Old versions of PCAP defined it as D_IN */ --#ifndef PCAP_D_IN --#define PCAP_D_IN D_IN -+#ifndef D_IN -+#define D_IN PCAP_D_IN - #endif - - #endif Property changes on: head/net/avahi-app/files/patch-avahi-autoipd_main.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/avahi-app/pkg-plist =================================================================== --- head/net/avahi-app/pkg-plist (revision 477045) +++ head/net/avahi-app/pkg-plist (revision 477046) @@ -1,164 +1,173 @@ bin/avahi-browse bin/avahi-browse-domains bin/avahi-publish bin/avahi-publish-address bin/avahi-publish-service bin/avahi-resolve bin/avahi-resolve-address bin/avahi-resolve-host-name bin/avahi-set-host-name @sample etc/avahi/avahi-daemon.conf.sample etc/avahi/avahi-dnsconfd.action @sample etc/avahi/hosts.sample etc/avahi/services/sftp-ssh.service etc/avahi/services/ssh.service etc/dbus-1/system.d/avahi-dbus.conf etc/rc.d/avahi-daemon etc/rc.d/avahi-dnsconfd include/avahi-client/client.h include/avahi-client/lookup.h include/avahi-client/publish.h include/avahi-common/address.h include/avahi-common/alternative.h include/avahi-common/cdecl.h include/avahi-common/defs.h include/avahi-common/domain.h include/avahi-common/error.h include/avahi-common/gccmacro.h include/avahi-common/llist.h include/avahi-common/malloc.h include/avahi-common/rlist.h include/avahi-common/simple-watch.h include/avahi-common/strlst.h include/avahi-common/thread-watch.h include/avahi-common/timeval.h include/avahi-common/watch.h include/avahi-compat-howl/corby/buffer.h include/avahi-compat-howl/corby/channel.h include/avahi-compat-howl/corby/corby.h include/avahi-compat-howl/corby/message.h include/avahi-compat-howl/corby/object.h include/avahi-compat-howl/corby/orb.h include/avahi-compat-howl/discovery/discovery.h include/avahi-compat-howl/discovery/text_record.h include/avahi-compat-howl/howl.h include/avahi-compat-howl/rendezvous/rendezvous.h include/avahi-compat-howl/rendezvous/text_record.h include/avahi-compat-howl/salt/address.h include/avahi-compat-howl/salt/debug.h include/avahi-compat-howl/salt/interface.h include/avahi-compat-howl/salt/platform.h include/avahi-compat-howl/salt/salt.h include/avahi-compat-howl/salt/signal.h include/avahi-compat-howl/salt/socket.h include/avahi-compat-howl/salt/time.h include/avahi-core/core.h include/avahi-core/log.h include/avahi-core/lookup.h include/avahi-core/publish.h include/avahi-core/rr.h include/avahi-glib/glib-malloc.h include/avahi-glib/glib-watch.h include/avahi-gobject/ga-client.h include/avahi-gobject/ga-entry-group.h include/avahi-gobject/ga-enums.h include/avahi-gobject/ga-error.h include/avahi-gobject/ga-record-browser.h include/avahi-gobject/ga-service-browser.h include/avahi-gobject/ga-service-resolver.h lib/avahi/.keep lib/girepository-1.0/Avahi-0.6.typelib lib/girepository-1.0/AvahiCore-0.6.typelib lib/libavahi-client.a lib/libavahi-client.so lib/libavahi-client.so.3 lib/libavahi-client.so.3.2.9 lib/libavahi-common.a lib/libavahi-common.so lib/libavahi-common.so.3 lib/libavahi-common.so.3.5.3 lib/libavahi-core.a lib/libavahi-core.so lib/libavahi-core.so.7 lib/libavahi-core.so.7.0.2 lib/libavahi-glib.a lib/libavahi-glib.so lib/libavahi-glib.so.1 lib/libavahi-glib.so.1.0.2 lib/libavahi-gobject.a lib/libavahi-gobject.so lib/libavahi-gobject.so.0 -lib/libavahi-gobject.so.0.0.4 +lib/libavahi-gobject.so.0.0.5 lib/libhowl.a lib/libhowl.so lib/libhowl.so.0 lib/libhowl.so.0.0.0 libdata/pkgconfig/avahi-client.pc libdata/pkgconfig/avahi-compat-howl.pc 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 -%%DATADIR%%/service-types share/dbus-1/interfaces/org.freedesktop.Avahi.AddressResolver.xml share/dbus-1/interfaces/org.freedesktop.Avahi.DomainBrowser.xml share/dbus-1/interfaces/org.freedesktop.Avahi.EntryGroup.xml share/dbus-1/interfaces/org.freedesktop.Avahi.HostNameResolver.xml share/dbus-1/interfaces/org.freedesktop.Avahi.RecordBrowser.xml share/dbus-1/interfaces/org.freedesktop.Avahi.Server.xml share/dbus-1/interfaces/org.freedesktop.Avahi.ServiceBrowser.xml share/dbus-1/interfaces/org.freedesktop.Avahi.ServiceResolver.xml share/dbus-1/interfaces/org.freedesktop.Avahi.ServiceTypeBrowser.xml share/dbus-1/system-services/org.freedesktop.Avahi.service share/gir-1.0/Avahi-0.6.gir share/gir-1.0/AvahiCore-0.6.gir +share/locale/ach/LC_MESSAGES/avahi.mo +share/locale/ar/LC_MESSAGES/avahi.mo share/locale/bg/LC_MESSAGES/avahi.mo share/locale/ca/LC_MESSAGES/avahi.mo share/locale/cs/LC_MESSAGES/avahi.mo share/locale/da/LC_MESSAGES/avahi.mo share/locale/de/LC_MESSAGES/avahi.mo share/locale/el/LC_MESSAGES/avahi.mo share/locale/en_AU/LC_MESSAGES/avahi.mo share/locale/en_CA/LC_MESSAGES/avahi.mo share/locale/en_GB/LC_MESSAGES/avahi.mo share/locale/en_NZ/LC_MESSAGES/avahi.mo +share/locale/eo/LC_MESSAGES/avahi.mo +share/locale/et/LC_MESSAGES/avahi.mo share/locale/es/LC_MESSAGES/avahi.mo +share/locale/fa/LC_MESSAGES/avahi.mo share/locale/fi/LC_MESSAGES/avahi.mo share/locale/fo/LC_MESSAGES/avahi.mo share/locale/fr/LC_MESSAGES/avahi.mo share/locale/gl/LC_MESSAGES/avahi.mo share/locale/he/LC_MESSAGES/avahi.mo share/locale/hu/LC_MESSAGES/avahi.mo share/locale/id/LC_MESSAGES/avahi.mo share/locale/it/LC_MESSAGES/avahi.mo share/locale/ja/LC_MESSAGES/avahi.mo +share/locale/ko/LC_MESSAGES/avahi.mo +share/locale/lv/LC_MESSAGES/avahi.mo share/locale/ms/LC_MESSAGES/avahi.mo share/locale/nl/LC_MESSAGES/avahi.mo +share/locale/oc/LC_MESSAGES/avahi.mo share/locale/pl/LC_MESSAGES/avahi.mo share/locale/pt_BR/LC_MESSAGES/avahi.mo share/locale/ro/LC_MESSAGES/avahi.mo share/locale/ru/LC_MESSAGES/avahi.mo +share/locale/sk/LC_MESSAGES/avahi.mo share/locale/sl/LC_MESSAGES/avahi.mo share/locale/sr/LC_MESSAGES/avahi.mo share/locale/sv/LC_MESSAGES/avahi.mo share/locale/sr@latin/LC_MESSAGES/avahi.mo +share/locale/tr/LC_MESSAGES/avahi.mo share/locale/uk/LC_MESSAGES/avahi.mo share/locale/zh_CN/LC_MESSAGES/avahi.mo share/locale/zh_TW/LC_MESSAGES/avahi.mo Index: head/net/avahi-gtk/Makefile =================================================================== --- head/net/avahi-gtk/Makefile (revision 477045) +++ head/net/avahi-gtk/Makefile (revision 477046) @@ -1,38 +1,47 @@ # Created by: Michael Johnson # $FreeBSD$ -PORTREVISION= 4 +PORTREVISION= 0 CATEGORIES= net PKGNAMESUFFIX= -gtk MAINTAINER= gnome@FreeBSD.org COMMENT= Gtk+ tools and bindings to the Avahi mDNS system -LIB_DEPENDS= libavahi-common.so:net/avahi-app +LIB_DEPENDS= libavahi-common.so:net/avahi-app \ + libfontconfig.so:x11-fonts/fontconfig \ + libfreetype.so:print/freetype2 \ + libgdbm.so:databases/gdbm RUN_DEPENDS= avahi-header>=0.6: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 MANPAGES= bssh.1 -USE_GNOME+= libglade2 +USE_GNOME+= cairo gdkpixbuf2 libglade2 + +do-build: + @(cd ${WRKSRC}/avahi-common; ${MAKE_CMD}) + @(cd ${WRKSRC}/avahi-client; ${MAKE_CMD}) + @(cd ${WRKSRC}/avahi-glib; ${MAKE_CMD}) + @(cd ${WRKSRC}/avahi-ui; ${MAKE_CMD}) post-build: @(cd ${WRKSRC}/avahi-discover-standalone && \ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}) post-install: @(cd ${WRKSRC}/avahi-discover-standalone && \ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}) ${LN} -sf bssh.1 ${STAGEDIR}${MANPREFIX}/man/man1/bvnc.1 ${LN} -sf bssh.1 ${STAGEDIR}${MANPREFIX}/man/man1/bshell.1 @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libavahi-ui.so.0 .include "${MASTERDIR}/Makefile" Index: head/net/avahi-gtk3/Makefile =================================================================== --- head/net/avahi-gtk3/Makefile (revision 477045) +++ head/net/avahi-gtk3/Makefile (revision 477046) @@ -1,31 +1,35 @@ # Created by: Michael Johnson # $FreeBSD$ -PORTREVISION= 3 +PORTREVISION= 0 CATEGORIES= net PKGNAMESUFFIX= -gtk3 MAINTAINER= gnome@FreeBSD.org COMMENT= Gtk+ 3 library to the Avahi mDNS system -LIB_DEPENDS= libavahi-common.so:net/avahi-app -RUN_DEPENDS= avahi-header>=0.6:net/avahi-header +LIB_DEPENDS= libavahi-common.so:net/avahi-app \ + libgdbm.so:databases/gdbm +RUN_DEPENDS= avahi-header>=0.7: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= gtk3 AVAHI_PKGCONFIG=avahi-ui-gtk3.pc -USE_GNOME+= gtk30 +USE_GNOME+= cairo gdkpixbuf2 gtk30 do-build: + @(cd ${WRKSRC}/avahi-common; ${MAKE_CMD}) + @(cd ${WRKSRC}/avahi-client; ${MAKE_CMD}) + @(cd ${WRKSRC}/avahi-glib; ${MAKE_CMD}) @(cd ${WRKSRC}/avahi-ui; ${MAKE_CMD} libavahi-ui-gtk3.la) do-install: @(cd ${WRKSRC}/avahi-ui; ${MAKE_CMD} ${MAKE_ARGS} install-libLTLIBRARIES) .include "${MASTERDIR}/Makefile" Index: head/net/avahi-header/Makefile =================================================================== --- head/net/avahi-header/Makefile (revision 477045) +++ head/net/avahi-header/Makefile (revision 477046) @@ -1,28 +1,28 @@ # Created by: Michael Johnson # $FreeBSD$ # $MCom: ports/net/avahi-header/Makefile,v 1.4 2012/07/09 18:22:19 kwm Exp $ PORTREVISION= 0 CATEGORIES= net PKGNAMESUFFIX= -header COMMENT= Install an avahi-gtk* header to avoid conflict -CONFLICTS= avahi-gtk-0.6.[0-2]* +CONFLICTS= avahi-gtk-0.7.[0-2]* MASTERDIR= ${.CURDIR}/../avahi-app BUILD_WRKSRC= ${WRKSRC}/avahi-ui INSTALL_WRKSRC= ${BUILD_WRKSRC} DESCR= ${.CURDIR}/pkg-descr PLIST= ${.CURDIR}/pkg-plist AVAHI_SLAVE= header NO_BUILD= yes do-install: ${MKDIR} ${STAGEDIR}/${PREFIX}/include/avahi-ui ${INSTALL_DATA} ${BUILD_WRKSRC}/avahi-ui.h \ ${STAGEDIR}/${PREFIX}/include/avahi-ui/ .include "${MASTERDIR}/Makefile" Index: head/net/avahi-libdns/Makefile =================================================================== --- head/net/avahi-libdns/Makefile (revision 477045) +++ head/net/avahi-libdns/Makefile (revision 477046) @@ -1,24 +1,24 @@ # Created by: Michael Johnson # $FreeBSD$ -PORTREVISION= 2 +PORTREVISION= 0 CATEGORIES= net PKGNAMESUFFIX= -libdns MAINTAINER= gnome@FreeBSD.org COMMENT= mDNSResponder compatibility from Avahi LIB_DEPENDS= libavahi-common.so:net/avahi-app MASTERDIR= ${.CURDIR}/../avahi-app BUILD_WRKSRC= ${WRKSRC}/avahi-compat-libdns_sd INSTALL_WRKSRC= ${BUILD_WRKSRC} DESCR= ${.CURDIR}/pkg-descr PLIST= ${.CURDIR}/pkg-plist AVAHI_SLAVE= libdns AVAHI_PKGCONFIG=avahi-compat-libdns_sd.pc CONFLICTS= mDNSResponder-[0-9]* .include "${MASTERDIR}/Makefile" Index: head/net/avahi-qt4/Makefile =================================================================== --- head/net/avahi-qt4/Makefile (revision 477045) +++ head/net/avahi-qt4/Makefile (revision 477046) @@ -1,24 +1,24 @@ # Created by: Michael Johnson # $FreeBSD$ -PORTREVISION= 1 +PORTREVISION= 0 CATEGORIES= net dns PKGNAMESUFFIX= -sharp MAINTAINER= mono@FreeBSD.org COMMENT= Mono bindings for Avahi service discovery LIB_DEPENDS= libavahi-core.so:net/avahi-app USES= mono MASTERDIR= ${.CURDIR}/../avahi-app BUILD_WRKSRC= ${WRKSRC}/avahi-sharp INSTALL_WRKSRC= ${BUILD_WRKSRC} DESCR= ${.CURDIR}/pkg-descr PLIST= ${.CURDIR}/pkg-plist AVAHI_SLAVE= sharp AVAHI_PKGCONFIG=avahi-sharp.pc post-patch: @${REINPLACE_CMD} 's|@CLIENT_DLNAME@|libavahi-client.so|g; \ s|@COMMON_DLNAME@|libavahi-common.so|g; \ s|@GLIB_DLNAME@|libavahi-glib.so|g' \ ${BUILD_WRKSRC}/avahi-sharp.dll.config.in @${CP} ${WRKSRC}/avahi-sharp/avahi-sharp.dll.config.in ${WRKSRC}/avahi-sharp/avahi-sharp.dll.config .include "${MASTERDIR}/Makefile" Index: head/net/py-avahi/Makefile =================================================================== --- head/net/py-avahi/Makefile (revision 477045) +++ head/net/py-avahi/Makefile (revision 477046) @@ -1,52 +1,53 @@ # Created by: Joe Marcus Clarke # $FreeBSD$ # $MCom: ports/net/py-avahi/Makefile,v 1.4 2007/07/31 18:24:13 ahze Exp $ -PORTREVISION= 8 +PORTREVISION= 0 CATEGORIES= net gnome python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} PKGNAMESUFFIX= # empty MAINTAINER= gnome@FreeBSD.org COMMENT= Python interface to the Avahi mDNS system BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gdbm>0:databases/py-gdbm@${PY_FLAVOR} \ ${PYTHON_SITELIBDIR}/dbus/_dbus.py:devel/py-dbus@${PY_FLAVOR} LIB_DEPENDS= libavahi-client.so:net/avahi-app RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gdbm>0:databases/py-gdbm@${PY_FLAVOR} \ - ${PYTHON_SITELIBDIR}/dbus/_dbus.py:devel/py-dbus@${PY_FLAVOR} + ${PYTHON_SITELIBDIR}/dbus/_dbus.py:devel/py-dbus@${PY_FLAVOR} \ + avahi-gtk>=0.7:net/avahi-gtk MASTERDIR= ${.CURDIR}/../avahi-app BUILD_WRKSRC= ${WRKSRC}/avahi-python INSTALL_WRKSRC= ${BUILD_WRKSRC} DESCR= ${.CURDIR}/pkg-descr PLIST= ${.CURDIR}/pkg-plist AVAHI_SLAVE= python -USE_GNOME= pygtk2 +USE_GNOME= pygobject3 pygtk2 gtk30 USES= python:2.7 USE_PYTHON= flavors MANPAGES= avahi-bookmarks.1 avahi-discover.1 post-patch: @${REINPLACE_CMD} -e 's|@pkglibdir@|${DATADIR}|' \ ${WRKSRC}/avahi-python/avahi/ServiceTypeDatabase.py.in pre-build: @cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \ Makefile ${MAKE_ARGS} clean post-build: @cd ${WRKSRC}/service-type-database && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \ ${MAKE_FLAGS} Makefile ${MAKE_ARGS} ${ALL_TARGET} post-install: @cd ${WRKSRC}/service-type-database && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \ ${MAKE_FLAGS} Makefile ${MAKE_ARGS} install (cd ${STAGEDIR}${PREFIX} && ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \ -d ${PREFIX} -f ${PYTHONPREFIX_SITELIBDIR:S,${PREFIX}/,,}) (cd ${STAGEDIR}${PREFIX} && ${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \ -d ${PREFIX} -f ${PYTHONPREFIX_SITELIBDIR:S,${PREFIX}/,,}) .include "${MASTERDIR}/Makefile"