Upgrade to pdflib-2.01. Changes include a new (autoconf based) build

environment, bugfixes and documentation improvements.

6 files changed, 95 insertions, 96 deletions

diff --git a/print/pdflib/Makefile b/print/pdflib/Makefile
index d2a009ac08d..ab08fd3c600 100644
--- a/print/pdflib/Makefile
+++ b/print/pdflib/Makefile
@@ -1,19 +1,19 @@
-# $NetBSD: Makefile,v 1.2 1999/03/01 20:33:01 hwr Exp $
+# $NetBSD: Makefile,v 1.3 2000/02/03 19:32:59 drochner Exp $
 #
 
-DISTNAME=		pdflib-0.6
+DISTNAME=		pdflib-2.01
 CATEGORIES=		print
-MASTER_SITES=		http://www.ifconnection.de/~tm/software/pdflib/
+MASTER_SITES=		http://www.pdflib.com/pdflib/download/
 
 MAINTAINER=		packages@netbsd.org
-HOMEPAGE=		http://www.ifconnection.de/~tm/software/pdflib/
+HOMEPAGE=		http://www.pdflib.com/pdflib/index.html
 
-#BUILD_DEPENDS+=		gmake-3.77:../../devel/
+DEPENDS+=	tiff-3.5.4:../../graphics/tiff
+DEPENDS+=	jpeg-6b:../../graphics/jpeg
+#DEPENDS+=	zlib-1.1.3:../../devel/zlib
 
 USE_GMAKE=		yes
-
-# the next is a empty target, as pdflib itself does not have a install
-# target. The real install is done by scripts/pre-install
-do-install:
+GNU_CONFIGURE=		yes
+USE_LIBTOOL=		yes
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/pdflib/files/md5 b/print/pdflib/files/md5
index cd252200d6c..73270ca3e7e 100644
--- a/print/pdflib/files/md5
+++ b/print/pdflib/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.1.1.1 1999/02/28 15:17:54 hwr Exp $
+$NetBSD: md5,v 1.2 2000/02/03 19:33:00 drochner Exp $
 
-MD5 (pdflib-0.6.tar.gz) = a7773a2cbebe30655cbbe884f3a012db
+MD5 (pdflib-2.01.tar.gz) = 193f938f1066e7a560874c9e483bd3db
diff --git a/print/pdflib/files/patch-sum b/print/pdflib/files/patch-sum
index 4e253c0d569..0f85677b104 100644
--- a/print/pdflib/files/patch-sum
+++ b/print/pdflib/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 14:23:01 agc Exp $
+$NetBSD: patch-sum,v 1.2 2000/02/03 19:33:00 drochner Exp $
 
-MD5 (patch-aa) = 627d8ab4ce4cccad17c89b346672c5e9
-MD5 (patch-ab) = f56f80ea29b5ecf6eb5aa90044171350
+MD5 (patch-aa) = 1b5869dc41d33d03827331e6a1b2c056
+MD5 (patch-ab) = 91f2e0398fe30d44959bf6ac200464b4
diff --git a/print/pdflib/patches/patch-aa b/print/pdflib/patches/patch-aa
index 1f039fb38bb..a8b01d1b6bd 100644
--- a/print/pdflib/patches/patch-aa
+++ b/print/pdflib/patches/patch-aa
@@ -1,53 +1,60 @@
-$NetBSD: patch-aa,v 1.1.1.1 1999/02/28 15:17:54 hwr Exp $
+$NetBSD: patch-aa,v 1.2 2000/02/03 19:33:01 drochner Exp $
 
---- Makefile.orig	Sun Feb 28 15:36:30 1999
-+++ Makefile	Sun Feb 28 15:37:40 1999
-@@ -37,32 +37,32 @@
- # TIFF and JPEG are not currently supported along with scripting
- 
- #DEFINES	= -DUSE_TIFF
--DEFINES		= 
-+DEFINES		= -DPOSIX -DUSE_ZLIB
- EXTRALIBS	= 
- 
- # ------------------- SWIG related stuff ----------------------------------
- SWIG		= swig
- 
--PDFLIB_TCL	= BINDINGS/TCL/pdflib.so
--SWIGOPT_TCL	= -tcl -DTCL -d pdflib_tcl
--TCL_OBJS	= pdftcl_wrap.o
--TCL_INC		= 
--
--PDFLIB_PYTHON	= BINDINGS/PYTHON/pdflib.so
--SWIGOPT_PYTHON	= -python -d pdflib_python
--PYTHON_OBJS	= pdfpython_wrap.o
--PYTHON_INC	= -I/usr/include/python1.4
--
--PDFLIB_PERL	= BINDINGS/PERL/pdflib.so
--SWIGOPT_PERL	= -perl5 -shadow -DPERL5 -d pdflib_perl
--PERL_OBJS	= pdfperl_wrap.o
--PERL_INC	= -I/usr/lib/perl5/i586-linux/5.004/CORE
-+#PDFLIB_TCL	= BINDINGS/TCL/pdflib.so
-+#SWIGOPT_TCL	= -tcl -DTCL -d pdflib_tcl
-+#TCL_OBJS	= pdftcl_wrap.o
-+#TCL_INC		= -I/@PREFIX@/include/tcl8.0
-+
-+#PDFLIB_PYTHON	= BINDINGS/PYTHON/pdflib.so
-+#SWIGOPT_PYTHON	= -python -d pdflib_python
-+#PYTHON_OBJS	= pdfpython_wrap.o
-+#PYTHON_INC	= -I/usr/include/python1.4
-+
-+#PDFLIB_PERL	= BINDINGS/PERL/pdflib.so
-+#SWIGOPT_PERL	= -perl5 -shadow -DPERL5 -d pdflib_perl
-+#PERL_OBJS	= pdfperl_wrap.o
-+#PERL_INC	= -I/usr/local/lib/perl5/i386-netbsd/5.00404/CORE
- 
- SWIG_OBJS	= $(TCL_OBJS) $(PYTHON_OBJS) $(PERL_OBJS)
- 
- # ------------------- Make variables for Linux/Gnu Compiler ----------------
- # Additional include directories, e.g. for TIFF and ZLIB library headers
--INCDIR	= -I/usr/local/include $(TCL_INC) $(PYTHON_INC) $(PERL_INC)
-+INCDIR	= -I/usr/local/include -I/usr/pkg/include $(TCL_INC) $(PYTHON_INC) $(PERL_INC)
- CC	= gcc
- 
- # needed only for swig
+--- pdflib/Makefile.in.orig	Tue Aug  3 14:59:53 1999
++++ pdflib/Makefile.in	Wed Feb  2 21:31:11 2000
+@@ -8,7 +8,7 @@
+ srcdir = @srcdir@
+ 
+ EXE	= @EXE@
+-OBJ	= @OBJ@
++OBJ	= lo
+ AR	= @AR@
+ CC	= @CC@
+ RM      = @RM@
+@@ -30,16 +30,16 @@
+ LDSHARED = @LDSHARED@
+ 
+ # Either pdflib.a or pdflib.so, selected by configure script
+-PDFLIB		= @PDFLIB@
++PDFLIB		= libpdf.la
+ PDFLIB_STATIC	= @PDFLIB_STATIC@
+-PDFLIB_SHARED	= @PDFLIB_SHARED@
++PDFLIB_SHARED	= libpdf.la
+ 
+ CFLAGS = -c @DEFS@ @DEFINES@ @CCSHARED@ $(TIFFINC) $(ZLIBINC)
+ 
+-.SUFFIXES: .c
++.SUFFIXES: .lo
+ 
+-.c.o:
+-	$(CC) $(CFLAGS) $(DEFINES) $<
++.c.lo:
++	${LIBTOOL} --mode=compile $(CC) $(CFLAGS) $(DEFINES) $<
+ 
+ SRC	= \
+ 	$(srcdir)/p_afmparse.c	\
+@@ -86,7 +86,8 @@
+ 
+ $(PDFLIB_SHARED):	$(OBJS)
+ 	$(RM) $(PDFLIB_STATIC) $(PDFLIB_SHARED)
+-	$(LDSHARED) -o $(PDFLIB_SHARED) $(OBJS)
++	${LIBTOOL} --mode=link ${CC} -o $(PDFLIB_SHARED) $(OBJS) \
++		-rpath ${prefix}/lib -version-info 2:1
+ 
+ clean:
+ 	-$(RM) $(OBJS) $(PDFLIB_STATIC) $(PDFLIB_SHARED)
+@@ -96,13 +97,7 @@
+ 
+ install: $(PDFLIB)
+ 	$(INSTALL) pdflib.h $(includedir)
+-	$(INSTALL) $(PDFLIB) $(libdir)
+-	cd $(libdir);						\
+-	if test $(PDFLIB) != $(PDFLIB_STATIC); then		\
+-		(ldconfig || true)  >/dev/null 2>&1; 		\
+-	else							\
+-		$(RANLIB) $(libdir)/$(PDFLIB_STATIC);		\
+-        fi
++	${LIBTOOL} --mode=install $(INSTALL) $(PDFLIB) $(libdir)
+ 
+ uninstall:
+ 	-$(RM) $(includedir)/pdflib.h
diff --git a/print/pdflib/patches/patch-ab b/print/pdflib/patches/patch-ab
index ecf92eddade..76dce5700ff 100644
--- a/print/pdflib/patches/patch-ab
+++ b/print/pdflib/patches/patch-ab
@@ -1,13 +1,22 @@
-$NetBSD: patch-ab,v 1.2 1999/03/01 20:33:01 hwr Exp $
+$NetBSD: patch-ab,v 1.3 2000/02/03 19:33:01 drochner Exp $
 
---- pdf.h.orig	Wed Jul  8 15:32:59 1998
-+++ pdf.h	Sun Feb 28 15:29:53 1999
-@@ -20,7 +20,7 @@
+--- Makefile.in.orig	Sun Aug  1 14:36:05 1999
++++ Makefile.in	Wed Feb  2 20:54:50 2000
+@@ -29,7 +29,7 @@
  
- /* default path to font and AFM directory */
- #ifndef PDF_DEFAULT_FONT_PATH
--#define PDF_DEFAULT_FONT_PATH	"./fonts"
-+#define PDF_DEFAULT_FONT_PATH	"@PREFIX@/share/afm"
- #endif
+ # ------------------------- default target  -------------------------------
  
- /* Data types and defines */
+-all:	pdflib @BINDINGS@
++all:	pdflib
+ 
+ pdflib::
+ 	cd pdflib && $(MAKE)
+@@ -83,7 +83,7 @@
+ 
+ # --------------------------- install ---------------------------------
+ 
+-install: pdflib_install @BINDINGS_INSTALL@
++install: pdflib_install
+ 
+ pdflib_install:
+ 	-cd pdflib && $(MAKE) install
diff --git a/print/pdflib/pkg/PLIST b/print/pdflib/pkg/PLIST
index 908f7b4174e..3ae80a17013 100644
--- a/print/pdflib/pkg/PLIST
+++ b/print/pdflib/pkg/PLIST
@@ -1,21 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 1999/03/01 20:33:01 hwr Exp $
-share/afm/Courier-Bold.afm
-share/afm/Courier-BoldOblique.afm
-share/afm/Courier-Oblique.afm
-share/afm/Courier.afm
-share/afm/Helvetica-Bold.afm
-share/afm/Helvetica-BoldOblique.afm
-share/afm/Helvetica-Oblique.afm
-share/afm/Helvetica.afm
-share/afm/Symbol.afm
-share/afm/Times-Bold.afm
-share/afm/Times-BoldItalic.afm
-share/afm/Times-Italic.afm
-share/afm/Times-Roman.afm
-share/afm/ZapfDingbats.afm
-share/afm/afmlist
-@dirrm share/afm
+@comment $NetBSD: PLIST,v 1.3 2000/02/03 19:33:01 drochner Exp $
 lib/libpdf.a
-include/pdf.h
-include/p_port.h
-bin/text2pdf
+lib/libpdf.so.2.1
+include/pdflib.h