CVS commit: pkgsrc/misc/gkrellm-moon

["Masatake Daimon" <pho%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   pho
Date:           Sat Nov 27 05:51:04 UTC 2021

Modified Files:
        pkgsrc/misc/gkrellm-moon: Makefile distinfo
        pkgsrc/misc/gkrellm-moon/patches: patch-aa

Log Message:
Support RELRO


To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.63 pkgsrc/misc/gkrellm-moon/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/misc/gkrellm-moon/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/misc/gkrellm-moon/patches/patch-aa

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/misc/gkrellm-moon/Makefile
diff -u pkgsrc/misc/gkrellm-moon/Makefile:1.62 pkgsrc/misc/gkrellm-moon/Makefile:1.63
--- pkgsrc/misc/gkrellm-moon/Makefile:1.62      Mon Aug 17 20:19:30 2020
+++ pkgsrc/misc/gkrellm-moon/Makefile   Sat Nov 27 05:51:04 2021
@@ -1,15 +1,16 @@
-# $NetBSD: Makefile,v 1.62 2020/08/17 20:19:30 leot Exp $
+# $NetBSD: Makefile,v 1.63 2021/11/27 05:51:04 pho Exp $
 #
 
 DISTNAME=              gkrellmoon-0.6
 PKGNAME=               gkrellm-moon-0.6
-PKGREVISION=           43
+PKGREVISION=           44
 CATEGORIES=            misc
 MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=gkrellmoon/}
 
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=              http://gkrellmoon.sourceforge.net/
 COMMENT=               GKrellM2 moonclock plugin
+LICENSE=               gnu-gpl-v2
 
 USE_TOOLS+=            pkg-config
 BUILD_TARGET=          gkrellmoon.so

Index: pkgsrc/misc/gkrellm-moon/distinfo
diff -u pkgsrc/misc/gkrellm-moon/distinfo:1.7 pkgsrc/misc/gkrellm-moon/distinfo:1.8
--- pkgsrc/misc/gkrellm-moon/distinfo:1.7       Tue Oct 26 10:59:04 2021
+++ pkgsrc/misc/gkrellm-moon/distinfo   Sat Nov 27 05:51:04 2021
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.7 2021/10/26 10:59:04 nia Exp $
+$NetBSD: distinfo,v 1.8 2021/11/27 05:51:04 pho Exp $
 
 BLAKE2s (gkrellmoon-0.6.tar.gz) = 7e4d6590d412be95d2ab272f9d63b0acbdc939ed37ef29863fe67c3b6905f0e0
 SHA512 (gkrellmoon-0.6.tar.gz) = d0f1008b4501c412817168f751c1d948dc4fdda97572a85c950c7595dfdb0466be964a04ccd8eb31b1bfd83709607fe6cb422ec15d144ef8615dd9700adf127d
 Size (gkrellmoon-0.6.tar.gz) = 55035 bytes
-SHA1 (patch-aa) = d2d78944247972c2cc3c7eed4310d4ec80287305
+SHA1 (patch-aa) = 823759c9e9169db8c328ef9c837129d35990a8c5

Index: pkgsrc/misc/gkrellm-moon/patches/patch-aa
diff -u pkgsrc/misc/gkrellm-moon/patches/patch-aa:1.3 pkgsrc/misc/gkrellm-moon/patches/patch-aa:1.4
--- pkgsrc/misc/gkrellm-moon/patches/patch-aa:1.3       Fri Jun 20 01:09:26 2008
+++ pkgsrc/misc/gkrellm-moon/patches/patch-aa   Sat Nov 27 05:51:04 2021
@@ -1,8 +1,13 @@
-$NetBSD: patch-aa,v 1.3 2008/06/20 01:09:26 joerg Exp $
+$NetBSD: patch-aa,v 1.4 2021/11/27 05:51:04 pho Exp $
 
---- Makefile.orig      2002-12-11 04:36:06.000000000 +0100
+* Change the hard-coded installation path.
+* Change the hard-coded C compiler.
+* Honor LDFLAGS so that flags like -Wl,-zrelro can be used.
+* Use BSD_INSTALL_LIB to install the plugin .so file.
+
+--- Makefile.orig      2002-12-11 03:36:06.000000000 +0000
 +++ Makefile
-@@ -1,14 +1,14 @@
+@@ -1,19 +1,19 @@
  GTK_INCLUDE = `pkg-config gtk+-2.0 --cflags`
  GTK_LIB = `pkg-config gtk+-2.0 --libs`
  
@@ -19,10 +24,16 @@ $NetBSD: patch-aa,v 1.3 2008/06/20 01:09
  
  OBJS = gkrellmoon.o MoonRise.o CalcEphem.o Moon.o
  
+ gkrellmoon.so: $(OBJS)
+-      $(CC) $(OBJS) -o gkrellmoon.so $(LFLAGS) $(LIBS)
++      $(CC) $(OBJS) -o gkrellmoon.so $(LDFLAGS) $(LFLAGS) $(LIBS)
+ 
+ clean:
+       rm -f *.o core *.so* *.bak *~
 @@ -23,4 +23,5 @@ gkrellmoon.o: gkrellmoon.c moon_60.xpm
  # %.o: %.c
  
  install: gkrellmoon.so
 -      install -c -s -m 644 gkrellmoon.so $(INSTALLDIR)
 +      $(BSD_INSTALL_DATA_DIR) ${DESTDIR}$(INSTALLDIR)
-+      $(BSD_INSTALL_DATA) gkrellmoon.so ${DESTDIR}$(INSTALLDIR)
++      $(BSD_INSTALL_LIB) gkrellmoon.so ${DESTDIR}$(INSTALLDIR)