Date: Sun, 12 Aug 2018 19:55:56 -0600 From: Adam Weinberger <adamw@adamw.org> To: zi@freebsd.org Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r477046 - in head/net: avahi avahi-app avahi-app/files avahi-gtk avahi-gtk3 avahi-header avahi-libdns avahi-qt4 avahi-sharp py-avahi Message-ID: <CAP7rwch89xzNmtFDNwof0os3K4hg23nJmBZcxNm7eb9zsn=MBw@mail.gmail.com> In-Reply-To: <201808130149.w7D1nxiv054335@repo.freebsd.org> References: <201808130149.w7D1nxiv054335@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Sun, Aug 12, 2018 at 7:50 PM Ryan Steinmetz <zi@freebsd.org> wrote: > > Author: zi > Date: Mon Aug 13 01:49:59 2018 > New Revision: 477046 > URL: https://svnweb.freebsd.org/changeset/ports/477046 > > Log: > - Update to 0.7 > > PR: 220022, 217179, 223889, 228138 > Approved by: maintainer timeout (3 months) > > Deleted: > head/net/avahi-app/files/patch-avahi-autoipd_main.c > head/net/avahi-app/files/patch-avahi-daemon_Makefile.in > head/net/avahi-app/files/patch-avahi-ui_Makefile.in > head/net/avahi-app/files/patch-avahi-utils_Makefile.in > Modified: > head/net/avahi-app/Makefile > head/net/avahi-app/distinfo > head/net/avahi-app/pkg-plist > head/net/avahi-gtk/Makefile > head/net/avahi-gtk3/Makefile > head/net/avahi-header/Makefile > head/net/avahi-libdns/Makefile > head/net/avahi-qt4/Makefile > head/net/avahi-sharp/Makefile > head/net/avahi/Makefile > head/net/py-avahi/Makefile > > Modified: head/net/avahi-app/Makefile > ============================================================================== > --- head/net/avahi-app/Makefile Mon Aug 13 01:17:47 2018 (r477045) > +++ head/net/avahi-app/Makefile Mon Aug 13 01:49:59 2018 (r477046) > @@ -2,8 +2,8 @@ > # $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 > @@ -20,6 +20,7 @@ AVAHI_SLAVE?= no > 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} > @@ -39,7 +40,7 @@ CONFIGURE_ARGS?=--with-distro=freebsd \ > --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 > @@ -94,6 +95,8 @@ 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 > @@ -151,6 +154,7 @@ avahi-post-install: > ${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 > > Modified: head/net/avahi-app/distinfo > ============================================================================== > --- head/net/avahi-app/distinfo Mon Aug 13 01:17:47 2018 (r477045) > +++ head/net/avahi-app/distinfo Mon Aug 13 01:49:59 2018 (r477046) > @@ -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 > > Modified: head/net/avahi-app/pkg-plist > ============================================================================== > --- head/net/avahi-app/pkg-plist Mon Aug 13 01:17:47 2018 (r477045) > +++ head/net/avahi-app/pkg-plist Mon Aug 13 01:49:59 2018 (r477046) > @@ -88,7 +88,7 @@ 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 > @@ -116,7 +116,6 @@ 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 > @@ -129,6 +128,8 @@ share/dbus-1/interfaces/org.freedesktop.Avahi.ServiceT > 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 > @@ -139,7 +140,10 @@ 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 > @@ -149,16 +153,21 @@ 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 > > Modified: head/net/avahi-gtk/Makefile > ============================================================================== > --- head/net/avahi-gtk/Makefile Mon Aug 13 01:17:47 2018 (r477045) > +++ head/net/avahi-gtk/Makefile Mon Aug 13 01:49:59 2018 (r477046) > @@ -1,14 +1,17 @@ > # Created by: Michael Johnson <ahze@FreeBSD.org> > # $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 > @@ -22,7 +25,13 @@ 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}) Ryan, Are you sure this is what you want? It discards MAKE_ENV and MAKE_ARGS. Consider using DO_MAKE_BUILD instead, which preserves them: ${DO_MAKE_BUILD} -C ${WRKSRC}/avahi-common ${DO_MAKE_BUILD} -C ${WRKSRC}/avahi-client etc. # Adam -- Adam Weinberger adamw@adamw.org https://www.adamw.org
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAP7rwch89xzNmtFDNwof0os3K4hg23nJmBZcxNm7eb9zsn=MBw>