CVS commit: pkgsrc

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Mon Sep  9 13:25:47 UTC 2019

Modified Files:
        pkgsrc/devel/libappindicator: Makefile buildlink3.mk
        pkgsrc/devel/libindicator: DESCR Makefile PLIST buildlink3.mk distinfo
        pkgsrc/x11/mate-indicator-applet: Makefile
        pkgsrc/x11/xfce4-indicator-plugin: Makefile
Removed Files:
        pkgsrc/devel/libindicator: Makefile.common
        pkgsrc/devel/libindicator-tools: DESCR Makefile PLIST
        pkgsrc/devel/libindicator/patches: patch-tools_Makefile.in
        pkgsrc/devel/libindicator3: DESCR Makefile PLIST buildlink3.mk

Log Message:
libindicator: Make this the GTK3 version.

Nothing is using the GTK2 version.

Bump PKGREVISIONs


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 pkgsrc/devel/libappindicator/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/devel/libappindicator/buildlink3.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/libindicator/DESCR \
    pkgsrc/devel/libindicator/PLIST
cvs rdiff -u -r1.9 -r1.10 pkgsrc/devel/libindicator/Makefile \
    pkgsrc/devel/libindicator/buildlink3.mk
cvs rdiff -u -r1.1 -r0 pkgsrc/devel/libindicator/Makefile.common
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/libindicator/distinfo
cvs rdiff -u -r1.1 -r0 pkgsrc/devel/libindicator-tools/DESCR \
    pkgsrc/devel/libindicator-tools/PLIST
cvs rdiff -u -r1.10 -r0 pkgsrc/devel/libindicator-tools/Makefile
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/devel/libindicator/patches/patch-tools_Makefile.in
cvs rdiff -u -r1.1 -r0 pkgsrc/devel/libindicator3/DESCR \
    pkgsrc/devel/libindicator3/PLIST
cvs rdiff -u -r1.10 -r0 pkgsrc/devel/libindicator3/Makefile \
    pkgsrc/devel/libindicator3/buildlink3.mk
cvs rdiff -u -r1.15 -r1.16 pkgsrc/x11/mate-indicator-applet/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/x11/xfce4-indicator-plugin/Makefile

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

Modified files:

Index: pkgsrc/devel/libappindicator/Makefile
diff -u pkgsrc/devel/libappindicator/Makefile:1.16 pkgsrc/devel/libappindicator/Makefile:1.17
--- pkgsrc/devel/libappindicator/Makefile:1.16  Mon Sep  9 13:01:55 2019
+++ pkgsrc/devel/libappindicator/Makefile       Mon Sep  9 13:25:47 2019
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2019/09/09 13:01:55 nia Exp $
+# $NetBSD: Makefile,v 1.17 2019/09/09 13:25:47 nia Exp $
 
 DISTNAME=      libappindicator-12.10.0
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    devel
 MASTER_SITES=  https://launchpad.net/libappindicator/12.10/12.10.0/+download/
 
@@ -27,7 +27,7 @@ DEPENDS+=     ${PYPKGPREFIX}-gobject3-[0-9]*
 
 PYTHON_VERSIONS_ACCEPTED=      27 # py-gtk2
 
-.include "../../devel/libindicator3/buildlink3.mk"
+.include "../../devel/libindicator/buildlink3.mk"
 .include "../../devel/libdbusmenu-gtk3/buildlink3.mk"
 .include "../../sysutils/dbus-glib/buildlink3.mk"
 .include "../../lang/python/extension.mk"

Index: pkgsrc/devel/libappindicator/buildlink3.mk
diff -u pkgsrc/devel/libappindicator/buildlink3.mk:1.10 pkgsrc/devel/libappindicator/buildlink3.mk:1.11
--- pkgsrc/devel/libappindicator/buildlink3.mk:1.10     Mon Sep  9 12:59:06 2019
+++ pkgsrc/devel/libappindicator/buildlink3.mk  Mon Sep  9 13:25:47 2019
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2019/09/09 12:59:06 nia Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2019/09/09 13:25:47 nia Exp $
 
 BUILDLINK_TREE+=       libappindicator
 
@@ -9,7 +9,7 @@ BUILDLINK_API_DEPENDS.libappindicator+= 
 BUILDLINK_ABI_DEPENDS.libappindicator+=        libappindicator>=12.10.0nb1
 BUILDLINK_PKGSRCDIR.libappindicator?=  ../../devel/libappindicator
 
-.include "../../devel/libindicator3/buildlink3.mk"
+.include "../../devel/libindicator/buildlink3.mk"
 .include "../../devel/libdbusmenu-gtk3/buildlink3.mk"
 .include "../../x11/gtk3/buildlink3.mk"
 .endif # LIBAPPINDICATOR_BUILDLINK3_MK

Index: pkgsrc/devel/libindicator/DESCR
diff -u pkgsrc/devel/libindicator/DESCR:1.1 pkgsrc/devel/libindicator/DESCR:1.2
--- pkgsrc/devel/libindicator/DESCR:1.1 Fri May 20 21:32:24 2016
+++ pkgsrc/devel/libindicator/DESCR     Mon Sep  9 13:25:47 2019
@@ -1,2 +1,4 @@
 A set of symbols and convience functions that all indicators would
 like to use.
+
+This package provide GTK3 API.
Index: pkgsrc/devel/libindicator/PLIST
diff -u pkgsrc/devel/libindicator/PLIST:1.1 pkgsrc/devel/libindicator/PLIST:1.2
--- pkgsrc/devel/libindicator/PLIST:1.1 Fri May 20 21:32:24 2016
+++ pkgsrc/devel/libindicator/PLIST     Mon Sep  9 13:25:47 2019
@@ -1,9 +1,9 @@
-@comment $NetBSD: PLIST,v 1.1 2016/05/20 21:32:24 youri Exp $
-include/libindicator-0.4/libindicator/indicator-desktop-shortcuts.h
-include/libindicator-0.4/libindicator/indicator-image-helper.h
-include/libindicator-0.4/libindicator/indicator-object.h
-include/libindicator-0.4/libindicator/indicator-service-manager.h
-include/libindicator-0.4/libindicator/indicator-service.h
-include/libindicator-0.4/libindicator/indicator.h
-lib/libindicator.la
-lib/pkgconfig/indicator-0.4.pc
+@comment $NetBSD: PLIST,v 1.2 2019/09/09 13:25:47 nia Exp $
+include/libindicator3-0.4/libindicator/indicator-desktop-shortcuts.h
+include/libindicator3-0.4/libindicator/indicator-image-helper.h
+include/libindicator3-0.4/libindicator/indicator-object.h
+include/libindicator3-0.4/libindicator/indicator-service-manager.h
+include/libindicator3-0.4/libindicator/indicator-service.h
+include/libindicator3-0.4/libindicator/indicator.h
+lib/libindicator3.la
+lib/pkgconfig/indicator3-0.4.pc

Index: pkgsrc/devel/libindicator/Makefile
diff -u pkgsrc/devel/libindicator/Makefile:1.9 pkgsrc/devel/libindicator/Makefile:1.10
--- pkgsrc/devel/libindicator/Makefile:1.9      Sun Jul 21 22:24:01 2019
+++ pkgsrc/devel/libindicator/Makefile  Mon Sep  9 13:25:47 2019
@@ -1,14 +1,27 @@
-# $NetBSD: Makefile,v 1.9 2019/07/21 22:24:01 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2019/09/09 13:25:47 nia Exp $
 
-USE_GTK_VERSION=2
-
-PKGREVISION= 8
-.include "Makefile.common"
+DISTNAME=      libindicator-12.10.1
+PKGREVISION=   9
+CATEGORIES=    devel
+MASTER_SITES=  https://launchpad.net/libindicator/12.10/${PKGVERSION_NOREV}/+download/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-COMMENT=       GTK+2 symbols and convience functions for indicators
+HOMEPAGE=      https://launchpad.net/libindicator
+COMMENT=       GTK+3 symbols and convience functions for indicators
+LICENSE=       gnu-gpl-v3
+
+EXTRACT_USING= gtar
+GNU_CONFIGURE= yes
+USE_LIBTOOL=   yes
+USE_TOOLS+=    gmake pkg-config
 
 INSTALL_DIRS=  libindicator
 
-.include "../../x11/gtk2/buildlink3.mk"
+BUILDLINK_TRANSFORM+=  rm:-Werror
+PKGCONFIG_OVERRIDE+=   libindicator/indicator-0.4.pc.in.in
+PKGCONFIG_OVERRIDE+=   libindicator/indicator3-0.4.pc.in.in
+
+CONFIGURE_ARGS+=       --with-gtk=3
+
+.include "../../x11/gtk3/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
Index: pkgsrc/devel/libindicator/buildlink3.mk
diff -u pkgsrc/devel/libindicator/buildlink3.mk:1.9 pkgsrc/devel/libindicator/buildlink3.mk:1.10
--- pkgsrc/devel/libindicator/buildlink3.mk:1.9 Sun Jul 21 22:24:01 2019
+++ pkgsrc/devel/libindicator/buildlink3.mk     Mon Sep  9 13:25:47 2019
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2019/07/21 22:24:01 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2019/09/09 13:25:47 nia Exp $
 
 BUILDLINK_TREE+=       libindicator
 
@@ -6,10 +6,10 @@ BUILDLINK_TREE+=      libindicator
 LIBINDICATOR_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libindicator+=   libindicator>=12.10.1
-BUILDLINK_ABI_DEPENDS.libindicator?=   libindicator>=12.10.1nb8
+BUILDLINK_ABI_DEPENDS.libindicator+=   libindicator>=12.10.1nb9
 BUILDLINK_PKGSRCDIR.libindicator?=     ../../devel/libindicator
 
-.include "../../x11/gtk2/buildlink3.mk"
+.include "../../x11/gtk3/buildlink3.mk"
 .endif # LIBINDICATOR_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -libindicator

Index: pkgsrc/devel/libindicator/distinfo
diff -u pkgsrc/devel/libindicator/distinfo:1.3 pkgsrc/devel/libindicator/distinfo:1.4
--- pkgsrc/devel/libindicator/distinfo:1.3      Thu Mar 23 17:06:48 2017
+++ pkgsrc/devel/libindicator/distinfo  Mon Sep  9 13:25:47 2019
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.3 2017/03/23 17:06:48 joerg Exp $
+$NetBSD: distinfo,v 1.4 2019/09/09 13:25:47 nia Exp $
 
 SHA1 (libindicator-12.10.1.tar.gz) = 25c8a0a150651ee6b2198df3f36fcbb49f0295c2
 RMD160 (libindicator-12.10.1.tar.gz) = c5353a3ee5b9b24fac0cb2a7b620a23c406055af
 SHA512 (libindicator-12.10.1.tar.gz) = d6d77d0309b15cf6b52539323920ab0c1594cb1c1cef8a8d67cd0f76f8ceeeac28eb6db6227563df1932e6f1fadcffac68d82982182b745257dfaf91f1c945af
 Size (libindicator-12.10.1.tar.gz) = 427764 bytes
 SHA1 (patch-configure) = 3af0c7c242613fac3727620dcca1aa5e51d0fa6f
-SHA1 (patch-tools_Makefile.in) = 9988879025dd4cc541407958e83b0d69eea1926c

Index: pkgsrc/x11/mate-indicator-applet/Makefile
diff -u pkgsrc/x11/mate-indicator-applet/Makefile:1.15 pkgsrc/x11/mate-indicator-applet/Makefile:1.16
--- pkgsrc/x11/mate-indicator-applet/Makefile:1.15      Sun Jul 21 22:26:01 2019
+++ pkgsrc/x11/mate-indicator-applet/Makefile   Mon Sep  9 13:25:46 2019
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.15 2019/07/21 22:26:01 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2019/09/09 13:25:46 nia Exp $
 
 .include "../../meta-pkgs/mate/Makefile.common"
 
 DISTNAME=      mate-indicator-applet-${VERSION}
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    x11
 
 COMMENT=       MATE indicator applet
 
 .include "../../x11/mate-panel/buildlink3.mk"
-.include "../../devel/libindicator3/buildlink3.mk"
+.include "../../devel/libindicator/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/x11/xfce4-indicator-plugin/Makefile
diff -u pkgsrc/x11/xfce4-indicator-plugin/Makefile:1.14 pkgsrc/x11/xfce4-indicator-plugin/Makefile:1.15
--- pkgsrc/x11/xfce4-indicator-plugin/Makefile:1.14     Sun Aug 11 13:25:19 2019
+++ pkgsrc/x11/xfce4-indicator-plugin/Makefile  Mon Sep  9 13:25:46 2019
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.14 2019/08/11 13:25:19 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2019/09/09 13:25:46 nia Exp $
 
-PKGREVISION= 5
+PKGREVISION= 6
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 DISTNAME=      xfce4-indicator-plugin-2.3.4
@@ -10,7 +10,7 @@ MASTER_SITES= http://archive.xfce.org/sr
 HOMEPAGE=      https://goodies.xfce.org/projects/panel-plugins/xfce4-indicator-plugin
 COMMENT=       Xfce indicator plugin
 
-.include "../../devel/libindicator3/buildlink3.mk"
+.include "../../devel/libindicator/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../x11/xfce4-panel/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"