summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--x11/xworld/Makefile4
-rw-r--r--x11/xworld/files/patch-sum3
-rw-r--r--x11/xworld/patches/patch-ac11
3 files changed, 16 insertions, 2 deletions
diff --git a/x11/xworld/Makefile b/x11/xworld/Makefile
index ad97740c2c3..efe7383ec0c 100644
--- a/x11/xworld/Makefile
+++ b/x11/xworld/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 1999/07/28 17:21:48 hubertf Exp $
+# $NetBSD: Makefile,v 1.2 2000/08/17 15:26:31 fredb Exp $
#
DISTNAME= xworld-2.0
@@ -11,4 +11,6 @@ MAINTAINER= wennmach@geo.Uni-Koeln.DE
HAS_CONFIGURE= yes
+CONFIGURE_ENV+= LDLIBS="-lm ${LDFLAGS} -lX11"
+
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/xworld/files/patch-sum b/x11/xworld/files/patch-sum
index a0372a14cf8..afcf4f56958 100644
--- a/x11/xworld/files/patch-sum
+++ b/x11/xworld/files/patch-sum
@@ -1,4 +1,5 @@
-$NetBSD: patch-sum,v 1.3 1999/08/18 00:17:40 hubertf Exp $
+$NetBSD: patch-sum,v 1.4 2000/08/17 15:26:32 fredb Exp $
MD5 (patch-aa) = 77c1d0c6752a84a93f7fb566c6ba3a6e
MD5 (patch-ab) = 7a372dfcb44f68a52e65eed100883f7d
+MD5 (patch-ac) = 5d1eab63a888564e347b8687a2ff6876
diff --git a/x11/xworld/patches/patch-ac b/x11/xworld/patches/patch-ac
new file mode 100644
index 00000000000..5240c5fbd75
--- /dev/null
+++ b/x11/xworld/patches/patch-ac
@@ -0,0 +1,11 @@
+$NetBSD: patch-ac,v 1.1 2000/08/17 15:26:32 fredb Exp $
+
+--- defaults/NetBSD/set.csh.orig Wed Jul 28 10:13:06 1999
++++ defaults/NetBSD/set.csh Thu Aug 17 10:17:24 2000
+@@ -4,5 +4,5 @@
+ set INSTALL = "/usr/bin/install -c"
+ set STRIP = "/usr/bin/strip"
+ set INCLUDES = "-I/usr/X11R6/include"
+-set LDLIBS = "-lm -L/usr/X11R6/lib -lX11"
++set LDLIBS = "-lm -L/usr/X11R6/lib -Wl,-R/usr/X11R6/lib -lX11"
+ set MORELIBS = " "