summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin Davis <jrcd83@gmail.com>2012-08-15 22:07:20 +0200
committerJustin Davis <jrcd83@gmail.com>2012-08-15 22:07:20 +0200
commitcb1e445b491a6264756121f85a4480d34ab1dad0 (patch)
tree9164ba9e094e7ce4bae3e1d8b91fbb6f07100063
parent77e3eb9e7b18be9228d1c7c7f2430fd01e58d99a (diff)
parent4d268f66905b41ae19cc1308747f9d1f24eb965c (diff)
downloadgenpkg-cb1e445b491a6264756121f85a4480d34ab1dad0.tar.gz
genpkg-cb1e445b491a6264756121f85a4480d34ab1dad0.tar.xz
Merge branch 'master' of github.com:juster/genpkg
-rwxr-xr-xbin/modpkg12
-rw-r--r--mods/perlbrew2
2 files changed, 8 insertions, 6 deletions
diff --git a/bin/modpkg b/bin/modpkg
index 4b62eb6..30345c2 100755
--- a/bin/modpkg
+++ b/bin/modpkg
@@ -119,11 +119,13 @@ $modi eval {
fput $name $code beg
}
- proc move {srcname destname args} {
+ proc move {srcname pats destname} {
upvar #0 $srcname src $destname dest
- foreach pat $args {
- set idx [lsearch -glob $src "$pat*"]
- if {$idx == -1} { error "$pat was not found in $srcname" }
+ foreach pat $pats {
+ set idx [lsearch -glob $src $pat*]
+ if { $idx == -1 } {
+ error "$pat was not found in $srcname"
+ }
lappend dest [lindex $src $idx]
set src [lreplace $src $idx $idx]
}
@@ -157,7 +159,7 @@ $modi eval {
}
}
- error "$name was not found in $type"
+ error "$depname was not found in $type"
}
}
diff --git a/mods/perlbrew b/mods/perlbrew
index 6191df6..12bf8e0 100644
--- a/mods/perlbrew
+++ b/mods/perlbrew
@@ -1,5 +1,5 @@
set provides {perl-app-perlbrew=$pkgver}
-move makedepends checkdepends perl-io-all perl-path-class perl-file-temp
+move makedepends { perl-io-all perl-path-class perl-file-temp } checkdepends
setdep makedepends perl-extutils-makemaker>=5.59
set license custom:MIT
fappend package {