summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authorhubertf <hubertf@pkgsrc.org>2000-06-20 22:25:57 +0000
committerhubertf <hubertf@pkgsrc.org>2000-06-20 22:25:57 +0000
commit86b51a1f9b6f1ee361b6a88b82d069370bededfe (patch)
treeb77fd593423a269f1ffd3e9dafeda0cca84fa4b8 /graphics
parentc5aa44ac5d425f12cbfbb5d753ef3c3357018c43 (diff)
downloadpkgsrc-86b51a1f9b6f1ee361b6a88b82d069370bededfe.tar.gz
fix for ELF
Diffstat (limited to 'graphics')
-rw-r--r--graphics/cqcam/files/patch-sum4
-rw-r--r--graphics/cqcam/patches/patch-aa17
2 files changed, 11 insertions, 10 deletions
diff --git a/graphics/cqcam/files/patch-sum b/graphics/cqcam/files/patch-sum
index 9189f8998e5..9b4e836fdfe 100644
--- a/graphics/cqcam/files/patch-sum
+++ b/graphics/cqcam/files/patch-sum
@@ -1,5 +1,5 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 13:51:06 agc Exp $
+$NetBSD: patch-sum,v 1.2 2000/06/20 22:25:57 hubertf Exp $
-MD5 (patch-aa) = 2a9fe0d1a42eccce1f6bac868f162b31
+MD5 (patch-aa) = 542c6cc1afdb2414643acec1f8aac5a2
MD5 (patch-ab) = 7d33c419cf524e108a53213fd4f02fe9
MD5 (patch-ac) = e4fa0ab6d99a51cdb2225eb274c4cb7c
diff --git a/graphics/cqcam/patches/patch-aa b/graphics/cqcam/patches/patch-aa
index d0d110fcf8a..0e3edd3ed31 100644
--- a/graphics/cqcam/patches/patch-aa
+++ b/graphics/cqcam/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.2 1998/08/24 11:47:34 frueauf Exp $
+$NetBSD: patch-aa,v 1.3 2000/06/20 22:25:58 hubertf Exp $
---- Makefile.orig Mon Oct 27 15:07:06 1997
-+++ Makefile Sun Aug 23 20:39:57 1998
+--- Makefile.orig Tue Oct 28 00:07:06 1997
++++ Makefile Wed Jun 21 00:20:49 2000
@@ -13,9 +13,9 @@
# OS-specific stuff: uncomment all of the lines for your OS of choice
@@ -27,7 +27,7 @@ $NetBSD: patch-aa,v 1.2 1998/08/24 11:47:34 frueauf Exp $
+# NetBSD
+CFLAGS = -O2 -I${X11BASE}/include -I${PREFIX}/include
-+LDFLAGS = -L${PREFIX}/lib -L${X11BASE}/lib
++LDFLAGS = -L${PREFIX}/lib -L${X11BASE}/lib -Wl,-R${PREFIX}/lib -Wl,-R${X11BASE}/lib
+DEFS += -DNETBSD
+# XXX Until we work out a way to use this on non-x86
+LDLIBS += -li386
@@ -35,16 +35,17 @@ $NetBSD: patch-aa,v 1.2 1998/08/24 11:47:34 frueauf Exp $
# BSDI 3.0
#CFLAGS = -O2 -I/usr/X11R6/include -I/usr/local/include
#LDFLAGS = -L/usr/local/lib -L/usr/X11R6/lib
-@@ -44,7 +51,7 @@
+@@ -44,15 +51,15 @@
# JPEG stuff: do you want JPEG support? Where is your JPEG library?
LDLIBS += -ljpeg
-#LDFLAGS += # -L/usr/local/lib
-+LDFLAGS += # -L/usr/local/lib
++LDFLAGS += -L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib
DEFS += -DJPEG
- #CFLAGS += -I/usr/local/include
+-#CFLAGS += -I/usr/local/include
++CFLAGS += -I${LOCALBASE}/include
######################################################################
-@@ -52,7 +59,7 @@
+
######################################################################
# X11 stuff: where are your X11 .h and .a files?