Upgrade to 2.0.

pdflib is build as a shared library, now.

14 files changed, 273 insertions, 84 deletions

diff --git a/print/pdflib/Makefile b/print/pdflib/Makefile
index d72630387fdd..420fb9614426 100644
--- a/print/pdflib/Makefile
+++ b/print/pdflib/Makefile
@@ -1,39 +1,36 @@
 # New ports collection makefile for:	pdflib
-# Version required:	0.6
+# Version required:	2.0
 # Date created:		Mon Jan 18 17:03:33 CET 1999
-# Whom:			Dirk Froemberg <dirk@FreeBSD.ORG>
+# Whom:			Dirk Froemberg <dirk@FreeBSD.org>
 #
-# $Id: Makefile,v 1.1.1.1 1999/01/20 14:49:12 dirk Exp $
+# $Id: Makefile,v 1.2 1999/05/19 21:45:53 dirk Exp $
 #
 
-DISTNAME=	pdflib-0.6
+DISTNAME=	pdflib-2.0
 CATEGORIES=	print
-MASTER_SITES=	http://www.ifconnection.de/~tm/software/pdflib/ \
+MASTER_SITES=	http://www.ifconnection.de/~tm/pdflib/ \
 		http://www.physik.TU-Berlin.DE/~ibex/ports/distfiles/
 
-MAINTAINER=	dirk@FreeBSD.ORG
+MAINTAINER=	dirk@FreeBSD.org
 
 RUN_DEPENDS=	${PREFIX}/lib/afm/Courier:${PORTSDIR}/print/afm
 LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff34 \
 		jpeg.9:${PORTSDIR}/graphics/jpeg
 
-USE_GMAKE=	yes
-MAKEFILE=	makefile.gcc
-MAKE_ENV=	CC=${CC}
-
-pre-build:
-	${SED} -e "s#!!PREFIX!!#${PREFIX}#" < ${WRKSRC}/pdf.h > ${WRKSRC}/pdf.h.tmp
-	${MV} ${WRKSRC}/pdf.h.tmp ${WRKSRC}/pdf.h
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--with-perl5=${PERL} \
+		--with-tiff=${PREFIX} \
+		--with-jpeg=${PREFIX} \
+		--with-zlib=/usr
 
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/libpdf.a ${PREFIX}/lib
-.for prg in imagepdf pdfclock pdfdemo pdfgraph text2pdf
-	${INSTALL_PROGRAM} ${WRKSRC}/${prg} ${PREFIX}/bin
-.endfor
-	${INSTALL_DATA} ${WRKSRC}/pdf.h ${PREFIX}/include
+	${INSTALL_DATA} ${WRKSRC}/pdflib/libpdf.so.2 ${PREFIX}/lib
+	${LN} -s libpdf.so.2 ${PREFIX}/lib/libpdf.so
+	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
+	${INSTALL_DATA} ${WRKSRC}/pdflib/pdflib.h ${PREFIX}/include
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/pdflib
-	${INSTALL_DATA} ${WRKSRC}/PDFlib-0.6.pdf ${PREFIX}/share/doc/pdflib
+	${INSTALL_DATA} ${WRKSRC}/doc/* ${PREFIX}/share/doc/pdflib
 .endif
 
 .include <bsd.port.mk>
diff --git a/print/pdflib/distinfo b/print/pdflib/distinfo
index 87ab9b286a91..bb381a3637a0 100644
--- a/print/pdflib/distinfo
+++ b/print/pdflib/distinfo
@@ -1 +1 @@
-MD5 (pdflib-0.6.tar.gz) = a7773a2cbebe30655cbbe884f3a012db
+MD5 (pdflib-2.0.tar.gz) = 17a28a7ecc91d0a02472bcc0e74da0d2
diff --git a/print/pdflib/files/patch-ad b/print/pdflib/files/patch-ad
new file mode 100644
index 000000000000..24706cf9974a
--- /dev/null
+++ b/print/pdflib/files/patch-ad
@@ -0,0 +1,52 @@
+--- configure.orig	Wed Jun 30 12:52:35 1999
++++ configure	Mon Jul 12 16:17:30 1999
+@@ -555,7 +555,7 @@
+ 
+ 
+ 
+-VERSION="2.0"
++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"
+ 
+ 
+ 
diff --git a/print/pdflib/files/patch-af b/print/pdflib/files/patch-af
new file mode 100644
index 000000000000..bf6cda2d47da
--- /dev/null
+++ b/print/pdflib/files/patch-af
@@ -0,0 +1,18 @@
+--- 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
+ 
+ .SUFFIXES: .cpp
+ 
+ .cpp.o:
+-	$(CXX) $(CXXFLAGS) $(DEFINES) $<
++	$(CXX) $(CFLAGS) $(CXXFLAGS) $(DEFINES) $<
+ 
+ # ----------------------------------
+ 
diff --git a/print/pdflib/pkg-plist b/print/pdflib/pkg-plist
index 79825e4f03b7..93db2111b09d 100644
--- a/print/pdflib/pkg-plist
+++ b/print/pdflib/pkg-plist
@@ -1,9 +1,11 @@
-bin/imagepdf
-bin/pdfclock
-bin/pdfdemo
-bin/pdfgraph
-bin/text2pdf
-include/pdf.h
-lib/libpdf.a
-share/doc/pdflib/PDFlib-0.6.pdf
+include/pdflib.h
+lib/libpdf.so
+lib/libpdf.so.2
+share/doc/pdflib/PDFlib.pdf
+share/doc/pdflib/changes.txt
+share/doc/pdflib/compatibility.txt
+share/doc/pdflib/install.txt
+share/doc/pdflib/license.pdf
 @dirrm share/doc/pdflib
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D/lib
+@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
diff --git a/print/pdflib3/Makefile b/print/pdflib3/Makefile
index d72630387fdd..420fb9614426 100644
--- a/print/pdflib3/Makefile
+++ b/print/pdflib3/Makefile
@@ -1,39 +1,36 @@
 # New ports collection makefile for:	pdflib
-# Version required:	0.6
+# Version required:	2.0
 # Date created:		Mon Jan 18 17:03:33 CET 1999
-# Whom:			Dirk Froemberg <dirk@FreeBSD.ORG>
+# Whom:			Dirk Froemberg <dirk@FreeBSD.org>
 #
-# $Id: Makefile,v 1.1.1.1 1999/01/20 14:49:12 dirk Exp $
+# $Id: Makefile,v 1.2 1999/05/19 21:45:53 dirk Exp $
 #
 
-DISTNAME=	pdflib-0.6
+DISTNAME=	pdflib-2.0
 CATEGORIES=	print
-MASTER_SITES=	http://www.ifconnection.de/~tm/software/pdflib/ \
+MASTER_SITES=	http://www.ifconnection.de/~tm/pdflib/ \
 		http://www.physik.TU-Berlin.DE/~ibex/ports/distfiles/
 
-MAINTAINER=	dirk@FreeBSD.ORG
+MAINTAINER=	dirk@FreeBSD.org
 
 RUN_DEPENDS=	${PREFIX}/lib/afm/Courier:${PORTSDIR}/print/afm
 LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff34 \
 		jpeg.9:${PORTSDIR}/graphics/jpeg
 
-USE_GMAKE=	yes
-MAKEFILE=	makefile.gcc
-MAKE_ENV=	CC=${CC}
-
-pre-build:
-	${SED} -e "s#!!PREFIX!!#${PREFIX}#" < ${WRKSRC}/pdf.h > ${WRKSRC}/pdf.h.tmp
-	${MV} ${WRKSRC}/pdf.h.tmp ${WRKSRC}/pdf.h
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--with-perl5=${PERL} \
+		--with-tiff=${PREFIX} \
+		--with-jpeg=${PREFIX} \
+		--with-zlib=/usr
 
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/libpdf.a ${PREFIX}/lib
-.for prg in imagepdf pdfclock pdfdemo pdfgraph text2pdf
-	${INSTALL_PROGRAM} ${WRKSRC}/${prg} ${PREFIX}/bin
-.endfor
-	${INSTALL_DATA} ${WRKSRC}/pdf.h ${PREFIX}/include
+	${INSTALL_DATA} ${WRKSRC}/pdflib/libpdf.so.2 ${PREFIX}/lib
+	${LN} -s libpdf.so.2 ${PREFIX}/lib/libpdf.so
+	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
+	${INSTALL_DATA} ${WRKSRC}/pdflib/pdflib.h ${PREFIX}/include
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/pdflib
-	${INSTALL_DATA} ${WRKSRC}/PDFlib-0.6.pdf ${PREFIX}/share/doc/pdflib
+	${INSTALL_DATA} ${WRKSRC}/doc/* ${PREFIX}/share/doc/pdflib
 .endif
 
 .include <bsd.port.mk>
diff --git a/print/pdflib3/distinfo b/print/pdflib3/distinfo
index 87ab9b286a91..bb381a3637a0 100644
--- a/print/pdflib3/distinfo
+++ b/print/pdflib3/distinfo
@@ -1 +1 @@
-MD5 (pdflib-0.6.tar.gz) = a7773a2cbebe30655cbbe884f3a012db
+MD5 (pdflib-2.0.tar.gz) = 17a28a7ecc91d0a02472bcc0e74da0d2
diff --git a/print/pdflib3/files/patch-ad b/print/pdflib3/files/patch-ad
new file mode 100644
index 000000000000..24706cf9974a
--- /dev/null
+++ b/print/pdflib3/files/patch-ad
@@ -0,0 +1,52 @@
+--- configure.orig	Wed Jun 30 12:52:35 1999
++++ configure	Mon Jul 12 16:17:30 1999
+@@ -555,7 +555,7 @@
+ 
+ 
+ 
+-VERSION="2.0"
++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"
+ 
+ 
+ 
diff --git a/print/pdflib3/pkg-plist b/print/pdflib3/pkg-plist
index 79825e4f03b7..93db2111b09d 100644
--- a/print/pdflib3/pkg-plist
+++ b/print/pdflib3/pkg-plist
@@ -1,9 +1,11 @@
-bin/imagepdf
-bin/pdfclock
-bin/pdfdemo
-bin/pdfgraph
-bin/text2pdf
-include/pdf.h
-lib/libpdf.a
-share/doc/pdflib/PDFlib-0.6.pdf
+include/pdflib.h
+lib/libpdf.so
+lib/libpdf.so.2
+share/doc/pdflib/PDFlib.pdf
+share/doc/pdflib/changes.txt
+share/doc/pdflib/compatibility.txt
+share/doc/pdflib/install.txt
+share/doc/pdflib/license.pdf
 @dirrm share/doc/pdflib
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D/lib
+@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
diff --git a/print/pdflib4/Makefile b/print/pdflib4/Makefile
index d72630387fdd..420fb9614426 100644
--- a/print/pdflib4/Makefile
+++ b/print/pdflib4/Makefile
@@ -1,39 +1,36 @@
 # New ports collection makefile for:	pdflib
-# Version required:	0.6
+# Version required:	2.0
 # Date created:		Mon Jan 18 17:03:33 CET 1999
-# Whom:			Dirk Froemberg <dirk@FreeBSD.ORG>
+# Whom:			Dirk Froemberg <dirk@FreeBSD.org>
 #
-# $Id: Makefile,v 1.1.1.1 1999/01/20 14:49:12 dirk Exp $
+# $Id: Makefile,v 1.2 1999/05/19 21:45:53 dirk Exp $
 #
 
-DISTNAME=	pdflib-0.6
+DISTNAME=	pdflib-2.0
 CATEGORIES=	print
-MASTER_SITES=	http://www.ifconnection.de/~tm/software/pdflib/ \
+MASTER_SITES=	http://www.ifconnection.de/~tm/pdflib/ \
 		http://www.physik.TU-Berlin.DE/~ibex/ports/distfiles/
 
-MAINTAINER=	dirk@FreeBSD.ORG
+MAINTAINER=	dirk@FreeBSD.org
 
 RUN_DEPENDS=	${PREFIX}/lib/afm/Courier:${PORTSDIR}/print/afm
 LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff34 \
 		jpeg.9:${PORTSDIR}/graphics/jpeg
 
-USE_GMAKE=	yes
-MAKEFILE=	makefile.gcc
-MAKE_ENV=	CC=${CC}
-
-pre-build:
-	${SED} -e "s#!!PREFIX!!#${PREFIX}#" < ${WRKSRC}/pdf.h > ${WRKSRC}/pdf.h.tmp
-	${MV} ${WRKSRC}/pdf.h.tmp ${WRKSRC}/pdf.h
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--with-perl5=${PERL} \
+		--with-tiff=${PREFIX} \
+		--with-jpeg=${PREFIX} \
+		--with-zlib=/usr
 
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/libpdf.a ${PREFIX}/lib
-.for prg in imagepdf pdfclock pdfdemo pdfgraph text2pdf
-	${INSTALL_PROGRAM} ${WRKSRC}/${prg} ${PREFIX}/bin
-.endfor
-	${INSTALL_DATA} ${WRKSRC}/pdf.h ${PREFIX}/include
+	${INSTALL_DATA} ${WRKSRC}/pdflib/libpdf.so.2 ${PREFIX}/lib
+	${LN} -s libpdf.so.2 ${PREFIX}/lib/libpdf.so
+	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
+	${INSTALL_DATA} ${WRKSRC}/pdflib/pdflib.h ${PREFIX}/include
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/pdflib
-	${INSTALL_DATA} ${WRKSRC}/PDFlib-0.6.pdf ${PREFIX}/share/doc/pdflib
+	${INSTALL_DATA} ${WRKSRC}/doc/* ${PREFIX}/share/doc/pdflib
 .endif
 
 .include <bsd.port.mk>
diff --git a/print/pdflib4/distinfo b/print/pdflib4/distinfo
index 87ab9b286a91..bb381a3637a0 100644
--- a/print/pdflib4/distinfo
+++ b/print/pdflib4/distinfo
@@ -1 +1 @@
-MD5 (pdflib-0.6.tar.gz) = a7773a2cbebe30655cbbe884f3a012db
+MD5 (pdflib-2.0.tar.gz) = 17a28a7ecc91d0a02472bcc0e74da0d2
diff --git a/print/pdflib4/files/patch-ad b/print/pdflib4/files/patch-ad
new file mode 100644
index 000000000000..24706cf9974a
--- /dev/null
+++ b/print/pdflib4/files/patch-ad
@@ -0,0 +1,52 @@
+--- configure.orig	Wed Jun 30 12:52:35 1999
++++ configure	Mon Jul 12 16:17:30 1999
+@@ -555,7 +555,7 @@
+ 
+ 
+ 
+-VERSION="2.0"
++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"
+ 
+ 
+ 
diff --git a/print/pdflib4/files/patch-af b/print/pdflib4/files/patch-af
new file mode 100644
index 000000000000..bf6cda2d47da
--- /dev/null
+++ b/print/pdflib4/files/patch-af
@@ -0,0 +1,18 @@
+--- 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
+ 
+ .SUFFIXES: .cpp
+ 
+ .cpp.o:
+-	$(CXX) $(CXXFLAGS) $(DEFINES) $<
++	$(CXX) $(CFLAGS) $(CXXFLAGS) $(DEFINES) $<
+ 
+ # ----------------------------------
+ 
diff --git a/print/pdflib4/pkg-plist b/print/pdflib4/pkg-plist
index 79825e4f03b7..93db2111b09d 100644
--- a/print/pdflib4/pkg-plist
+++ b/print/pdflib4/pkg-plist
@@ -1,9 +1,11 @@
-bin/imagepdf
-bin/pdfclock
-bin/pdfdemo
-bin/pdfgraph
-bin/text2pdf
-include/pdf.h
-lib/libpdf.a
-share/doc/pdflib/PDFlib-0.6.pdf
+include/pdflib.h
+lib/libpdf.so
+lib/libpdf.so.2
+share/doc/pdflib/PDFlib.pdf
+share/doc/pdflib/changes.txt
+share/doc/pdflib/compatibility.txt
+share/doc/pdflib/install.txt
+share/doc/pdflib/license.pdf
 @dirrm share/doc/pdflib
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D/lib
+@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R