CVS commit: pkgsrc/net/avahi

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Mon Mar 23 09:22:08 UTC 2020

Modified Files:
        pkgsrc/net/avahi: Makefile PLIST PLIST.python options.mk

Log Message:
avahi: Switch to gtk3 and avoid needing Python 2

Fix PLISTs to accomodate these things.

Bump PKGREVISION


To generate a diff of this commit:
cvs rdiff -u -r1.90 -r1.91 pkgsrc/net/avahi/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/net/avahi/PLIST pkgsrc/net/avahi/options.mk
cvs rdiff -u -r1.4 -r1.5 pkgsrc/net/avahi/PLIST.python

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/avahi/Makefile
diff -u pkgsrc/net/avahi/Makefile:1.90 pkgsrc/net/avahi/Makefile:1.91
--- pkgsrc/net/avahi/Makefile:1.90      Tue Mar 10 22:08:56 2020
+++ pkgsrc/net/avahi/Makefile   Mon Mar 23 09:22:07 2020
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.90 2020/03/10 22:08:56 wiz Exp $
+# $NetBSD: Makefile,v 1.91 2020/03/23 09:22:07 nia Exp $
 
 DISTNAME=              avahi-0.6.32
-PKGREVISION=           21
+PKGREVISION=           22
 CATEGORIES=            net
 MASTER_SITES=          https://github.com/lathiat/avahi/releases/download/v${PKGVERSION_NOREV}/
 
@@ -79,6 +79,7 @@ CONFIGURE_ARGS+=      --disable-xmltoman
 CONFIGURE_ARGS+=       --disable-autoipd
 CONFIGURE_ARGS+=       --disable-qt3
 CONFIGURE_ARGS+=       --disable-qt4
+CONFIGURE_ARGS+=       --disable-pygtk
 CONFIGURE_ARGS+=       --with-distro=none
 
 INSTALL_MAKE_FLAGS+=   sysconfdir=${PREFIX}/share/examples

Index: pkgsrc/net/avahi/PLIST
diff -u pkgsrc/net/avahi/PLIST:1.15 pkgsrc/net/avahi/PLIST:1.16
--- pkgsrc/net/avahi/PLIST:1.15 Sun Oct 27 14:46:09 2019
+++ pkgsrc/net/avahi/PLIST      Mon Mar 23 09:22:07 2020
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2019/10/27 14:46:09 kamil Exp $
+@comment $NetBSD: PLIST,v 1.16 2020/03/23 09:22:07 nia Exp $
 bin/avahi-browse
 bin/avahi-browse-domains
 ${PLIST.ui}bin/avahi-discover-standalone
@@ -44,7 +44,7 @@ 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
-${PLIST.gtk2}include/avahi-ui/avahi-ui.h
+${PLIST.ui}include/avahi-ui/avahi-ui.h
 ${PLIST.introspection}lib/girepository-1.0/Avahi-0.6.typelib
 ${PLIST.introspection}lib/girepository-1.0/AvahiCore-0.6.typelib
 lib/libavahi-client.la
@@ -79,8 +79,8 @@ man/man1/avahi-resolve-address.1
 man/man1/avahi-resolve-host-name.1
 man/man1/avahi-resolve.1
 man/man1/avahi-set-host-name.1
-${PLIST.ui}man/man1/bssh.1
-${PLIST.ui}man/man1/bvnc.1
+${PLIST.gtk2}man/man1/bssh.1
+${PLIST.gtk2}man/man1/bvnc.1
 man/man5/avahi-daemon.conf.5
 man/man5/avahi.hosts.5
 man/man5/avahi.service.5
Index: pkgsrc/net/avahi/options.mk
diff -u pkgsrc/net/avahi/options.mk:1.15 pkgsrc/net/avahi/options.mk:1.16
--- pkgsrc/net/avahi/options.mk:1.15    Sun Jan 26 12:36:34 2020
+++ pkgsrc/net/avahi/options.mk Mon Mar 23 09:22:07 2020
@@ -1,9 +1,9 @@
-# $NetBSD: options.mk,v 1.15 2020/01/26 12:36:34 nia Exp $
+# $NetBSD: options.mk,v 1.16 2020/03/23 09:22:07 nia Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.avahi
 PKG_SUPPORTED_OPTIONS= avahi-howl gdbm introspection gtk2 gtk3 mono python
 PKG_SUPPORTED_OPTIONS+=        tests
-PKG_SUGGESTED_OPTIONS+=        gtk2
+PKG_SUGGESTED_OPTIONS+=        gtk3
 PLIST_VARS+=           introspection gtk2 gtk3 mono ui
 
 .include "../../mk/bsd.options.mk"
@@ -64,12 +64,10 @@ CONFIGURE_ARGS+=    --disable-mono --disabl
 ###
 .if !empty(PKG_OPTIONS:Mpython)
 PY_PATCHPLIST=         yes
-PYTHON_VERSIONS_ACCEPTED=       27 # py-gtk2
 .  include "../../lang/python/application.mk"
 REPLACE_PYTHON+=       avahi-python/avahi-discover/__init__.py
 .  include "../../lang/python/extension.mk"
 .  include "../../sysutils/py-dbus/buildlink3.mk"
-.  include "../../x11/py-gtk2/buildlink3.mk"
 DEPENDS+=              ${PYPKGPREFIX}-libxml2-[0-9]*:../../textproc/py-libxml2
 DEPENDS+=              ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
 ### If python and gdbm are enabled we need py-gdbm as well
@@ -81,7 +79,6 @@ PLIST_SRC+=           ${PKGDIR}/PLIST.python
 .else
 CONFIGURE_ARGS+=       --disable-python
 CONFIGURE_ARGS+=       --disable-python-dbus
-CONFIGURE_ARGS+=       --disable-pygtk
 .endif
 
 .if !empty(PKG_OPTIONS:Mtests)

Index: pkgsrc/net/avahi/PLIST.python
diff -u pkgsrc/net/avahi/PLIST.python:1.4 pkgsrc/net/avahi/PLIST.python:1.5
--- pkgsrc/net/avahi/PLIST.python:1.4   Sat Jul 24 13:42:12 2010
+++ pkgsrc/net/avahi/PLIST.python       Mon Mar 23 09:22:07 2020
@@ -1,7 +1,6 @@
-@comment $NetBSD: PLIST.python,v 1.4 2010/07/24 13:42:12 obache Exp $
+@comment $NetBSD: PLIST.python,v 1.5 2020/03/23 09:22:07 nia Exp $
 ${PYSITELIB}/avahi/__init__.py
 ${PYSITELIB}/avahi/__init__.pyc
 ${PYSITELIB}/avahi/__init__.pyo
 bin/avahi-bookmarks
 man/man1/avahi-bookmarks.1
-man/man1/avahi-discover.1