Mon Sep 9 12:59:06 2019 UTC ()
libappindicator: Make this the gtk3 version.

Nothing is using the gtk2 version.

Bump PKGREVISIONs.


(nia)
diff -r1.2907 -r1.2908 pkgsrc/devel/Makefile
diff -r1.14 -r1.15 pkgsrc/devel/libappindicator/Makefile
diff -r1.2 -r0 pkgsrc/devel/libappindicator/Makefile.common
diff -r1.1 -r1.2 pkgsrc/devel/libappindicator/PLIST
diff -r1.1 -r1.2 pkgsrc/devel/libappindicator/distinfo
diff -r1.9 -r1.10 pkgsrc/devel/libappindicator/buildlink3.mk
diff -r1.1 -r0 pkgsrc/devel/libappindicator3/DESCR
diff -r1.1 -r0 pkgsrc/devel/libappindicator3/PLIST
diff -r1.16 -r0 pkgsrc/devel/libappindicator3/Makefile
diff -r1.11 -r0 pkgsrc/devel/libappindicator3/buildlink3.mk
diff -r1.2 -r0 pkgsrc/devel/libappindicator3/distinfo
diff -r1.593 -r1.594 pkgsrc/mk/defaults/options.description
diff -r1.18 -r1.19 pkgsrc/x11/mate-control-center/Makefile
diff -r1.1 -r1.2 pkgsrc/x11/mate-control-center/options.mk
cvs diff -r1.2907 -r1.2908 pkgsrc/devel/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/Makefile 2019/09/08 12:27:08 1.2907
+++ pkgsrc/devel/Makefile 2019/09/09 12:59:06 1.2908
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.2907 2019/09/08 12:27:08 nia Exp $ 1# $NetBSD: Makefile,v 1.2908 2019/09/09 12:59:06 nia Exp $
2# 2#
3 3
4COMMENT= Development utilities 4COMMENT= Development utilities
5 5
6SUBDIR+= ETL 6SUBDIR+= ETL
7SUBDIR+= ExmanIDE 7SUBDIR+= ExmanIDE
8SUBDIR+= GConf 8SUBDIR+= GConf
9SUBDIR+= GConf-ui 9SUBDIR+= GConf-ui
10SUBDIR+= Gorm 10SUBDIR+= Gorm
11SUBDIR+= MoarVM 11SUBDIR+= MoarVM
12SUBDIR+= ObjectiveLib 12SUBDIR+= ObjectiveLib
13SUBDIR+= ProjectCenter 13SUBDIR+= ProjectCenter
14SUBDIR+= R-BH 14SUBDIR+= R-BH
@@ -582,27 +582,26 @@ SUBDIR+= kservice @@ -582,27 +582,26 @@ SUBDIR+= kservice
582SUBDIR+= ktexteditor 582SUBDIR+= ktexteditor
583SUBDIR+= kwayland 583SUBDIR+= kwayland
584SUBDIR+= kyua 584SUBDIR+= kyua
585SUBDIR+= lcc 585SUBDIR+= lcc
586SUBDIR+= lcdis 586SUBDIR+= lcdis
587SUBDIR+= lcov 587SUBDIR+= lcov
588SUBDIR+= ldapsdk 588SUBDIR+= ldapsdk
589SUBDIR+= ldpc 589SUBDIR+= ldpc
590SUBDIR+= lemon 590SUBDIR+= lemon
591SUBDIR+= lettuce 591SUBDIR+= lettuce
592SUBDIR+= libFoundation 592SUBDIR+= libFoundation
593SUBDIR+= libFoundation-examples 593SUBDIR+= libFoundation-examples
594SUBDIR+= libappindicator 594SUBDIR+= libappindicator
595SUBDIR+= libappindicator3 
596SUBDIR+= libarena 595SUBDIR+= libarena
597SUBDIR+= libargparse 596SUBDIR+= libargparse
598SUBDIR+= libast 597SUBDIR+= libast
599SUBDIR+= libatomic_ops 598SUBDIR+= libatomic_ops
600SUBDIR+= libbegemot 599SUBDIR+= libbegemot
601SUBDIR+= libbinio 600SUBDIR+= libbinio
602SUBDIR+= libblkid 601SUBDIR+= libblkid
603SUBDIR+= libbonobo 602SUBDIR+= libbonobo
604SUBDIR+= libbonoboui 603SUBDIR+= libbonoboui
605SUBDIR+= libcbor 604SUBDIR+= libcbor
606SUBDIR+= libcerf 605SUBDIR+= libcerf
607SUBDIR+= libcfg+ 606SUBDIR+= libcfg+
608SUBDIR+= libcompizconfig 607SUBDIR+= libcompizconfig
cvs diff -r1.14 -r1.15 pkgsrc/devel/libappindicator/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/libappindicator/Makefile 2019/09/02 13:19:36 1.14
+++ pkgsrc/devel/libappindicator/Makefile 2019/09/09 12:59:06 1.15
@@ -1,19 +1,36 @@ @@ -1,19 +1,36 @@
1# $NetBSD: Makefile,v 1.14 2019/09/02 13:19:36 adam Exp $ 1# $NetBSD: Makefile,v 1.15 2019/09/09 12:59:06 nia Exp $
2 2
3USE_GTK_VERSION= 2 3DISTNAME= libappindicator-12.10.0
4PYTHON_VERSIONS_ACCEPTED= 27 # py-gtk2 4PKGREVISION= 1
5 5CATEGORIES= devel
6PKGREVISION= 8 6MASTER_SITES= https://launchpad.net/libappindicator/12.10/12.10.0/+download/
7.include "Makefile.common" 
8 7
9MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
10COMMENT= Allow applications to export a menu into the panel 9HOMEPAGE= https://launchpad.net/libappindicator/
 10COMMENT= GTK+3 Allow applications to export a menu into the panel
 11LICENSE= gnu-lgpl-v3 AND gnu-lgpl-v2.1
 12
 13EXTRACT_USING= gtar
 14GNU_CONFIGURE= yes
 15USE_LIBTOOL= yes
 16USE_TOOLS+= gmake pkg-config
 17
 18PKGCONFIG_OVERRIDE+= bindings/mono/appindicator-sharp-0.1.pc.in
 19PKGCONFIG_OVERRIDE+= src/appindicator3-0.1.pc.in
 20PKGCONFIG_OVERRIDE+= src/appindicator-0.1.pc.in
 21
 22BUILDLINK_TRANSFORM+= rm:-Werror
 23
 24CONFIGURE_ARGS+= --with-gtk=3
 25
 26DEPENDS+= ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3
 27
 28PYTHON_VERSIONS_ACCEPTED= 27 # py-gtk2
11 29
12.include "../../devel/libindicator/buildlink3.mk" 30.include "../../devel/libindicator3/buildlink3.mk"
13.include "../../devel/libdbusmenu-gtk/buildlink3.mk" 31.include "../../devel/libdbusmenu-gtk3/buildlink3.mk"
14.include "../../devel/glib2/buildlink3.mk" 
15.include "../../devel/py-gobject/buildlink3.mk" 
16.include "../../sysutils/dbus-glib/buildlink3.mk" 32.include "../../sysutils/dbus-glib/buildlink3.mk"
17.include "../../x11/gtk2/buildlink3.mk" 33.include "../../lang/python/extension.mk"
 34.include "../../x11/gtk3/buildlink3.mk"
18.include "../../x11/py-gtk2/buildlink3.mk" 35.include "../../x11/py-gtk2/buildlink3.mk"
19.include "../../mk/bsd.pkg.mk" 36.include "../../mk/bsd.pkg.mk"
File Deleted: pkgsrc/devel/libappindicator/Attic/Makefile.common
cvs diff -r1.1 -r1.2 pkgsrc/devel/libappindicator/PLIST (expand / switch to unified diff)

--- pkgsrc/devel/libappindicator/PLIST 2016/05/20 21:39:03 1.1
+++ pkgsrc/devel/libappindicator/PLIST 2019/09/09 12:59:06 1.2
@@ -1,25 +1,20 @@ @@ -1,25 +1,20 @@
1@comment $NetBSD: PLIST,v 1.1 2016/05/20 21:39:03 youri Exp $ 1@comment $NetBSD: PLIST,v 1.2 2019/09/09 12:59:06 nia Exp $
2include/libappindicator-0.1/libappindicator/app-indicator-enum-types.h 2include/libappindicator3-0.1/libappindicator/app-indicator-enum-types.h
3include/libappindicator-0.1/libappindicator/app-indicator.h 3include/libappindicator3-0.1/libappindicator/app-indicator.h
4lib/libappindicator.la 4lib/libappindicator3.la
5lib/pkgconfig/appindicator-0.1.pc 5lib/pkgconfig/appindicator3-0.1.pc
6${PYSITELIB}/appindicator/__init__.py 
7${PYSITELIB}/appindicator/__init__.pyc 
8${PYSITELIB}/appindicator/__init__.pyo 
9${PYSITELIB}/appindicator/_appindicator.la 
10share/gtk-doc/html/libappindicator/annotation-glossary.html 6share/gtk-doc/html/libappindicator/annotation-glossary.html
11share/gtk-doc/html/libappindicator/api-index-0-5.html 7share/gtk-doc/html/libappindicator/api-index-0-5.html
12share/gtk-doc/html/libappindicator/api-index-deprecated.html 8share/gtk-doc/html/libappindicator/api-index-deprecated.html
13share/gtk-doc/html/libappindicator/api-index-full.html 9share/gtk-doc/html/libappindicator/api-index-full.html
14share/gtk-doc/html/libappindicator/ch01.html 10share/gtk-doc/html/libappindicator/ch01.html
15share/gtk-doc/html/libappindicator/home.png 11share/gtk-doc/html/libappindicator/home.png
16share/gtk-doc/html/libappindicator/index.html 12share/gtk-doc/html/libappindicator/index.html
17share/gtk-doc/html/libappindicator/index.sgml 13share/gtk-doc/html/libappindicator/index.sgml
18share/gtk-doc/html/libappindicator/left.png 14share/gtk-doc/html/libappindicator/left.png
19share/gtk-doc/html/libappindicator/libappindicator-app-indicator.html 15share/gtk-doc/html/libappindicator/libappindicator-app-indicator.html
20share/gtk-doc/html/libappindicator/libappindicator.devhelp2 16share/gtk-doc/html/libappindicator/libappindicator.devhelp2
21share/gtk-doc/html/libappindicator/object-tree.html 17share/gtk-doc/html/libappindicator/object-tree.html
22share/gtk-doc/html/libappindicator/right.png 18share/gtk-doc/html/libappindicator/right.png
23share/gtk-doc/html/libappindicator/style.css 19share/gtk-doc/html/libappindicator/style.css
24share/gtk-doc/html/libappindicator/up.png 20share/gtk-doc/html/libappindicator/up.png
25share/pygtk/2.0/defs/appindicator.defs 
cvs diff -r1.1 -r1.2 pkgsrc/devel/libappindicator/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/libappindicator/distinfo 2016/05/20 21:39:03 1.1
+++ pkgsrc/devel/libappindicator/distinfo 2019/09/09 12:59:06 1.2
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.1 2016/05/20 21:39:03 youri Exp $ 1$NetBSD: distinfo,v 1.2 2019/09/09 12:59:06 nia Exp $
2 2
3SHA1 (libappindicator-12.10.0.tar.gz) = 17e2e22cb7025a175ba7f7cff5efdf5dc0e79634 3SHA1 (libappindicator-12.10.0.tar.gz) = 17e2e22cb7025a175ba7f7cff5efdf5dc0e79634
4RMD160 (libappindicator-12.10.0.tar.gz) = 24e5df115394adcea584c19d36562162c3ab333e 4RMD160 (libappindicator-12.10.0.tar.gz) = 24e5df115394adcea584c19d36562162c3ab333e
5SHA512 (libappindicator-12.10.0.tar.gz) = 317a22a23c8ed84e74207b64b2e9683992d1fb7208176637a051dfe925974f966d1cfa31e650b45eaf839ab61641dee8fbebc8a07882a09b0dd766d88b8d5b9a 5SHA512 (libappindicator-12.10.0.tar.gz) = 317a22a23c8ed84e74207b64b2e9683992d1fb7208176637a051dfe925974f966d1cfa31e650b45eaf839ab61641dee8fbebc8a07882a09b0dd766d88b8d5b9a
6Size (libappindicator-12.10.0.tar.gz) = 535562 bytes 6Size (libappindicator-12.10.0.tar.gz) = 535562 bytes
7SHA1 (patch-src_app-indicator.c) = 681e8be34a56748cb0786fb06e299df5fd2e1a7a 7SHA1 (patch-src_app-indicator.c) = 681e8be34a56748cb0786fb06e299df5fd2e1a7a
cvs diff -r1.9 -r1.10 pkgsrc/devel/libappindicator/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/devel/libappindicator/buildlink3.mk 2019/07/21 22:24:00 1.9
+++ pkgsrc/devel/libappindicator/buildlink3.mk 2019/09/09 12:59:06 1.10
@@ -1,18 +1,17 @@ @@ -1,18 +1,17 @@
1# $NetBSD: buildlink3.mk,v 1.9 2019/07/21 22:24:00 wiz Exp $ 1# $NetBSD: buildlink3.mk,v 1.10 2019/09/09 12:59:06 nia Exp $
2 2
3BUILDLINK_TREE+= libappindicator 3BUILDLINK_TREE+= libappindicator
4 4
5.if !defined(LIBAPPINDICATOR_BUILDLINK3_MK) 5.if !defined(LIBAPPINDICATOR_BUILDLINK3_MK)
6LIBAPPINDICATOR_BUILDLINK3_MK:= 6LIBAPPINDICATOR_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.libappindicator+= libappindicator>=12.10.0 8BUILDLINK_API_DEPENDS.libappindicator+= libappindicator>=12.10.0
9BUILDLINK_ABI_DEPENDS.libappindicator?= libappindicator>=12.10.0nb8 9BUILDLINK_ABI_DEPENDS.libappindicator+= libappindicator>=12.10.0nb1
10BUILDLINK_PKGSRCDIR.libappindicator?= ../../devel/libappindicator 10BUILDLINK_PKGSRCDIR.libappindicator?= ../../devel/libappindicator
11 11
12.include "../../devel/libindicator/buildlink3.mk" 12.include "../../devel/libindicator3/buildlink3.mk"
13.include "../../devel/libdbusmenu-gtk/buildlink3.mk" 13.include "../../devel/libdbusmenu-gtk3/buildlink3.mk"
14.include "../../devel/glib2/buildlink3.mk" 14.include "../../x11/gtk3/buildlink3.mk"
15.include "../../x11/gtk2/buildlink3.mk" 
16.endif # LIBAPPINDICATOR_BUILDLINK3_MK 15.endif # LIBAPPINDICATOR_BUILDLINK3_MK
17 16
18BUILDLINK_TREE+= -libappindicator 17BUILDLINK_TREE+= -libappindicator
File Deleted: pkgsrc/devel/libappindicator3/Attic/DESCR
File Deleted: pkgsrc/devel/libappindicator3/Attic/PLIST
File Deleted: pkgsrc/devel/libappindicator3/Attic/Makefile
File Deleted: pkgsrc/devel/libappindicator3/Attic/buildlink3.mk
File Deleted: pkgsrc/devel/libappindicator3/Attic/distinfo
cvs diff -r1.593 -r1.594 pkgsrc/mk/defaults/options.description (expand / switch to unified diff)

--- pkgsrc/mk/defaults/options.description 2019/09/08 14:05:38 1.593
+++ pkgsrc/mk/defaults/options.description 2019/09/09 12:59:06 1.594
@@ -426,27 +426,27 @@ lang-te Add Telugu language support. @@ -426,27 +426,27 @@ lang-te Add Telugu language support.
426lang-th Add Thai language support. 426lang-th Add Thai language support.
427lang-tl Add Tagalog language support. 427lang-tl Add Tagalog language support.
428lang-tr Add Turkish language support. 428lang-tr Add Turkish language support.
429lang-uk Add Ukrainian language support. 429lang-uk Add Ukrainian language support.
430lang-uk-ua Add Ukrainian/UKRAINE language support. 430lang-uk-ua Add Ukrainian/UKRAINE language support.
431lang-zh Add Chinese language support. 431lang-zh Add Chinese language support.
432lang-zh-cn Add Chinese Simplified language support. 432lang-zh-cn Add Chinese Simplified language support.
433lang-zh-tw Add Chinese Traditional language support. 433lang-zh-tw Add Chinese Traditional language support.
434latex Depend on latex for build-time or run-time documentation. 434latex Depend on latex for build-time or run-time documentation.
435lcms Enable Light Color Management System support. 435lcms Enable Light Color Management System support.
436ldap Enable LDAP support. 436ldap Enable LDAP support.
437lensfun Enable lensfun (camera lens distortion rectifyer) support. 437lensfun Enable lensfun (camera lens distortion rectifyer) support.
438libao Enable the platform-independent 'ao' audio library. 438libao Enable the platform-independent 'ao' audio library.
439libappindicator3 Enable libappindicator3 support. 439libappindicator Enable libappindicator support.
440libchamplain Enable libchamplain support (map widget). 440libchamplain Enable libchamplain support (map widget).
441libdbi Enable libdbi support (similar p5-DBI but for C). 441libdbi Enable libdbi support (similar p5-DBI but for C).
442libdrm Enable libdrm support. 442libdrm Enable libdrm support.
443libgcrypt Use GNU cryptographic library. 443libgcrypt Use GNU cryptographic library.
444libgme Enable Game_Music_Emu video game music file library support. 444libgme Enable Game_Music_Emu video game music file library support.
445libgpod Enable libgpod support. 445libgpod Enable libgpod support.
446libiconv-cp932 Add supplemental support for CP932. 446libiconv-cp932 Add supplemental support for CP932.
447libind Add Indian script support using libind. 447libind Add Indian script support using libind.
448liblqr Enable liblqr (liquid rescale) support. 448liblqr Enable liblqr (liquid rescale) support.
449libmms Enable streaming from mms:// URLS using libmms. 449libmms Enable streaming from mms:// URLS using libmms.
450libmp4v2 Enable MP4 support using libmp4v2. 450libmp4v2 Enable MP4 support using libmp4v2.
451libmpdclient Enable MPD client support. 451libmpdclient Enable MPD client support.
452libmpg123 Enable mpg123 project's core decoder library support. 452libmpg123 Enable mpg123 project's core decoder library support.
cvs diff -r1.18 -r1.19 pkgsrc/x11/mate-control-center/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/mate-control-center/Makefile 2019/09/07 04:02:58 1.18
+++ pkgsrc/x11/mate-control-center/Makefile 2019/09/09 12:59:06 1.19
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1# $NetBSD: Makefile,v 1.18 2019/09/07 04:02:58 gutteridge Exp $ 1# $NetBSD: Makefile,v 1.19 2019/09/09 12:59:06 nia Exp $
2 2
3PKGREVISION= 1 3PKGREVISION= 2
4.include "../../meta-pkgs/mate/Makefile.common" 4.include "../../meta-pkgs/mate/Makefile.common"
5 5
6DISTNAME= mate-control-center-${VERSION:R}.1 6DISTNAME= mate-control-center-${VERSION:R}.1
7CATEGORIES= sysutils 7CATEGORIES= sysutils
8 8
9COMMENT= MATE Control Center 9COMMENT= MATE Control Center
10 10
11BUILD_DEPENDS+= itstool>=0:../../textproc/itstool 11BUILD_DEPENDS+= itstool>=0:../../textproc/itstool
12 12
13PKGCONFIG_OVERRIDE+= capplets/keybindings/mate-keybindings.pc.in 13PKGCONFIG_OVERRIDE+= capplets/keybindings/mate-keybindings.pc.in
14PKGCONFIG_OVERRIDE+= capplets/default-applications/mate-default-applications.pc.in 14PKGCONFIG_OVERRIDE+= capplets/default-applications/mate-default-applications.pc.in
15PKGCONFIG_OVERRIDE+= libslab/libslab.pc.in 15PKGCONFIG_OVERRIDE+= libslab/libslab.pc.in
16PKGCONFIG_OVERRIDE+= libwindow-settings/mate-window-settings-2.0.pc.in 16PKGCONFIG_OVERRIDE+= libwindow-settings/mate-window-settings-2.0.pc.in
cvs diff -r1.1 -r1.2 pkgsrc/x11/mate-control-center/options.mk (expand / switch to unified diff)

--- pkgsrc/x11/mate-control-center/options.mk 2019/09/07 04:02:58 1.1
+++ pkgsrc/x11/mate-control-center/options.mk 2019/09/09 12:59:06 1.2
@@ -1,13 +1,15 @@ @@ -1,13 +1,15 @@
1# $NetBSD: options.mk,v 1.1 2019/09/07 04:02:58 gutteridge Exp $ 1# $NetBSD: options.mk,v 1.2 2019/09/09 12:59:06 nia Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.mate-control-center 3PKG_OPTIONS_VAR= PKG_OPTIONS.mate-control-center
4PKG_SUPPORTED_OPTIONS= libappindicator3 4PKG_SUPPORTED_OPTIONS= libappindicator
5PKG_SUGGESTED_OPTIONS= libappindicator3 5PKG_SUGGESTED_OPTIONS= libappindicator
 6
 7PKG_OPTIONS_LEGACY_OPTS+= libappindicator3:libappindicator
6 8
7.include "../../mk/bsd.options.mk" 9.include "../../mk/bsd.options.mk"
8 10
9.if !empty(PKG_OPTIONS:Mlibappindicator3) 11.if !empty(PKG_OPTIONS:Mlibappindicator)
10.include "../../devel/libappindicator3/buildlink3.mk" 12.include "../../devel/libappindicator/buildlink3.mk"
11# configure automatically enables this option if it finds it in the 13# configure automatically enables this option if it finds it in the
12# environment. There are no additional files generated. 14# environment. There are no additional files generated.
13.endif 15.endif