p5-File-BaseDir: update to 0.09. 0.09 2021-07-08 14:04:14 -0600 - Tests can now be run in parallel or isolation safely (rt#199256) - Fallback on getpwuid if environment variable not set (rt#127138) - Test suite works with or without environment variables (rt#127138)diff -r1.34 -r1.35 pkgsrc/devel/p5-File-BaseDir/Makefile
(wiz)
@@ -1,33 +1,31 @@ | @@ -1,33 +1,31 @@ | |||
1 | # $NetBSD: Makefile,v 1.34 2022/06/28 11:32:24 wiz Exp $ | 1 | # $NetBSD: Makefile,v 1.35 2023/05/20 07:18:56 wiz Exp $ | |
2 | 2 | |||
3 | DISTNAME= File-BaseDir-0.08 | 3 | DISTNAME= File-BaseDir-0.09 | |
4 | PKGNAME= p5-${DISTNAME} | 4 | PKGNAME= p5-${DISTNAME} | |
5 | PKGREVISION= 5 | |||
6 | CATEGORIES= devel perl5 | 5 | CATEGORIES= devel perl5 | |
7 | MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=File/} | 6 | MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=File/} | |
8 | 7 | |||
9 | MAINTAINER= pkgsrc-users@NetBSD.org | 8 | MAINTAINER= pkgsrc-users@NetBSD.org | |
10 | HOMEPAGE= https://metacpan.org/release/File-BaseDir | 9 | HOMEPAGE= https://metacpan.org/release/File-BaseDir | |
11 | COMMENT= Perl module for the XDG Base Directory Specification | 10 | COMMENT= Perl module for the XDG Base Directory Specification | |
12 | LICENSE= ${PERL5_LICENSE} | 11 | LICENSE= ${PERL5_LICENSE} | |
13 | 12 | |||
14 | DEPENDS+= p5-IPC-System-Simple-[0-9]*:../../devel/p5-IPC-System-Simple | 13 | DEPENDS+= p5-IPC-System-Simple-[0-9]*:../../devel/p5-IPC-System-Simple | |
15 | # for make test | 14 | # for make test | |
16 | BUILD_DEPENDS+= xdg-user-dirs-[0-9]*:../../x11/xdg-user-dirs | 15 | BUILD_DEPENDS+= xdg-user-dirs-[0-9]*:../../x11/xdg-user-dirs | |
17 | BUILD_DEPENDS+= p5-File-Which-[0-9]*:../../devel/p5-File-Which | 16 | BUILD_DEPENDS+= p5-File-Which-[0-9]*:../../devel/p5-File-Which | |
18 | 17 | |||
19 | SHAREDIR= ${PREFIX}/share | 18 | SHAREDIR= ${PREFIX}/share | |
20 | SHAREDIR_SPLIT= ${SHAREDIR:S/\// /g} | 19 | SHAREDIR_SPLIT= ${SHAREDIR:S/\// /g} | |
21 | SUBST_CLASSES+= paths | 20 | SUBST_CLASSES+= paths | |
22 | SUBST_STAGE.paths= post-configure | 21 | SUBST_STAGE.paths= post-configure | |
23 | SUBST_FILES.paths= lib/File/BaseDir.pm t/01_vars.t t/03_OO.t | 22 | SUBST_FILES.paths= lib/File/BaseDir.pm t/01_vars.t t/03_OO.t | |
24 | SUBST_VARS.paths= SHAREDIR_SPLIT | 23 | SUBST_VARS.paths= SHAREDIR_SPLIT | |
25 | 24 | |||
26 | PERL5_MODULE_TYPE= Module::Build | |||
27 | PERL5_PACKLIST= auto/File/BaseDir/.packlist | 25 | PERL5_PACKLIST= auto/File/BaseDir/.packlist | |
28 | 26 | |||
29 | pre-test: | 27 | pre-test: | |
30 | ${MKDIR} ${WRKDIR}/.home/.config/user-dirs.dirs | 28 | ${MKDIR} ${WRKDIR}/.home/.config/user-dirs.dirs | |
31 | 29 | |||
32 | .include "../../lang/perl5/module.mk" | 30 | .include "../../lang/perl5/module.mk" | |
33 | .include "../../mk/bsd.pkg.mk" | 31 | .include "../../mk/bsd.pkg.mk" |
@@ -1,8 +1,8 @@ | @@ -1,8 +1,8 @@ | |||
1 | $NetBSD: distinfo,v 1.10 2021/10/26 10:16:34 nia Exp $ | 1 | $NetBSD: distinfo,v 1.11 2023/05/20 07:18:56 wiz Exp $ | |
2 | 2 | |||
3 | BLAKE2s (File-BaseDir-0.08.tar.gz) = e7b82b79b581d87224e0b51d2dab6f51ba13e0693273ea96d283c55348e071c7 | 3 | BLAKE2s (File-BaseDir-0.09.tar.gz) = 0ed48f31512eb6ad3a1f6011f745d9f97ab529ae279fb0506f1c80e05f158059 | |
4 | SHA512 (File-BaseDir-0.08.tar.gz) = 6b44edca34906c34d574933c21c0e3a1a236a431a3ac12caeabcc2638688dfe1c02efc9a1e75a2c2cd522de0dca00df0620cd262c184ec938cc97766d1121f99 | 4 | SHA512 (File-BaseDir-0.09.tar.gz) = 07b07f43bce392beda6ac10729925c3b6ad850f0af5485c3f540b72353a1e877e7e9b76580057197cf68864086f1a3d1f9459cfcf142f16772f48125426d72db | |
5 | Size (File-BaseDir-0.08.tar.gz) = 10052 bytes | 5 | Size (File-BaseDir-0.09.tar.gz) = 21508 bytes | |
6 | SHA1 (patch-lib_File_BaseDir.pm) = 2374434a67b8d0c935a4cdab6d3c31bd8a71ac5e | 6 | SHA1 (patch-lib_File_BaseDir.pm) = 20e5dffb9bf070f74de8ab245cbc1c86ad441b02 | |
7 | SHA1 (patch-t_01__vars.t) = 8f0273889bd698a5b066384dd5ccd89cf3a11338 | 7 | SHA1 (patch-t_01__vars.t) = 9d888f52ad70c668aaa1ddd7a32b7314010b7973 | |
8 | SHA1 (patch-t_03__OO.t) = c3a20a26417a1d833c4d462a12b1e01d3127121c | 8 | SHA1 (patch-t_03__OO.t) = 025b7bdc816ed6b36dad28e900f31e7f1e61e457 |
@@ -1,14 +1,15 @@ | @@ -1,14 +1,15 @@ | |||
1 | $NetBSD: patch-lib_File_BaseDir.pm,v 1.1 2013/02/16 22:14:41 schmonz Exp $ | 1 | $NetBSD: patch-lib_File_BaseDir.pm,v 1.2 2023/05/20 07:18:56 wiz Exp $ | |
2 | 2 | |||
3 | Look in pkgsrc's sharedir, too. | 3 | Look in pkgsrc's sharedir, too. | |
4 | 4 | |||
5 | --- lib/File/BaseDir.pm.orig 2007-10-24 19:57:22.000000000 +0000 | 5 | --- lib/File/BaseDir.pm.orig 2021-07-08 20:04:16.000000000 +0000 | |
6 | +++ lib/File/BaseDir.pm | 6 | +++ lib/File/BaseDir.pm | |
7 | @@ -41,6 +41,7 @@ unless ($home) { | 7 | @@ -46,7 +46,7 @@ sub xdg_data_home { $ENV{XDG_DATA_HOME} | |
8 | # Set defaults | 8 | sub xdg_data_dirs { | |
9 | our $xdg_data_home = File::Spec->catdir($home, qw/.local share/); | 9 | ( $ENV{XDG_DATA_DIRS} | |
10 | our @xdg_data_dirs = ( | 10 | ? _adapt($ENV{XDG_DATA_DIRS}) | |
11 | + File::Spec->catdir($rootdir, qw/@SHAREDIR_SPLIT@/), | 11 | - : (File::Spec->catdir(_rootdir(), qw/usr local share/), File::Spec->catdir(_rootdir(), qw/usr share/)) | |
12 | File::Spec->catdir($rootdir, qw/usr local share/), | 12 | + : (File::Spec->catdir(_rootdir(), qw/@SHAREDIR_SPLIT@/), File::Spec->catdir(_rootdir(), qw/usr local share/), File::Spec->catdir(_rootdir(), qw/usr share/)) | |
13 | File::Spec->catdir($rootdir, qw/usr share/), | 13 | ) | |
14 | ); | 14 | } | |
15 |
@@ -1,16 +1,16 @@ | @@ -1,16 +1,16 @@ | |||
1 | $NetBSD: patch-t_01__vars.t,v 1.1 2013/02/16 22:14:41 schmonz Exp $ | 1 | $NetBSD: patch-t_01__vars.t,v 1.2 2023/05/20 07:18:56 wiz Exp $ | |
2 | 2 | |||
3 | Look in pkgsrc's sharedir, too. | 3 | Look in pkgsrc's sharedir, too. | |
4 | 4 | |||
5 | --- t/01_vars.t.orig 2007-10-24 19:57:22.000000000 +0000 | 5 | --- t/01_vars.t.orig 2021-07-08 20:04:16.000000000 +0000 | |
6 | +++ t/01_vars.t | 6 | +++ t/01_vars.t | |
7 | @@ -29,7 +29,8 @@ ok( xdg_data_home() eq 'test123', 'xdg_d | 7 | @@ -33,7 +33,8 @@ ok( xdg_data_home() eq 'test123', 'xdg_d | |
8 | 8 | |||
9 | $ENV{XDG_DATA_DIRS} = ''; | 9 | $ENV{XDG_DATA_DIRS} = ''; | |
10 | is_deeply( [xdg_data_dirs()], | 10 | is_deeply( [xdg_data_dirs()], | |
11 | - [ File::Spec->catdir($rootdir, qw/usr local share/), | 11 | - [ File::Spec->catdir(File::BaseDir->_rootdir, qw/usr local share/), | |
12 | + [ File::Spec->catdir($rootdir, qw/@SHAREDIR_SPLIT@/), | 12 | + [ File::Spec->catdir(File::BaseDir->_rootdir, qw/@SHAREDIR_SPLIT@/), | |
13 | + File::Spec->catdir($rootdir, qw/usr local share/), | 13 | + File::Spec->catdir(File::BaseDir->_rootdir, qw/usr local share/), | |
14 | File::Spec->catdir($rootdir, qw/usr share/) ], | 14 | File::Spec->catdir(File::BaseDir->_rootdir, qw/usr share/) ], | |
15 | 'xdg_data_dirs default'); | 15 | 'xdg_data_dirs default'); | |
16 | $ENV{XDG_DATA_DIRS} = './t:foo:bar'; | 16 | $ENV{XDG_DATA_DIRS} = join $Config{path_sep}, qw/ t foo bar /; |
@@ -1,16 +1,16 @@ | @@ -1,16 +1,16 @@ | |||
1 | $NetBSD: patch-t_03__OO.t,v 1.1 2013/02/16 22:14:42 schmonz Exp $ | 1 | $NetBSD: patch-t_03__OO.t,v 1.2 2023/05/20 07:18:56 wiz Exp $ | |
2 | 2 | |||
3 | Look in pkgsrc's sharedir, too. | 3 | Look in pkgsrc's sharedir, too. | |
4 | 4 | |||
5 | --- t/03_OO.t.orig 2007-10-24 19:57:22.000000000 +0000 | 5 | --- t/03_OO.t.orig 2021-07-08 20:04:16.000000000 +0000 | |
6 | +++ t/03_OO.t | 6 | +++ t/03_OO.t | |
7 | @@ -10,7 +10,8 @@ is(ref($conf), 'File::BaseDir', 'OO cons | 7 | @@ -14,7 +14,8 @@ isa_ok $conf, 'File::BaseDir'; | |
8 | ||||
9 | $ENV{XDG_DATA_DIRS} = ''; | |||
10 | is_deeply( [$conf->xdg_data_dirs()], | |||
11 | - [ File::Spec->catdir($rootdir, qw/usr local share/), | |||
12 | + [ File::Spec->catdir($rootdir, qw/@SHAREDIR_SPLIT@/), | |||
13 | + File::Spec->catdir($rootdir, qw/usr local share/), | |||
14 | File::Spec->catdir($rootdir, qw/usr share/) ], | |||
15 | 'xdg_data_dirs default - OO'); | |||
16 | 8 | |||
9 | $ENV{XDG_DATA_DIRS} = ''; | |||
10 | is_deeply( [$conf->xdg_data_dirs()], | |||
11 | - [ File::Spec->catdir($rootdir, qw/usr local share/), | |||
12 | + [ File::Spec->catdir($rootdir, qw/@SHAREDIR_SPLIT@/), | |||
13 | + File::Spec->catdir($rootdir, qw/usr local share/), | |||
14 | File::Spec->catdir($rootdir, qw/usr share/) ], | |||
15 | 'xdg_data_dirs default - OO'); | |||
16 | } |