summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhubertf <hubertf>2000-12-27 11:54:32 +0000
committerhubertf <hubertf>2000-12-27 11:54:32 +0000
commit55be6a92623e9a86921f3a8ce0276201ff03611f (patch)
tree734d6401ffcd0a7ace2ddc11878dc3cbd1f6919a
parent0222281ad825c6aebed78cf6adbd0b38f39778c7 (diff)
downloadpkgsrc-55be6a92623e9a86921f3a8ce0276201ff03611f.tar.gz
Make sdl-config --libs find libX11.
-rw-r--r--devel/SDL/Makefile4
-rw-r--r--devel/SDL/files/patch-sum4
-rw-r--r--devel/SDL/patches/patch-ak12
3 files changed, 11 insertions, 9 deletions
diff --git a/devel/SDL/Makefile b/devel/SDL/Makefile
index b1ed1bcfea6..dc68112c608 100644
--- a/devel/SDL/Makefile
+++ b/devel/SDL/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2000/12/03 04:33:10 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2000/12/27 11:54:32 hubertf Exp $
#
DISTNAME= SDL-1.1.6
@@ -22,7 +22,7 @@ USE_LIBTOOL= YES
LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
CONFIGURE_ARGS+= --disable-pthread-sem
CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -D_POSIX_THREAD_SYSCALL_SOFT=1"
-LDFLAGS+= -Wl,-R${X11BASE}/lib
+LDFLAGS+= -Wl,-R${X11BASE}/lib -L${X11BASE}/lib
#CC= ${LOCALBASE}/pthreads/bin/pgcc
pre-patch:
diff --git a/devel/SDL/files/patch-sum b/devel/SDL/files/patch-sum
index 81f73e5e823..3219506d2f8 100644
--- a/devel/SDL/files/patch-sum
+++ b/devel/SDL/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.5 2000/12/03 04:33:10 wiz Exp $
+$NetBSD: patch-sum,v 1.6 2000/12/27 11:54:33 hubertf Exp $
MD5 (patch-aa) = 9f1f063534b7a1687ee160a02ba55957
MD5 (patch-ab) = 9b3e6e48901394b9af2146c9e3d23bad
@@ -10,7 +10,7 @@ MD5 (patch-ag) = 4adf64909111de90a5a64aece847e343
MD5 (patch-ah) = 5dcfce9c64721177b198ccf2dd584f14
MD5 (patch-ai) = dd9eebc4a45a6809cf72e7a4b57b2384
MD5 (patch-aj) = 5c30150fb938136e44eb744988c48ddf
-MD5 (patch-ak) = 4914b1b04a740338a8ffc7ca42e46fe1
+MD5 (patch-ak) = a4d89770fdf36e06c0bf285b6ac159de
MD5 (patch-al) = 1d1ce08c9ec803e011386cacb33c7fa8
MD5 (patch-am) = 5d49c17ae9fc9ff82a1a747c6778712a
MD5 (patch-an) = 7c663d0be5b3f1a9545af4443103c6c2
diff --git a/devel/SDL/patches/patch-ak b/devel/SDL/patches/patch-ak
index be72587649e..71fed09fe63 100644
--- a/devel/SDL/patches/patch-ak
+++ b/devel/SDL/patches/patch-ak
@@ -1,12 +1,14 @@
-$NetBSD: patch-ak,v 1.2 2000/10/15 07:39:45 wulf Exp $
+$NetBSD: patch-ak,v 1.3 2000/12/27 11:54:33 hubertf Exp $
---- sdl-config.in.orig Sun Sep 24 10:29:01 2000
-+++ sdl-config.in Mon Oct 2 13:24:05 2000
-@@ -49,7 +49,7 @@
+--- sdl-config.in.orig Sun Sep 24 02:59:01 2000
++++ sdl-config.in Wed Dec 27 12:30:27 2000
+@@ -48,8 +48,8 @@
+ echo $includes -I@includedir@/SDL @SDL_CFLAGS@
;;
--libs)
- libdirs="-L@libdir@ @SDL_RLD_FLAGS@"
+- libdirs="-L@libdir@ @SDL_RLD_FLAGS@"
- echo $libdirs @SDL_LIBS@
++ libdirs="-L@libdir@ -Wl,-R@libdir@ @SDL_RLD_FLAGS@"
+ echo $libdirs @SDL_LIBS@ @SYSTEM_LIBS@
;;
--static-libs)