summaryrefslogtreecommitdiff
path: root/misc
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2004-08-27 06:29:06 +0000
committerjlam <jlam@pkgsrc.org>2004-08-27 06:29:06 +0000
commitca7093842870728d22dde1258798b1704c53ca18 (patch)
tree0ff3b0eccc04d1b065efd866b0590608098961d5 /misc
parent49f0d0312d389247bf08d1e7c28970e1dfb7508f (diff)
downloadpkgsrc-ca7093842870728d22dde1258798b1704c53ca18.tar.gz
Replace RPATH_FLAG with LINKER_RPATH_FLAG and COMPILER_RPATH_FLAG,
which are the full option names used to set rpath directives for the linker and the compiler, respectively. In places were we are invoking the linker, use "${LINKER_RPATH_FLAG} <path>", where the space is inserted in case the flag is a word, e.g. -rpath. The default values of *_RPATH_FLAG are set by the compiler/*.mk files, depending on the compiler that you use. They may be overridden on a ${OPSYS}-specific basis by setting _OPSYS_LINKER_RPATH_FLAG and _OPSYS_COMPILER_RPATH_FLAG, respectively. Garbage-collect _OPSYS_RPATH_NAME and _COMPILER_LD_FLAG.
Diffstat (limited to 'misc')
-rw-r--r--misc/gkrellm-leds/distinfo4
-rw-r--r--misc/gkrellm-leds/patches/patch-aa4
2 files changed, 4 insertions, 4 deletions
diff --git a/misc/gkrellm-leds/distinfo b/misc/gkrellm-leds/distinfo
index 2ebc20226bc..5713c411128 100644
--- a/misc/gkrellm-leds/distinfo
+++ b/misc/gkrellm-leds/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2004/02/25 00:52:33 cube Exp $
+$NetBSD: distinfo,v 1.2 2004/08/27 06:29:08 jlam Exp $
SHA1 (gkleds-0.8.1.tar.gz) = 4b126ea47470430adf2938b79c6e1aa70371912e
Size (gkleds-0.8.1.tar.gz) = 44904 bytes
-SHA1 (patch-aa) = 12d84074a4cc3a5562700ff7be06677fcad417c2
+SHA1 (patch-aa) = 8240be1e14291bc795e9b09ab377f5dbc53d174c
diff --git a/misc/gkrellm-leds/patches/patch-aa b/misc/gkrellm-leds/patches/patch-aa
index 9b7a4d8e669..7a403447b6d 100644
--- a/misc/gkrellm-leds/patches/patch-aa
+++ b/misc/gkrellm-leds/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/02/25 00:52:33 cube Exp $
+$NetBSD: patch-aa,v 1.2 2004/08/27 06:29:08 jlam Exp $
--- Makefile.orig 2003-01-29 00:14:08.000000000 +0100
+++ Makefile
@@ -7,7 +7,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2004/02/25 00:52:33 cube Exp $
GTK_LIBS = `pkg-config gtk+-2.0 --libs`
-X11_LIB = -L/usr/X11R6/lib -lX11 -lXtst
-+X11_LIB = -L$(X11BASE)/lib $(RPATH_FLAG)$(X11BASE)/lib -lX11 -lXtst
++X11_LIB = -L$(X11BASE)/lib $(LINKER_RPATH_FLAG) $(X11BASE)/lib -lX11 -lXtst
WIN32_LIBS = -luser32 -lkernel32 -lwinspool -lcomdlg32 -ladvapi32 -lshell32 -lole32 -loleaut32 -luuid -lodbc32 -lodbccp32 -lws2_32 $(GTK_LIBS)
UNIX_LIBS = $(X11_LIB) $(GTK_LIBS)