Sat Feb 16 22:14:42 2013 UTC ()
Search in ${PREFIX}/share too. Noticed because p5-File-MimeInfo was
warning (falsely) about shared-mime-info not being installed and
failing to assign sane types. Fixes at least that problem, and
possibly others. Bump PKGREVISION.


(schmonz)
diff -r1.14 -r1.15 pkgsrc/devel/p5-File-BaseDir/Makefile
diff -r1.3 -r1.4 pkgsrc/devel/p5-File-BaseDir/distinfo
diff -r0 -r1.1 pkgsrc/devel/p5-File-BaseDir/patches/patch-lib_File_BaseDir.pm
diff -r0 -r1.1 pkgsrc/devel/p5-File-BaseDir/patches/patch-t_01__vars.t
diff -r0 -r1.1 pkgsrc/devel/p5-File-BaseDir/patches/patch-t_03__OO.t
cvs diff -r1.14 -r1.15 pkgsrc/devel/p5-File-BaseDir/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/p5-File-BaseDir/Makefile 2012/10/31 11:18:09 1.14
+++ pkgsrc/devel/p5-File-BaseDir/Makefile 2013/02/16 22:14:40 1.15
@@ -1,20 +1,27 @@ @@ -1,20 +1,27 @@
1# $NetBSD: Makefile,v 1.14 2012/10/31 11:18:09 asau Exp $ 1# $NetBSD: Makefile,v 1.15 2013/02/16 22:14:40 schmonz Exp $
2 2
3DISTNAME= File-BaseDir-0.03 3DISTNAME= File-BaseDir-0.03
4PKGNAME= p5-${DISTNAME} 4PKGNAME= p5-${DISTNAME}
5PKGREVISION= 4 5PKGREVISION= 5
6CATEGORIES= devel perl5 6CATEGORIES= devel perl5
7MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=File/} 7MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=File/}
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://search.cpan.org/dist/File-BaseDir/ 10HOMEPAGE= http://search.cpan.org/dist/File-BaseDir/
11COMMENT= Perl module for the XDG Base Directory Specification 11COMMENT= Perl module for the XDG Base Directory Specification
12LICENSE= ${PERL5_LICENSE} 12LICENSE= ${PERL5_LICENSE}
13 13
14PKG_INSTALLATION_TYPES= overwrite pkgviews 14PKG_INSTALLATION_TYPES= overwrite pkgviews
15 15
 16SHAREDIR= ${PREFIX}/share
 17SHAREDIR_SPLIT= ${SHAREDIR:S/\// /g}
 18SUBST_CLASSES+= paths
 19SUBST_STAGE.paths= post-configure
 20SUBST_FILES.paths= lib/File/BaseDir.pm t/01_vars.t t/03_OO.t
 21SUBST_SED.paths= -e 's|@SHAREDIR_SPLIT@|${SHAREDIR_SPLIT}|g'
 22
16PERL5_MODULE_TYPE= Module::Build 23PERL5_MODULE_TYPE= Module::Build
17PERL5_PACKLIST= auto/File/BaseDir/.packlist 24PERL5_PACKLIST= auto/File/BaseDir/.packlist
18 25
19.include "../../lang/perl5/module.mk" 26.include "../../lang/perl5/module.mk"
20.include "../../mk/bsd.pkg.mk" 27.include "../../mk/bsd.pkg.mk"
cvs diff -r1.3 -r1.4 pkgsrc/devel/p5-File-BaseDir/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/p5-File-BaseDir/distinfo 2007/11/29 16:00:40 1.3
+++ pkgsrc/devel/p5-File-BaseDir/distinfo 2013/02/16 22:14:41 1.4
@@ -1,5 +1,8 @@ @@ -1,5 +1,8 @@
1$NetBSD: distinfo,v 1.3 2007/11/29 16:00:40 wiz Exp $ 1$NetBSD: distinfo,v 1.4 2013/02/16 22:14:41 schmonz Exp $
2 2
3SHA1 (File-BaseDir-0.03.tar.gz) = 901f56c06fd3b4a105bd24b8790ba95337d9aea7 3SHA1 (File-BaseDir-0.03.tar.gz) = 901f56c06fd3b4a105bd24b8790ba95337d9aea7
4RMD160 (File-BaseDir-0.03.tar.gz) = 8ca2e29a57fe65c58c04f9f205247831f16a0c39 4RMD160 (File-BaseDir-0.03.tar.gz) = 8ca2e29a57fe65c58c04f9f205247831f16a0c39
5Size (File-BaseDir-0.03.tar.gz) = 6065 bytes 5Size (File-BaseDir-0.03.tar.gz) = 6065 bytes
 6SHA1 (patch-lib_File_BaseDir.pm) = 2374434a67b8d0c935a4cdab6d3c31bd8a71ac5e
 7SHA1 (patch-t_01__vars.t) = 8f0273889bd698a5b066384dd5ccd89cf3a11338
 8SHA1 (patch-t_03__OO.t) = c3a20a26417a1d833c4d462a12b1e01d3127121c
File Added: pkgsrc/devel/p5-File-BaseDir/patches/patch-lib_File_BaseDir.pm
$NetBSD: patch-lib_File_BaseDir.pm,v 1.1 2013/02/16 22:14:41 schmonz Exp $

Look in pkgsrc's sharedir, too.

--- lib/File/BaseDir.pm.orig	2007-10-24 19:57:22.000000000 +0000
+++ lib/File/BaseDir.pm
@@ -41,6 +41,7 @@ unless ($home) {
 # Set defaults
 our $xdg_data_home = File::Spec->catdir($home, qw/.local share/);
 our @xdg_data_dirs = (
+	File::Spec->catdir($rootdir, qw/@SHAREDIR_SPLIT@/),
 	File::Spec->catdir($rootdir, qw/usr local share/),
 	File::Spec->catdir($rootdir, qw/usr share/),
 );
File Added: pkgsrc/devel/p5-File-BaseDir/patches/patch-t_01__vars.t
$NetBSD: patch-t_01__vars.t,v 1.1 2013/02/16 22:14:41 schmonz Exp $

Look in pkgsrc's sharedir, too.

--- t/01_vars.t.orig	2007-10-24 19:57:22.000000000 +0000
+++ t/01_vars.t
@@ -29,7 +29,8 @@ ok( xdg_data_home() eq 'test123', 'xdg_d
 
 $ENV{XDG_DATA_DIRS} = '';
 is_deeply( [xdg_data_dirs()],
-           [ File::Spec->catdir($rootdir, qw/usr local share/),
+           [ File::Spec->catdir($rootdir, qw/@SHAREDIR_SPLIT@/),
+             File::Spec->catdir($rootdir, qw/usr local share/),
              File::Spec->catdir($rootdir, qw/usr share/)         ],
 	   'xdg_data_dirs default');
 $ENV{XDG_DATA_DIRS} = './t:foo:bar';
File Added: pkgsrc/devel/p5-File-BaseDir/patches/patch-t_03__OO.t
$NetBSD: patch-t_03__OO.t,v 1.1 2013/02/16 22:14:42 schmonz Exp $

Look in pkgsrc's sharedir, too.

--- t/03_OO.t.orig	2007-10-24 19:57:22.000000000 +0000
+++ t/03_OO.t
@@ -10,7 +10,8 @@ is(ref($conf), 'File::BaseDir', 'OO cons
 
 $ENV{XDG_DATA_DIRS} = '';
 is_deeply( [$conf->xdg_data_dirs()],
-           [ File::Spec->catdir($rootdir, qw/usr local share/),
+           [ File::Spec->catdir($rootdir, qw/@SHAREDIR_SPLIT@/),
+             File::Spec->catdir($rootdir, qw/usr local share/),
              File::Spec->catdir($rootdir, qw/usr share/)         ],
 	   'xdg_data_dirs default - OO');