summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2010-10-08 15:59:02 +0200
committerDan McGee <dan@archlinux.org>2010-10-14 06:29:27 +0200
commit0d5fa576b3ed011d091b87d84b79db794b37320c (patch)
tree4343ba3bdbd9ad0bf653939dd61ac71dab4bf612
parent8aa7ed5a7e82eaa40c2ee68271226787710f8f08 (diff)
downloadpacman-0d5fa576b3ed011d091b87d84b79db794b37320c.tar.gz
pacman-0d5fa576b3ed011d091b87d84b79db794b37320c.tar.xz
Update contrib/ for epoch
Signed-off-by: Dan McGee <dan@archlinux.org>
-rw-r--r--contrib/PKGBUILD.vim10
-rwxr-xr-xcontrib/bacman.in3
2 files changed, 11 insertions, 2 deletions
diff --git a/contrib/PKGBUILD.vim b/contrib/PKGBUILD.vim
index 8b40ed7c..c2b60450 100644
--- a/contrib/PKGBUILD.vim
+++ b/contrib/PKGBUILD.vim
@@ -40,7 +40,7 @@ syn match pbPkgverGroup /^pkgver=.*/ contains=pbIllegalPkgver,pbValidPkgver,pb_k
" pkgrel
syn keyword pb_k_pkgrel pkgrel contained
-syn match pbValidPkgrel /[[:digit:]]*/ contained contains=pbIllegalPkgver
+syn match pbValidPkgrel /[[:digit:]]*/ contained contains=pbIllegalPkgrel
syn match pbIllegalPkgrel /[^[:digit:]=]\|=.*=/ contained
syn match pbPkgrelGroup /^pkgrel=.*/ contains=pbIllegalPkgrel,pbValidPkgrel,pb_k_pkgrel,shDoubleQuote,shSingleQuote
@@ -52,6 +52,12 @@ syn match pbValidPkgdesc /[^='"]\.\{,80}/ contained contains=pbIllegalPkgdesc
syn match pbPkgdescGroup /^pkgdesc=.*/ contains=pbIllegalPkgdesc,pb_k_desc,pbValidPkgdesc,shDoubleQuote,shSingleQuote
syn match pbPkgdescSign /[='"]/ contained
+" epoch
+syn keyword pb_k_epoch epoch contained
+syn match pbValidEpoch /[[:digit:]]*/ contained contains=pbIllegalEpoch
+syn match pbIllegalEpoch /[^[:digit:]=]\|=.*=/ contained
+syn match pbEpochGroup /^epoch=.*/ contains=pbIllegalEpoch,pbValidEpoch,pb_k_epoch,shDoubleQuote,shSingleQuote
+
" url
syn keyword pb_k_url url contained
syn match pbValidUrl /['"]*\(https\|http\|ftp\)\:\/.*\.\+.*/ contained
@@ -163,7 +169,7 @@ hi def link pbValidSha1sums Number
" options
syn keyword pb_k_options options contained
-syn match pbOptions /\(no\)\?\(strip\|docs\|libtool\|emptydirs\|zipman\|ccache\|distcc\|makeflags\|force\)/ contained
+syn match pbOptions /\(no\)\?\(strip\|docs\|libtool\|emptydirs\|zipman\|ccache\|distcc\|makeflags\)/ contained
syn match pbOptionsNeg /\!/ contained
syn match pbOptionsDeprec /no/ contained
syn region pbOptionsGroup start=/^options=(/ end=/)/ contains=pb_k_options,pbOptions,pbOptionsNeg,pbOptionsDeprec,pbIllegalOption,shDoubleQuote,shSingleQuote
diff --git a/contrib/bacman.in b/contrib/bacman.in
index 991acb00..b4e3b4ba 100755
--- a/contrib/bacman.in
+++ b/contrib/bacman.in
@@ -220,6 +220,9 @@ while read i; do
%REPLACES%)
echo "replaces = $i" >> .PKGINFO
;;
+ %EPOCH%)
+ echo "epoch = $i" >> .PKGINFO
+ ;;
%FORCE%)
echo "force = true" >> .PKGINFO
;;