summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authorfrueauf <frueauf@pkgsrc.org>1999-08-01 09:38:38 +0000
committerfrueauf <frueauf@pkgsrc.org>1999-08-01 09:38:38 +0000
commit15163d593c2efa262dabb9b9e9fba2fe60688271 (patch)
tree7383388d586af916b6573c0f65a9b8a0a1f32362 /graphics
parentb341be17d795f522c9c315a846c5ccec7423e6bc (diff)
downloadpkgsrc-15163d593c2efa262dabb9b9e9fba2fe60688271.tar.gz
Make xpdf really use the xpm lib and make it work on elf systems.
Diffstat (limited to 'graphics')
-rw-r--r--graphics/xpdf/Makefile5
-rw-r--r--graphics/xpdf/files/patch-sum3
-rw-r--r--graphics/xpdf/patches/patch-ab13
3 files changed, 17 insertions, 4 deletions
diff --git a/graphics/xpdf/Makefile b/graphics/xpdf/Makefile
index 97fffa27924..9366a30eec3 100644
--- a/graphics/xpdf/Makefile
+++ b/graphics/xpdf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 1999/02/20 22:48:32 hubertf Exp $
+# $NetBSD: Makefile,v 1.7 1999/08/01 09:38:38 frueauf Exp $
# FreeBSD Id: Makefile,v 1.12 1998/03/11 03:08:12 vanilla Exp
#
@@ -13,8 +13,7 @@ HOMEPAGE= http://www.foolabs.com/xpdf/
DEPENDS= xpm-3.4k:../../graphics/xpm
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include"
-CONFIGURE_ARGS= --with-gzip
+CONFIGURE_ARGS= --with-gzip --with-Xpm-includes=${X11BASE}/include
USE_X11BASE= yes
MAN1= xpdf.1 pdftops.1 pdftotext.1 pdfinfo.1 pdftopbm.1 pdfimages.1
diff --git a/graphics/xpdf/files/patch-sum b/graphics/xpdf/files/patch-sum
index c6e2dce17c4..e53281aa1d1 100644
--- a/graphics/xpdf/files/patch-sum
+++ b/graphics/xpdf/files/patch-sum
@@ -1,3 +1,4 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 13:51:15 agc Exp $
+$NetBSD: patch-sum,v 1.2 1999/08/01 09:38:39 frueauf Exp $
MD5 (patch-aa) = f0a06ec0b128104a68a30b76ec037caa
+MD5 (patch-ab) = 8dc9cfcb1d9fea60160996259d9f1a78
diff --git a/graphics/xpdf/patches/patch-ab b/graphics/xpdf/patches/patch-ab
new file mode 100644
index 00000000000..4e28db8ddb0
--- /dev/null
+++ b/graphics/xpdf/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 1999/08/01 09:38:39 frueauf Exp $
+
+--- configure-orig Sun Aug 1 09:56:37 1999
++++ configure Sun Aug 1 09:57:31 1999
+@@ -1453,7 +1453,7 @@
+
+ # It would also be nice to do this for all -L options, not just this one.
+ if test -n "$x_libraries"; then
+- X_LIBS="$X_LIBS -L$x_libraries"
++ X_LIBS="$X_LIBS -L$x_libraries -Wl,-R$x_libraries"
+ # For Solaris; some versions of Sun CC require a space after -R and
+ # others require no space. Words are not sufficient . . . .
+ case "`(uname -sr) 2>/dev/null`" in