4 files changed, 29 insertions, 59 deletions

diff --git a/print/pdflib4/Makefile b/print/pdflib4/Makefile
index 95da15faf5e8..a2d606572c76 100644
--- a/print/pdflib4/Makefile
+++ b/print/pdflib4/Makefile
@@ -6,9 +6,9 @@
 # $FreeBSD$
 #
 
-DISTNAME=	pdflib-2.0
+DISTNAME=	pdflib-2.01
 CATEGORIES=	print
-MASTER_SITES=	http://www.ifconnection.de/~tm/pdflib/ \
+MASTER_SITES=	http://www.pdflib.com/pdflib/download/ \
 		http://www.physik.TU-Berlin.DE/~ibex/ports/distfiles/
 
 MAINTAINER=	dirk@FreeBSD.org
diff --git a/print/pdflib4/distinfo b/print/pdflib4/distinfo
index bb381a3637a0..150bb362495c 100644
--- a/print/pdflib4/distinfo
+++ b/print/pdflib4/distinfo
@@ -1 +1 @@
-MD5 (pdflib-2.0.tar.gz) = 17a28a7ecc91d0a02472bcc0e74da0d2
+MD5 (pdflib-2.01.tar.gz) = 193f938f1066e7a560874c9e483bd3db
diff --git a/print/pdflib4/files/patch-ad b/print/pdflib4/files/patch-ad
index 24706cf9974a..a8d0d5636b06 100644
--- a/print/pdflib4/files/patch-ad
+++ b/print/pdflib4/files/patch-ad
@@ -1,52 +1,29 @@
---- configure.orig	Wed Jun 30 12:52:35 1999
-+++ configure	Mon Jul 12 16:17:30 1999
-@@ -555,7 +555,7 @@
+--- configure.orig	Mon Aug  2 18:04:00 1999
++++ configure	Tue Sep  7 23:14:14 1999
+@@ -557,7 +557,7 @@
  
  
  
--VERSION="2.0"
+-VERSION="2.01"
 +VERSION="2"
  
- DEFINES=""
- 
-@@ -1503,6 +1503,7 @@
-   PERLINCLUDE=nope
- fi
- 
-+PERLINCLUDE=`($PERL -e 'use Config; print $Config{privlib};') 2>/dev/null`
- 
- # First figure out what the name of Perl5 is
- 
-@@ -1569,12 +1570,12 @@
- 		PERLINCLUDE="-I$PERL5DIR"
- 	fi
- 	PERLLIBDIR=`($PERL -e 'use Config; print $Config{sitearchexp};') 2>/dev/null`
--	if test -z "$PERLLIBDIR" -o ! -d "$PERLLIBDIR"; then
-+	if test -z "$PERLLIBDIR"; then
- 		echo "$ac_t""unable to determine perl5 shared library directory" 1>&6
- 		PERLIB="/usr/lib/perl5/site_perl/5.005/archname"
- 	fi
- 	PERLMODDIR=`($PERL -e 'use Config; print $Config{sitelib};') 2>/dev/null`
--	if test -z "$PERLMODDIR" -o ! -d "$PERLMODDIR"; then
-+	if test -z "$PERLMODDIR"; then
- 		echo "$ac_t""unable to determine perl5 module directory" 1>&6
- 		PERLMODDIR="/usr/lib/perl5/site_perl/5.005"
- 	fi
-@@ -1887,7 +1888,7 @@
- 	BINDINGS_TEST=""
- 	CCSHARED=""
- else
--	PDFLIB=libpdf$VERSION$SO
-+	PDFLIB=libpdf$SO.$VERSION
- fi
- 
- 
-@@ -1902,7 +1903,7 @@
-    	ZLIBLINK=""
- fi
- 
--PDFLIBLINK="-lpdf$VERSION $TIFFLINK $ZLIBLINK -lm"
-+PDFLIBLINK="-lpdf $TIFFLINK $ZLIBLINK -lm"
- 
- 
+ WITH_CXX=nope
+ WITH_JAVA=nope
+@@ -1936,7 +1936,7 @@
+ PDFLIB_STATIC=libpdf$VERSION.a
+ 
+ case $ac_sys_system in
+-    NetBSD*) PDFLIB_SHARED=libpdf$SO.$VERSION;;
++    NetBSD*|FreeBSD*) PDFLIB_SHARED=libpdf$SO.$VERSION;;
+     *)	PDFLIB_SHARED=libpdf$VERSION$SO;;
+ esac
+ 
+@@ -1971,7 +1971,7 @@
+ # This must work with the shared as well as the dynamic version.
+ 
+ case $ac_sys_system in
+-    NetBSD*) PDFLIBLINK="-lpdf $TIFFLINK $ZLIBLINK -lm";;
++    NetBSD*|FreeBSD*) PDFLIBLINK="-lpdf $TIFFLINK $ZLIBLINK -lm";;
+     *) PDFLIBLINK="-lpdf$VERSION $TIFFLINK $ZLIBLINK -lm";;
+ esac
  
diff --git a/print/pdflib4/files/patch-af b/print/pdflib4/files/patch-af
index bf6cda2d47da..54e3289aa4fc 100644
--- a/print/pdflib4/files/patch-af
+++ b/print/pdflib4/files/patch-af
@@ -1,13 +1,6 @@
---- bind/cpp/Makefile.in.orig	Tue Jun 29 00:34:15 1999
-+++ bind/cpp/Makefile.in	Sat Jul 17 12:22:41 1999
-@@ -24,13 +24,13 @@
- exec_prefix = @exec_prefix@
- 
- PDFLIB = @PDFLIB@
--CXXFLAGS = -c -g @DEFS@ @CCSHARED@ -I../../pdflib
-+CXXFLAGS = -c @DEFS@ -I../../pdflib
- LDFLAGS = -L../../pdflib
- 
+--- bind/cpp/Makefile.in.orig	Thu Jul 22 12:10:37 1999
++++ bind/cpp/Makefile.in	Tue Sep  7 23:14:14 1999
+@@ -30,7 +30,7 @@
  .SUFFIXES: .cpp
  
  .cpp.o: