From a3d7dc8a1b0b7aa5ea14b181053ccda83a232466 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Fri, 20 Mar 2009 07:07:43 +0100
Subject: [PATCH] Repair build/installation of perl modules.

--HG--
extra : convert_revision : e72ba0f07d5bcbd009b598a63dadfc665fd7fb1c
---
 shutils/install_funcs.sh         | 11 ++++++++++-
 templates/helpers/perl-module.sh | 12 ++++++------
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/shutils/install_funcs.sh b/shutils/install_funcs.sh
index 5020320ee93..9005ad458f3 100644
--- a/shutils/install_funcs.sh
+++ b/shutils/install_funcs.sh
@@ -115,7 +115,9 @@ install_src_phase()
 
 make_install()
 {
-	if [ -z "$make_install_target" ]; then
+	if [ "$build_style" = "perl_module" ]; then
+		make_install_target="install"
+	elif [ -z "$make_install_target" ]; then
 		make_install_target="DESTDIR=${DESTDIR} install"
 	fi
 
@@ -141,6 +143,13 @@ make_install()
 		fi
 	fi
 
+	# Always remove perllocal.pod and .packlist files for
+	# perl modules.
+	if [ "$build_style" = "perl_module" -a "$pkgname" != "perl" ]; then
+		find ${DESTDIR} -name perllocal.pod -delete
+		find ${DESTDIR} -name .packlist -delete
+	fi
+
 	# Unset build vars.
 	unset_build_vars
 }
diff --git a/templates/helpers/perl-module.sh b/templates/helpers/perl-module.sh
index 535489bedbd..6f527e3a8d3 100644
--- a/templates/helpers/perl-module.sh
+++ b/templates/helpers/perl-module.sh
@@ -9,16 +9,16 @@
 # Optionally if the module needs more directories to be configured other
 # than $XBPS_BUILDDIR/$wrksrc, one can use (relative to $wrksrc):
 #
-#	perl_configure_dirs=blob/bob foo/blah
+#	perl_configure_dirs="blob/bob foo/blah"
 #
 
 # Override the paths to get desired results.
 : ${_arch:=$(uname -m)}
-: ${perl_thrmulti:=${_arch}-netbsd-thread-multi}
+: ${perl_thrmulti:=${_arch}-linux-thread-multi}
 : ${perl_cmd:=$XBPS_MASTERDIR/usr/bin/perl}
-: ${PERL_DESTDIR:=$XBPS_MASTERDIR/usr}
+: ${PERL_DESTDIR:=$XBPS_MASTERDIR}
 : ${PERL_PREFIX:=$PERL_DESTDIR/usr}
-: ${PERL_DPREFIX:=$XBPS_DESTDIR/$pkgname-$version/usr}
+: ${PERL_DPREFIX:=${DESTDIR}/usr}
 : ${PERL_VERSION:=5.10.0}
 : ${PERL_LDDLFLAGS:=--whole-archive -shared -L$XBPS_MASTERDIR/lib}
 : ${PERL_SITELIBEXP:=$PERL_DPREFIX/lib/perl5/site_perl/$PERL_VERSION}
@@ -32,9 +32,9 @@
 : ${PERL_INSTALLSITEBIN:=$PERL_INSTALLBIN}
 : ${PERL_INSTALLSCRIPT:=$PERL_DPREFIX/bin}
 : ${PERL_INSTALLSITESCRIPT:=$PERL_INSTALLSCRIPT}
-: ${PERL_INSTALLMAN1DIR:=$PERL_DPREFIX/man/man1}
+: ${PERL_INSTALLMAN1DIR:=$PERL_DPREFIX/share/man/man1}
 : ${PERL_INSTALLSITEMAN1DIR=$PERL_INSTALLMAN1DIR}
-: ${PERL_INSTALLMAN3DIR:=$PERL_DPREFIX/man/man3}
+: ${PERL_INSTALLMAN3DIR:=$PERL_DPREFIX/share/man/man3}
 : ${PERL_INSTALLSITEMAN3DIR:=$PERL_INSTALLMAN3DIR}
 : ${PERL_PERLLIB:=$PERL_PREFIX/lib/perl5/$PERL_VERSION}
 : ${PERL_ARCHLIB:=$PERL_PREFIX/lib/perl5/$PERL_VERSION/$perl_thrmulti}