6 files changed, 156 insertions, 20 deletions

diff --git a/print/pdflib/Makefile b/print/pdflib/Makefile
index e0ac8c06f353..46fcc414e0b2 100644
--- a/print/pdflib/Makefile
+++ b/print/pdflib/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	pdflib
 PORTVERSION=	4.0.3
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	http://www.pdflib.com/pdflib/download/
 
@@ -16,12 +17,26 @@ COMMENT=	A C library for dynamically generating PDF
 RESTRICTED=	"many odd restrictions on usage and distribution"
 
 INSTALLS_SHLIB=	yes
+USE_LIBTOOL=	yes
 USE_GMAKE=	yes
-USE_PERL5=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--enable-cxx --prefix=${PREFIX} --with-perl=${PERL}
+CONFIGURE_ARGS=	--enable-cxx \
+		--with-java=no \
+		--with-py=no \
+		--with-tcl=no
+
+.if defined(WITH_PERL)
+USE_PERL5=	yes
+PLIST_SUB=	PERL=""
+CONFIGURE_ARGS+=--with-perl=${PERL}
+.else
+CONFIGURE_ARGS+=--with-perl=no
+PLIST_SUB=	PERL="@comment "
+.endif
 
 post-install:
+	${MKDIR} ${DATADIR}/fonts
+	${INSTALL_DATA} ${WRKSRC}/fonts/* ${DATADIR}/fonts
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/* ${DOCSDIR}
diff --git a/print/pdflib/files/patch-configure b/print/pdflib/files/patch-configure
index 5ea6049e910f..8dcd28d8dd8e 100644
--- a/print/pdflib/files/patch-configure
+++ b/print/pdflib/files/patch-configure
@@ -1,5 +1,5 @@
---- configure.orig	Sat Feb  2 23:32:27 2002
-+++ configure	Sat Feb  2 23:32:37 2002
+--- configure.orig	Tue Jun 18 13:31:49 2002
++++ configure	Thu Mar  6 01:04:11 2003
 @@ -736,7 +736,7 @@
  
  
@@ -9,3 +9,11 @@
  PDFLIB_LTREVISION=3
  PDFLIB_LTAGE=1
  
+@@ -5583,6 +5583,7 @@
+ 
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/print/pdflib/pkg-plist b/print/pdflib/pkg-plist
index bd790d7f1daf..8d22d8afdc90 100644
--- a/print/pdflib/pkg-plist
+++ b/print/pdflib/pkg-plist
@@ -1,14 +1,12 @@
 bin/pdflib-config
 include/pdflib.h
 lib/libpdf.a
-lib/libpdf.la
 lib/libpdf.so
 lib/libpdf.so.4
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/pdflib_pl.a
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/pdflib_pl.la
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/pdflib_pl.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/pdflib_pl.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/pdflib_pl.so.0
+%%PERL%%lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/pdflib_pl.a
+%%PERL%%lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/pdflib_pl.pm
+%%PERL%%lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/pdflib_pl.so
+%%PERL%%lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/pdflib_pl.so.0
 %%PORTDOCS%%share/doc/pdflib/PDFlib-license.pdf
 %%PORTDOCS%%share/doc/pdflib/PDFlib-manual.pdf
 %%PORTDOCS%%share/doc/pdflib/PDFlib-purchase-order.pdf
@@ -20,4 +18,51 @@ lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/pdflib_pl.so.0
 %%PORTDOCS%%share/doc/pdflib/readme_mac.txt
 %%PORTDOCS%%share/doc/pdflib/readme_unix.txt
 %%PORTDOCS%%share/doc/pdflib/readme_win.txt
+share/pdflib/fonts/copyright.txt
+share/pdflib/fonts/Courier.afm
+share/pdflib/fonts/Courier-Bold.afm
+share/pdflib/fonts/Courier-Oblique.afm
+share/pdflib/fonts/Courier-BoldOblique.afm
+share/pdflib/fonts/Helvetica.afm
+share/pdflib/fonts/Helvetica-Bold.afm
+share/pdflib/fonts/Helvetica-Oblique.afm
+share/pdflib/fonts/Helvetica-BoldOblique.afm
+share/pdflib/fonts/Symbol.afm
+share/pdflib/fonts/Times-Roman.afm
+share/pdflib/fonts/Times-Bold.afm
+share/pdflib/fonts/Times-Italic.afm
+share/pdflib/fonts/Times-BoldItalic.afm
+share/pdflib/fonts/ZapfDingbats.afm
+share/pdflib/fonts/lcdxsr.pfa
+share/pdflib/fonts/lcdxsr.afm
+share/pdflib/fonts/cp1250.cpg
+share/pdflib/fonts/cp1250.enc
+share/pdflib/fonts/cp1251.cpg
+share/pdflib/fonts/cp1252.cpg
+share/pdflib/fonts/cp1253.cpg
+share/pdflib/fonts/cp1254.cpg
+share/pdflib/fonts/cp1255.cpg
+share/pdflib/fonts/cp1256.cpg
+share/pdflib/fonts/cp1257.cpg
+share/pdflib/fonts/cp1258.cpg
+share/pdflib/fonts/iso8859-2.cpg
+share/pdflib/fonts/iso8859-2.enc
+share/pdflib/fonts/iso8859-3.cpg
+share/pdflib/fonts/iso8859-4.cpg
+share/pdflib/fonts/iso8859-5.cpg
+share/pdflib/fonts/iso8859-6.cpg
+share/pdflib/fonts/iso8859-7.cpg
+share/pdflib/fonts/iso8859-8.cpg
+share/pdflib/fonts/iso8859-9.cpg
+share/pdflib/fonts/iso8859-9.enc
+share/pdflib/fonts/iso8859-10.cpg
+share/pdflib/fonts/iso8859-13.cpg
+share/pdflib/fonts/iso8859-14.cpg
+share/pdflib/fonts/iso8859-15.cpg
+share/pdflib/fonts/iso8859-15.enc
+share/pdflib/fonts/iso8859-16.cpg
+share/pdflib/fonts/pdflib.upr
+share/pdflib/fonts/print_glyphs.ps
 %%PORTDOCS%%@dirrm share/doc/pdflib
+@dirrm share/pdflib/fonts
+@dirrm share/pdflib
diff --git a/print/pdflib4/Makefile b/print/pdflib4/Makefile
index e0ac8c06f353..46fcc414e0b2 100644
--- a/print/pdflib4/Makefile
+++ b/print/pdflib4/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	pdflib
 PORTVERSION=	4.0.3
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	http://www.pdflib.com/pdflib/download/
 
@@ -16,12 +17,26 @@ COMMENT=	A C library for dynamically generating PDF
 RESTRICTED=	"many odd restrictions on usage and distribution"
 
 INSTALLS_SHLIB=	yes
+USE_LIBTOOL=	yes
 USE_GMAKE=	yes
-USE_PERL5=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--enable-cxx --prefix=${PREFIX} --with-perl=${PERL}
+CONFIGURE_ARGS=	--enable-cxx \
+		--with-java=no \
+		--with-py=no \
+		--with-tcl=no
+
+.if defined(WITH_PERL)
+USE_PERL5=	yes
+PLIST_SUB=	PERL=""
+CONFIGURE_ARGS+=--with-perl=${PERL}
+.else
+CONFIGURE_ARGS+=--with-perl=no
+PLIST_SUB=	PERL="@comment "
+.endif
 
 post-install:
+	${MKDIR} ${DATADIR}/fonts
+	${INSTALL_DATA} ${WRKSRC}/fonts/* ${DATADIR}/fonts
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/* ${DOCSDIR}
diff --git a/print/pdflib4/files/patch-configure b/print/pdflib4/files/patch-configure
index 5ea6049e910f..8dcd28d8dd8e 100644
--- a/print/pdflib4/files/patch-configure
+++ b/print/pdflib4/files/patch-configure
@@ -1,5 +1,5 @@
---- configure.orig	Sat Feb  2 23:32:27 2002
-+++ configure	Sat Feb  2 23:32:37 2002
+--- configure.orig	Tue Jun 18 13:31:49 2002
++++ configure	Thu Mar  6 01:04:11 2003
 @@ -736,7 +736,7 @@
  
  
@@ -9,3 +9,11 @@
  PDFLIB_LTREVISION=3
  PDFLIB_LTAGE=1
  
+@@ -5583,6 +5583,7 @@
+ 
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/print/pdflib4/pkg-plist b/print/pdflib4/pkg-plist
index bd790d7f1daf..8d22d8afdc90 100644
--- a/print/pdflib4/pkg-plist
+++ b/print/pdflib4/pkg-plist
@@ -1,14 +1,12 @@
 bin/pdflib-config
 include/pdflib.h
 lib/libpdf.a
-lib/libpdf.la
 lib/libpdf.so
 lib/libpdf.so.4
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/pdflib_pl.a
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/pdflib_pl.la
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/pdflib_pl.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/pdflib_pl.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/pdflib_pl.so.0
+%%PERL%%lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/pdflib_pl.a
+%%PERL%%lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/pdflib_pl.pm
+%%PERL%%lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/pdflib_pl.so
+%%PERL%%lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/pdflib_pl.so.0
 %%PORTDOCS%%share/doc/pdflib/PDFlib-license.pdf
 %%PORTDOCS%%share/doc/pdflib/PDFlib-manual.pdf
 %%PORTDOCS%%share/doc/pdflib/PDFlib-purchase-order.pdf
@@ -20,4 +18,51 @@ lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/pdflib_pl.so.0
 %%PORTDOCS%%share/doc/pdflib/readme_mac.txt
 %%PORTDOCS%%share/doc/pdflib/readme_unix.txt
 %%PORTDOCS%%share/doc/pdflib/readme_win.txt
+share/pdflib/fonts/copyright.txt
+share/pdflib/fonts/Courier.afm
+share/pdflib/fonts/Courier-Bold.afm
+share/pdflib/fonts/Courier-Oblique.afm
+share/pdflib/fonts/Courier-BoldOblique.afm
+share/pdflib/fonts/Helvetica.afm
+share/pdflib/fonts/Helvetica-Bold.afm
+share/pdflib/fonts/Helvetica-Oblique.afm
+share/pdflib/fonts/Helvetica-BoldOblique.afm
+share/pdflib/fonts/Symbol.afm
+share/pdflib/fonts/Times-Roman.afm
+share/pdflib/fonts/Times-Bold.afm
+share/pdflib/fonts/Times-Italic.afm
+share/pdflib/fonts/Times-BoldItalic.afm
+share/pdflib/fonts/ZapfDingbats.afm
+share/pdflib/fonts/lcdxsr.pfa
+share/pdflib/fonts/lcdxsr.afm
+share/pdflib/fonts/cp1250.cpg
+share/pdflib/fonts/cp1250.enc
+share/pdflib/fonts/cp1251.cpg
+share/pdflib/fonts/cp1252.cpg
+share/pdflib/fonts/cp1253.cpg
+share/pdflib/fonts/cp1254.cpg
+share/pdflib/fonts/cp1255.cpg
+share/pdflib/fonts/cp1256.cpg
+share/pdflib/fonts/cp1257.cpg
+share/pdflib/fonts/cp1258.cpg
+share/pdflib/fonts/iso8859-2.cpg
+share/pdflib/fonts/iso8859-2.enc
+share/pdflib/fonts/iso8859-3.cpg
+share/pdflib/fonts/iso8859-4.cpg
+share/pdflib/fonts/iso8859-5.cpg
+share/pdflib/fonts/iso8859-6.cpg
+share/pdflib/fonts/iso8859-7.cpg
+share/pdflib/fonts/iso8859-8.cpg
+share/pdflib/fonts/iso8859-9.cpg
+share/pdflib/fonts/iso8859-9.enc
+share/pdflib/fonts/iso8859-10.cpg
+share/pdflib/fonts/iso8859-13.cpg
+share/pdflib/fonts/iso8859-14.cpg
+share/pdflib/fonts/iso8859-15.cpg
+share/pdflib/fonts/iso8859-15.enc
+share/pdflib/fonts/iso8859-16.cpg
+share/pdflib/fonts/pdflib.upr
+share/pdflib/fonts/print_glyphs.ps
 %%PORTDOCS%%@dirrm share/doc/pdflib
+@dirrm share/pdflib/fonts
+@dirrm share/pdflib