From ea8184012874f11d4ef9eed6e7fcc8cd5a1bf848 Mon Sep 17 00:00:00 2001
From: Justin Davis <jrcd83@gmail.com>
Date: Thu, 11 Apr 2013 11:33:35 +0000
Subject: Perl mod pkgbuilds use $_ddir now.

With pacman 4.1 $srcdir is no longer set outside of PKGBUILD
functions. Yipee! This breaks all of my PKGBUILDs. Now we
switch to storing the distribution's tarballed directory in the
_ddir custom variable. We cd into $srcdir/$_ddir at the
beginning of every func.

Custom variable mechanics have changed in bin/pbfields as
well. Instead of hard-coding _dir as an accepted field, any
PKGDATA entry with a name starting with underscore (_) is
considered a custom variable and printed in the PKGBUILD.
---
 preps/perl.d/perl-dist     | 2 +-
 preps/perl.d/perl-pkgbuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'preps')

diff --git a/preps/perl.d/perl-dist b/preps/perl.d/perl-dist
index c6fa2e3..0310fa4 100755
--- a/preps/perl.d/perl-dist
+++ b/preps/perl.d/perl-dist
@@ -402,7 +402,7 @@ sub main
 		'pkgver'  => $ver,
 		'pkgdesc' => $meta->{'abstract'},
 		'arch' => (xsdist($distdir) ? ['i686', 'x86_64'] : 'any'),
-		'dir' => "\$srcdir/$distdir",
+		'_ddir' => $distdir,
 		%$deps,
 	);
 
diff --git a/preps/perl.d/perl-pkgbuild b/preps/perl.d/perl-pkgbuild
index 47a39ea..3708bc5 100755
--- a/preps/perl.d/perl-pkgbuild
+++ b/preps/perl.d/perl-pkgbuild
@@ -31,7 +31,7 @@ sub startfunc
 	return <<"ENDTXT";
 ${name}()
 (
-  cd "\$_dir"
+  cd "\$srcdir/\$_ddir"
 ENDTXT
 }
 
-- 
cgit v1.2.3-24-g4f1b