Received: by mail.netbsd.org (Postfix, from userid 605) id 73D3384DA9; Mon, 9 Sep 2019 12:59:08 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id F0D3A84DA8 for ; Mon, 9 Sep 2019 12:59:07 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id mJB2qr7g4bbF for ; Mon, 9 Sep 2019 12:59:07 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 1D27B84C2B for ; Mon, 9 Sep 2019 12:59:07 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 114A5FBF4; Mon, 9 Sep 2019 12:59:07 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_156803394714150" MIME-Version: 1.0 Date: Mon, 9 Sep 2019 12:59:07 +0000 From: "Nia Alarie" Subject: CVS commit: pkgsrc To: pkgsrc-changes@NetBSD.org Reply-To: nia@netbsd.org X-Mailer: log_accum Message-Id: <20190909125907.114A5FBF4@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_156803394714150 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: nia Date: Mon Sep 9 12:59:06 UTC 2019 Modified Files: pkgsrc/devel: Makefile pkgsrc/devel/libappindicator: Makefile PLIST buildlink3.mk distinfo pkgsrc/mk/defaults: options.description pkgsrc/x11/mate-control-center: Makefile options.mk Removed Files: pkgsrc/devel/libappindicator: Makefile.common pkgsrc/devel/libappindicator3: DESCR Makefile PLIST buildlink3.mk distinfo Log Message: libappindicator: Make this the gtk3 version. Nothing is using the gtk2 version. Bump PKGREVISIONs. To generate a diff of this commit: cvs rdiff -u -r1.2907 -r1.2908 pkgsrc/devel/Makefile cvs rdiff -u -r1.14 -r1.15 pkgsrc/devel/libappindicator/Makefile cvs rdiff -u -r1.2 -r0 pkgsrc/devel/libappindicator/Makefile.common cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/libappindicator/PLIST \ pkgsrc/devel/libappindicator/distinfo cvs rdiff -u -r1.9 -r1.10 pkgsrc/devel/libappindicator/buildlink3.mk cvs rdiff -u -r1.1 -r0 pkgsrc/devel/libappindicator3/DESCR \ pkgsrc/devel/libappindicator3/PLIST cvs rdiff -u -r1.16 -r0 pkgsrc/devel/libappindicator3/Makefile cvs rdiff -u -r1.11 -r0 pkgsrc/devel/libappindicator3/buildlink3.mk cvs rdiff -u -r1.2 -r0 pkgsrc/devel/libappindicator3/distinfo cvs rdiff -u -r1.593 -r1.594 pkgsrc/mk/defaults/options.description cvs rdiff -u -r1.18 -r1.19 pkgsrc/x11/mate-control-center/Makefile cvs rdiff -u -r1.1 -r1.2 pkgsrc/x11/mate-control-center/options.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_156803394714150 Content-Disposition: inline Content-Length: 8116 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/devel/Makefile diff -u pkgsrc/devel/Makefile:1.2907 pkgsrc/devel/Makefile:1.2908 --- pkgsrc/devel/Makefile:1.2907 Sun Sep 8 12:27:08 2019 +++ pkgsrc/devel/Makefile Mon Sep 9 12:59:06 2019 @@ -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+= lettuce SUBDIR+= libFoundation SUBDIR+= libFoundation-examples SUBDIR+= libappindicator -SUBDIR+= libappindicator3 SUBDIR+= libarena SUBDIR+= libargparse SUBDIR+= libast Index: pkgsrc/devel/libappindicator/Makefile diff -u pkgsrc/devel/libappindicator/Makefile:1.14 pkgsrc/devel/libappindicator/Makefile:1.15 --- pkgsrc/devel/libappindicator/Makefile:1.14 Mon Sep 2 13:19:36 2019 +++ pkgsrc/devel/libappindicator/Makefile Mon Sep 9 12:59:06 2019 @@ -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 -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 + +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/libindicator/buildlink3.mk" -.include "../../devel/libdbusmenu-gtk/buildlink3.mk" -.include "../../devel/glib2/buildlink3.mk" -.include "../../devel/py-gobject/buildlink3.mk" +.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" Index: pkgsrc/devel/libappindicator/PLIST diff -u pkgsrc/devel/libappindicator/PLIST:1.1 pkgsrc/devel/libappindicator/PLIST:1.2 --- pkgsrc/devel/libappindicator/PLIST:1.1 Fri May 20 21:39:03 2016 +++ pkgsrc/devel/libappindicator/PLIST Mon Sep 9 12:59:06 2019 @@ -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/objec 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 Index: pkgsrc/devel/libappindicator/distinfo diff -u pkgsrc/devel/libappindicator/distinfo:1.1 pkgsrc/devel/libappindicator/distinfo:1.2 --- pkgsrc/devel/libappindicator/distinfo:1.1 Fri May 20 21:39:03 2016 +++ pkgsrc/devel/libappindicator/distinfo Mon Sep 9 12:59:06 2019 @@ -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 Index: pkgsrc/devel/libappindicator/buildlink3.mk diff -u pkgsrc/devel/libappindicator/buildlink3.mk:1.9 pkgsrc/devel/libappindicator/buildlink3.mk:1.10 --- pkgsrc/devel/libappindicator/buildlink3.mk:1.9 Sun Jul 21 22:24:00 2019 +++ pkgsrc/devel/libappindicator/buildlink3.mk Mon Sep 9 12:59:06 2019 @@ -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 @@ BUILDLINK_TREE+= libappindicator 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 Index: pkgsrc/mk/defaults/options.description diff -u pkgsrc/mk/defaults/options.description:1.593 pkgsrc/mk/defaults/options.description:1.594 --- pkgsrc/mk/defaults/options.description:1.593 Sun Sep 8 14:05:38 2019 +++ pkgsrc/mk/defaults/options.description Mon Sep 9 12:59:06 2019 @@ -436,7 +436,7 @@ lcms Enable Light Color Management Sys 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. Index: pkgsrc/x11/mate-control-center/Makefile diff -u pkgsrc/x11/mate-control-center/Makefile:1.18 pkgsrc/x11/mate-control-center/Makefile:1.19 --- pkgsrc/x11/mate-control-center/Makefile:1.18 Sat Sep 7 04:02:58 2019 +++ pkgsrc/x11/mate-control-center/Makefile Mon Sep 9 12:59:06 2019 @@ -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 Index: pkgsrc/x11/mate-control-center/options.mk diff -u pkgsrc/x11/mate-control-center/options.mk:1.1 pkgsrc/x11/mate-control-center/options.mk:1.2 --- pkgsrc/x11/mate-control-center/options.mk:1.1 Sat Sep 7 04:02:58 2019 +++ pkgsrc/x11/mate-control-center/options.mk Mon Sep 9 12:59:06 2019 @@ -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 --_----------=_156803394714150--