summaryrefslogtreecommitdiff
path: root/misc/gkrellm-flynn
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2010-02-25 18:23:45 +0000
committerjoerg <joerg@pkgsrc.org>2010-02-25 18:23:45 +0000
commitb466f91f24f005bf5d940da14c74f8d74cbdd618 (patch)
treed6b0cbb553f83f2277d7310ebafb789445638391 /misc/gkrellm-flynn
parenta1b48e0106fdf5b51cf32026f5c22133635d2b51 (diff)
downloadpkgsrc-b466f91f24f005bf5d940da14c74f8d74cbdd618.tar.gz
Clean up linker invocation to not just work by pure luck.
Diffstat (limited to 'misc/gkrellm-flynn')
-rw-r--r--misc/gkrellm-flynn/distinfo4
-rw-r--r--misc/gkrellm-flynn/patches/patch-aa17
2 files changed, 12 insertions, 9 deletions
diff --git a/misc/gkrellm-flynn/distinfo b/misc/gkrellm-flynn/distinfo
index 74fce69926a..23a212e7aaf 100644
--- a/misc/gkrellm-flynn/distinfo
+++ b/misc/gkrellm-flynn/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2008/06/20 01:09:25 joerg Exp $
+$NetBSD: distinfo,v 1.4 2010/02/25 18:23:45 joerg Exp $
SHA1 (gkrellflynn-0.8.tar.gz) = 8fc8ab477572ca8a858d19d5903f9a2b7c3b2d31
RMD160 (gkrellflynn-0.8.tar.gz) = f35eeacd8121bd52c53a5610199211f7c34c790c
Size (gkrellflynn-0.8.tar.gz) = 26722 bytes
-SHA1 (patch-aa) = 933bc33c0ded493762e18b94c45714896595e452
+SHA1 (patch-aa) = 9d0a58b73b70df9cb312d4c60f57cff6ce23db05
diff --git a/misc/gkrellm-flynn/patches/patch-aa b/misc/gkrellm-flynn/patches/patch-aa
index 33719cc9a57..78c085bff3b 100644
--- a/misc/gkrellm-flynn/patches/patch-aa
+++ b/misc/gkrellm-flynn/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2008/06/20 01:09:25 joerg Exp $
+$NetBSD: patch-aa,v 1.3 2010/02/25 18:23:45 joerg Exp $
---- Makefile.orig 2002-05-07 10:04:49.000000000 +0200
+--- Makefile.orig 2002-05-07 08:04:49.000000000 +0000
+++ Makefile
-@@ -3,12 +3,12 @@
+@@ -3,12 +3,11 @@
#
# updated for gkrellm2.0
@@ -14,12 +14,11 @@ $NetBSD: patch-aa,v 1.2 2008/06/20 01:09:25 joerg Exp $
LD = $(CC)
-LDFLAGS = -shared -Wl -o
-INCPATH = -I.
-+LDFLAGS += -shared -Wl -o
+INCPATH = -I. -I${BUILDLINK_DIR}/include
INCPATH += ${GKRELL_INC}
TARGET = gkrellflynn.so
-@@ -22,10 +22,10 @@ all:
+@@ -22,13 +21,13 @@ all:
@echo " make gkrellm2"
gkrellm:
@@ -31,8 +30,12 @@ $NetBSD: patch-aa,v 1.2 2008/06/20 01:09:25 joerg Exp $
+ (${MAKE} GKRELL_INC=-DGKRELLM2 EXTRACONF="pkg-config --cflags gtk+-2.0 gthread-2.0" ${TARGET})
${TARGET}: ${OBJS}
- ${LD} ${DEBUG} ${LDFLAGS} ${TARGET} ${OBJS}
-@@ -44,7 +44,7 @@ installgkrellm:
+- ${LD} ${DEBUG} ${LDFLAGS} ${TARGET} ${OBJS}
++ ${LD} ${DEBUG} ${LDFLAGS} -shared -o ${TARGET} ${OBJS}
+
+ clean:
+ rm -f ${OBJS}
+@@ -44,7 +43,7 @@ installgkrellm:
./install-sub.sh ${TARGET} gkrellm
installgkrellm2: