[pkgsrc/trunk]: pkgsrc libappindicator: Make this the gtk3 version.

[nia <nia%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3152a6e76365
branches:  trunk
changeset: 401029:3152a6e76365
user:      nia <nia%pkgsrc.org@localhost>
date:      Mon Sep 09 12:59:06 2019 +0000

description:
libappindicator: Make this the gtk3 version.

Nothing is using the gtk2 version.

Bump PKGREVISIONs.

diffstat:

 devel/Makefile                        |   3 +-
 devel/libappindicator/Makefile        |  41 ++++++++++++++++++++++++----------
 devel/libappindicator/Makefile.common |  25 ---------------------
 devel/libappindicator/PLIST           |  15 ++++--------
 devel/libappindicator/buildlink3.mk   |  11 ++++-----
 devel/libappindicator/distinfo        |   2 +-
 devel/libappindicator3/DESCR          |   3 --
 devel/libappindicator3/Makefile       |  22 ------------------
 devel/libappindicator3/PLIST          |  20 -----------------
 devel/libappindicator3/buildlink3.mk  |  17 --------------
 devel/libappindicator3/distinfo       |   6 -----
 mk/defaults/options.description       |   2 +-
 x11/mate-control-center/Makefile      |   4 +-
 x11/mate-control-center/options.mk    |  12 +++++----
 14 files changed, 51 insertions(+), 132 deletions(-)

diffs (296 lines):

diff -r df13f260bfbc -r 3152a6e76365 devel/Makefile
--- a/devel/Makefile    Mon Sep 09 12:40:50 2019 +0000
+++ b/devel/Makefile    Mon Sep 09 12:59:06 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2907 2019/09/08 12:27:08 nia Exp $
+# $NetBSD: Makefile,v 1.2908 2019/09/09 12:59:06 nia Exp $
 #
 
 COMMENT=       Development utilities
@@ -592,7 +592,6 @@
 SUBDIR+=       libFoundation
 SUBDIR+=       libFoundation-examples
 SUBDIR+=       libappindicator
-SUBDIR+=       libappindicator3
 SUBDIR+=       libarena
 SUBDIR+=       libargparse
 SUBDIR+=       libast
diff -r df13f260bfbc -r 3152a6e76365 devel/libappindicator/Makefile
--- a/devel/libappindicator/Makefile    Mon Sep 09 12:40:50 2019 +0000
+++ b/devel/libappindicator/Makefile    Mon Sep 09 12:59:06 2019 +0000
@@ -1,19 +1,36 @@
-# $NetBSD: Makefile,v 1.14 2019/09/02 13:19:36 adam Exp $
+# $NetBSD: Makefile,v 1.15 2019/09/09 12:59:06 nia Exp $
 
-USE_GTK_VERSION=               2
-PYTHON_VERSIONS_ACCEPTED=       27 # py-gtk2
-
-PKGREVISION= 8
-.include "Makefile.common"
+DISTNAME=      libappindicator-12.10.0
+PKGREVISION=   1
+CATEGORIES=    devel
+MASTER_SITES=  https://launchpad.net/libappindicator/12.10/12.10.0/+download/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-COMMENT=       Allow applications to export a menu into the panel
+HOMEPAGE=      https://launchpad.net/libappindicator/
+COMMENT=       GTK+3 Allow applications to export a menu into the panel
+LICENSE=       gnu-lgpl-v3 AND gnu-lgpl-v2.1
+
+EXTRACT_USING= gtar
+GNU_CONFIGURE= yes
+USE_LIBTOOL=   yes
+USE_TOOLS+=    gmake pkg-config
+
+PKGCONFIG_OVERRIDE+=   bindings/mono/appindicator-sharp-0.1.pc.in
+PKGCONFIG_OVERRIDE+=   src/appindicator3-0.1.pc.in
+PKGCONFIG_OVERRIDE+=   src/appindicator-0.1.pc.in
 
-.include "../../devel/libindicator/buildlink3.mk"
-.include "../../devel/libdbusmenu-gtk/buildlink3.mk"
-.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/py-gobject/buildlink3.mk"
+BUILDLINK_TRANSFORM+=  rm:-Werror
+
+CONFIGURE_ARGS+=       --with-gtk=3
+
+DEPENDS+=      ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3
+
+PYTHON_VERSIONS_ACCEPTED=      27 # py-gtk2
+
+.include "../../devel/libindicator3/buildlink3.mk"
+.include "../../devel/libdbusmenu-gtk3/buildlink3.mk"
 .include "../../sysutils/dbus-glib/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
+.include "../../lang/python/extension.mk"
+.include "../../x11/gtk3/buildlink3.mk"
 .include "../../x11/py-gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r df13f260bfbc -r 3152a6e76365 devel/libappindicator/Makefile.common
--- a/devel/libappindicator/Makefile.common     Mon Sep 09 12:40:50 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-# $NetBSD: Makefile.common,v 1.2 2016/05/20 21:40:45 youri Exp $
-#
-# used by devel/libappindicator3/Makefile
-
-DISTNAME=      libappindicator-12.10.0
-CATEGORIES=    devel
-MASTER_SITES=  https://launchpad.net/libappindicator/12.10/12.10.0/+download/
-
-HOMEPAGE=      https://launchpad.net/libappindicator/
-LICENSE=       gnu-lgpl-v3 AND gnu-lgpl-v2.1
-
-GNU_CONFIGURE= yes
-USE_LIBTOOL=   yes
-USE_TOOLS+=    gmake pkg-config
-
-EXTRACT_USING= gtar
-
-PKGCONFIG_OVERRIDE+=   bindings/mono/appindicator-sharp-0.1.pc.in
-PKGCONFIG_OVERRIDE+=   src/appindicator3-0.1.pc.in
-PKGCONFIG_OVERRIDE+=   src/appindicator-0.1.pc.in
-
-CONFIGURE_ARGS+=       --with-gtk=${USE_GTK_VERSION}
-
-PY_PATCHPLIST= yes
-.include "../../lang/python/extension.mk"
diff -r df13f260bfbc -r 3152a6e76365 devel/libappindicator/PLIST
--- a/devel/libappindicator/PLIST       Mon Sep 09 12:40:50 2019 +0000
+++ b/devel/libappindicator/PLIST       Mon Sep 09 12:59:06 2019 +0000
@@ -1,12 +1,8 @@
-@comment $NetBSD: PLIST,v 1.1 2016/05/20 21:39:03 youri Exp $
-include/libappindicator-0.1/libappindicator/app-indicator-enum-types.h
-include/libappindicator-0.1/libappindicator/app-indicator.h
-lib/libappindicator.la
-lib/pkgconfig/appindicator-0.1.pc
-${PYSITELIB}/appindicator/__init__.py
-${PYSITELIB}/appindicator/__init__.pyc
-${PYSITELIB}/appindicator/__init__.pyo
-${PYSITELIB}/appindicator/_appindicator.la
+@comment $NetBSD: PLIST,v 1.2 2019/09/09 12:59:06 nia Exp $
+include/libappindicator3-0.1/libappindicator/app-indicator-enum-types.h
+include/libappindicator3-0.1/libappindicator/app-indicator.h
+lib/libappindicator3.la
+lib/pkgconfig/appindicator3-0.1.pc
 share/gtk-doc/html/libappindicator/annotation-glossary.html
 share/gtk-doc/html/libappindicator/api-index-0-5.html
 share/gtk-doc/html/libappindicator/api-index-deprecated.html
@@ -22,4 +18,3 @@
 share/gtk-doc/html/libappindicator/right.png
 share/gtk-doc/html/libappindicator/style.css
 share/gtk-doc/html/libappindicator/up.png
-share/pygtk/2.0/defs/appindicator.defs
diff -r df13f260bfbc -r 3152a6e76365 devel/libappindicator/buildlink3.mk
--- a/devel/libappindicator/buildlink3.mk       Mon Sep 09 12:40:50 2019 +0000
+++ b/devel/libappindicator/buildlink3.mk       Mon Sep 09 12:59:06 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2019/07/21 22:24:00 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2019/09/09 12:59:06 nia Exp $
 
 BUILDLINK_TREE+=       libappindicator
 
@@ -6,13 +6,12 @@
 LIBAPPINDICATOR_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libappindicator+=        libappindicator>=12.10.0
-BUILDLINK_ABI_DEPENDS.libappindicator?=        libappindicator>=12.10.0nb8
+BUILDLINK_ABI_DEPENDS.libappindicator+=        libappindicator>=12.10.0nb1
 BUILDLINK_PKGSRCDIR.libappindicator?=  ../../devel/libappindicator
 
-.include "../../devel/libindicator/buildlink3.mk"
-.include "../../devel/libdbusmenu-gtk/buildlink3.mk"
-.include "../../devel/glib2/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
+.include "../../devel/libindicator3/buildlink3.mk"
+.include "../../devel/libdbusmenu-gtk3/buildlink3.mk"
+.include "../../x11/gtk3/buildlink3.mk"
 .endif # LIBAPPINDICATOR_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -libappindicator
diff -r df13f260bfbc -r 3152a6e76365 devel/libappindicator/distinfo
--- a/devel/libappindicator/distinfo    Mon Sep 09 12:40:50 2019 +0000
+++ b/devel/libappindicator/distinfo    Mon Sep 09 12:59:06 2019 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1 2016/05/20 21:39:03 youri Exp $
+$NetBSD: distinfo,v 1.2 2019/09/09 12:59:06 nia Exp $
 
 SHA1 (libappindicator-12.10.0.tar.gz) = 17e2e22cb7025a175ba7f7cff5efdf5dc0e79634
 RMD160 (libappindicator-12.10.0.tar.gz) = 24e5df115394adcea584c19d36562162c3ab333e
diff -r df13f260bfbc -r 3152a6e76365 devel/libappindicator3/DESCR
--- a/devel/libappindicator3/DESCR      Mon Sep 09 12:40:50 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-A library to allow applications to export a menu into the Unity Menu bar. Based
-on KSNI it also works in KDE and will fallback to generic Systray support if
-none of those are available.
diff -r df13f260bfbc -r 3152a6e76365 devel/libappindicator3/Makefile
--- a/devel/libappindicator3/Makefile   Mon Sep 09 12:40:50 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-# $NetBSD: Makefile,v 1.16 2019/09/02 13:19:35 adam Exp $
-
-USE_GTK_VERSION=               3
-PYTHON_VERSIONS_ACCEPTED=       27 # py-gtk2
-
-PKGREVISION= 9
-.include "../../devel/libappindicator/Makefile.common"
-
-MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-COMMENT=       GTK+3 Allow applications to export a menu into the panel
-PKGNAME=       ${DISTNAME:S/-/3-/}
-
-BUILDLINK_TRANSFORM+=  rm:-Werror
-
-DEPENDS+=      ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3
-
-.include "../../devel/libindicator3/buildlink3.mk"
-.include "../../devel/libdbusmenu-gtk3/buildlink3.mk"
-.include "../../sysutils/dbus-glib/buildlink3.mk"
-.include "../../x11/gtk3/buildlink3.mk"
-.include "../../x11/py-gtk2/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff -r df13f260bfbc -r 3152a6e76365 devel/libappindicator3/PLIST
--- a/devel/libappindicator3/PLIST      Mon Sep 09 12:40:50 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2016/05/20 21:41:14 youri Exp $
-include/libappindicator3-0.1/libappindicator/app-indicator-enum-types.h
-include/libappindicator3-0.1/libappindicator/app-indicator.h
-lib/libappindicator3.la
-lib/pkgconfig/appindicator3-0.1.pc
-share/gtk-doc/html/libappindicator/annotation-glossary.html
-share/gtk-doc/html/libappindicator/api-index-0-5.html
-share/gtk-doc/html/libappindicator/api-index-deprecated.html
-share/gtk-doc/html/libappindicator/api-index-full.html
-share/gtk-doc/html/libappindicator/ch01.html
-share/gtk-doc/html/libappindicator/home.png
-share/gtk-doc/html/libappindicator/index.html
-share/gtk-doc/html/libappindicator/index.sgml
-share/gtk-doc/html/libappindicator/left.png
-share/gtk-doc/html/libappindicator/libappindicator-app-indicator.html
-share/gtk-doc/html/libappindicator/libappindicator.devhelp2
-share/gtk-doc/html/libappindicator/object-tree.html
-share/gtk-doc/html/libappindicator/right.png
-share/gtk-doc/html/libappindicator/style.css
-share/gtk-doc/html/libappindicator/up.png
diff -r df13f260bfbc -r 3152a6e76365 devel/libappindicator3/buildlink3.mk
--- a/devel/libappindicator3/buildlink3.mk      Mon Sep 09 12:40:50 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.11 2019/07/21 22:24:00 wiz Exp $
-
-BUILDLINK_TREE+=       libappindicator3
-
-.if !defined(LIBAPPINDICATOR3_BUILDLINK3_MK)
-LIBAPPINDICATOR3_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.libappindicator3+=       libappindicator3>=12.10.0
-BUILDLINK_ABI_DEPENDS.libappindicator3?=       libappindicator3>=12.10.0nb9
-BUILDLINK_PKGSRCDIR.libappindicator3?=         ../../devel/libappindicator3
-
-.include "../../devel/libindicator3/buildlink3.mk"
-.include "../../devel/libdbusmenu-gtk3/buildlink3.mk"
-.include "../../x11/gtk3/buildlink3.mk"
-.endif # LIBAPPINDICATOR3_BUILDLINK3_MK
-
-BUILDLINK_TREE+=       -libappindicator3
diff -r df13f260bfbc -r 3152a6e76365 devel/libappindicator3/distinfo
--- a/devel/libappindicator3/distinfo   Mon Sep 09 12:40:50 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.2 2017/03/23 17:06:48 joerg Exp $
-
-SHA1 (libappindicator-12.10.0.tar.gz) = 17e2e22cb7025a175ba7f7cff5efdf5dc0e79634
-RMD160 (libappindicator-12.10.0.tar.gz) = 24e5df115394adcea584c19d36562162c3ab333e
-SHA512 (libappindicator-12.10.0.tar.gz) = 317a22a23c8ed84e74207b64b2e9683992d1fb7208176637a051dfe925974f966d1cfa31e650b45eaf839ab61641dee8fbebc8a07882a09b0dd766d88b8d5b9a
-Size (libappindicator-12.10.0.tar.gz) = 535562 bytes
diff -r df13f260bfbc -r 3152a6e76365 mk/defaults/options.description
--- a/mk/defaults/options.description   Mon Sep 09 12:40:50 2019 +0000
+++ b/mk/defaults/options.description   Mon Sep 09 12:59:06 2019 +0000
@@ -436,7 +436,7 @@
 ldap                   Enable LDAP support.
 lensfun                        Enable lensfun (camera lens distortion rectifyer) support.
 libao                  Enable the platform-independent 'ao' audio library.
-libappindicator3       Enable libappindicator3 support.
+libappindicator                Enable libappindicator support.
 libchamplain           Enable libchamplain support (map widget).
 libdbi                 Enable libdbi support (similar p5-DBI but for C).
 libdrm                 Enable libdrm support.
diff -r df13f260bfbc -r 3152a6e76365 x11/mate-control-center/Makefile
--- a/x11/mate-control-center/Makefile  Mon Sep 09 12:40:50 2019 +0000
+++ b/x11/mate-control-center/Makefile  Mon Sep 09 12:59:06 2019 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.18 2019/09/07 04:02:58 gutteridge Exp $
+# $NetBSD: Makefile,v 1.19 2019/09/09 12:59:06 nia Exp $
 
-PKGREVISION= 1
+PKGREVISION= 2
 .include "../../meta-pkgs/mate/Makefile.common"
 
 DISTNAME=      mate-control-center-${VERSION:R}.1
diff -r df13f260bfbc -r 3152a6e76365 x11/mate-control-center/options.mk
--- a/x11/mate-control-center/options.mk        Mon Sep 09 12:40:50 2019 +0000
+++ b/x11/mate-control-center/options.mk        Mon Sep 09 12:59:06 2019 +0000
@@ -1,13 +1,15 @@
-# $NetBSD: options.mk,v 1.1 2019/09/07 04:02:58 gutteridge Exp $
+# $NetBSD: options.mk,v 1.2 2019/09/09 12:59:06 nia Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.mate-control-center
-PKG_SUPPORTED_OPTIONS= libappindicator3
-PKG_SUGGESTED_OPTIONS= libappindicator3
+PKG_SUPPORTED_OPTIONS= libappindicator
+PKG_SUGGESTED_OPTIONS= libappindicator
+
+PKG_OPTIONS_LEGACY_OPTS+=      libappindicator3:libappindicator
 
 .include "../../mk/bsd.options.mk"
 
-.if !empty(PKG_OPTIONS:Mlibappindicator3)
-.include "../../devel/libappindicator3/buildlink3.mk"
+.if !empty(PKG_OPTIONS:Mlibappindicator)
+.include "../../devel/libappindicator/buildlink3.mk"
 # configure automatically enables this option if it finds it in the
 # environment. There are no additional files generated.
 .endif