5 files changed, 11 insertions, 48 deletions

diff --git a/textproc/p5-XML-Sablotron/Makefile b/textproc/p5-XML-Sablotron/Makefile
index ae4fbf68389a..344b4514c9dc 100644
--- a/textproc/p5-XML-Sablotron/Makefile
+++ b/textproc/p5-XML-Sablotron/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	XML-Sablotron
-PORTVERSION=	0.61
-PORTREVISION=	1
+PORTVERSION=	0.65
 CATEGORIES=	textproc perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	XML
@@ -20,7 +19,12 @@ LIB_DEPENDS=	sablot.65:${PORTSDIR}/textproc/sablotron \
 
 PERL_CONFIGURE=	yes
 CONFIGURE_ARGS=	LIBS='-L${LOCALBASE}/lib -lexpat -lsablot -liconv' \
-		INC='-I${LOCALBASE}/include'
+		INC='-I${LOCALBASE}/include' \
+		EXPATLIBPATH='${LOCALBASE}/lib' \
+		EXPATINCPATH='${LOCALBASE}/include' \
+		SABLOTLIBPATH='${LOCALBASE}/lib' \
+		SABLOTINCPATH='${LOCALBASE}/include'
+
 post-patch:
 		@${PERL} -pi -e 's,%%PREFIX%%,${PREFIX},g' \
 			${WRKSRC}/Sablotron/Makefile.PL
diff --git a/textproc/p5-XML-Sablotron/distinfo b/textproc/p5-XML-Sablotron/distinfo
index b2948ad99e2c..5d7b91bb8c57 100644
--- a/textproc/p5-XML-Sablotron/distinfo
+++ b/textproc/p5-XML-Sablotron/distinfo
@@ -1 +1 @@
-MD5 (XML-Sablotron-0.61.tar.gz) = d411a680fa61994f6419cdf2e242271d
+MD5 (XML-Sablotron-0.65.tar.gz) = c52e542828173565216bee2dcaa2afbf
diff --git a/textproc/p5-XML-Sablotron/files/patch-Makefile.PL b/textproc/p5-XML-Sablotron/files/patch-Makefile.PL
deleted file mode 100644
index 2d4d06a6f324..000000000000
--- a/textproc/p5-XML-Sablotron/files/patch-Makefile.PL
+++ /dev/null
@@ -1,22 +0,0 @@
-*** Makefile.PL.orig	Sun Apr 29 14:54:12 2001
---- Makefile.PL	Sun Apr 29 14:55:07 2001
-***************
-*** 45,50 ****
---- 45,51 ----
-  
-  my $DEBUG = delete $config{DEBUG};
-  
-+ =item
-  if (delete $config{CHARLIE}) {
-      $config{LIBS} = "-L$ENV{CHARLIE_HOME}/lib -lsablot -lexpat";
-      $config{INC} = '-I$(CHARLIE_HOME)/include';
-***************
-*** 96,101 ****
---- 97,103 ----
-    \$ $^X Makefile.PL LIBS='-L/path/to/sablot/lib -lexpat -lsablot'
-  
-  DEATH
-+ =cut
-  
-  WriteMakefile(
-      NAME	=> 'XML::Sablotron',
diff --git a/textproc/p5-XML-Sablotron/files/patch-Sablotron-Makefile.PL b/textproc/p5-XML-Sablotron/files/patch-Sablotron-Makefile.PL
deleted file mode 100644
index de4afd1dc8a3..000000000000
--- a/textproc/p5-XML-Sablotron/files/patch-Sablotron-Makefile.PL
+++ /dev/null
@@ -1,20 +0,0 @@
-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 960f201c338c..63be54394ba9 100644
--- a/textproc/p5-XML-Sablotron/pkg-plist
+++ b/textproc/p5-XML-Sablotron/pkg-plist
@@ -1,11 +1,12 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/Sablotron/.packlist
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/XML/Sablotron.pm
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/XML/Sablotron/DOM.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/Sablotron/.packlist
 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
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/XML/Sablotron
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/XML 2>/dev/null || true