12 files changed, 86 insertions, 39 deletions
diff --git a/contrib/.gitignore b/contrib/.gitignore
new file mode 100644
index 00000000..91044765
--- /dev/null
+++ b/contrib/.gitignore
@@ -0,0 +1,9 @@
+bacman
+bash_completion
+pacdiff
+paclist
+pacscripts
+pacsearch
+pactree
+wget-xdelta.sh
+zsh_completion
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index c6243b16..55366b47 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -1,5 +1,4 @@
-EXTRA_DIST = \
-	PKGBUILD.vim \
+OURFILES = \
 	bacman \
 	bash_completion \
 	pacdiff \
@@ -7,9 +6,38 @@ EXTRA_DIST = \
 	pacscripts \
 	pacsearch \
 	pactree \
-	vimprojects \
 	wget-xdelta.sh \
-	zsh_completion \
+	zsh_completion
+
+EXTRA_DIST = \
+	PKGBUILD.vim \
+	bacman.in \
+	bash_completion.in \
+	pacdiff.in \
+	paclist.in \
+	pacscripts.in \
+	pacsearch.in \
+	pactree.in \
+	vimprojects \
+	wget-xdelta.sh.in \
+	zsh_completion.in \
 	README
 
+# Files that should be removed, but which Automake does not know.
+MOSTLYCLEANFILES = $(OURFILES) *.tmp
+
+edit = sed \
+	-e 's|@sysconfdir[@]|$(sysconfdir)|g' \
+	-e 's|@localstatedir[@]|$(localstatedir)|g' \
+	-e 's|@BASH_SHELL[@]|$(BASH_SHELL)|g'
+
+$(OURFILES): Makefile
+	@echo '    ' GEN $@;
+	@rm -f $@ $@.tmp
+	@cp -a $@.in $@.tmp
+	@$(edit) $@.in >$@.tmp
+	@mv $@.tmp $@
+
+all-am: $(OURFILES)
+
 # vim:set ts=2 sw=2 noet:
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 b/contrib/bacman.in
index 6dd78394..b4e3b4ba 100755
--- a/contrib/bacman
+++ b/contrib/bacman.in
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!@BASH_SHELL@
 #
 #   bacman: recreate a package from a running system
 #   This script rebuilds an already installed package using metadata
@@ -67,20 +67,20 @@ fi
 #
 # Setting environmental variables
 #
-if [ ! -r /etc/pacman.conf ]; then
-    echo "ERROR: unable to read /etc/pacman.conf"
+if [ ! -r @sysconfdir@/pacman.conf ]; then
+    echo "ERROR: unable to read @sysconfdir@/pacman.conf"
     exit 1
 fi
 
-eval $(awk '/DBPath/ {print $1$2$3}' /etc/pacman.conf)
-pac_db="${DBPath:-/var/lib/pacman/}/local"
+eval $(awk '/DBPath/ {print $1$2$3}' @sysconfdir@/pacman.conf)
+pac_db="${DBPath:-@localstatedir@/lib/pacman/}/local"
 
-if [ ! -r /etc/makepkg.conf ]; then
-    echo "ERROR: unable to read /etc/makepkg.conf"
+if [ ! -r @sysconfdir@/makepkg.conf ]; then
+    echo "ERROR: unable to read @sysconfdir@/makepkg.conf"
     exit 1
 fi
 
-source "/etc/makepkg.conf"
+source "@sysconfdir@/makepkg.conf"
 if [ -r ~/.makepkg.conf ]; then
     source ~/.makepkg.conf
 fi
@@ -220,6 +220,9 @@ while read i; do
         %REPLACES%)
             echo "replaces = $i"    >> .PKGINFO
         ;;
+        %EPOCH%)
+            echo "epoch = $i" >> .PKGINFO
+        ;;
         %FORCE%)
             echo "force = true" >> .PKGINFO
         ;;
diff --git a/contrib/bash_completion b/contrib/bash_completion.in
index bdc4754a..bdc4754a 100644
--- a/contrib/bash_completion
+++ b/contrib/bash_completion.in
diff --git a/contrib/pacdiff b/contrib/pacdiff.in
index 3f26f381..ac4ce893 100755
--- a/contrib/pacdiff
+++ b/contrib/pacdiff.in
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!@BASH_SHELL@
 #   pacdiff : a simple pacnew/pacorig/pacsave updater
 #
 #   Copyright (c) 2007 Aaron Griffin <aaronmgriffin@gmail.com>
diff --git a/contrib/paclist b/contrib/paclist.in
index 0379a4c5..0379a4c5 100755
--- a/contrib/paclist
+++ b/contrib/paclist.in
diff --git a/contrib/pacscripts b/contrib/pacscripts.in
index 101fb15f..d3664091 100755
--- a/contrib/pacscripts
+++ b/contrib/pacscripts.in
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!@BASH_SHELL@
 #
 #   pacscripts : tries to print out the {pre,post}_{install,remove,upgrade}
 #   scripts of a given package
@@ -27,7 +27,7 @@ set -o errexit
 progname=$(basename $0)
 progver="0.4"
 
-conf="/etc/pacman.conf"
+conf="@sysconfdir@/pacman.conf"
 
 if [ ! -r "$conf" ]; then
 	echo "ERROR: unable to read $conf"
@@ -36,8 +36,8 @@ fi
 
 eval $(awk '/DBPath/ {print $1$2$3}' "$conf")
 eval $(awk '/CacheDir/ {print $1$2$3}' "$conf")
-pac_db="${DBPath:-/var/lib/pacman}/local"
-pac_cache="${CacheDir:-/var/cache/pacman/pkg}"
+pac_db="${DBPath:-@localstatedir@/lib/pacman}/local"
+pac_cache="${CacheDir:-@localstatedir@/cache/pacman/pkg}"
 
 error() {
 	local mesg=$1; shift
diff --git a/contrib/pacsearch b/contrib/pacsearch.in
index a20df265..a20df265 100755
--- a/contrib/pacsearch
+++ b/contrib/pacsearch.in
diff --git a/contrib/pactree b/contrib/pactree.in
index 73bece3a..b43005a8 100755
--- a/contrib/pactree
+++ b/contrib/pactree.in
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!@BASH_SHELL@
 # pactree : a simple dependency tree viewer
 #
 # Copyright (C) 2008 Carlo "carlocci" Bersani <carlocci@gmail.com>
@@ -130,9 +130,10 @@ _tree(){
 
 		# Generate the spacer
 		spacer=""
-		for each in $(seq 1 $spaces); do
+		for ((count = 0; count < spaces; count++)); do
 			spacer="$spacer$separator"
 		done
+		unset count
 		spacer="$spacer$branch_tip"
 
 		[ $silent -ne 1 ] &&	echo -e "$branch_color$spacer$leaf_color$pkg_name$provided"
@@ -271,14 +272,14 @@ if [ $graphviz -eq 1 ]; then
 	fi
 fi
 
-if [ ! -r /etc/pacman.conf ]; then
-	echo "ERROR: unable to read /etc/pacman.conf"
+if [ ! -r @sysconfdir@/pacman.conf ]; then
+	echo "ERROR: unable to read @sysconfdir@/pacman.conf"
 	exit 1
 else
-	eval $(awk '/DBPath/ {print $1$2$3}' /etc/pacman.conf)
+	eval $(awk '/DBPath/ {print $1$2$3}' @sysconfdir@/pacman.conf)
 fi
 
-pac_db="${DBPath:-/var/lib/pacman}/local"
+pac_db="${DBPath:-@localstatedir@/lib/pacman}/local"
 
 if [ ! -d "$pac_db" ] ; then
 	echo "ERROR: pacman database directory ${pac_db} not found"
diff --git a/contrib/wget-xdelta.sh b/contrib/wget-xdelta.sh.in
index 4656f4dd..f2ac1c87 100755
--- a/contrib/wget-xdelta.sh
+++ b/contrib/wget-xdelta.sh.in
@@ -1,7 +1,7 @@
-#!/bin/bash
+#!@BASH_SHELL@
 
-if [ -r "/etc/makepkg.conf" ]; then
-	source /etc/makepkg.conf
+if [ -r "@sysconfdir@/makepkg.conf" ]; then
+	source @sysconfdir@/makepkg.conf
 else
 	echo "wget-xdelta: Unable to find makepkg.conf"
 	exit 1
@@ -30,11 +30,11 @@ new_version=$(echo $pkg_data | cut -d ' ' -f 2)
 base_url=${file_url%/*}
 
 # Look for the last version
-for file in $(ls -r /var/cache/pacman/pkg/${pkgname}-*-*{,-$CARCH}$PKGEXT 2>/dev/null); do
+for file in $(ls -r @localstatedir@/cache/pacman/pkg/${pkgname}-*-*{,-$CARCH}$PKGEXT 2>/dev/null); do
 	[[ "$file" =~ "$CARCH" ]] && arch="-$CARCH" || arch=""
 	check_version=$(echo $file | \
 		sed "s|^.*/${pkgname}-\([[:alnum:]_\.]*-[[:alnum:]_\.]*\)${arch}$PKGEXT$|\1|" | \
-		grep -v "^/var/cache/pacman/pkg")
+		grep -v "^@localstatedir@/cache/pacman/pkg")
 
 	[ "$check_version" = "" ] && continue
 
diff --git a/contrib/zsh_completion b/contrib/zsh_completion.in
index f69fe631..16919134 100644
--- a/contrib/zsh_completion
+++ b/contrib/zsh_completion.in
@@ -222,20 +222,20 @@ _pacman_completions_all_groups() {
 _pacman_completions_all_packages() {
 	local -a cmd packages repositories packages_long
 
-	repositories=(${(o)${${${(M)${(f)"$(</etc/pacman.conf)"}:#\[*}/\[/}/\]/}:#options})
+	repositories=(${(o)${${${(M)${(f)"$(<@sysconfdir@/pacman.conf)"}:#\[*}/\[/}/\]/}:#options})
 	typeset -U repositories
-	packages_long=(/var/lib/pacman/sync/${^repositories}/*(/))
-	packages=(${(o)${${packages_long/\/var\/lib\/pacman\/sync\//}#*/}%-*-*} )
+	packages_long=(@localstatedir@/lib/pacman/sync/${^repositories}/*(/))
+	packages=(${(o)${${packages_long#@localstatedir@/lib/pacman/sync/}#*/}%-*-*} )
 	typeset -U packages
 	_wanted packages expl "packages" compadd - "${(@)packages}"
 	if [[ $PREFIX != */* ]] ; then
-		repositories=(${(o)${${${(M)${(f)"$(</etc/pacman.conf)"}:#\[*}/\[/}/\]/}:#options})
+		repositories=(${(o)${${${(M)${(f)"$(<@sysconfdir@/pacman.conf)"}:#\[*}/\[/}/\]/}:#options})
 		typeset -U repositories
 		_wanted repo_packages expl "repository/package" compadd -S "/" $repositories
 	else
 		compset -P '*/'
-		packages_long=(/var/lib/pacman/sync/$IPREFIX*(/))
-		packages=(${(o)${${packages_long/\/var\/lib\/pacman\/sync\//}#*/}%-*-*} )
+		packages_long=(@localstatedir@/lib/pacman/sync/$IPREFIX*(/))
+		packages=(${(o)${${packages_long#@localstatedir@/lib/pacman/sync/}#*/}%-*-*} )
 		typeset -U packages
 		_wanted repo_packages expl "repository/package" compadd ${(@)packages}
 	fi
@@ -253,15 +253,15 @@ _pacman_completions_installed_groups() {
 # provides completions for installed packages
 _pacman_completions_installed_packages() {
 	local -a cmd packages packages_long
-	packages_long=(/var/lib/pacman/local/*(/))
-	packages=( ${${packages_long/\/var\/lib\/pacman\/local\//}%-*-*} )
+	packages_long=(@localstatedir@/lib/pacman/local/*(/))
+	packages=( ${${packages_long#@localstatedir@/lib/pacman/local/}%-*-*} )
 	compadd "$@" -a packages
 }
 
 # provides completions for repository names
 _pacman_completions_repositories() {
 	local -a cmd repositories
-	repositories=(${(o)${${${(M)${(f)"$(</etc/pacman.conf)"}:#\[*}/\[/}/\]/}:#options})
+	repositories=(${(o)${${${(M)${(f)"$(<@sysconfdir@/pacman.conf)"}:#\[*}/\[/}/\]/}:#options})
 	# Uniq the array
 	typeset -U repositories
 	compadd "$@" -a repositories