Received: by mail.netbsd.org (Postfix, from userid 605) id 701C784EB8; Tue, 13 Dec 2022 13:12:12 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id A2C4E84EAB for ; Tue, 13 Dec 2022 13:12:11 +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 DkJ43U8PxgtD for ; Tue, 13 Dec 2022 13:12:11 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 1789184D4B for ; Tue, 13 Dec 2022 13:12:11 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 10EB6FA90; Tue, 13 Dec 2022 13:12:11 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_167093713129250" MIME-Version: 1.0 Date: Tue, 13 Dec 2022 13:12:11 +0000 From: "Jonathan Perkin" Subject: CVS commit: pkgsrc/misc/gkrellsun To: pkgsrc-changes@NetBSD.org Reply-To: jperkin@netbsd.org X-Mailer: log_accum Message-Id: <20221213131211.10EB6FA90@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_167093713129250 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: jperkin Date: Tue Dec 13 13:12:10 UTC 2022 Modified Files: pkgsrc/misc/gkrellsun: Makefile distinfo Added Files: pkgsrc/misc/gkrellsun/patches: patch-src20_gkrellsun.c Log Message: gkrellsun: Build and PKGLOCALEDIR fixes. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 pkgsrc/misc/gkrellsun/Makefile cvs rdiff -u -r1.1 -r1.2 pkgsrc/misc/gkrellsun/distinfo cvs rdiff -u -r0 -r1.1 pkgsrc/misc/gkrellsun/patches/patch-src20_gkrellsun.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_167093713129250 Content-Disposition: inline Content-Length: 2281 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/misc/gkrellsun/Makefile diff -u pkgsrc/misc/gkrellsun/Makefile:1.3 pkgsrc/misc/gkrellsun/Makefile:1.4 --- pkgsrc/misc/gkrellsun/Makefile:1.3 Wed Oct 26 10:31:42 2022 +++ pkgsrc/misc/gkrellsun/Makefile Tue Dec 13 13:12:10 2022 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2022/10/26 10:31:42 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2022/12/13 13:12:10 jperkin Exp $ DISTNAME= gkrellsun-1.0.0 PKGREVISION= 2 CATEGORIES= misc @@ -9,7 +9,8 @@ HOMEPAGE= http://gkrellsun.sourceforge.n COMMENT= GKrellM plugin to display sun rise and sun set times LICENSE= gnu-gpl-v2 -USE_TOOLS+= pkg-config gmake +USE_PKGLOCALEDIR= yes +USE_TOOLS+= pkg-config gmake .include "options.mk" Index: pkgsrc/misc/gkrellsun/distinfo diff -u pkgsrc/misc/gkrellsun/distinfo:1.1 pkgsrc/misc/gkrellsun/distinfo:1.2 --- pkgsrc/misc/gkrellsun/distinfo:1.1 Sat Nov 27 12:33:20 2021 +++ pkgsrc/misc/gkrellsun/distinfo Tue Dec 13 13:12:10 2022 @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.1 2021/11/27 12:33:20 pho Exp $ +$NetBSD: distinfo,v 1.2 2022/12/13 13:12:10 jperkin Exp $ BLAKE2s (gkrellsun-1.0.0.tar.gz) = 29aebc2c39df47ce9b06a27882f2ba2b0853fa5c1504c01d3e735ba267a33e03 SHA512 (gkrellsun-1.0.0.tar.gz) = 1a34812e94f16d19311c23d44a0353dade50b802dd3ab115738959b9322c3bc6a28daa2bcea889700e6cc2ff8eb9400b989bf02c6f138bb878b94118ffd6e27a Size (gkrellsun-1.0.0.tar.gz) = 96970 bytes SHA1 (patch-src20_Makefile) = aa82b3842f704ced762830bf65de5b69e368c78d +SHA1 (patch-src20_gkrellsun.c) = 5361ecc6e27ca9407d7cfa02ab186554df7ba9c6 Added files: Index: pkgsrc/misc/gkrellsun/patches/patch-src20_gkrellsun.c diff -u /dev/null pkgsrc/misc/gkrellsun/patches/patch-src20_gkrellsun.c:1.1 --- /dev/null Tue Dec 13 13:12:11 2022 +++ pkgsrc/misc/gkrellsun/patches/patch-src20_gkrellsun.c Tue Dec 13 13:12:10 2022 @@ -0,0 +1,17 @@ +$NetBSD: patch-src20_gkrellsun.c,v 1.1 2022/12/13 13:12:10 jperkin Exp $ + +Avoid "sun" conflict. + +--- src20/gkrellsun.c.orig 2006-03-17 13:29:51.000000000 +0000 ++++ src20/gkrellsun.c +@@ -16,6 +16,10 @@ time_t* CurrentTime; + + #include + ++#ifdef __sun ++#undef sun ++#endif ++ + /* splint */ + extern gchar* g_string_free (/*@only@*/ GString *, gboolean); + extern void pango_font_description_free (/*@owned@*/PangoFontDescription *); --_----------=_167093713129250--