3 files changed, 15 insertions, 14 deletions
diff --git a/textproc/p5-XML-AutoWriter/Makefile b/textproc/p5-XML-AutoWriter/Makefile
index 70c20dfb6661..c9e1df7e5b04 100644
--- a/textproc/p5-XML-AutoWriter/Makefile
+++ b/textproc/p5-XML-AutoWriter/Makefile
@@ -16,7 +16,8 @@ LICENSE_COMB=	dual
 
 TEST_DEPENDS=	p5-XML-Parser>=0:textproc/p5-XML-Parser
 
-USES=		perl5
+USES=		dos2unix perl5
+DOS2UNIX_GLOB=	*.pm
 USE_PERL5=	configure
 
 post-patch:
diff --git a/textproc/p5-XML-AutoWriter/files/patch-Makefile.PL b/textproc/p5-XML-AutoWriter/files/patch-Makefile.PL
index 4618fef63a73..885901fc6790 100644
--- a/textproc/p5-XML-AutoWriter/files/patch-Makefile.PL
+++ b/textproc/p5-XML-AutoWriter/files/patch-Makefile.PL
@@ -1,6 +1,6 @@
---- Makefile.PL.orig	2012-12-23 11:07:17.511361339 +0900
-+++ Makefile.PL	2012-12-23 11:09:35.165438990 +0900
-@@ -9,7 +9,6 @@
+--- Makefile.PL.orig	2009-06-11 18:26:48 UTC
++++ Makefile.PL
+@@ -9,7 +9,6 @@ requires => 'XML::Parser';
  build_requires => 'Test';
  build_requires => 'IO::File';
  
diff --git a/textproc/p5-XML-AutoWriter/files/patch-Doctype.pm b/textproc/p5-XML-AutoWriter/files/patch-lib_XML_Doctype.pm
index d9d905f2fae4..be7993d4c047 100644
--- a/textproc/p5-XML-AutoWriter/files/patch-Doctype.pm
+++ b/textproc/p5-XML-AutoWriter/files/patch-lib_XML_Doctype.pm
@@ -1,12 +1,12 @@
---- lib/XML/Doctype.pm.orig	Tue Dec 27 23:27:13 2005
-+++ lib/XML/Doctype.pm	Mon Jan 30 23:43:38 2006
-@@ -62,7 +62,9 @@
- =cut
- 
- use strict ;
+--- lib/XML/Doctype.pm.orig	2016-06-20 16:08:38 UTC
++++ lib/XML/Doctype.pm
+@@ -62,7 +62,9 @@ XML::Doctype::ENITITY
+ =cut
+ 
+ use strict ;
 +use Config;
- use vars qw( $VERSION %_default_dtds ) ;
+ use vars qw( $VERSION %_default_dtds ) ;
 +use lib $Config{sitelib};
- use fields (
-    'ELTS',       # A hash of declared & undeclared elements, keyed by name
-    'NAME',       # The root node (the name from the DOCTYPE decl).
+ use fields (
+    'ELTS',       # A hash of declared & undeclared elements, keyed by name
+    'NAME',       # The root node (the name from the DOCTYPE decl).