Date: Tue, 6 May 2014 20:22:34 +0000 (UTC) From: Tijl Coosemans <tijl@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r353132 - in head/net: avahi-app avahi-gtk avahi-gtk3 avahi-libdns avahi-qt4 Message-ID: <201405062022.s46KMYe2013917@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tijl Date: Tue May 6 20:22:33 2014 New Revision: 353132 URL: http://svnweb.freebsd.org/changeset/ports/353132 QAT: https://qat.redports.org/buildarchive/r353132/ Log: - Convert net/avahi-* to USES=libtool:keepla. - INSTALL_TARGET=install-strip. - Replace GMAKE with MAKE_CMD. Modified: head/net/avahi-app/Makefile head/net/avahi-app/pkg-plist head/net/avahi-gtk/Makefile head/net/avahi-gtk/pkg-plist head/net/avahi-gtk3/Makefile head/net/avahi-gtk3/pkg-plist head/net/avahi-libdns/Makefile head/net/avahi-libdns/pkg-plist head/net/avahi-qt4/Makefile head/net/avahi-qt4/pkg-plist Modified: head/net/avahi-app/Makefile ============================================================================== --- head/net/avahi-app/Makefile Tue May 6 20:21:29 2014 (r353131) +++ head/net/avahi-app/Makefile Tue May 6 20:22:33 2014 (r353132) @@ -4,7 +4,7 @@ PORTNAME= avahi PORTVERSION= 0.6.31 -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES?= net dns MASTER_SITES= http://www.avahi.org/download/ PKGNAMESUFFIX?= -app @@ -23,11 +23,11 @@ LIB_DEPENDS?= libexpat.so:${PORTSDIR}/te USERS?= ${PORTNAME} GROUPS?= ${USERS} -USE_GNOME+= ltverhack glib20 intltool introspection -USES= gettext gmake pathfix pkgconfig +USES= gettext gmake libtool:keepla pathfix pkgconfig +USE_GNOME+= glib20 intltool introspection USE_GNOME_SUBR= yes -USE_AUTOTOOLS= libtool 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 \ @@ -38,6 +38,7 @@ CONFIGURE_ARGS?=--with-distro=freebsd \ --enable-compat-howl CPPFLAGS+= -I${LOCALBASE}/include -DHAVE_KQUEUE LDFLAGS+= -L${LOCALBASE}/lib +INSTALL_TARGET= install-strip .if ${AVAHI_SLAVE} == no CONFLICTS= howl-[0-9]* @@ -121,7 +122,7 @@ 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 @@ -152,14 +153,7 @@ avahi-post-install: .if ${AVAHI_SLAVE}==no ${INSTALL_DATA} ${FILESDIR}/org.freedesktop.Avahi.service \ ${STAGEDIR}${PREFIX}/share/dbus-1/system-services - @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib*.so* -.elif ${AVAHI_SLAVE}==gtk3 - @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libavahi-ui-gtk3.so.0 -.elif ${AVAHI_SLAVE}==libdns - @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libdns_sd.so.1 -.elif ${AVAHI_SLAVE}==qt4 - @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libavahi-qt4.so.1 .endif -.endif # avahi-header +.endif # ! avahi-header .include <bsd.port.mk> Modified: head/net/avahi-app/pkg-plist ============================================================================== --- head/net/avahi-app/pkg-plist Tue May 6 20:21:29 2014 (r353131) +++ head/net/avahi-app/pkg-plist Tue May 6 20:22:33 2014 (r353132) @@ -77,26 +77,32 @@ lib/libavahi-client.a lib/libavahi-client.la lib/libavahi-client.so lib/libavahi-client.so.3 +lib/libavahi-client.so.3.2.9 lib/libavahi-common.a lib/libavahi-common.la lib/libavahi-common.so lib/libavahi-common.so.3 +lib/libavahi-common.so.3.5.3 lib/libavahi-core.a lib/libavahi-core.la lib/libavahi-core.so lib/libavahi-core.so.7 +lib/libavahi-core.so.7.0.2 lib/libavahi-glib.a lib/libavahi-glib.la lib/libavahi-glib.so lib/libavahi-glib.so.1 +lib/libavahi-glib.so.1.0.2 lib/libavahi-gobject.a lib/libavahi-gobject.la lib/libavahi-gobject.so lib/libavahi-gobject.so.0 +lib/libavahi-gobject.so.0.0.4 lib/libhowl.a lib/libhowl.la 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 Modified: head/net/avahi-gtk/Makefile ============================================================================== --- head/net/avahi-gtk/Makefile Tue May 6 20:21:29 2014 (r353131) +++ head/net/avahi-gtk/Makefile Tue May 6 20:22:33 2014 (r353132) @@ -2,7 +2,7 @@ # $FreeBSD$ # $MCom: ports/net/avahi-gtk/Makefile,v 1.9 2012/07/09 18:22:19 kwm Exp $ -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net PKGNAMESUFFIX= -gtk Modified: head/net/avahi-gtk/pkg-plist ============================================================================== --- head/net/avahi-gtk/pkg-plist Tue May 6 20:21:29 2014 (r353131) +++ head/net/avahi-gtk/pkg-plist Tue May 6 20:22:33 2014 (r353132) @@ -6,6 +6,7 @@ lib/libavahi-ui.a lib/libavahi-ui.la lib/libavahi-ui.so lib/libavahi-ui.so.0 +lib/libavahi-ui.so.0.1.4 libdata/pkgconfig/avahi-ui.pc man/man1/bshell.1.gz man/man1/bssh.1.gz Modified: head/net/avahi-gtk3/Makefile ============================================================================== --- head/net/avahi-gtk3/Makefile Tue May 6 20:21:29 2014 (r353131) +++ head/net/avahi-gtk3/Makefile Tue May 6 20:22:33 2014 (r353132) @@ -1,7 +1,7 @@ # Created by: Michael Johnson <ahze@FreeBSD.org> # $FreeBSD$ -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net PKGNAMESUFFIX= -gtk3 Modified: head/net/avahi-gtk3/pkg-plist ============================================================================== --- head/net/avahi-gtk3/pkg-plist Tue May 6 20:21:29 2014 (r353131) +++ head/net/avahi-gtk3/pkg-plist Tue May 6 20:22:33 2014 (r353132) @@ -2,4 +2,5 @@ lib/libavahi-ui-gtk3.a lib/libavahi-ui-gtk3.la lib/libavahi-ui-gtk3.so lib/libavahi-ui-gtk3.so.0 +lib/libavahi-ui-gtk3.so.0.1.4 libdata/pkgconfig/avahi-ui-gtk3.pc Modified: head/net/avahi-libdns/Makefile ============================================================================== --- head/net/avahi-libdns/Makefile Tue May 6 20:21:29 2014 (r353131) +++ head/net/avahi-libdns/Makefile Tue May 6 20:22:33 2014 (r353132) @@ -1,7 +1,7 @@ # Created by: Michael Johnson <ahze@FreeBSD.org> # $FreeBSD$ -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= net PKGNAMESUFFIX= -libdns Modified: head/net/avahi-libdns/pkg-plist ============================================================================== --- head/net/avahi-libdns/pkg-plist Tue May 6 20:21:29 2014 (r353131) +++ head/net/avahi-libdns/pkg-plist Tue May 6 20:22:33 2014 (r353132) @@ -3,5 +3,6 @@ lib/libdns_sd.a lib/libdns_sd.la lib/libdns_sd.so lib/libdns_sd.so.1 +lib/libdns_sd.so.1.0.0 libdata/pkgconfig/avahi-compat-libdns_sd.pc @dirrm include/avahi-compat-libdns_sd Modified: head/net/avahi-qt4/Makefile ============================================================================== --- head/net/avahi-qt4/Makefile Tue May 6 20:21:29 2014 (r353131) +++ head/net/avahi-qt4/Makefile Tue May 6 20:22:33 2014 (r353132) @@ -1,7 +1,7 @@ # Created by: Michael Johnson <ahze@FreeBSD.org # $FreeBSD$ -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= net PKGNAMESUFFIX= -qt4 Modified: head/net/avahi-qt4/pkg-plist ============================================================================== --- head/net/avahi-qt4/pkg-plist Tue May 6 20:21:29 2014 (r353131) +++ head/net/avahi-qt4/pkg-plist Tue May 6 20:22:33 2014 (r353132) @@ -3,5 +3,6 @@ lib/libavahi-qt4.a lib/libavahi-qt4.la lib/libavahi-qt4.so lib/libavahi-qt4.so.1 +lib/libavahi-qt4.so.1.0.2 libdata/pkgconfig/avahi-qt4.pc @dirrm include/avahi-qt4
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405062022.s46KMYe2013917>