summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authorhubertf <hubertf@pkgsrc.org>2000-04-26 03:09:30 +0000
committerhubertf <hubertf@pkgsrc.org>2000-04-26 03:09:30 +0000
commitdc67579a9677886b31d6f990efd1799c9572c417 (patch)
tree11bbde88a109fd6fdf348b7139a291cd9f0b2c11 /x11
parent3bd499e4788b67baead2667a706c6082522dddcb (diff)
downloadpkgsrc-dc67579a9677886b31d6f990efd1799c9572c417.tar.gz
Use -Wl,-R... to please our linker (ELF issue)
Diffstat (limited to 'x11')
-rw-r--r--x11/xpns/files/patch-sum4
-rw-r--r--x11/xpns/patches/patch-aa12
2 files changed, 7 insertions, 9 deletions
diff --git a/x11/xpns/files/patch-sum b/x11/xpns/files/patch-sum
index 03a9c9a7170..523c2bf0988 100644
--- a/x11/xpns/files/patch-sum
+++ b/x11/xpns/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 14:23:37 agc Exp $
+$NetBSD: patch-sum,v 1.2 2000/04/26 03:09:30 hubertf Exp $
-MD5 (patch-aa) = 28b5f576ab0c175032b5ccdc5ce61dd8
+MD5 (patch-aa) = be472342f2466cc8cbfe2d54218a9831
MD5 (patch-ab) = 1eef8909406872f5a2ca1abad60e0d31
diff --git a/x11/xpns/patches/patch-aa b/x11/xpns/patches/patch-aa
index 8cd4417c06d..28b4c4a8810 100644
--- a/x11/xpns/patches/patch-aa
+++ b/x11/xpns/patches/patch-aa
@@ -1,21 +1,19 @@
-$NetBSD: patch-aa,v 1.3 1998/08/07 11:18:28 agc Exp $
-
---- makefile.orig Wed Jul 14 06:05:14 1993
-+++ makefile Tue Apr 8 11:49:27 1997
+--- makefile.orig Wed Jul 14 04:05:14 1993
++++ makefile Tue Apr 25 21:02:22 2000
@@ -7,19 +7,19 @@
#I = -I/usr/include
#------------------------------------------
-# OPTIONEN SUN
-+# OPTIONEN FreeBSD
++# OPTIONEN FreeBSD / NetBSD
#------------------------------------------
-O = -O
-I = -I/usr/local/X11R5/include
+O = -O2
-+I = -I/usr/X11R6/include
++I = -I${X11BASE}/include
-L = -L/usr/local/X11R5/lib -lXaw -lXmu -lXt -lXext -lX11 -lm
-+L = -L/usr/X11R6/lib -lXaw -lXmu -lXt -lXext -lX11 -lm
++L = -Wl,-R${X11BASE}/lib -L${X11BASE}/lib -lXaw -lXmu -lXt -lXext -lX11 -lm
#------------------------------------------