Received: by mail.netbsd.org (Postfix, from userid 605) id 3CE0384D7E; Mon, 10 Feb 2020 13:08:12 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id B77F884D73 for ; Mon, 10 Feb 2020 13:08:11 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id vjwkyYTZP8ul for ; Mon, 10 Feb 2020 13:08:11 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id E5AFE84D28 for ; Mon, 10 Feb 2020 13:08:10 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id E35A7FBF4; Mon, 10 Feb 2020 13:08:10 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1581340090207100" MIME-Version: 1.0 Date: Mon, 10 Feb 2020 13:08:10 +0000 From: "Ryo ONODERA" Subject: CVS commit: pkgsrc/graphics/grafx2 To: pkgsrc-changes@NetBSD.org Reply-To: ryoon@netbsd.org X-Mailer: log_accum Message-Id: <20200210130810.E35A7FBF4@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. --_----------=_1581340090207100 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: ryoon Date: Mon Feb 10 13:08:10 UTC 2020 Modified Files: pkgsrc/graphics/grafx2: Makefile PLIST distinfo pkgsrc/graphics/grafx2/patches: patch-help.c patch-main.c patch-misc.c Log Message: grafx2: Update to 2.7.2950 Changelog: Not available. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 pkgsrc/graphics/grafx2/Makefile cvs rdiff -u -r1.2 -r1.3 pkgsrc/graphics/grafx2/PLIST \ pkgsrc/graphics/grafx2/distinfo cvs rdiff -u -r1.1 -r1.2 pkgsrc/graphics/grafx2/patches/patch-help.c \ pkgsrc/graphics/grafx2/patches/patch-main.c cvs rdiff -u -r1.2 -r1.3 pkgsrc/graphics/grafx2/patches/patch-misc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1581340090207100 Content-Disposition: inline Content-Length: 7700 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/graphics/grafx2/Makefile diff -u pkgsrc/graphics/grafx2/Makefile:1.5 pkgsrc/graphics/grafx2/Makefile:1.6 --- pkgsrc/graphics/grafx2/Makefile:1.5 Sun Jul 28 19:50:55 2019 +++ pkgsrc/graphics/grafx2/Makefile Mon Feb 10 13:08:10 2020 @@ -1,20 +1,20 @@ -# $NetBSD: Makefile,v 1.5 2019/07/28 19:50:55 nia Exp $ +# $NetBSD: Makefile,v 1.6 2020/02/10 13:08:10 ryoon Exp $ -DISTNAME= grafX2-v2.6 -PKGNAME= ${DISTNAME:S/X2-v/x2-/} +DISTNAME= grafx2-2.7.2950-src +PKGNAME= ${DISTNAME:S/-src//} CATEGORIES= graphics -MASTER_SITES= https://gitlab.com/GrafX2/grafX2/-/archive/v${PKGVERSION_NOREV}/ +MASTER_SITES= https://gitlab.com/GrafX2/grafX2/-/jobs/428763304/artifacts/raw/ EXTRACT_SUFX= .tgz MAINTAINER= ryoon@NetBSD.org -HOMEPAGE= http://grafx2.chez.com/ +HOMEPAGE= https://grafx2.gitlab.io/grafX2/ COMMENT= Ultimate 256-color bitmap paint program LICENSE= gnu-gpl-v2 USE_TOOLS+= curl gmake pkg-config USE_LANGUAGES= c c++ -WRKSRC= ${WRKDIR}/${DISTNAME}/src +WRKSRC= ${WRKDIR}/grafx2/src SUBST_CLASSES+= fix-paths SUBST_STAGE.fix-paths= pre-configure Index: pkgsrc/graphics/grafx2/PLIST diff -u pkgsrc/graphics/grafx2/PLIST:1.2 pkgsrc/graphics/grafx2/PLIST:1.3 --- pkgsrc/graphics/grafx2/PLIST:1.2 Thu Jul 18 12:15:04 2019 +++ pkgsrc/graphics/grafx2/PLIST Mon Feb 10 13:08:10 2020 @@ -1,10 +1,7 @@ -@comment $NetBSD: PLIST,v 1.2 2019/07/18 12:15:04 nia Exp $ +@comment $NetBSD: PLIST,v 1.3 2020/02/10 13:08:10 ryoon Exp $ bin/grafx2-sdl share/applications/grafx2.desktop -share/grafx2/fonts/5pxtinyfont.png share/grafx2/fonts/8pxfont.png -share/grafx2/fonts/GrafX2_Black.gif -share/grafx2/fonts/GrafX2_Dark.gif share/grafx2/fonts/PF_Arma_5__.png share/grafx2/fonts/PF_Easta_7_.png share/grafx2/fonts/PF_Easta_7__.png @@ -20,8 +17,8 @@ share/grafx2/fonts/PF_Tempesta_7___.png share/grafx2/fonts/PF_Westa_7_.png share/grafx2/fonts/PF_Westa_7__.png share/grafx2/fonts/Tuffy.ttf -share/grafx2/fonts/colorfont.pcx share/grafx2/gfx2.gif +share/grafx2/gfx2.png share/grafx2/gfx2def.ini share/grafx2/scripts/samples/brush/ApplyColor.lua share/grafx2/scripts/samples/brush/Fisheye.lua @@ -93,7 +90,9 @@ share/grafx2/skins/skin_DPaint.png share/grafx2/skins/skin_classic.png share/grafx2/skins/skin_modern.png share/grafx2/skins/skin_scenish.png +share/grafx2/skins/unicode_0390-03C9.png share/grafx2/skins/unicode_0410-044F.png +share/grafx2/skins/unicode_3040-309F.png share/icons/hicolor/scalable/apps/grafx2.svg share/icons/hicolor/scalable/apps/grafx2.xpm share/metainfo/grafx2.appdata.xml Index: pkgsrc/graphics/grafx2/distinfo diff -u pkgsrc/graphics/grafx2/distinfo:1.2 pkgsrc/graphics/grafx2/distinfo:1.3 --- pkgsrc/graphics/grafx2/distinfo:1.2 Thu Jul 18 12:15:04 2019 +++ pkgsrc/graphics/grafx2/distinfo Mon Feb 10 13:08:10 2020 @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.2 2019/07/18 12:15:04 nia Exp $ +$NetBSD: distinfo,v 1.3 2020/02/10 13:08:10 ryoon Exp $ -SHA1 (grafX2-v2.6.tgz) = 0aa6501a6ab6815917826603f7d4ef4e2cf01b4e -RMD160 (grafX2-v2.6.tgz) = ae0eb91a69be72e343241221a1c28261416aea51 -SHA512 (grafX2-v2.6.tgz) = 45daf4c32d7523f6b5c54b4b8d1fe9e35aff663a650ee86bd9898d91510340ae8e1fb61ea35d83efc944af28568258f827cdebb79362648361688c306781d8c6 -Size (grafX2-v2.6.tgz) = 1228632 bytes -SHA1 (patch-help.c) = b4df9282f64760f00f380f19e52a48839f3d9025 -SHA1 (patch-main.c) = 32ab12bd3a3b39cc89004afde815dbd4fddc0802 -SHA1 (patch-misc.c) = e4913bbf2b309ff0c2858158b6b53d6768ebff85 +SHA1 (grafx2-2.7.2950-src.tgz) = 126fa87c1bcd18af0215b24451828c37d6c45f31 +RMD160 (grafx2-2.7.2950-src.tgz) = c9a2ca8c59d0229b296bb2eeac3293a7a2fbd679 +SHA512 (grafx2-2.7.2950-src.tgz) = 1f13d17327b55d040cca63bf804f81ff2cc8a57ef6c3418d5da2e84c090b3c2b62ed348abfb95b50f11ceea80637477e8cfd3d277dfd5c8949fbdb7620098cec +Size (grafx2-2.7.2950-src.tgz) = 1104406 bytes +SHA1 (patch-help.c) = 769082d899ee7e3e88fa789f59d26db723d7c8ee +SHA1 (patch-main.c) = 3116bf8990994265132ce95fec1ca13a0b735912 +SHA1 (patch-misc.c) = 19d9c3225babd1f62c14def892b77a8691edb0a6 Index: pkgsrc/graphics/grafx2/patches/patch-help.c diff -u pkgsrc/graphics/grafx2/patches/patch-help.c:1.1 pkgsrc/graphics/grafx2/patches/patch-help.c:1.2 --- pkgsrc/graphics/grafx2/patches/patch-help.c:1.1 Thu Jul 18 12:15:04 2019 +++ pkgsrc/graphics/grafx2/patches/patch-help.c Mon Feb 10 13:08:10 2020 @@ -1,10 +1,10 @@ -$NetBSD: patch-help.c,v 1.1 2019/07/18 12:15:04 nia Exp $ +$NetBSD: patch-help.c,v 1.2 2020/02/10 13:08:10 ryoon Exp $ Use statvfs on NetBSD. ---- help.c.orig 2019-01-10 08:40:57.000000000 +0000 +--- help.c.orig 2020-02-06 21:01:27.000000000 +0000 +++ help.c -@@ -30,9 +30,11 @@ +@@ -31,9 +31,11 @@ #if defined(_MSC_VER) && _MSC_VER < 1900 #define snprintf _snprintf #endif @@ -17,9 +17,9 @@ Use statvfs on NetBSD. #elif defined (__linux__) || defined(__SYLLABLE__) #include #elif defined (__HAIKU__) -@@ -966,12 +968,18 @@ void Button_Stats(int btn) - GetDiskFreeSpaceExA(Main.selector.Directory,&tailleU,NULL,NULL); - mem_size = tailleU.QuadPart; +@@ -976,12 +978,18 @@ void Button_Stats(int btn) + GFX2_Log(GFX2_ERROR, "GetDiskFreeSpaceExA() failed\n"); + } } -#elif defined(__linux__) || defined(__macosx__) || defined(__FreeBSD__) || defined(__SYLLABLE__) || defined(__AROS__) || defined(__OpenBSD__) || defined(__NetBSD__) +#elif defined(__linux__) || defined(__macosx__) || defined(__FreeBSD__) || defined(__SYLLABLE__) || defined(__AROS__) || defined(__OpenBSD__) Index: pkgsrc/graphics/grafx2/patches/patch-main.c diff -u pkgsrc/graphics/grafx2/patches/patch-main.c:1.1 pkgsrc/graphics/grafx2/patches/patch-main.c:1.2 --- pkgsrc/graphics/grafx2/patches/patch-main.c:1.1 Tue Jul 17 13:07:50 2018 +++ pkgsrc/graphics/grafx2/patches/patch-main.c Mon Feb 10 13:08:10 2020 @@ -1,15 +1,15 @@ -$NetBSD: patch-main.c,v 1.1 2018/07/17 13:07:50 ryoon Exp $ +$NetBSD: patch-main.c,v 1.2 2020/02/10 13:08:10 ryoon Exp $ * Enable non-absolute path execute ---- main.c.orig 2018-05-15 16:51:04.000000000 +0000 +--- main.c.orig 2020-02-06 21:01:27.000000000 +0000 +++ main.c -@@ -544,7 +544,7 @@ int Init_program(int argc,char * argv[]) +@@ -654,7 +654,7 @@ int Init_program(int argc,char * argv[]) Init_list_of_pages(Spare.backups); // Determine the executable directory -- Set_program_directory(argv[0],program_directory); -+ Set_program_directory("@PREFIX@/bin/grafx2",program_directory); +- program_directory = Get_program_directory(argv[0]); ++ program_directory = Get_program_directory("@PREFIX@/bin/grafx2-sdl"); // Choose directory for data (read only) - Set_data_directory(program_directory,Data_directory); + Data_directory = Get_data_directory(program_directory); // Choose directory for settings (read/write) Index: pkgsrc/graphics/grafx2/patches/patch-misc.c diff -u pkgsrc/graphics/grafx2/patches/patch-misc.c:1.2 pkgsrc/graphics/grafx2/patches/patch-misc.c:1.3 --- pkgsrc/graphics/grafx2/patches/patch-misc.c:1.2 Thu Jul 18 12:15:04 2019 +++ pkgsrc/graphics/grafx2/patches/patch-misc.c Mon Feb 10 13:08:10 2020 @@ -1,16 +1,16 @@ -$NetBSD: patch-misc.c,v 1.2 2019/07/18 12:15:04 nia Exp $ +$NetBSD: patch-misc.c,v 1.3 2020/02/10 13:08:10 ryoon Exp $ * Fix sysctl build failure ---- misc.c.orig 2019-01-10 08:40:57.000000000 +0000 +--- misc.c.orig 2020-02-06 21:01:27.000000000 +0000 +++ misc.c -@@ -25,6 +25,9 @@ - #if defined(WIN32) - #define _WIN32_WINNT 0x0500 +@@ -29,6 +29,9 @@ + #ifndef _MSC_VER + #include #endif +#if defined(__NetBSD__) +#define _NETBSD_SOURCE +#endif - #include - #ifndef _MSC_VER - #include + #include + #include + #if !defined(USE_SDL) && !defined(USE_SDL2) --_----------=_1581340090207100--