Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mail.NetBSD.org", Issuer "mail.NetBSD.org CA" (not verified)) by mollari.NetBSD.org (Postfix) with ESMTPS id 776781A9239 for ; Fri, 12 Nov 2021 16:17:22 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 44F0B84E7E; Fri, 12 Nov 2021 16:17:22 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 8077A84D82 for ; Fri, 12 Nov 2021 16:17:21 +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 kR9yuiWbb2CB for ; Fri, 12 Nov 2021 16:17:20 +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 A7B3184D0E for ; Fri, 12 Nov 2021 16:17:20 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id A15F5FAEC; Fri, 12 Nov 2021 16:17:20 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1636733840257290" MIME-Version: 1.0 Date: Fri, 12 Nov 2021 16:17:20 +0000 From: "Nia Alarie" Subject: CVS commit: pkgsrc/graphics/gpick To: pkgsrc-changes@NetBSD.org Reply-To: nia@netbsd.org X-Mailer: log_accum Message-Id: <20211112161720.A15F5FAEC@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1636733840257290 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: nia Date: Fri Nov 12 16:17:20 UTC 2021 Modified Files: pkgsrc/graphics/gpick: Makefile PLIST distinfo pkgsrc/graphics/gpick/patches: patch-SConscript Log Message: gpick: Update to 0.2.6. Builds again. To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 pkgsrc/graphics/gpick/Makefile cvs rdiff -u -r1.1 -r1.2 pkgsrc/graphics/gpick/PLIST cvs rdiff -u -r1.3 -r1.4 pkgsrc/graphics/gpick/distinfo cvs rdiff -u -r1.1 -r1.2 pkgsrc/graphics/gpick/patches/patch-SConscript Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1636733840257290 Content-Disposition: inline Content-Length: 6156 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/graphics/gpick/Makefile diff -u pkgsrc/graphics/gpick/Makefile:1.31 pkgsrc/graphics/gpick/Makefile:1.32 --- pkgsrc/graphics/gpick/Makefile:1.31 Wed Sep 29 19:00:45 2021 +++ pkgsrc/graphics/gpick/Makefile Fri Nov 12 16:17:20 2021 @@ -1,23 +1,30 @@ -# $NetBSD: Makefile,v 1.31 2021/09/29 19:00:45 adam Exp $ +# $NetBSD: Makefile,v 1.32 2021/11/12 16:17:20 nia Exp $ -DISTNAME= gpick-gpick-0.2.5 -PKGNAME= ${DISTNAME:S/gpick-//} -PKGREVISION= 24 +DISTNAME= gpick-0.2.6 CATEGORIES= graphics -MASTER_SITES= -http://github.com/thezbyg/gpick/archive/gpick-0.2.5.tar.gz +MASTER_SITES= ${MASTER_SITE_GITHUB:=thezbyg/} +GITHUB_TAG= ${DISTNAME} MAINTAINER= ryoon@NetBSD.org HOMEPAGE= https://github.com/thezbyg/gpick/ COMMENT= Advanced color picker LICENSE= modified-bsd -USE_LANGUAGES= c c++03 -USE_TOOLS+= pkg-config +USE_LANGUAGES= c c++ +USE_TOOLS+= pkg-config msgfmt msgmerge xgettext + +GCC_REQD+= 5 # C++14 + +TOOL_DEPENDS+= ragel-[0-9]*:../../devel/ragel PYTHON_VERSIONS_ACCEPTED= 27 # as of 0.2.5 SCONS_ARGS+= DESTDIR=${DESTDIR}${PREFIX} -SCONS_ARGS+= PKGMANDIR=${PKGMANDIR} + +SUBST_CLASSES+= man +SUBST_STAGE.man= pre-configure +SUBST_FILES.man+= SConscript +SUBST_SED.man+= -e "s,/share/man/man1,/${PKGMANDIR}/man1,g" do-build: cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${SCONSBIN} ${SCONS_ARGS} Index: pkgsrc/graphics/gpick/PLIST diff -u pkgsrc/graphics/gpick/PLIST:1.1 pkgsrc/graphics/gpick/PLIST:1.2 --- pkgsrc/graphics/gpick/PLIST:1.1 Fri Dec 30 21:23:54 2016 +++ pkgsrc/graphics/gpick/PLIST Fri Nov 12 16:17:20 2021 @@ -1,21 +1,28 @@ -@comment $NetBSD: PLIST,v 1.1 2016/12/30 21:23:54 ryoon Exp $ +@comment $NetBSD: PLIST,v 1.2 2021/11/12 16:17:20 nia Exp $ bin/gpick man/man1/gpick.1 share/applications/gpick.desktop share/doc/gpick/copyright -share/gpick/colors.txt -share/gpick/colors0.txt +share/gpick/color_dictionary_0.txt +share/gpick/converters.lua share/gpick/gpick-falloff-cubic.png share/gpick/gpick-falloff-exponential.png share/gpick/gpick-falloff-linear.png share/gpick/gpick-falloff-none.png share/gpick/gpick-falloff-quadratic.png share/gpick/gpick-gray-pattern.png +share/gpick/gpick-tray.png share/gpick/helpers.lua share/gpick/init.lua share/gpick/layouts.lua +share/gpick/logo.png +share/gpick/options.lua share/icons/hicolor/48x48/apps/gpick.png share/icons/hicolor/scalable/apps/gpick.svg +share/locale/cs/LC_MESSAGES/gpick.mo share/locale/es/LC_MESSAGES/gpick.mo share/locale/lt/LC_MESSAGES/gpick.mo share/locale/ru/LC_MESSAGES/gpick.mo +share/locale/sv/LC_MESSAGES/gpick.mo +share/metainfo/gpick.appdata.xml +share/mime/packages/gpick.xml Index: pkgsrc/graphics/gpick/distinfo diff -u pkgsrc/graphics/gpick/distinfo:1.3 pkgsrc/graphics/gpick/distinfo:1.4 --- pkgsrc/graphics/gpick/distinfo:1.3 Tue Oct 26 10:46:16 2021 +++ pkgsrc/graphics/gpick/distinfo Fri Nov 12 16:17:20 2021 @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.3 2021/10/26 10:46:16 nia Exp $ +$NetBSD: distinfo,v 1.4 2021/11/12 16:17:20 nia Exp $ -BLAKE2s (gpick-gpick-0.2.5.tar.gz) = b949f8fc7664c07ca3a6c870bd88318343348a79e794c771e1b13ee87e38d6ae -SHA512 (gpick-gpick-0.2.5.tar.gz) = 05ff855e28dcfede0c825d555d5572650ffda9cfaa6462e5b503d2a64cb340eca675b37780dbd3bf43750dbd2d844cb755277eaba7e7a77cb0c3b7e772d552e6 -Size (gpick-gpick-0.2.5.tar.gz) = 329190 bytes -SHA1 (patch-SConscript) = 391723077ea44372c316dadb78535a0b54fd2f4c +BLAKE2s (gpick-0.2.6.tar.gz) = 26745d0822db138c0f1bbd860c2fe8cac6c501de8e02be6e57b9621d6712e929 +SHA512 (gpick-0.2.6.tar.gz) = 85f4d0978915e0c0b6e412d619a28af62a43547d39c4b97d8dddc4024f9d8b339f09e91f70d929073ebbad7a6e008e174aa76fdc611008ba269dedb403ed6867 +Size (gpick-0.2.6.tar.gz) = 363810 bytes +SHA1 (patch-SConscript) = b934c7e48eedbc08fcdc38c558ff35e38fb446c8 Index: pkgsrc/graphics/gpick/patches/patch-SConscript diff -u pkgsrc/graphics/gpick/patches/patch-SConscript:1.1 pkgsrc/graphics/gpick/patches/patch-SConscript:1.2 --- pkgsrc/graphics/gpick/patches/patch-SConscript:1.1 Fri Dec 30 21:23:55 2016 +++ pkgsrc/graphics/gpick/patches/patch-SConscript Fri Nov 12 16:17:20 2021 @@ -1,23 +1,14 @@ -$NetBSD: patch-SConscript,v 1.1 2016/12/30 21:23:55 ryoon Exp $ +$NetBSD: patch-SConscript,v 1.2 2021/11/12 16:17:20 nia Exp $ -* Fix man page path +Add missing SCons include. ---- SConscript.orig 2013-02-28 17:34:31.000000000 +0000 +--- SConscript.orig 2021-11-12 15:54:16.512135933 +0000 +++ SConscript -@@ -10,6 +10,7 @@ env = GpickEnvironment(ENV=os.environ, B +@@ -2,6 +2,7 @@ + # coding: utf-8 + import os, string, sys, shutil, math + from tools import * ++import SCons + + env = GpickEnvironment(ENV = os.environ, BUILDERS = {'WriteNsisVersion': Builder(action = WriteNsisVersion, suffix = ".nsi")}) - vars = Variables(os.path.join(env.GetLaunchDir(), 'user-config.py')) - vars.Add('DESTDIR', 'Directory to install under', '/usr/local') -+vars.Add('PKGMANDIR', 'Path to man pages', 'man') - vars.Add('LOCALEDIR', 'Path to locale directory', '') - vars.Add('DEBARCH', 'Debian package architecture', 'i386') - vars.Add(BoolVariable('ENABLE_NLS', 'Compile with gettext support', True)) -@@ -164,7 +165,7 @@ env.Alias(target="install", source=[ - env.InstallData(dir=env['DESTDIR'] +'/share/applications', source=['share/applications/gpick.desktop']), - env.InstallData(dir=env['DESTDIR'] +'/share/doc/gpick', source=['share/doc/gpick/copyright']), - env.InstallData(dir=env['DESTDIR'] +'/share/gpick', source=[env.Glob('share/gpick/*.png'), env.Glob('share/gpick/*.lua'), env.Glob('share/gpick/*.txt')]), -- env.InstallData(dir=env['DESTDIR'] +'/share/man/man1', source=['share/man/man1/gpick.1']), -+ env.InstallData(dir=env['DESTDIR'] + '/' + env['PKGMANDIR'] + '/man1', source=['share/man/man1/gpick.1']), - env.InstallData(dir=env['DESTDIR'] +'/share/icons/hicolor/48x48/apps/', source=[env.Glob('share/icons/hicolor/48x48/apps/*.png')]), - env.InstallData(dir=env['DESTDIR'] +'/share/icons/hicolor/scalable/apps/', source=[env.Glob('share/icons/hicolor/scalable/apps/*.svg')]), - env.InstallDataAutoDir(dir=env['DESTDIR'] + '/share/locale/', relative_dir='share/locale/', source=[env.Glob('share/locale/*/LC_MESSAGES/gpick.mo')]), --_----------=_1636733840257290--