4 files changed, 35 insertions, 8 deletions

diff --git a/textproc/p5-XML-Sablotron/Makefile b/textproc/p5-XML-Sablotron/Makefile
index 0f4ea7544da1..b88a420049f2 100644
--- a/textproc/p5-XML-Sablotron/Makefile
+++ b/textproc/p5-XML-Sablotron/Makefile
@@ -6,21 +6,24 @@
 #
 
 PORTNAME=	XML-Sablotron
-PORTVERSION=	0.52
+PORTVERSION=	0.61
 CATEGORIES=	textproc perl5
 MASTER_SITES=	http://download.gingerall.cz/sablot/
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@protey.ru
 
-LIB_DEPENDS=	sablot.52:${PORTSDIR}/textproc/sablotron \
+LIB_DEPENDS=	sablot.60:${PORTSDIR}/textproc/sablotron \
 		iconv.2:${PORTSDIR}/converters/iconv
 
 PERL_CONFIGURE=	yes
 CONFIGURE_ARGS=	LIBS='-L${LOCALBASE}/lib -lexpat -lsablot -liconv' \
 		INC='-I${LOCALBASE}/include'
+post-patch:
+		@${PERL} -pi -e 's,%%PREFIX%%,${PREFIX},g' \
+			${WRKSRC}/Sablotron/Makefile.PL
 
-MAN3=		XML::Sablotron.3
+MAN3=		XML::Sablotron.3 XML::Sablotron::DOM.3
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
 .include <bsd.port.mk>
diff --git a/textproc/p5-XML-Sablotron/distinfo b/textproc/p5-XML-Sablotron/distinfo
index 1fffe0ad85f5..b2948ad99e2c 100644
--- a/textproc/p5-XML-Sablotron/distinfo
+++ b/textproc/p5-XML-Sablotron/distinfo
@@ -1 +1 @@
-MD5 (XML-Sablotron-0.52.tar.gz) = c5ae053e61b6b61908d2f67dd7759923
+MD5 (XML-Sablotron-0.61.tar.gz) = d411a680fa61994f6419cdf2e242271d
diff --git a/textproc/p5-XML-Sablotron/files/patch-Sablotron-Makefile.PL b/textproc/p5-XML-Sablotron/files/patch-Sablotron-Makefile.PL
new file mode 100644
index 000000000000..de4afd1dc8a3
--- /dev/null
+++ b/textproc/p5-XML-Sablotron/files/patch-Sablotron-Makefile.PL
@@ -0,0 +1,20 @@
+diff -crN Sablotron/Makefile.PL.orig Sablotron/Makefile.PL
+*** Sablotron/Makefile.PL.orig	Sun Jun 17 15:10:21 2001
+--- Sablotron/Makefile.PL	Sun Jun 17 15:11:07 2001
+***************
+*** 5,11 ****
+      'NAME'		=> 'XML::Sablotron::DOM',
+      'VERSION_FROM'	=> 'DOM.pm', # finds $VERSION
+      'PREREQ_PM'		=> {}, # e.g., Module::Name => 1.1
+!     'LIBS'		=> ['-L/home/pavel/sablot/lib -lsablot'], # e.g., '-lm'
+      'DEFINE'		=> '', # e.g., '-DHAVE_SOMETHING'
+!     'INC'		=> '', # e.g., '-I/usr/include/other'
+  );
+--- 5,11 ----
+      'NAME'		=> 'XML::Sablotron::DOM',
+      'VERSION_FROM'	=> 'DOM.pm', # finds $VERSION
+      'PREREQ_PM'		=> {}, # e.g., Module::Name => 1.1
+!     'LIBS'		=> ['-L%%PREFIX%%/lib -lsablot'],
+      'DEFINE'		=> '', # e.g., '-DHAVE_SOMETHING'
+!     'INC'		=> '-I%%PREFIX%%/include',
+  );
diff --git a/textproc/p5-XML-Sablotron/pkg-plist b/textproc/p5-XML-Sablotron/pkg-plist
index 968a35ae7c57..960f201c338c 100644
--- a/textproc/p5-XML-Sablotron/pkg-plist
+++ b/textproc/p5-XML-Sablotron/pkg-plist
@@ -1,7 +1,11 @@
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/Sablotron/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/Sablotron/Sablotron.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/Sablotron/Sablotron.bs
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/XML/Sablotron.pm
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/XML 2>/dev/null || true
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/XML/Sablotron/DOM.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/Sablotron/DOM/DOM.bs
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/Sablotron/DOM/DOM.so
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/Sablotron/Sablotron.bs
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/Sablotron/Sablotron.so
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/Sablotron/DOM
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/Sablotron
-
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/XML 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true