Sun Nov 28 05:22:15 2021 UTC ()
Support RELRO


(pho)
diff -r1.9 -r1.10 pkgsrc/audio/gkrellm-volume/distinfo
diff -r1.4 -r1.5 pkgsrc/audio/gkrellm-volume/patches/patch-aa
cvs diff -r1.9 -r1.10 pkgsrc/audio/gkrellm-volume/distinfo (expand / switch to unified diff)

--- pkgsrc/audio/gkrellm-volume/distinfo 2021/10/26 09:58:58 1.9
+++ pkgsrc/audio/gkrellm-volume/distinfo 2021/11/28 05:22:15 1.10
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.9 2021/10/26 09:58:58 nia Exp $ 1$NetBSD: distinfo,v 1.10 2021/11/28 05:22:15 pho Exp $
2 2
3BLAKE2s (gkrellm-volume-2.1.13.tar.gz) = 3e06f29260bb57e914c7939d1860bc476f0309656a74d9ab15228d7f2ced06c8 3BLAKE2s (gkrellm-volume-2.1.13.tar.gz) = 3e06f29260bb57e914c7939d1860bc476f0309656a74d9ab15228d7f2ced06c8
4SHA512 (gkrellm-volume-2.1.13.tar.gz) = 4f244978ea8b68994540b050244350c7c2389b227541822fde009408378ce0511c32956daea205465a4c4890c68e47f64dcd8b3eca8901963d38fd1852526eb5 4SHA512 (gkrellm-volume-2.1.13.tar.gz) = 4f244978ea8b68994540b050244350c7c2389b227541822fde009408378ce0511c32956daea205465a4c4890c68e47f64dcd8b3eca8901963d38fd1852526eb5
5Size (gkrellm-volume-2.1.13.tar.gz) = 42087 bytes 5Size (gkrellm-volume-2.1.13.tar.gz) = 42087 bytes
6SHA1 (patch-aa) = 450cbad8d74cdbf3d6795bb81facd7ff4a080a5a 6SHA1 (patch-aa) = 346253261d63191122103529e566a683d08919e0
7SHA1 (patch-ab) = 5f71beea53f24f0c9649db0d855974eff0394352 7SHA1 (patch-ab) = 5f71beea53f24f0c9649db0d855974eff0394352
cvs diff -r1.4 -r1.5 pkgsrc/audio/gkrellm-volume/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/audio/gkrellm-volume/patches/patch-aa 2005/03/22 14:58:55 1.4
+++ pkgsrc/audio/gkrellm-volume/patches/patch-aa 2021/11/28 05:22:15 1.5
@@ -1,21 +1,34 @@ @@ -1,21 +1,34 @@
1$NetBSD: patch-aa,v 1.4 2005/03/22 14:58:55 cube Exp $ 1$NetBSD: patch-aa,v 1.5 2021/11/28 05:22:15 pho Exp $
2 2
3--- Makefile.orig 2004-05-16 19:21:50.000000000 +0200 3* Change the hard-coded plugin path.
 4* NetBSD requires -lossaudio to use OSS.
 5* Honor LDFLAGS to support RELRO.
 6
 7--- Makefile.orig 2004-08-19 20:07:27.000000000 +0000
4+++ Makefile 8+++ Makefile
5@@ -8,14 +8,14 @@ export PACKAGE LOCALEDIR 9@@ -8,14 +8,14 @@ export PACKAGE LOCALEDIR
6  10
7 GTK_CONFIG = pkg-config gtk+-2.0 11 GTK_CONFIG = pkg-config gtk+-2.0
8  12
9-PLUGIN_DIR ?= /usr/local/lib/gkrellm2/plugins 13-PLUGIN_DIR ?= /usr/local/lib/gkrellm2/plugins
10+PLUGIN_DIR ?= $(PREFIX)/lib/gkrellm2/plugins 14+PLUGIN_DIR ?= $(PREFIX)/lib/gkrellm2/plugins
11 GKRELLM_INCLUDE = -I/usr/local/include 15 GKRELLM_INCLUDE = -I/usr/local/include
12  16
13 GTK_CFLAGS = `$(GTK_CONFIG) --cflags`  17 GTK_CFLAGS = `$(GTK_CONFIG) --cflags`
14 GTK_LIB = `$(GTK_CONFIG) --libs` 18 GTK_LIB = `$(GTK_CONFIG) --libs`
15  19
16 FLAGS = -O2 -Wall -fPIC $(GTK_CFLAGS) $(GKRELLM_INCLUDE) 20 FLAGS = -O2 -Wall -fPIC $(GTK_CFLAGS) $(GKRELLM_INCLUDE)
17-LIBS = $(GTK_LIB) 21-LIBS = $(GTK_LIB)
18+LIBS = $(GTK_LIB) $(LIBOSSAUDIO) 22+LIBS = $(GTK_LIB) $(LIBOSSAUDIO)
19 LFLAGS = -shared 23 LFLAGS = -shared
20  24
21 OBJS = volume.o mixer.o oss_mixer.o 25 OBJS = volume.o mixer.o oss_mixer.o
 26@@ -40,7 +40,7 @@ all: volume.so
 27 (cd po && ${MAKE} all )
 28
 29 volume.so: $(OBJS)
 30- $(CC) $(OBJS) -o volume.so $(LIBS) $(LFLAGS)
 31+ $(CC) $(OBJS) -o volume.so $(LIBS) $(LFLAGS) $(LDFLAGS)
 32
 33 clean:
 34 rm -f *.o core *.so* *.bak *~