summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2012-12-20 22:07:57 +0000
committerjoerg <joerg@pkgsrc.org>2012-12-20 22:07:57 +0000
commit2a36c0c5bc3403fd41e55749053a789ba8e76fc2 (patch)
tree95ba39a9948893ce065b6504b2fe704e10a56f7b
parentca4b6a43b196d117bf8be882a3d2f0771d1f0249 (diff)
downloadpkgsrc-2a36c0c5bc3403fd41e55749053a789ba8e76fc2.tar.gz
-R is a linker flag, so prefix with -Wl.
-rw-r--r--lang/pict/distinfo4
-rw-r--r--lang/pict/patches/patch-bb18
2 files changed, 18 insertions, 4 deletions
diff --git a/lang/pict/distinfo b/lang/pict/distinfo
index eeecf1ffc90..ae59445a7c9 100644
--- a/lang/pict/distinfo
+++ b/lang/pict/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2011/09/05 00:15:37 dholland Exp $
+$NetBSD: distinfo,v 1.3 2012/12/20 22:07:57 joerg Exp $
SHA1 (pict-4.1.tar.gz) = e3d3341d4dc54ed015b0d89eab6760ee7f14c5cd
RMD160 (pict-4.1.tar.gz) = aea1df3530387c592a1c5eb9e8f464e242109f86
@@ -10,7 +10,7 @@ SHA1 (patch-ad) = 5867631186c5973b76d81704306fb142e479b72d
SHA1 (patch-ae) = 5eaf7be65894e22a7200e8075dfb988722220765
SHA1 (patch-af) = 38a20d8bf945b3a3662d4c4ebc0d7158eac607ec
SHA1 (patch-ba) = b7dc6e6b43935e2c87e636cd43ebd9fb9c53c762
-SHA1 (patch-bb) = bf1b3a2fb74f4740439bc4c3f67f8aa3178a5600
+SHA1 (patch-bb) = 172d1f9bf91783c139537a497a622fd1ebd43ad6
SHA1 (patch-bc) = 81f178d7e48f21afb5fbc1c21f4de839307568c1
SHA1 (patch-bd) = d1784b7d180c26625205d68aa0143d7796a80c2f
SHA1 (patch-ya) = d7513a4431ede203217bb39feb42b62c2f9784b0
diff --git a/lang/pict/patches/patch-bb b/lang/pict/patches/patch-bb
index 7a28598c83b..b215541eab2 100644
--- a/lang/pict/patches/patch-bb
+++ b/lang/pict/patches/patch-bb
@@ -1,8 +1,8 @@
-$NetBSD: patch-bb,v 1.1 2011/09/05 00:15:37 dholland Exp $
+$NetBSD: patch-bb,v 1.2 2012/12/20 22:07:57 joerg Exp $
fix void main.
---- Config/autoconf~ 1998-03-22 23:26:53.000000000 +0000
+--- Config/autoconf.orig 1998-03-22 23:26:53.000000000 +0000
+++ Config/autoconf
@@ -6,7 +6,7 @@ touch Config test.h config.h config.outp
# Test for broken include files (SunOS)
@@ -13,3 +13,17 @@ fix void main.
if gcc -Wall -c test.c 2>config.output; then
if grep -q implicit config.output; then
echo "Some function prototypes seem to be missing"
+@@ -173,11 +173,11 @@ if sh ./runtest x11.c; then
+ echo "Successfully linked sample X11 program"
+ echo "X11EXTRA = $X11EXTRA" >>Config
+ else
+- libs="-idirafter $X11INCLUDE -R$X11LIB -L$X11LIB -lX11 $X11EXTRA"
++ libs="-idirafter $X11INCLUDE -Wl,-R$X11LIB -L$X11LIB -lX11 $X11EXTRA"
+ export libs
+ if sh ./runtest x11.c; then
+ echo "Successfully linked sample X11 program by using -R$X11LIB"
+- echo "X11EXTRA = -R$X11LIB $X11EXTRA" >>Config
++ echo "X11EXTRA = -Wl,-R$X11LIB $X11EXTRA" >>Config
+ else
+ echo "Failed to link sample X11 program"
+ exit 1