Tue Dec 13 13:12:10 2022 UTC ()
gkrellsun: Build and PKGLOCALEDIR fixes.


(jperkin)
diff -r1.3 -r1.4 pkgsrc/misc/gkrellsun/Makefile
diff -r1.1 -r1.2 pkgsrc/misc/gkrellsun/distinfo
diff -r0 -r1.1 pkgsrc/misc/gkrellsun/patches/patch-src20_gkrellsun.c
cvs diff -r1.3 -r1.4 pkgsrc/misc/gkrellsun/Makefile (expand / switch to unified diff)

--- pkgsrc/misc/gkrellsun/Makefile 2022/10/26 10:31:42 1.3
+++ pkgsrc/misc/gkrellsun/Makefile 2022/12/13 13:12:10 1.4
@@ -1,22 +1,23 @@ @@ -1,22 +1,23 @@
1# $NetBSD: Makefile,v 1.3 2022/10/26 10:31:42 wiz Exp $ 1# $NetBSD: Makefile,v 1.4 2022/12/13 13:12:10 jperkin Exp $
2DISTNAME= gkrellsun-1.0.0 2DISTNAME= gkrellsun-1.0.0
3PKGREVISION= 2 3PKGREVISION= 2
4CATEGORIES= misc 4CATEGORIES= misc
5MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gkrellsun/} 5MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gkrellsun/}
6 6
7MAINTAINER= pkgsrc-users@NetBSD.org 7MAINTAINER= pkgsrc-users@NetBSD.org
8HOMEPAGE= http://gkrellsun.sourceforge.net/ 8HOMEPAGE= http://gkrellsun.sourceforge.net/
9COMMENT= GKrellM plugin to display sun rise and sun set times 9COMMENT= GKrellM plugin to display sun rise and sun set times
10LICENSE= gnu-gpl-v2 10LICENSE= gnu-gpl-v2
11 11
12USE_TOOLS+= pkg-config gmake 12USE_PKGLOCALEDIR= yes
 13USE_TOOLS+= pkg-config gmake
13 14
14.include "options.mk" 15.include "options.mk"
15 16
16INSTALLATION_DIRS+= share/doc/${PKGBASE} 17INSTALLATION_DIRS+= share/doc/${PKGBASE}
17post-install: 18post-install:
18 ${INSTALL_DATA} "${WRKSRC}/README" \ 19 ${INSTALL_DATA} "${WRKSRC}/README" \
19 "${DESTDIR}${PREFIX}/share/doc/${PKGBASE}" 20 "${DESTDIR}${PREFIX}/share/doc/${PKGBASE}"
20 21
21.include "../../sysutils/gkrellm/buildlink3.mk" 22.include "../../sysutils/gkrellm/buildlink3.mk"
22.include "../../mk/bsd.pkg.mk" 23.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1 -r1.2 pkgsrc/misc/gkrellsun/distinfo (expand / switch to unified diff)

--- pkgsrc/misc/gkrellsun/distinfo 2021/11/27 12:33:20 1.1
+++ pkgsrc/misc/gkrellsun/distinfo 2022/12/13 13:12:10 1.2
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
1$NetBSD: distinfo,v 1.1 2021/11/27 12:33:20 pho Exp $ 1$NetBSD: distinfo,v 1.2 2022/12/13 13:12:10 jperkin Exp $
2 2
3BLAKE2s (gkrellsun-1.0.0.tar.gz) = 29aebc2c39df47ce9b06a27882f2ba2b0853fa5c1504c01d3e735ba267a33e03 3BLAKE2s (gkrellsun-1.0.0.tar.gz) = 29aebc2c39df47ce9b06a27882f2ba2b0853fa5c1504c01d3e735ba267a33e03
4SHA512 (gkrellsun-1.0.0.tar.gz) = 1a34812e94f16d19311c23d44a0353dade50b802dd3ab115738959b9322c3bc6a28daa2bcea889700e6cc2ff8eb9400b989bf02c6f138bb878b94118ffd6e27a 4SHA512 (gkrellsun-1.0.0.tar.gz) = 1a34812e94f16d19311c23d44a0353dade50b802dd3ab115738959b9322c3bc6a28daa2bcea889700e6cc2ff8eb9400b989bf02c6f138bb878b94118ffd6e27a
5Size (gkrellsun-1.0.0.tar.gz) = 96970 bytes 5Size (gkrellsun-1.0.0.tar.gz) = 96970 bytes
6SHA1 (patch-src20_Makefile) = aa82b3842f704ced762830bf65de5b69e368c78d 6SHA1 (patch-src20_Makefile) = aa82b3842f704ced762830bf65de5b69e368c78d
 7SHA1 (patch-src20_gkrellsun.c) = 5361ecc6e27ca9407d7cfa02ab186554df7ba9c6
File Added: pkgsrc/misc/gkrellsun/patches/patch-src20_gkrellsun.c
$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 <math.h>
 
+#ifdef __sun
+#undef sun
+#endif
+
 /* splint */
 extern gchar* g_string_free (/*@only@*/ GString *, gboolean);
 extern void pango_font_description_free (/*@owned@*/PangoFontDescription *);