Update pdflib to 4.0.1. Changes from version 3.03 include some

optimizations, bug fixes in image-handling for JPEG, TIFF and PNG files,
support for TrueType fonts, and pluggin some memory leaks.  The API changed
slightly and a major number bump on the shared library occurred.

Convert to use buildlink.mk files and mark as USE_BUILDLINK_ONLY.  Add a
buildlink.mk file for use by other package Makefiles.  Also install the
license info and PDFlib manual.

6 files changed, 73 insertions, 52 deletions

diff --git a/print/pdflib/Makefile b/print/pdflib/Makefile
index 97576dd803c..5f9b355a161 100644
--- a/print/pdflib/Makefile
+++ b/print/pdflib/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2001/05/22 09:32:25 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2001/07/29 05:38:40 jlam Exp $
 
-DISTNAME=		pdflib-3.03
+DISTNAME=		pdflib-4.0.1
 CATEGORIES=		print
 MASTER_SITES=		http://www.pdflib.com/pdflib/download/
 
@@ -8,16 +8,32 @@ MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.pdflib.com/pdflib/index.html
 COMMENT=		C library to produce PDF files
 
-DEPENDS+=		tiff-3.5.5:../../graphics/tiff
-DEPENDS+=		jpeg-6b:../../graphics/jpeg
-DEPENDS+=		png>=1.0.11:../../graphics/png
+USE_BUILDLINK_ONLY=	yes
+REPLACE_BUILDLINK=	pdflib-config
 
 USE_GMAKE=		yes
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS=		--with-tifflib=${PREFIX} \
-			--with-pnglib=${PREFIX} \
-			--enable-shared-pdflib
+CONFIGURE_ARGS=		--with-tifflib
+CONFIGURE_ARGS+=	--with-zlib
+CONFIGURE_ARGS+=	--with-pnglib
+CPPFLAGS+=		-Dunix
+
 USE_LIBTOOL=		yes
 LTCONFIG_OVERRIDE=	${WRKSRC}/config/ltconfig
 
+ALL_TARGET=		pdflib
+DOCDIR=			${PREFIX}/share/doc/pdflib
+
+post-install:
+	${INSTALL_DATA_DIR} ${DOCDIR}
+	cd ${WRKSRC}/doc; for file in					\
+		PDFlib-license.pdf					\
+		PDFlib-manual.pdf					\
+		aladdin-license.pdf;					\
+	do								\
+		${INSTALL_DATA} $${file} ${DOCDIR};			\
+	done
+
+.include "../../graphics/png/buildlink.mk"
+.include "../../graphics/tiff/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/pdflib/buildlink.mk b/print/pdflib/buildlink.mk
new file mode 100644
index 00000000000..e786c777bc2
--- /dev/null
+++ b/print/pdflib/buildlink.mk
@@ -0,0 +1,37 @@
+# $NetBSD: buildlink.mk,v 1.1 2001/07/29 05:38:40 jlam Exp $
+#
+# This Makefile fragment is included by packages that use pdflib.
+#
+# To use this Makefile fragment, simply:
+#
+# (1) Optionally define BUILDLINK_DEPENDS.pdflib to the dependency pattern
+#     for the version of pdflib desired.
+# (2) Include this Makefile fragment in the package Makefile,
+# (3) Add ${BUILDLINK_DIR}/include to the front of the C preprocessor's header
+#     search path, and
+# (4) Add ${BUILDLINK_DIR}/lib to the front of the linker's library search
+#     path.
+
+.if !defined(PDFLIB_BUILDLINK_MK)
+PDFLIB_BUILDLINK_MK=	# defined
+
+.include "../../mk/bsd.buildlink.mk"
+
+BUILDLINK_DEPENDS.pdflib?=	pdflib>=4.0.1
+DEPENDS+=	${BUILDLINK_DEPENDS.pdflib}:../../print/pdflib
+
+EVAL_PREFIX+=				BUILDLINK_PREFIX.pdflib=pdflib
+BUILDLINK_PREFIX.pdflib_DEFAULT=	${LOCALBASE}
+BUILDLINK_FILES.pdflib=			include/pdflib.h
+BUILDLINK_FILES.pdflib+=		lib/libpdf.*
+
+.include "../../graphics/png/buildlink.mk"
+.include "../../graphics/tiff/buildlink.mk"
+
+BUILDLINK_TARGETS.pdflib=	pdflib-buildlink
+BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.pdflib}
+
+pre-configure: ${BUILDLINK_TARGETS.pdflib}
+pdflib-buildlink: _BUILDLINK_USE
+
+.endif	# PDFLIB_BUILDLINK_MK
diff --git a/print/pdflib/distinfo b/print/pdflib/distinfo
index f645aeb4d8a..18db3f7fffe 100644
--- a/print/pdflib/distinfo
+++ b/print/pdflib/distinfo
@@ -1,6 +1,4 @@
-$NetBSD: distinfo,v 1.2 2001/04/20 12:41:53 agc Exp $
+$NetBSD: distinfo,v 1.3 2001/07/29 05:38:41 jlam Exp $
 
-SHA1 (pdflib-3.03.tar.gz) = 29e4b5ffe6b1d5199bc394004dd02616f38c67ff
-Size (pdflib-3.03.tar.gz) = 1978076 bytes
-SHA1 (patch-ab) = c9a54acdc362a1a08d6ce921a231285426bec7ee
-SHA1 (patch-ad) = 00071b5e2e0b3d2284554ebfe246cb7963f23ce8
+SHA1 (pdflib-4.0.1.tar.gz) = 3d51257d05e2916865b82e0ddeca74049fc30fc1
+Size (pdflib-4.0.1.tar.gz) = 2715296 bytes
diff --git a/print/pdflib/patches/patch-ab b/print/pdflib/patches/patch-ab
deleted file mode 100644
index 76dce5700ff..00000000000
--- a/print/pdflib/patches/patch-ab
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2000/02/03 19:33:01 drochner Exp $
-
---- Makefile.in.orig	Sun Aug  1 14:36:05 1999
-+++ Makefile.in	Wed Feb  2 20:54:50 2000
-@@ -29,7 +29,7 @@
- 
- # ------------------------- default target  -------------------------------
- 
--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/patches/patch-ad b/print/pdflib/patches/patch-ad
deleted file mode 100644
index a1cfabf51e8..00000000000
--- a/print/pdflib/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2001/01/15 18:09:03 drochner Exp $
-
---- pdflib/Makefile.in.orig	Fri Dec 22 03:03:00 2000
-+++ pdflib/Makefile.in	Mon Jan 15 16:03:30 2001
-@@ -27,7 +27,7 @@
- TIFFLIBINC	= @TIFFLIBINC@
- ZLIBINC		= @ZLIBINC@
- PNGLIBINC	= @PNGLIBINC@
--PDFLIBLINKSELF	= @PDFLIBLINKSELF@
-+PDFLIBLINKSELF	= @PDFLIBLINKSELF@ -Wl,-R${PREFIX}/lib
- 
- CFLAGS = @DEFS@ @DEFINES@ @DEBUGFLAGS@ $(TIFFLIBINC) $(ZLIBINC) $(PNGLIBINC)
- 
diff --git a/print/pdflib/pkg/PLIST b/print/pdflib/pkg/PLIST
index 1349d83aab9..1e1ab48e559 100644
--- a/print/pdflib/pkg/PLIST
+++ b/print/pdflib/pkg/PLIST
@@ -1,7 +1,12 @@
-@comment $NetBSD: PLIST,v 1.7 2001/01/15 18:09:03 drochner Exp $
+@comment $NetBSD: PLIST,v 1.8 2001/07/29 05:38:41 jlam Exp $
+bin/pdflib-config
+include/pdflib.h
 lib/libpdf.a
 lib/libpdf.la
 lib/libpdf.so
-lib/libpdf.so.1
-lib/libpdf.so.1.1
-include/pdflib.h
+lib/libpdf.so.2
+lib/libpdf.so.2.1
+share/doc/pdflib/PDFlib-license.pdf
+share/doc/pdflib/PDFlib-manual.pdf
+share/doc/pdflib/aladdin-license.pdf
+@dirrm share/doc/pdflib