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.

4 files changed, 27 insertions, 7 deletions

diff --git a/net/p5-File-Rsync/Makefile b/net/p5-File-Rsync/Makefile
index d1def308e2b..60f47054245 100644
--- a/net/p5-File-Rsync/Makefile
+++ b/net/p5-File-Rsync/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.1 2017/02/07 09:50:32 hauke Exp $
+# $NetBSD: Makefile,v 1.2 2017/02/08 10:35:21 hauke Exp $
 
 DISTNAME=	File-Rsync-0.49
 PKGNAME=	p5-${DISTNAME}
-#PKGREVISION=	1
+PKGREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=../..//authors/id/L/LE/LEAKIN/}
+
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://search.cpan.org/~leakin/File-Rsync/Rsync.pm
 COMMENT=	Perl module interface to rsync(1)
@@ -14,6 +15,12 @@ DEPENDS+=		rsync-[0-9]*:../../net/rsync
 
 REPLACE_PERL+=		test.pl
 
+SUBST_CLASSES+=			fix-paths
+SUBST_STAGE.fix-paths=		pre-install
+SUBST_MESSAGE.fix-paths=	Fixing absolute paths
+SUBST_FILES.fix-paths=		Rsync.pm
+SUBST_SED.fix-paths+=		-e 's,@PREFIX@,${PREFIX},g'
+
 PERL5_MODULE_TYPE=      MakeMaker
 PERL5_PACKLIST=         auto/File/Rsync/.packlist
 
diff --git a/net/p5-File-Rsync/PLIST b/net/p5-File-Rsync/PLIST
deleted file mode 100644
index 7dd4cf1014f..00000000000
--- a/net/p5-File-Rsync/PLIST
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2017/02/07 09:50:32 hauke Exp $
-${PERL5_SUB_INSTALLVENDORLIB}/File/Rsync.pm
-${PERL5_SUB_INSTALLVENDORARCH}/auto/File/Rsync/.packlist
-${PERL5_SUB_INSTALLVENDORMAN3DIR}/File::Rsync.3
diff --git a/net/p5-File-Rsync/distinfo b/net/p5-File-Rsync/distinfo
index 8c7a462705c..561c8b6c862 100644
--- a/net/p5-File-Rsync/distinfo
+++ b/net/p5-File-Rsync/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.1 2017/02/07 09:50:32 hauke Exp $
+$NetBSD: distinfo,v 1.2 2017/02/08 10:35:21 hauke Exp $
 
 SHA1 (File-Rsync-0.49.tar.gz) = fee1c985bd3f5064cd47f2a9f10fd3d256b50e77
 RMD160 (File-Rsync-0.49.tar.gz) = 9953e960bb1132aaee9e6dd5fe56415e9416d7eb
 SHA512 (File-Rsync-0.49.tar.gz) = 2d8d227a5f7bedc97be678250b741c11279105f191ea773fb45b48fc8f3a3bf8f14e96103aa33fe8a6a5b2ae99e622dc2001f4df33a9de7b09d560f5b490cdb1
 Size (File-Rsync-0.49.tar.gz) = 21914 bytes
+SHA1 (patch-Rsync.pm) = 144875c61e2f119d2ac65a321472c355374ea8c3
diff --git a/net/p5-File-Rsync/patches/patch-Rsync.pm b/net/p5-File-Rsync/patches/patch-Rsync.pm
new file mode 100644
index 00000000000..476da431322
--- /dev/null
+++ b/net/p5-File-Rsync/patches/patch-Rsync.pm
@@ -0,0 +1,16 @@
+$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