svn commit: r558282 - in head/net: avahi avahi-autoipd avahi-gtk avahi-gtk3 avahi-libdns avahi-qt5 py-avahi

Rene Ladan rene at FreeBSD.org
Thu Dec 17 10:53:39 UTC 2020 

Author: rene
Date: Thu Dec 17 10:53:36 2020
New Revision: 558282
URL: https://svnweb.freebsd.org/changeset/ports/558282

Log:
  Oops, commit from the correct directory and update the rest of Avahi too.

Modified:
  head/net/avahi-autoipd/Makefile
  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/pkg-plist
  head/net/avahi-qt5/Makefile
  head/net/avahi-qt5/pkg-plist
  head/net/avahi/Makefile
  head/net/py-avahi/Makefile
  head/net/py-avahi/pkg-plist

Modified: head/net/avahi-autoipd/Makefile
==============================================================================
--- head/net/avahi-autoipd/Makefile	Thu Dec 17 10:52:12 2020	(r558281)
+++ head/net/avahi-autoipd/Makefile	Thu Dec 17 10:53:36 2020	(r558282)
@@ -9,7 +9,8 @@ PKGNAMESUFFIX=	-autoipd
 MAINTAINER=	gnome at FreeBSD.org
 COMMENT=	IPv4LL network address configuration daemon
 
-LIB_DEPENDS=	libavahi-common.so:net/avahi-app
+LIB_DEPENDS=	libavahi-common.so:net/avahi-app \
+		libdaemon.so:devel/libdaemon
 
 USERS=		avahi-autoipd
 GROUPS=		${USERS}

Modified: head/net/avahi-gtk/Makefile
==============================================================================
--- head/net/avahi-gtk/Makefile	Thu Dec 17 10:52:12 2020	(r558281)
+++ head/net/avahi-gtk/Makefile	Thu Dec 17 10:53:36 2020	(r558282)
@@ -1,7 +1,7 @@
 # Created by: Michael Johnson <ahze at FreeBSD.org>
 # $FreeBSD$
 
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	net
 PKGNAMESUFFIX=	-gtk
 
@@ -11,7 +11,8 @@ COMMENT=	Gtk+ tools and bindings to the Avahi mDNS sys
 LIB_DEPENDS=	libavahi-common.so:net/avahi-app \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
-		libgdbm.so:databases/gdbm
+		libgdbm.so:databases/gdbm \
+		libharfbuzz.so:print/harfbuzz
 RUN_DEPENDS=	avahi-header>=0.6:net/avahi-header
 
 MASTERDIR=	${.CURDIR}/../avahi-app
@@ -23,25 +24,18 @@ PLIST=		${.CURDIR}/pkg-plist
 AVAHI_SLAVE=	gtk
 AVAHI_PKGCONFIG=avahi-ui.pc
 
-MANPAGES=	bssh.1
+USE_GNOME+=	atk cairo gdkpixbuf2 gtk20 pango
 
-USE_GNOME+=	cairo gdkpixbuf2 libglade2
-
 do-build:
 	@${DO_MAKE_BUILD} -C ${WRKSRC}/avahi-common
 	@${DO_MAKE_BUILD} -C ${WRKSRC}/avahi-client
 	@${DO_MAKE_BUILD} -C ${WRKSRC}/avahi-glib
-	@${DO_MAKE_BUILD} -C ${WRKSRC}/avahi-ui
+	@${DO_MAKE_BUILD} -C ${WRKSRC}/avahi-ui libavahi-ui.la
 
-post-build:
-	@(cd ${WRKSRC}/avahi-discover-standalone && \
-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET})
+do-install:
+	@(cd ${WRKSRC}/avahi-ui; ${MAKE_CMD} ${MAKE_ARGS} install-libLTLIBRARIES)
 
 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"

Modified: head/net/avahi-gtk/pkg-plist
==============================================================================
--- head/net/avahi-gtk/pkg-plist	Thu Dec 17 10:52:12 2020	(r558281)
+++ head/net/avahi-gtk/pkg-plist	Thu Dec 17 10:53:36 2020	(r558282)
@@ -1,15 +1,4 @@
-bin/avahi-discover-standalone
-bin/bshell
-bin/bssh
-bin/bvnc
-lib/libavahi-ui.a
 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
-man/man1/bvnc.1.gz
-share/applications/bssh.desktop
-share/applications/bvnc.desktop
-%%DATADIR%%/interfaces/avahi-discover.ui

Modified: head/net/avahi-gtk3/Makefile
==============================================================================
--- head/net/avahi-gtk3/Makefile	Thu Dec 17 10:52:12 2020	(r558281)
+++ head/net/avahi-gtk3/Makefile	Thu Dec 17 10:53:36 2020	(r558282)
@@ -1,7 +1,7 @@
 # Created by: Michael Johnson <ahze at FreeBSD.org>
 # $FreeBSD$
 
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	net
 PKGNAMESUFFIX=	-gtk3
 
@@ -9,8 +9,9 @@ MAINTAINER=	gnome at FreeBSD.org
 COMMENT=	Gtk+ 3 library to the Avahi mDNS system
 
 LIB_DEPENDS=	libavahi-common.so:net/avahi-app \
-		libgdbm.so:databases/gdbm
-RUN_DEPENDS=	avahi-header>=0.7:net/avahi-header
+		libgdbm.so:databases/gdbm \
+		libharfbuzz.so:print/harfbuzz
+RUN_DEPENDS=	avahi-header>=0.8:net/avahi-header
 
 MASTERDIR=	${.CURDIR}/../avahi-app
 BUILD_WRKSRC=	${WRKSRC}/avahi-ui
@@ -28,8 +29,14 @@ do-build:
 	${DO_MAKE_BUILD} -C ${WRKSRC}/avahi-client
 	${DO_MAKE_BUILD} -C ${WRKSRC}/avahi-glib
 	${DO_MAKE_BUILD} -C ${WRKSRC}/avahi-ui libavahi-ui-gtk3.la
+	${DO_MAKE_BUILD} -C ${WRKSRC}/avahi-discover-standalone
 
 do-install:
-	@(cd ${WRKSRC}/avahi-ui; ${MAKE_CMD} ${MAKE_ARGS} install-libLTLIBRARIES)
+	@(cd ${WRKSRC}/avahi-discover-standalone; ${MAKE_CMD} ${MAKE_ARGS} install-binPROGRAMS install-interfacesDATA)
+#	@(cd ${WRKSRC}/avahi-ui; ${MAKE_CMD} ${MAKE_ARGS} install-libLTLIBRARIES)
+	@(cd ${WRKSRC}/avahi-ui; ${MAKE_CMD} ${MAKE_ARGS} install-binPROGRAMS install-desktopDATA install-exec-local)
+
+post-install:
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libavahi-ui-gtk3.so
 
 .include "${MASTERDIR}/Makefile"

Modified: head/net/avahi-gtk3/pkg-plist
==============================================================================
--- head/net/avahi-gtk3/pkg-plist	Thu Dec 17 10:52:12 2020	(r558281)
+++ head/net/avahi-gtk3/pkg-plist	Thu Dec 17 10:53:36 2020	(r558282)
@@ -1,5 +1,11 @@
-lib/libavahi-ui-gtk3.a
+bin/avahi-discover-standalone
+bin/bshell
+bin/bssh
+bin/bvnc
 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
+share/applications/bssh.desktop
+share/applications/bvnc.desktop
+%%DATADIR%%/interfaces/avahi-discover.ui

Modified: head/net/avahi-libdns/pkg-plist
==============================================================================
--- head/net/avahi-libdns/pkg-plist	Thu Dec 17 10:52:12 2020	(r558281)
+++ head/net/avahi-libdns/pkg-plist	Thu Dec 17 10:53:36 2020	(r558282)
@@ -1,5 +1,4 @@
 include/avahi-compat-libdns_sd/dns_sd.h
-lib/libdns_sd.a
 lib/libdns_sd.so
 lib/libdns_sd.so.1
 lib/libdns_sd.so.1.0.0

Modified: head/net/avahi-qt5/Makefile
==============================================================================
--- head/net/avahi-qt5/Makefile	Thu Dec 17 10:52:12 2020	(r558281)
+++ head/net/avahi-qt5/Makefile	Thu Dec 17 10:53:36 2020	(r558282)
@@ -1,7 +1,7 @@
 # Created by: Michael Johnson <ahze at FreeBSD.org
 # $FreeBSD$
 
-PORTREVISION=	2
+PORTREVISION=	0
 CATEGORIES=	net
 PKGNAMESUFFIX=	-qt5
 

Modified: head/net/avahi-qt5/pkg-plist
==============================================================================
--- head/net/avahi-qt5/pkg-plist	Thu Dec 17 10:52:12 2020	(r558281)
+++ head/net/avahi-qt5/pkg-plist	Thu Dec 17 10:53:36 2020	(r558282)
@@ -1,5 +1,4 @@
 include/avahi-qt5/qt-watch.h
-lib/libavahi-qt5.a
 lib/libavahi-qt5.so
 lib/libavahi-qt5.so.1
 lib/libavahi-qt5.so.1.0.2

Modified: head/net/avahi/Makefile
==============================================================================
--- head/net/avahi/Makefile	Thu Dec 17 10:52:12 2020	(r558281)
+++ head/net/avahi/Makefile	Thu Dec 17 10:53:36 2020	(r558282)
@@ -3,27 +3,27 @@
 #   $MCom: ports/net/avahi/Makefile,v 1.30 2011/03/13 17:23:19 kwm Exp $
 
 PORTNAME=	avahi
-PORTVERSION=	0.7
-PORTREVISION?=	1
+PORTVERSION=	0.8
 CATEGORIES?=	net dns
 
 MAINTAINER=	gnome at FreeBSD.org
 COMMENT=	"meta-port" for the Avahi service discovery suite
 
-RUN_DEPENDS=	avahi-app>=0.7:net/avahi-app
+RUN_DEPENDS=	avahi-app>=0.8:net/avahi-app
 
 USES=		metaport
 
-OPTIONS_DEFINE=	AUTOIPD GTK MONO QT5
-OPTIONS_DEFAULT=AUTOIPD GTK
+OPTIONS_DEFINE=	AUTOIPD GTK2 GTK3 MONO QT5 PYTHON
+OPTIONS_DEFAULT=AUTOIPD GTK3
 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
+GTK2_RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/avahi-ui.pc:net/avahi-gtk
+GTK3_RUN_DEPENDS=	avahi-discover-standalone:net/avahi-gtk3
 #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
 QT5_RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/avahi-qt5.pc:net/avahi-qt5
+PYTHON_RUN_DEPENDS=	avahi-bookmarks:net/py-avahi
 
 .include <bsd.port.mk>

Modified: head/net/py-avahi/Makefile
==============================================================================
--- head/net/py-avahi/Makefile	Thu Dec 17 10:52:12 2020	(r558281)
+++ head/net/py-avahi/Makefile	Thu Dec 17 10:53:36 2020	(r558282)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 #   $MCom: ports/net/py-avahi/Makefile,v 1.4 2007/07/31 18:24:13 ahze Exp $
 
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	net gnome python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 PKGNAMESUFFIX=	# empty
@@ -10,15 +10,12 @@ PKGNAMESUFFIX=	# empty
 MAINTAINER=	gnome at FreeBSD.org
 COMMENT=	Python interface to the Avahi mDNS system
 
-DEPRECATED=	Uses deprecated version of python
-EXPIRATION_DATE=	2020-11-15
-
 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} \
-		avahi-gtk>=0.7:net/avahi-gtk
+		avahi-gtk3>=0.7:net/avahi-gtk3
 
 MASTERDIR=	${.CURDIR}/../avahi-app
 BUILD_WRKSRC=	${WRKSRC}/avahi-python
@@ -29,25 +26,27 @@ PLIST=		${.CURDIR}/pkg-plist
 AVAHI_SLAVE=	python
 
 USE_GNOME=	pygobject3 gtk30
-USES=		python:2.7
-USE_PYTHON=	flavors
-MANPAGES=	avahi-bookmarks.1 avahi-discover.1
+USES=		python:3.5+
+USE_PYTHON=	flavors py3kplist
+MANPAGES=	avahi-bookmarks.1
 
+# See https://github.com/lathiat/avahi/issues/277
+post-extract:
+	${CP} ${FILESDIR}/build-db ${WRKSRC}/service-type-database
+
 post-patch:
-	@${REINPLACE_CMD} -e 's|@pkglibdir@|${DATADIR}|' \
+	@${REINPLACE_CMD} -e 's|@pkglibdatadir@|${DATADIR}|' \
 		${WRKSRC}/avahi-python/avahi/ServiceTypeDatabase.py.in
 
-pre-build:
-	@cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \
-		Makefile ${MAKE_ARGS} clean
+do-build:
+	@${DO_MAKE_BUILD} -C ${BUILD_WRKSRC}
+	@${DO_MAKE_BUILD} -C ${WRKSRC}/service-type-database
 
-post-build:
-	@cd ${WRKSRC}/service-type-database && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \
-		${MAKE_FLAGS} Makefile ${MAKE_ARGS} ${ALL_TARGET}
+do-install:
+	@(cd ${BUILD_WRKSRC}; ${MAKE_CMD} ${MAKE_ARGS} install-strip)
+	@(cd ${WRKSRC}/service-type-database; ${MAKE_CMD} ${MAKE_ARGS} install)
 
 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 \

Modified: head/net/py-avahi/pkg-plist
==============================================================================
--- head/net/py-avahi/pkg-plist	Thu Dec 17 10:52:12 2020	(r558281)
+++ head/net/py-avahi/pkg-plist	Thu Dec 17 10:53:36 2020	(r558282)
@@ -1,17 +1,11 @@
 bin/avahi-bookmarks
 bin/avahi-discover
 lib/avahi/service-types.db
- at comment Installed by avahi-app
- at comment %%DATADIR%%/service-types
 %%PYTHON_SITELIBDIR%%/avahi/ServiceTypeDatabase.py
 %%PYTHON_SITELIBDIR%%/avahi/ServiceTypeDatabase.pyc
 %%PYTHON_SITELIBDIR%%/avahi/ServiceTypeDatabase.pyo
 %%PYTHON_SITELIBDIR%%/avahi/__init__.py
 %%PYTHON_SITELIBDIR%%/avahi/__init__.pyc
 %%PYTHON_SITELIBDIR%%/avahi/__init__.pyo
-%%PYTHON_SITELIBDIR%%/avahi_discover/__init__.py
-%%PYTHON_SITELIBDIR%%/avahi_discover/__init__.pyc
-%%PYTHON_SITELIBDIR%%/avahi_discover/__init__.pyo
 man/man1/avahi-bookmarks.1.gz
-man/man1/avahi-discover.1.gz
 share/applications/avahi-discover.desktop

More information about the svn-ports-head mailing list