diff options
| -rwxr-xr-x | bin/genpkg | 6 | ||||
| -rwxr-xr-x | preps/perl (renamed from metas/perl) | 2 | ||||
| -rwxr-xr-x | preps/perl.d/fetchcpan (renamed from metas/perl.d/fetchcpan) | 0 | ||||
| -rwxr-xr-x | preps/perl.d/perl-dist (renamed from metas/perl.d/perl-dist) | 2 | ||||
| -rwxr-xr-x | preps/perl.d/perl-pkgbuild (renamed from metas/perl.d/perl-pkgbuild) | 0 | ||||
| -rwxr-xr-x | preps/perl.d/scrapecore (renamed from metas/perl.d/scrapecore) | 0 | ||||
| -rwxr-xr-x | setup | 8 |
7 files changed, 9 insertions, 9 deletions
@@ -2,7 +2,7 @@ prog=genpkg -metad=~/.genpkg/metas +prepd=~/.genpkg/preps templd=~/.genpkg/templ tweakd=~/pkg/tweaks pkgd=~/pkg/dest @@ -80,7 +80,7 @@ do mkdir PKGTREE trap 'rm -f PKGDATA' 1 2 15 - if METABIN="$metad" PKGVAR="$vard" prepkg "$pkg" > PKGDATA + if METABIN="$prepd" PKGVAR="$vard" prepkg "$pkg" > PKGDATA then echo "$pkgd/$pkg" else @@ -88,7 +88,7 @@ do exit "$?" fi - #twk="$tweakd/$pkg" + #mod="$tweakd/$pkg" #if [ -f "$twk" -a -r "$twk" ] && modmetapkg #then # echo "Modified metapackage." 1>&2 @@ -7,7 +7,7 @@ use File::Fetch; use IO::Handle; # for autoflush use Cwd; -my $PROG = 'metas/perl'; +my $PROG = 'preps/perl'; my %BADNAMES = ('perl-libwww' => 'libwww-perl'); sub err diff --git a/metas/perl.d/fetchcpan b/preps/perl.d/fetchcpan index 076599b..076599b 100755 --- a/metas/perl.d/fetchcpan +++ b/preps/perl.d/fetchcpan diff --git a/metas/perl.d/perl-dist b/preps/perl.d/perl-dist index b1eedf2..407403d 100755 --- a/metas/perl.d/perl-dist +++ b/preps/perl.d/perl-dist @@ -3,7 +3,7 @@ use warnings 'FATAL' => 'all'; use strict; -my $PROG = 'metas/perl.d/perl-dist'; +my $PROG = 'preps/perl.d/perl-dist'; my $PBPROG = 'perl-pkgbuild'; sub DBG {} diff --git a/metas/perl.d/perl-pkgbuild b/preps/perl.d/perl-pkgbuild index 80a92e4..80a92e4 100755 --- a/metas/perl.d/perl-pkgbuild +++ b/preps/perl.d/perl-pkgbuild diff --git a/metas/perl.d/scrapecore b/preps/perl.d/scrapecore index 25f5c80..25f5c80 100755 --- a/metas/perl.d/scrapecore +++ b/preps/perl.d/scrapecore @@ -4,7 +4,7 @@ set -e umask 022 prog=setup binfiles='genpkg prepkg modpkg pbfields putpkgtree getpkgtree injectdigs' -metas='perl perl.d/ +preps='perl perl.d/ perl.d/fetchcpan perl.d/perl-dist perl.d/perl-pkgbuild perl.d/scrapecore' @@ -42,10 +42,10 @@ genpkg) md ~/bin done md ~/.genpkg - md ~/.genpkg/metas - for m in $metas + md ~/.genpkg/preps + for p in $preps do - ins "metas/$m" ~/.genpkg + ins "preps/$p" ~/.genpkg done md ~/.genpkg/var ;; |