Sat Nov 27 05:51:04 2021 UTC ()
Support RELRO


(pho)
diff -r1.62 -r1.63 pkgsrc/misc/gkrellm-moon/Makefile
diff -r1.7 -r1.8 pkgsrc/misc/gkrellm-moon/distinfo
diff -r1.3 -r1.4 pkgsrc/misc/gkrellm-moon/patches/patch-aa
cvs diff -r1.62 -r1.63 pkgsrc/misc/gkrellm-moon/Makefile (expand / switch to unified diff)

--- pkgsrc/misc/gkrellm-moon/Makefile 2020/08/17 20:19:30 1.62
+++ pkgsrc/misc/gkrellm-moon/Makefile 2021/11/27 05:51:04 1.63
@@ -1,18 +1,19 @@ @@ -1,18 +1,19 @@
1# $NetBSD: Makefile,v 1.62 2020/08/17 20:19:30 leot Exp $ 1# $NetBSD: Makefile,v 1.63 2021/11/27 05:51:04 pho Exp $
2# 2#
3 3
4DISTNAME= gkrellmoon-0.6 4DISTNAME= gkrellmoon-0.6
5PKGNAME= gkrellm-moon-0.6 5PKGNAME= gkrellm-moon-0.6
6PKGREVISION= 43 6PKGREVISION= 44
7CATEGORIES= misc 7CATEGORIES= misc
8MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gkrellmoon/} 8MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gkrellmoon/}
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://gkrellmoon.sourceforge.net/ 11HOMEPAGE= http://gkrellmoon.sourceforge.net/
12COMMENT= GKrellM2 moonclock plugin 12COMMENT= GKrellM2 moonclock plugin
 13LICENSE= gnu-gpl-v2
13 14
14USE_TOOLS+= pkg-config 15USE_TOOLS+= pkg-config
15BUILD_TARGET= gkrellmoon.so 16BUILD_TARGET= gkrellmoon.so
16 17
17.include "../../sysutils/gkrellm/buildlink3.mk" 18.include "../../sysutils/gkrellm/buildlink3.mk"
18.include "../../mk/bsd.pkg.mk" 19.include "../../mk/bsd.pkg.mk"
cvs diff -r1.7 -r1.8 pkgsrc/misc/gkrellm-moon/distinfo (expand / switch to unified diff)

--- pkgsrc/misc/gkrellm-moon/distinfo 2021/10/26 10:59:04 1.7
+++ pkgsrc/misc/gkrellm-moon/distinfo 2021/11/27 05:51:04 1.8
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.7 2021/10/26 10:59:04 nia Exp $ 1$NetBSD: distinfo,v 1.8 2021/11/27 05:51:04 pho Exp $
2 2
3BLAKE2s (gkrellmoon-0.6.tar.gz) = 7e4d6590d412be95d2ab272f9d63b0acbdc939ed37ef29863fe67c3b6905f0e0 3BLAKE2s (gkrellmoon-0.6.tar.gz) = 7e4d6590d412be95d2ab272f9d63b0acbdc939ed37ef29863fe67c3b6905f0e0
4SHA512 (gkrellmoon-0.6.tar.gz) = d0f1008b4501c412817168f751c1d948dc4fdda97572a85c950c7595dfdb0466be964a04ccd8eb31b1bfd83709607fe6cb422ec15d144ef8615dd9700adf127d 4SHA512 (gkrellmoon-0.6.tar.gz) = d0f1008b4501c412817168f751c1d948dc4fdda97572a85c950c7595dfdb0466be964a04ccd8eb31b1bfd83709607fe6cb422ec15d144ef8615dd9700adf127d
5Size (gkrellmoon-0.6.tar.gz) = 55035 bytes 5Size (gkrellmoon-0.6.tar.gz) = 55035 bytes
6SHA1 (patch-aa) = d2d78944247972c2cc3c7eed4310d4ec80287305 6SHA1 (patch-aa) = 823759c9e9169db8c328ef9c837129d35990a8c5
cvs diff -r1.3 -r1.4 pkgsrc/misc/gkrellm-moon/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/misc/gkrellm-moon/patches/patch-aa 2008/06/20 01:09:26 1.3
+++ pkgsrc/misc/gkrellm-moon/patches/patch-aa 2021/11/27 05:51:04 1.4
@@ -1,28 +1,39 @@ @@ -1,28 +1,39 @@
1$NetBSD: patch-aa,v 1.3 2008/06/20 01:09:26 joerg Exp $ 1$NetBSD: patch-aa,v 1.4 2021/11/27 05:51:04 pho Exp $
2 2
3--- Makefile.orig 2002-12-11 04:36:06.000000000 +0100 3* Change the hard-coded installation path.
 4* Change the hard-coded C compiler.
 5* Honor LDFLAGS so that flags like -Wl,-zrelro can be used.
 6* Use BSD_INSTALL_LIB to install the plugin .so file.
 7
 8--- Makefile.orig 2002-12-11 03:36:06.000000000 +0000
4+++ Makefile 9+++ Makefile
5@@ -1,14 +1,14 @@ 10@@ -1,19 +1,19 @@
6 GTK_INCLUDE = `pkg-config gtk+-2.0 --cflags` 11 GTK_INCLUDE = `pkg-config gtk+-2.0 --cflags`
7 GTK_LIB = `pkg-config gtk+-2.0 --libs` 12 GTK_LIB = `pkg-config gtk+-2.0 --libs`
8  13
9-INSTALLDIR = ${DESTDIR}/usr/lib/gkrellm2/plugins 14-INSTALLDIR = ${DESTDIR}/usr/lib/gkrellm2/plugins
10+INSTALLDIR = ${PREFIX}/lib/gkrellm2/plugins 15+INSTALLDIR = ${PREFIX}/lib/gkrellm2/plugins
11  16
12  17
13 FLAGS = -O2 -Wall -fPIC $(GTK_INCLUDE) 18 FLAGS = -O2 -Wall -fPIC $(GTK_INCLUDE)
14 LIBS = $(GTK_LIB) 19 LIBS = $(GTK_LIB)
15 LFLAGS = -shared 20 LFLAGS = -shared
16  21
17-CC = gcc $(CFLAGS) $(FLAGS) 22-CC = gcc $(CFLAGS) $(FLAGS)
18+CC += $(CFLAGS) $(FLAGS) 23+CC += $(CFLAGS) $(FLAGS)
19  24
20 OBJS = gkrellmoon.o MoonRise.o CalcEphem.o Moon.o 25 OBJS = gkrellmoon.o MoonRise.o CalcEphem.o Moon.o
21  26
 27 gkrellmoon.so: $(OBJS)
 28- $(CC) $(OBJS) -o gkrellmoon.so $(LFLAGS) $(LIBS)
 29+ $(CC) $(OBJS) -o gkrellmoon.so $(LDFLAGS) $(LFLAGS) $(LIBS)
 30
 31 clean:
 32 rm -f *.o core *.so* *.bak *~
22@@ -23,4 +23,5 @@ gkrellmoon.o: gkrellmoon.c moon_60.xpm 33@@ -23,4 +23,5 @@ gkrellmoon.o: gkrellmoon.c moon_60.xpm
23 # %.o: %.c 34 # %.o: %.c
24  35
25 install: gkrellmoon.so 36 install: gkrellmoon.so
26- install -c -s -m 644 gkrellmoon.so $(INSTALLDIR) 37- install -c -s -m 644 gkrellmoon.so $(INSTALLDIR)
27+ $(BSD_INSTALL_DATA_DIR) ${DESTDIR}$(INSTALLDIR) 38+ $(BSD_INSTALL_DATA_DIR) ${DESTDIR}$(INSTALLDIR)
28+ $(BSD_INSTALL_DATA) gkrellmoon.so ${DESTDIR}$(INSTALLDIR) 39+ $(BSD_INSTALL_LIB) gkrellmoon.so ${DESTDIR}$(INSTALLDIR)