Modify package so that we can create separate packages for the different

language bindings for PDFlib: we split the Makefile in a common part and
a package-specific part, and we cause the configure script to substitute
the correct values to link against an installed libpdf.so when linking
the binding shared objects.

4 files changed, 69 insertions, 21 deletions

diff --git a/print/pdflib/Makefile b/print/pdflib/Makefile
index 5f9b355a161..6fcc99b07e8 100644
--- a/print/pdflib/Makefile
+++ b/print/pdflib/Makefile
@@ -1,25 +1,13 @@
-# $NetBSD: Makefile,v 1.11 2001/07/29 05:38:40 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2001/10/01 20:51:45 jlam Exp $
 
-DISTNAME=		pdflib-4.0.1
-CATEGORIES=		print
-MASTER_SITES=		http://www.pdflib.com/pdflib/download/
+.include "Makefile.common"
 
-MAINTAINER=		packages@netbsd.org
-HOMEPAGE=		http://www.pdflib.com/pdflib/index.html
+PKGNAME=		pdflib-${PDFLIB_VERS}
+PDFLIB_PKG_VERS=	# empty
 COMMENT=		C library to produce PDF files
 
-USE_BUILDLINK_ONLY=	yes
-REPLACE_BUILDLINK=	pdflib-config
-
-USE_GMAKE=		yes
-GNU_CONFIGURE=		yes
-CONFIGURE_ARGS=		--with-tifflib
-CONFIGURE_ARGS+=	--with-zlib
-CONFIGURE_ARGS+=	--with-pnglib
-CPPFLAGS+=		-Dunix
-
-USE_LIBTOOL=		yes
-LTCONFIG_OVERRIDE=	${WRKSRC}/config/ltconfig
+USE_BUILDLINK_ONLY=	YES
+REPLACE_BUILDLINK+=	pdflib-config
 
 ALL_TARGET=		pdflib
 DOCDIR=			${PREFIX}/share/doc/pdflib
@@ -34,6 +22,4 @@ post-install:
 		${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/Makefile.common b/print/pdflib/Makefile.common
new file mode 100644
index 00000000000..a7d4f2255f0
--- /dev/null
+++ b/print/pdflib/Makefile.common
@@ -0,0 +1,44 @@
+# $NetBSD: Makefile.common,v 1.1 2001/10/01 20:51:45 jlam Exp $
+
+DISTNAME=		pdflib-${PDFLIB_DIST_VERS}
+CATEGORIES=		print
+MASTER_SITES=		http://www.pdflib.com/pdflib/download/
+
+MAINTAINER=		packages@netbsd.org
+HOMEPAGE=		http://www.pdflib.com/pdflib/index.html
+
+# Version numbering scheme:
+#
+# PDFLIB_DIST_VERS	version number on the distfile
+# PDFLIB_BASE_VERS	pkgsrc-mangled version number (convert pl -> .)
+# PDFLIB_PKG_VERS	pkgsrc revisions (nbX, etc.)
+# PDFLIB_VERS		pkgsrc version number of package
+#
+PDFLIB_DIST_VERS=	4.0.1
+PDFLIB_PKG_VERS?=	# empty
+PDFLIB_VERS=		${PDFLIB_DIST_VERS}${PDFLIB_PKG_VERS}
+
+DISTINFO_FILE=		${.CURDIR}/../pdflib/distinfo
+PATCHDIR=		${.CURDIR}/../pdflib/patches
+
+USE_GMAKE=		YES
+GNU_CONFIGURE=		YES
+CONFIGURE_ARGS+=	--with-pnglib
+CONFIGURE_ARGS+=	--with-tifflib
+CONFIGURE_ARGS+=	--with-zlib
+
+# Disable all of the extra interfaces to PDFlib.
+CONFIGURE_ARGS+=	--with-java=no
+CONFIGURE_ARGS+=	--with-perl=no
+CONFIGURE_ARGS+=	--with-py=no
+CONFIGURE_ARGS+=	--with-tcl=no
+CONFIGURE_ARGS+=	--enable-php=no
+CONFIGURE_ARGS+=	--enable-cxx=no
+
+CPPFLAGS+=		-Dunix
+
+USE_LIBTOOL=		YES
+LTCONFIG_OVERRIDE=	${WRKSRC}/config/ltconfig
+
+.include "../../graphics/png/buildlink.mk"
+.include "../../graphics/tiff/buildlink.mk"
diff --git a/print/pdflib/distinfo b/print/pdflib/distinfo
index 18db3f7fffe..8c982c64907 100644
--- a/print/pdflib/distinfo
+++ b/print/pdflib/distinfo
@@ -1,4 +1,5 @@
-$NetBSD: distinfo,v 1.3 2001/07/29 05:38:41 jlam Exp $
+$NetBSD: distinfo,v 1.4 2001/10/01 20:51:45 jlam Exp $
 
 SHA1 (pdflib-4.0.1.tar.gz) = 3d51257d05e2916865b82e0ddeca74049fc30fc1
 Size (pdflib-4.0.1.tar.gz) = 2715296 bytes
+SHA1 (patch-aa) = 3114d92f7f0f7c18853b7c3eae99c25006d33c64
diff --git a/print/pdflib/patches/patch-aa b/print/pdflib/patches/patch-aa
new file mode 100644
index 00000000000..8d0d7d11945
--- /dev/null
+++ b/print/pdflib/patches/patch-aa
@@ -0,0 +1,17 @@
+$NetBSD: patch-aa,v 1.5 2001/10/01 20:51:46 jlam Exp $
+
+--- configure.orig	Fri May 18 06:29:15 2001
++++ configure
+@@ -3364,9 +3364,9 @@
+ 
+ fi
+ 
+-PDFLIBCONVENIENT="\$(top_builddir)/pdflib/libpdf_.la $INTERNALLIBS"
+-PDFLIBLINKSELF="$RPATH $PDFLIBCONVENIENT"
+-PDFLIBLINK="\$(top_builddir)/pdflib/libpdf.la $EXTERNALLIBS"
++PDFLIBCONVENIENT="-lpdf $EXTERNALLIBS"
++PDFLIBLINKSELF="$RPATH \$(top_builddir)/pdflib/libpdf_.la $EXTERNALLIBS"
++PDFLIBLINK="-lpdf $EXTERNALLIBS"
+ 
+ 
+