8 files changed, 420 insertions, 132 deletions

diff --git a/textproc/p5-PDF-API2/Makefile b/textproc/p5-PDF-API2/Makefile
index 1cf209b3b614..5c4d21d13d02 100644
--- a/textproc/p5-PDF-API2/Makefile
+++ b/textproc/p5-PDF-API2/Makefile
@@ -7,13 +7,11 @@
 #
 
 PORTNAME=	PDF-API2
-PORTVERSION=	0.2.3.8
-PORTREVISION=	1
+PORTVERSION=	0.3a30
 CATEGORIES=	textproc perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Text
+MASTER_SITE_SUBDIR=	PDF
 PKGNAMEPREFIX=	p5-
-DISTNAME=	${PORTNAME}-${PORTVERSION}_fix1
 
 MAINTAINER=	erwin@lansing.dk
 
@@ -25,7 +23,14 @@ RUN_DEPENDS=	${BUILD_DEPENDS}
 PERL_CONFIGURE=	yes
 PERL_SITELIBDIR=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
 
-post-patch:
-	@${RM} -f  ${WRKSRC}/lib/Text/PDF/FileAPI.pm.orig
+FILES=		API2.pm API2/IOString.pm API2/UniMap.pm  \
+		API2/PDF/FileAPI.pm API2/TTF/Font.pm
+
+pre-patch:
+.for i in ${FILES}
+	@${PERL} -pi -e '$$_="" if /require 5/;' \
+		-e '$$_="" if /no warnings/;' \
+		${WRKSRC}/lib/PDF/${i}
+.endfor
 
 .include <bsd.port.mk>
diff --git a/textproc/p5-PDF-API2/distinfo b/textproc/p5-PDF-API2/distinfo
index 264e298f2ed9..f8e7215d1165 100644
--- a/textproc/p5-PDF-API2/distinfo
+++ b/textproc/p5-PDF-API2/distinfo
@@ -1 +1 @@
-MD5 (PDF-API2-0.2.3.8_fix1.tar.gz) = 287ce63d0fe27788913a48b0dd7b8513
+MD5 (PDF-API2-0.3a30.tar.gz) = 20a14a4268c3235206411bad8d420e61
diff --git a/textproc/p5-PDF-API2/files/patch-lib::Text::PDF::FileAPI.pm b/textproc/p5-PDF-API2/files/patch-lib::Text::PDF::FileAPI.pm
deleted file mode 100644
index 4ecbc5cb449d..000000000000
--- a/textproc/p5-PDF-API2/files/patch-lib::Text::PDF::FileAPI.pm
+++ /dev/null
@@ -1,10 +0,0 @@
---- lib/Text/PDF/FileAPI.pm.orig       Fri Nov  1 13:01:57 2002
-+++ lib/Text/PDF/FileAPI.pm    Fri Nov  1 13:02:03 2002
-@@ -3,7 +3,6 @@
- use strict;
- no strict "refs";
- use vars qw($cr %types $VERSION @ISA);
--no warnings qw(uninitialized);
-
- use IO::File;
-
diff --git a/textproc/p5-PDF-API2/pkg-plist b/textproc/p5-PDF-API2/pkg-plist
index 41da9748f2ea..52609ea89d84 100644
--- a/textproc/p5-PDF-API2/pkg-plist
+++ b/textproc/p5-PDF-API2/pkg-plist
@@ -1,57 +1,206 @@
-lib/perl5/site_perl/%%PERL_VER%%/PDF/API2.pm
-lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/cFont.pm
-lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/Color.pm
-lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/Lite.pm
-lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap.pm
-lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/adobe-standard.map
-lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/adobe-symbol.map
-lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/adobe-zapf-dingbats.map
-lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/cp1250.map
-lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/cp1251.map
-lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/cp1252.map
-lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/cp437.map
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/PDF/API2/.packlist
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/Bsln.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/Kern.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/LTSH.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/Fmtx.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/Mort.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/Manual.pod
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/AATKern.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/Mort/Insertion.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/Mort/Ligature.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/Mort/Contextual.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/Mort/Chain.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/Mort/Rearrangement.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/Mort/Noncontextual.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/Mort/Subtable.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/Vmtx.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/Win32.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/Hhea.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/Prep.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/Cmap.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/Prop.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/OldMort.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/Kern/StateTable.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/Kern/ClassArray.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/Kern/CompactClassArray.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/Kern/Subtable.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/Kern/OrderedList.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/Fpgm.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/OldCmap.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/XMLparse.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/Changes
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/Hdmx.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/GSUB.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/Head.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/OS_2.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/PCLT.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/GDEF.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/Glyph.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/Useall.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/Ttopen.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/Loca.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/Hmtx.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/Anchor.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/Vhea.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/Delta.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/Ttc.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/Maxp.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/PSNames.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/Font.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/Name.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/Post.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/AATutils.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/Utils.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/Glyf.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/GPOS.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/Fdsc.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/Feat.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/Segarr.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/Table.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/Cvt_.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/Coverage.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/Barcode.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/PDF/SFont.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/PDF/TTFont0.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/PDF/Bool.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/PDF/Objind.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/PDF/String.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/PDF/AFont.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/PDF/FileAPI.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/PDF/Page.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/PDF/File.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/PDF/Utils.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/PDF/ImagePNG.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/PDF/ImageJPEG.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/PDF/Null.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/PDF/Filter.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/PDF/Number.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/PDF/TTFont.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/PDF/Array.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/PDF/Image.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/PDF/ImageGD.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/PDF/ImagePPM.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/PDF/Name.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/PDF/Pages.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/PDF/Dict.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/jis-c6229-1984-a.map
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/latin-lap.map
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/iso-ir-90.map
 lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/cp850.map
-lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/es.map
-lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/es2.map
-lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/iso-8859-1.map
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/cp852.map
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/jis-c6220-1969-ro.map
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/macintosh.map
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/latin1.map
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/jis-c6229-1984-hand-add.map
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/latin3.map
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/latin5.map
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/latin7.map
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/jus-i-b1-003-mac.map
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/cp437.map
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/latin-greek.map
 lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/iso-8859-2.map
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/iso-8859-4.map
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/iso-8859-6.map
 lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/koi8-r.map
-lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/koi8-u.map
-lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/latin1.map
-lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/latin2.map
-lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/macintosh.map
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/cp1250.map
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/iso-8859-8.map
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/latin13.map
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/cp1252.map
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/latin15.map
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/cp1254.map
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/cp1256.map
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/cp1258.map
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/iso-8859-13.map
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/iso-8859-15.map
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/jis-x0201.map
 lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/microsoft-dingbats.map
-lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/pt.map
-lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/pt2.map
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/jis-c6229-1984-b-add.map
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/adobe-standard.map
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/jis-c6229-1984-b.map
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/jus-i-b1-003-serb.map
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/iso-8859-supp.map
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/jis-c6220-1969-jp.map
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/adobe-zapf-dingbats.map
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/cp855.map
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/cp857.map
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/jus-i-b1-002.map
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/latin2.map
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/latin4.map
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/latin6.map
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/latin8.map
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/jis-c6229-1984-hand.map
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/latin-greek-1.map
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/jis-c6229-1984-kana.map
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/iso-8859-1.map
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/iso-8859-3.map
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/iso-8859-5.map
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/iso-8859-7.map
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/iso-8859-9.map
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/cp1251.map
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/koi8-u.map
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/adobe-symbol.map
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/cp1253.map
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/cp1255.map
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/cp1257.map
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/Font.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/Annotation.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/ColorSpace.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/CoreFont/trebuchetbolditalic.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/CoreFont/georgia.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/CoreFont/georgiaitalic.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/CoreFont/verdanaitalic.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/CoreFont/ozhandicraft.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/CoreFont/trebuchetbold.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/CoreFont/helveticaboldoblique.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/CoreFont/courierboldoblique.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/CoreFont/helveticaoblique.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/CoreFont/courieroblique.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/CoreFont/georgiabolditalic.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/CoreFont/timesitalic.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/CoreFont/courier.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/CoreFont/courierbold.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/CoreFont/arialrounded.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/CoreFont/georgiabold.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/CoreFont/timesbolditalic.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/CoreFont/trebuchet.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/CoreFont/wingdings.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/CoreFont/symbol.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/CoreFont/trebuchetitalic.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/CoreFont/impact.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/CoreFont/verdana.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/CoreFont/verdanabold.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/CoreFont/webdings.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/CoreFont/verdanabolditalic.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/CoreFont/bankgothic.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/Lite.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/PdfImage.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/ExtGState.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/Gfx.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/Text.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/Outlines.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TrueTypeFont.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/IOString.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/Page.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/Pattern.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/CoreFont.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/Outline.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/Hybrid.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/Matrix.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTFont.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/PSFont.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/Image.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/Content.pm
 lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/Util.pm
-lib/perl5/site_perl/%%PERL_VER%%/Text/PDF/AFont.pm
-lib/perl5/site_perl/%%PERL_VER%%/Text/PDF/FileAPI.pm
-lib/perl5/site_perl/%%PERL_VER%%/Text/PDF/Image.pm
-lib/perl5/site_perl/%%PERL_VER%%/Text/PDF/ImagePNG.pm
-lib/perl5/site_perl/%%PERL_VER%%/Text/PDF/ImageJPEG.pm
-lib/perl5/site_perl/%%PERL_VER%%/Text/PDF/ImageGD.pm
-lib/perl5/site_perl/%%PERL_VER%%/Text/PDF/ImagePPM.pm
-lib/perl5/site_perl/%%PERL_VER%%/Text/PDF/fonts/t1/Courier-Bold.afm
-lib/perl5/site_perl/%%PERL_VER%%/Text/PDF/fonts/t1/Courier-BoldOblique.afm
-lib/perl5/site_perl/%%PERL_VER%%/Text/PDF/fonts/t1/Courier-Oblique.afm
-lib/perl5/site_perl/%%PERL_VER%%/Text/PDF/fonts/t1/Courier.afm
-lib/perl5/site_perl/%%PERL_VER%%/Text/PDF/fonts/t1/Helvetica-Bold.afm
-lib/perl5/site_perl/%%PERL_VER%%/Text/PDF/fonts/t1/Helvetica-BoldOblique.afm
-lib/perl5/site_perl/%%PERL_VER%%/Text/PDF/fonts/t1/Helvetica-Oblique.afm
-lib/perl5/site_perl/%%PERL_VER%%/Text/PDF/fonts/t1/Helvetica.afm
-lib/perl5/site_perl/%%PERL_VER%%/Text/PDF/fonts/t1/Symbol.afm
-lib/perl5/site_perl/%%PERL_VER%%/Text/PDF/fonts/t1/Times-Bold.afm
-lib/perl5/site_perl/%%PERL_VER%%/Text/PDF/fonts/t1/Times-BoldItalic.afm
-lib/perl5/site_perl/%%PERL_VER%%/Text/PDF/fonts/t1/Times-Italic.afm
-lib/perl5/site_perl/%%PERL_VER%%/Text/PDF/fonts/t1/Times-Roman.afm
-lib/perl5/site_perl/%%PERL_VER%%/Text/PDF/fonts/t1/ZapfDingbats.afm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/PDF/API2/.packlist
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/Color.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2.pm
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/PDF/API2
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/PDF 2>/dev/null || true
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/Mort
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/Kern
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/PDF
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/CoreFont
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/PDF/API2
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Text/PDF/fonts/t1
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Text/PDF/fonts
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/PDF/API2
 @unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/PDF 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Text/PDF 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Text 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/PDF 2>/dev/null || true
diff --git a/textproc/p5-PDF-API3/Makefile b/textproc/p5-PDF-API3/Makefile
index 1cf209b3b614..5c4d21d13d02 100644
--- a/textproc/p5-PDF-API3/Makefile
+++ b/textproc/p5-PDF-API3/Makefile
@@ -7,13 +7,11 @@
 #
 
 PORTNAME=	PDF-API2
-PORTVERSION=	0.2.3.8
-PORTREVISION=	1
+PORTVERSION=	0.3a30
 CATEGORIES=	textproc perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Text
+MASTER_SITE_SUBDIR=	PDF
 PKGNAMEPREFIX=	p5-
-DISTNAME=	${PORTNAME}-${PORTVERSION}_fix1
 
 MAINTAINER=	erwin@lansing.dk
 
@@ -25,7 +23,14 @@ RUN_DEPENDS=	${BUILD_DEPENDS}
 PERL_CONFIGURE=	yes
 PERL_SITELIBDIR=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
 
-post-patch:
-	@${RM} -f  ${WRKSRC}/lib/Text/PDF/FileAPI.pm.orig
+FILES=		API2.pm API2/IOString.pm API2/UniMap.pm  \
+		API2/PDF/FileAPI.pm API2/TTF/Font.pm
+
+pre-patch:
+.for i in ${FILES}
+	@${PERL} -pi -e '$$_="" if /require 5/;' \
+		-e '$$_="" if /no warnings/;' \
+		${WRKSRC}/lib/PDF/${i}
+.endfor
 
 .include <bsd.port.mk>
diff --git a/textproc/p5-PDF-API3/distinfo b/textproc/p5-PDF-API3/distinfo
index 264e298f2ed9..f8e7215d1165 100644
--- a/textproc/p5-PDF-API3/distinfo
+++ b/textproc/p5-PDF-API3/distinfo
@@ -1 +1 @@
-MD5 (PDF-API2-0.2.3.8_fix1.tar.gz) = 287ce63d0fe27788913a48b0dd7b8513
+MD5 (PDF-API2-0.3a30.tar.gz) = 20a14a4268c3235206411bad8d420e61
diff --git a/textproc/p5-PDF-API3/files/patch-lib::Text::PDF::FileAPI.pm b/textproc/p5-PDF-API3/files/patch-lib::Text::PDF::FileAPI.pm
deleted file mode 100644
index 4ecbc5cb449d..000000000000
--- a/textproc/p5-PDF-API3/files/patch-lib::Text::PDF::FileAPI.pm
+++ /dev/null
@@ -1,10 +0,0 @@
---- lib/Text/PDF/FileAPI.pm.orig       Fri Nov  1 13:01:57 2002
-+++ lib/Text/PDF/FileAPI.pm    Fri Nov  1 13:02:03 2002
-@@ -3,7 +3,6 @@
- use strict;
- no strict "refs";
- use vars qw($cr %types $VERSION @ISA);
--no warnings qw(uninitialized);
-
- use IO::File;
-
diff --git a/textproc/p5-PDF-API3/pkg-plist b/textproc/p5-PDF-API3/pkg-plist
index 41da9748f2ea..52609ea89d84 100644
--- a/textproc/p5-PDF-API3/pkg-plist
+++ b/textproc/p5-PDF-API3/pkg-plist
@@ -1,57 +1,206 @@
-lib/perl5/site_perl/%%PERL_VER%%/PDF/API2.pm
-lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/cFont.pm
-lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/Color.pm
-lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/Lite.pm
-lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap.pm
-lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/adobe-standard.map
-lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/adobe-symbol.map
-lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/adobe-zapf-dingbats.map
-lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/cp1250.map
-lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/cp1251.map
-lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/cp1252.map
-lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/cp437.map
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/PDF/API2/.packlist
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/Bsln.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/Kern.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/LTSH.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/Fmtx.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/Mort.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/Manual.pod
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/AATKern.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/Mort/Insertion.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/Mort/Ligature.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/Mort/Contextual.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/Mort/Chain.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/Mort/Rearrangement.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/Mort/Noncontextual.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/Mort/Subtable.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/Vmtx.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/Win32.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/Hhea.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/Prep.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/Cmap.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/Prop.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/OldMort.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/Kern/StateTable.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/Kern/ClassArray.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/Kern/CompactClassArray.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/Kern/Subtable.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/Kern/OrderedList.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/Fpgm.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/OldCmap.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/XMLparse.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/Changes
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/Hdmx.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/GSUB.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/Head.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/OS_2.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/PCLT.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/GDEF.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/Glyph.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/Useall.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/Ttopen.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/Loca.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/Hmtx.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/Anchor.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/Vhea.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/Delta.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/Ttc.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/Maxp.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/PSNames.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/Font.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/Name.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/Post.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/AATutils.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/Utils.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/Glyf.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/GPOS.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/Fdsc.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/Feat.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/Segarr.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/Table.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/Cvt_.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/Coverage.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/Barcode.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/PDF/SFont.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/PDF/TTFont0.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/PDF/Bool.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/PDF/Objind.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/PDF/String.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/PDF/AFont.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/PDF/FileAPI.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/PDF/Page.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/PDF/File.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/PDF/Utils.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/PDF/ImagePNG.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/PDF/ImageJPEG.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/PDF/Null.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/PDF/Filter.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/PDF/Number.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/PDF/TTFont.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/PDF/Array.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/PDF/Image.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/PDF/ImageGD.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/PDF/ImagePPM.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/PDF/Name.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/PDF/Pages.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/PDF/Dict.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/jis-c6229-1984-a.map
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/latin-lap.map
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/iso-ir-90.map
 lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/cp850.map
-lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/es.map
-lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/es2.map
-lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/iso-8859-1.map
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/cp852.map
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/jis-c6220-1969-ro.map
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/macintosh.map
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/latin1.map
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/jis-c6229-1984-hand-add.map
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/latin3.map
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/latin5.map
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/latin7.map
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/jus-i-b1-003-mac.map
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/cp437.map
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/latin-greek.map
 lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/iso-8859-2.map
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/iso-8859-4.map
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/iso-8859-6.map
 lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/koi8-r.map
-lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/koi8-u.map
-lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/latin1.map
-lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/latin2.map
-lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/macintosh.map
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/cp1250.map
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/iso-8859-8.map
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/latin13.map
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/cp1252.map
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/latin15.map
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/cp1254.map
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/cp1256.map
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/cp1258.map
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/iso-8859-13.map
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/iso-8859-15.map
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/jis-x0201.map
 lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/microsoft-dingbats.map
-lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/pt.map
-lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/pt2.map
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/jis-c6229-1984-b-add.map
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/adobe-standard.map
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/jis-c6229-1984-b.map
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/jus-i-b1-003-serb.map
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/iso-8859-supp.map
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/jis-c6220-1969-jp.map
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/adobe-zapf-dingbats.map
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/cp855.map
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/cp857.map
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/jus-i-b1-002.map
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/latin2.map
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/latin4.map
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/latin6.map
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/latin8.map
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/jis-c6229-1984-hand.map
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/latin-greek-1.map
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/jis-c6229-1984-kana.map
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/iso-8859-1.map
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/iso-8859-3.map
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/iso-8859-5.map
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/iso-8859-7.map
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/iso-8859-9.map
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/cp1251.map
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/koi8-u.map
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/adobe-symbol.map
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/cp1253.map
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/cp1255.map
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap/cp1257.map
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/Font.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/Annotation.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/ColorSpace.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/CoreFont/trebuchetbolditalic.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/CoreFont/georgia.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/CoreFont/georgiaitalic.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/CoreFont/verdanaitalic.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/CoreFont/ozhandicraft.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/CoreFont/trebuchetbold.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/CoreFont/helveticaboldoblique.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/CoreFont/courierboldoblique.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/CoreFont/helveticaoblique.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/CoreFont/courieroblique.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/CoreFont/georgiabolditalic.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/CoreFont/timesitalic.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/CoreFont/courier.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/CoreFont/courierbold.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/CoreFont/arialrounded.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/CoreFont/georgiabold.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/CoreFont/timesbolditalic.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/CoreFont/trebuchet.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/CoreFont/wingdings.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/CoreFont/symbol.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/CoreFont/trebuchetitalic.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/CoreFont/impact.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/CoreFont/verdana.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/CoreFont/verdanabold.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/CoreFont/webdings.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/CoreFont/verdanabolditalic.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/CoreFont/bankgothic.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/Lite.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/PdfImage.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/ExtGState.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/Gfx.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/Text.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/Outlines.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TrueTypeFont.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/IOString.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/Page.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/Pattern.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/CoreFont.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/Outline.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/Hybrid.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/Matrix.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTFont.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/PSFont.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/Image.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/Content.pm
 lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/Util.pm
-lib/perl5/site_perl/%%PERL_VER%%/Text/PDF/AFont.pm
-lib/perl5/site_perl/%%PERL_VER%%/Text/PDF/FileAPI.pm
-lib/perl5/site_perl/%%PERL_VER%%/Text/PDF/Image.pm
-lib/perl5/site_perl/%%PERL_VER%%/Text/PDF/ImagePNG.pm
-lib/perl5/site_perl/%%PERL_VER%%/Text/PDF/ImageJPEG.pm
-lib/perl5/site_perl/%%PERL_VER%%/Text/PDF/ImageGD.pm
-lib/perl5/site_perl/%%PERL_VER%%/Text/PDF/ImagePPM.pm
-lib/perl5/site_perl/%%PERL_VER%%/Text/PDF/fonts/t1/Courier-Bold.afm
-lib/perl5/site_perl/%%PERL_VER%%/Text/PDF/fonts/t1/Courier-BoldOblique.afm
-lib/perl5/site_perl/%%PERL_VER%%/Text/PDF/fonts/t1/Courier-Oblique.afm
-lib/perl5/site_perl/%%PERL_VER%%/Text/PDF/fonts/t1/Courier.afm
-lib/perl5/site_perl/%%PERL_VER%%/Text/PDF/fonts/t1/Helvetica-Bold.afm
-lib/perl5/site_perl/%%PERL_VER%%/Text/PDF/fonts/t1/Helvetica-BoldOblique.afm
-lib/perl5/site_perl/%%PERL_VER%%/Text/PDF/fonts/t1/Helvetica-Oblique.afm
-lib/perl5/site_perl/%%PERL_VER%%/Text/PDF/fonts/t1/Helvetica.afm
-lib/perl5/site_perl/%%PERL_VER%%/Text/PDF/fonts/t1/Symbol.afm
-lib/perl5/site_perl/%%PERL_VER%%/Text/PDF/fonts/t1/Times-Bold.afm
-lib/perl5/site_perl/%%PERL_VER%%/Text/PDF/fonts/t1/Times-BoldItalic.afm
-lib/perl5/site_perl/%%PERL_VER%%/Text/PDF/fonts/t1/Times-Italic.afm
-lib/perl5/site_perl/%%PERL_VER%%/Text/PDF/fonts/t1/Times-Roman.afm
-lib/perl5/site_perl/%%PERL_VER%%/Text/PDF/fonts/t1/ZapfDingbats.afm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/PDF/API2/.packlist
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/Color.pm
+lib/perl5/site_perl/%%PERL_VER%%/PDF/API2.pm
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/PDF/API2
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/PDF 2>/dev/null || true
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/Mort
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF/Kern
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/TTF
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/PDF
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/UniMap
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/PDF/API2/CoreFont
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/PDF/API2
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Text/PDF/fonts/t1
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Text/PDF/fonts
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/PDF/API2
 @unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/PDF 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Text/PDF 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Text 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/PDF 2>/dev/null || true