2 files changed, 21 insertions, 22 deletions
diff --git a/audio/p5-Xmms/Makefile b/audio/p5-Xmms/Makefile
index 955af1a..c82729c 100644
--- a/audio/p5-Xmms/Makefile
+++ b/audio/p5-Xmms/Makefile
@@ -20,7 +20,7 @@ BUILD_DEPENDS=	xmms:${PORTSDIR}/multimedia/xmms \
 		${site_perl}/Term/ANSIColor.pm:${PORTSDIR}/devel/p5-Term-ANSIColor \
 		${site_perl}/Term/ReadLine/Perl.pm:${PORTSDIR}/devel/p5-ReadLine-Perl
 
-site_perl=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+site_perl=	${SITE_PERL}
 
 PERL_CONFIGURE=	YES
 
@@ -28,6 +28,5 @@ MAN3=		Xmms::Remote.3 \
 		Xmms::SongChange.3 \
 		Xmms.3 \
 		Bundle::Xmms.3
-MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
 .include <bsd.port.mk>
diff --git a/audio/p5-Xmms/pkg-plist b/audio/p5-Xmms/pkg-plist
index 7455bde..5d7d230 100644
--- a/audio/p5-Xmms/pkg-plist
+++ b/audio/p5-Xmms/pkg-plist
@@ -1,20 +1,20 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Bundle/Xmms.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Xmms.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Xmms/Config.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Xmms/ExtUtils.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Xmms/Remote.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Xmms/SongChange.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Xmms-Perl/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Xmms/Config/Config.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Xmms/Config/Config.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Xmms/Remote/Remote.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Xmms/Remote/Remote.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Xmms/SongChange/SongChange.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Xmms/SongChange/SongChange.so
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Xmms/Config
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Xmms/Remote
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Xmms/SongChange
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Xmms
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Xmms-Perl
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Bundle
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Xmms
+%%SITE_PERL%%/%%PERL_ARCH%%/Bundle/Xmms.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Xmms.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Xmms/Config.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Xmms/ExtUtils.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Xmms/Remote.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Xmms/SongChange.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Xmms-Perl/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Xmms/Config/Config.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Xmms/Config/Config.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Xmms/Remote/Remote.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Xmms/Remote/Remote.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Xmms/SongChange/SongChange.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Xmms/SongChange/SongChange.so
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Xmms/Config
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Xmms/Remote
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Xmms/SongChange
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Xmms
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Xmms-Perl
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Bundle
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Xmms