Wed Feb 8 10:35:21 2017 UTC ()
Drop PLIST, since PERL5_PACKLIST magic will take care of things.

Default to an absolute path for rsync. We explicitly depend on it,
and it may not be first in PATH, or not at all.


(hauke)
diff -r1.1 -r1.2 pkgsrc/net/p5-File-Rsync/Makefile
diff -r1.1 -r1.2 pkgsrc/net/p5-File-Rsync/distinfo
diff -r1.1 -r0 pkgsrc/net/p5-File-Rsync/PLIST
diff -r0 -r1.1 pkgsrc/net/p5-File-Rsync/patches/patch-Rsync.pm
cvs diff -r1.1 -r1.2 pkgsrc/net/p5-File-Rsync/Makefile (expand / switch to unified diff)

--- pkgsrc/net/p5-File-Rsync/Makefile 2017/02/07 09:50:32 1.1
+++ pkgsrc/net/p5-File-Rsync/Makefile 2017/02/08 10:35:21 1.2
@@ -1,23 +1,30 @@ @@ -1,23 +1,30 @@
1# $NetBSD: Makefile,v 1.1 2017/02/07 09:50:32 hauke Exp $ 1# $NetBSD: Makefile,v 1.2 2017/02/08 10:35:21 hauke Exp $
2 2
3DISTNAME= File-Rsync-0.49 3DISTNAME= File-Rsync-0.49
4PKGNAME= p5-${DISTNAME} 4PKGNAME= p5-${DISTNAME}
5#PKGREVISION= 1 5PKGREVISION= 1
6CATEGORIES= net perl5 6CATEGORIES= net perl5
7MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=../..//authors/id/L/LE/LEAKIN/} 7MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=../..//authors/id/L/LE/LEAKIN/}
 8
8MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://search.cpan.org/~leakin/File-Rsync/Rsync.pm 10HOMEPAGE= http://search.cpan.org/~leakin/File-Rsync/Rsync.pm
10COMMENT= Perl module interface to rsync(1) 11COMMENT= Perl module interface to rsync(1)
11LICENSE= ${PERL5_LICENSE} 12LICENSE= ${PERL5_LICENSE}
12 13
13DEPENDS+= rsync-[0-9]*:../../net/rsync 14DEPENDS+= rsync-[0-9]*:../../net/rsync
14 15
15REPLACE_PERL+= test.pl 16REPLACE_PERL+= test.pl
16 17
 18SUBST_CLASSES+= fix-paths
 19SUBST_STAGE.fix-paths= pre-install
 20SUBST_MESSAGE.fix-paths= Fixing absolute paths
 21SUBST_FILES.fix-paths= Rsync.pm
 22SUBST_SED.fix-paths+= -e 's,@PREFIX@,${PREFIX},g'
 23
17PERL5_MODULE_TYPE= MakeMaker 24PERL5_MODULE_TYPE= MakeMaker
18PERL5_PACKLIST= auto/File/Rsync/.packlist 25PERL5_PACKLIST= auto/File/Rsync/.packlist
19 26
20USE_LANGUAGES= # none 27USE_LANGUAGES= # none
21 28
22.include "../../lang/perl5/module.mk" 29.include "../../lang/perl5/module.mk"
23.include "../../mk/bsd.pkg.mk" 30.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1 -r1.2 pkgsrc/net/p5-File-Rsync/distinfo (expand / switch to unified diff)

--- pkgsrc/net/p5-File-Rsync/distinfo 2017/02/07 09:50:32 1.1
+++ pkgsrc/net/p5-File-Rsync/distinfo 2017/02/08 10:35:21 1.2
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
1$NetBSD: distinfo,v 1.1 2017/02/07 09:50:32 hauke Exp $ 1$NetBSD: distinfo,v 1.2 2017/02/08 10:35:21 hauke Exp $
2 2
3SHA1 (File-Rsync-0.49.tar.gz) = fee1c985bd3f5064cd47f2a9f10fd3d256b50e77 3SHA1 (File-Rsync-0.49.tar.gz) = fee1c985bd3f5064cd47f2a9f10fd3d256b50e77
4RMD160 (File-Rsync-0.49.tar.gz) = 9953e960bb1132aaee9e6dd5fe56415e9416d7eb 4RMD160 (File-Rsync-0.49.tar.gz) = 9953e960bb1132aaee9e6dd5fe56415e9416d7eb
5SHA512 (File-Rsync-0.49.tar.gz) = 2d8d227a5f7bedc97be678250b741c11279105f191ea773fb45b48fc8f3a3bf8f14e96103aa33fe8a6a5b2ae99e622dc2001f4df33a9de7b09d560f5b490cdb1 5SHA512 (File-Rsync-0.49.tar.gz) = 2d8d227a5f7bedc97be678250b741c11279105f191ea773fb45b48fc8f3a3bf8f14e96103aa33fe8a6a5b2ae99e622dc2001f4df33a9de7b09d560f5b490cdb1
6Size (File-Rsync-0.49.tar.gz) = 21914 bytes 6Size (File-Rsync-0.49.tar.gz) = 21914 bytes
 7SHA1 (patch-Rsync.pm) = 144875c61e2f119d2ac65a321472c355374ea8c3
File Deleted: pkgsrc/net/p5-File-Rsync/Attic/PLIST
File Added: pkgsrc/net/p5-File-Rsync/patches/patch-Rsync.pm
$NetBSD: patch-Rsync.pm,v 1.1 2017/02/08 10:35:21 hauke Exp $

Default to an absolute path for rsync. We explicitly depend on it,
and it may not be first in PATH, or not at all.

--- Rsync.pm.orig	2016-03-09 20:36:13.000000000 +0000
+++ Rsync.pm
@@ -241,7 +241,7 @@ sub new {
       },
       _perlopts => {
          # the path name to the rsync binary (default is to use $PATH)
-         'path-to-rsync' => 'rsync',
+         'path-to-rsync' => '@PREFIX@/bin/rsync',
          # hostname of source, used if 'source' is an array reference
          'srchost' => '',
          # double-quote source and/or destination paths