13 files changed, 160 insertions, 97 deletions
diff --git a/etc/.gitignore b/etc/.gitignore
index 19f2216d..7c5f1e2b 100644
--- a/etc/.gitignore
+++ b/etc/.gitignore
@@ -1,4 +1,2 @@
-Makefile
-Makefile.in
 makepkg.conf
 pacman.conf
diff --git a/etc/Makefile.am b/etc/Makefile.am
index 0bded95e..2cff0150 100644
--- a/etc/Makefile.am
+++ b/etc/Makefile.am
@@ -1,4 +1,36 @@
-SUBDIRS = pacman.d abs
+SUBDIRS = pacman.d
+
+if INCLUDE_ABS
+SUBDIRS += abs
+endif
 
-EXTRA_DIST = makepkg.conf pacman.conf
 dist_sysconf_DATA = makepkg.conf pacman.conf
+EXTRA_DIST = makepkg.conf.in pacman.conf.in
+
+# Files that should be removed, but which Automake does not know.
+MOSTLYCLEANFILES = $(dist_sysconf_DATA)
+
+#### Taken from the autoconf scripts Makefile.am ####
+edit = sed \
+	-e 's|@sysconfdir[@]|$(sysconfdir)|g' \
+	-e 's|@localstatedir[@]|$(localstatedir)|g' \
+	-e 's|@prefix[@]|$(prefix)|g' \
+	-e 's|@PACKAGE_VERSION[@]|$(PACKAGE_VERSION)|g' \
+	-e 's|@PACKAGE_NAME[@]|$(PACKAGE_NAME)|g' \
+	-e 's|@PKGEXT[@]|$(PKGEXT)|g' \
+	-e 's|@SRCEXT[@]|$(SRCEXT)|g' \
+	-e 's|@CARCH[@]|$(CARCH)|g' \
+	-e 's|@CHOST[@]|$(CHOST)|g' \
+	-e 's|@ARCHSWITCH[@]|$(ARCHSWITCH)|g' \
+	-e 's|@CARCHFLAGS[@]|$(CARCHFLAGS)|g' \
+	-e 's|@ROOTDIR[@]|$(ROOTDIR)|g'
+
+$(dist_sysconf_DATA): Makefile
+	rm -f $@ $@.tmp
+	$(edit) `test -f ./$@.in || echo $(srcdir)/`$@.in >$@.tmp
+	mv $@.tmp $@
+
+makepkg.conf: $(srcdir)/makepkg.conf.in
+pacman.conf: $(srcdir)/pacman.conf.in
+
+# vim:set ts=2 sw=2 noet:
diff --git a/etc/abs/Makefile.am b/etc/abs/Makefile.am
index 1c10d0b7..b6b64f03 100644
--- a/etc/abs/Makefile.am
+++ b/etc/abs/Makefile.am
@@ -1,17 +1,20 @@
-EXTRA_DIST = abs.conf \
-			 supfile.community \
-			 supfile.core \
-			 supfile.extra \
-			 supfile.testing \
-			 supfile.unstable
+EXTRA_DIST = \
+	abs.conf \
+	supfile.community \
+	supfile.core \
+	supfile.extra \
+	supfile.testing \
+	supfile.unstable
 
 install-data-hook:
 	mkdir -p $(DESTDIR)$(sysconfdir)/abs ; \
 	for j in $(EXTRA_DIST); do \
-	    $(INSTALL) -c -m 644 $(srcdir)/$$j $(DESTDIR)$(sysconfdir)/abs/$$j ; \
+		$(INSTALL) -c -m 644 $(srcdir)/$$j $(DESTDIR)$(sysconfdir)/abs/$$j ; \
 	done
 
 uninstall-hook:
 	for j in $(EXTRA_DIST); do \
-	    rm -f $(DESTDIR)$(sysconfdir)/abs/$$j ; \
+		rm -f $(DESTDIR)$(sysconfdir)/abs/$$j ; \
 	done
+
+# vim:set ts=2 sw=2 noet:
diff --git a/etc/abs/supfile.community b/etc/abs/supfile.community
index 87cc3351..6565ea50 100644
--- a/etc/abs/supfile.community
+++ b/etc/abs/supfile.community
@@ -1,5 +1,5 @@
 #
-# /etc/abs/supfile.community
+# supfile.community
 #
 
 # this is the host containing the community PKGBUILD files
diff --git a/etc/abs/supfile.core b/etc/abs/supfile.core
index e7867f10..2e052bce 100644
--- a/etc/abs/supfile.core
+++ b/etc/abs/supfile.core
@@ -1,5 +1,5 @@
 #
-# /etc/abs/supfile.core
+# supfile.core
 #
 
 # this is the host containing the core PKGBUILD files
diff --git a/etc/abs/supfile.extra b/etc/abs/supfile.extra
index 997027ab..3f69a7b5 100644
--- a/etc/abs/supfile.extra
+++ b/etc/abs/supfile.extra
@@ -1,5 +1,5 @@
 #
-# /etc/abs/supfile.extra
+# supfile.extra
 #
 
 # this is the host containing the extra PKGBUILD files
diff --git a/etc/abs/supfile.testing b/etc/abs/supfile.testing
index 92862af2..70fc6551 100644
--- a/etc/abs/supfile.testing
+++ b/etc/abs/supfile.testing
@@ -1,5 +1,5 @@
 #
-# /etc/abs/supfile.testing
+# supfile.testing
 #
 
 # this is the host containing the testing PKGBUILD files
diff --git a/etc/abs/supfile.unstable b/etc/abs/supfile.unstable
index d2c2041c..d567313d 100644
--- a/etc/abs/supfile.unstable
+++ b/etc/abs/supfile.unstable
@@ -1,5 +1,5 @@
 #
-# /etc/abs/supfile.unstable
+# supfile.unstable
 #
 
 # this is the host containing the unstable PKGBUILD files
diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in
index 90623c9d..d13c3d69 100644
--- a/etc/makepkg.conf.in
+++ b/etc/makepkg.conf.in
@@ -1,15 +1,23 @@
 #
-# /etc/makepkg.conf
+# @sysconfdir@/makepkg.conf
 #
 
 #########################################################################
 # SOURCE ACQUISITION
 #########################################################################
 #
-#-- The FTP/HTTP download utility that makepkg should use to acquire sources
-FTPAGENT="/usr/bin/wget --continue --passive-ftp --tries=3 --waitretry=3 --no-check-certificate"
-#FTPAGENT="/usr/bin/snarf"
-#FTPAGENT="/usr/bin/lftpget -c"
+#-- The download utilities that makepkg should use to acquire sources
+#  Format: 'protocol::agent'
+DLAGENTS=('ftp::/usr/bin/wget -c --passive-ftp -t 3 --waitretry=3'
+          'http::/usr/bin/wget -c -t 3 --waitretry=3'
+          'https::/usr/bin/wget -c -t 3 --waitretry=3 --no-check-certificate'
+          'rsync::/usr/bin/rsync -z'
+          'scp::/usr/bin/scp -C')
+
+# Other common tools:
+# /usr/bin/snarf
+# /usr/bin/lftpget -c
+# /usr/bin/curl
 
 #########################################################################
 # ARCHITECTURE, COMPILE FLAGS
@@ -19,10 +27,10 @@ CARCH="@CARCH@"
 CHOST="@CHOST@"
 
 #-- Exclusive: will only run on @CARCHFLAGS@
-# -mtune builds exclusively for an architecture
-# -mcpu optimizes for an architecture, but builds for the whole processor family
-CFLAGS="-@ARCHSWITCH@=@CARCHFLAGS@ -mtune=generic -O2 -pipe"
-CXXFLAGS="-@ARCHSWITCH@=@CARCHFLAGS@ -mtune=generic -O2 -pipe"
+# -march (or -mcpu) builds exclusively for an architecture
+# -mtune optimizes for an architecture, but builds for whole processor family
+CFLAGS="@CARCHFLAGS@-mtune=generic -O2 -pipe"
+CXXFLAGS="@CARCHFLAGS@-mtune=generic -O2 -pipe"
 #-- Make Flags: change this for DistCC/SMP systems
 #MAKEFLAGS="-j2"
 
@@ -30,14 +38,16 @@ CXXFLAGS="-@ARCHSWITCH@=@CARCHFLAGS@ -mtune=generic -O2 -pipe"
 # BUILD ENVIRONMENT
 #########################################################################
 #
-# Defaults: BUILDENV=(!fakeroot !distcc color !ccache)
+# Defaults: BUILDENV=(fakeroot !distcc color !ccache !xdelta)
+#  A negated environment option will do the opposite of the comments below.
 #
 #-- fakeroot: Allow building packages as a non-root user
 #-- distcc:   Use the Distributed C/C++/ObjC compiler
 #-- color:    Colorize output messages
 #-- ccache:   Use ccache to cache compilation
+#-- xdelta:   Generate delta patch from previous to current package
 #
-BUILDENV=(fakeroot !distcc color !ccache)
+BUILDENV=(fakeroot !distcc color !ccache !xdelta)
 #
 #-- If using DistCC, your MAKEFLAGS will also need modification. In addition,
 #-- specify a space-delimited list of hosts running in the DistCC cluster.
@@ -48,7 +58,8 @@ BUILDENV=(fakeroot !distcc color !ccache)
 #   These are default values for the options=() settings
 #########################################################################
 #
-# Default: OPTIONS=(strip !docs !libtool emptydirs)
+# Default: OPTIONS=(strip !docs libtool emptydirs)
+#  A negated option will do the opposite of the comments below.
 #
 #-- strip:     Strip symbols from binaries/libraries
 #-- docs:      Save doc and info directories
@@ -75,4 +86,17 @@ DOC_DIRS=(usr/{,share/}{info,doc,gtk-doc} opt/gnome/{,share/}{info,doc,gtk-doc})
 #-- Packager: name/email of the person or organization building packages
 #PACKAGER="John Doe <john@doe.com>"
 
+#########################################################################
+# BUILDSCRIPT/EXTENSION DEFAULTS
+#########################################################################
+#
+# WARNING: Do NOT modify these variables unless you know what you are
+#          doing.
+#
+BUILDSCRIPT='PKGBUILD'
+PKGEXT='@PKGEXT@'
+SRCEXT='@SRCEXT@'
+DB_COMPRESSION='gz'
+DB_CHECKSUMS=(md5)
+
 # vim: set ft=sh ts=2 sw=2 et:
diff --git a/etc/pacman.conf.in b/etc/pacman.conf.in
index f76c2acf..a072db13 100644
--- a/etc/pacman.conf.in
+++ b/etc/pacman.conf.in
@@ -1,5 +1,5 @@
 #
-# /etc/pacman.conf
+# @sysconfdir@/pacman.conf
 #
 # See the pacman manpage for option directives
 
@@ -7,7 +7,12 @@
 # GENERAL OPTIONS
 #
 [options]
-LogFile     = /var/log/pacman.log
+# The following paths are commented out with their default values listed.
+# If you wish to use different paths, uncomment and update the paths.
+#RootDir     = @ROOTDIR@
+#DBPath      = @localstatedir@/lib/pacman/
+#CacheDir    = @localstatedir@/cache/pacman/pkg/
+#LogFile     = @localstatedir@/log/pacman.log
 HoldPkg     = pacman glibc
 #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
 
@@ -20,23 +25,23 @@ HoldPkg     = pacman glibc
 #     have identical names, regardless of version number
 #
 #[testing]
-#Include = /etc/pacman.d/testing
+#Include = @sysconfdir@/pacman.d/mirrorlist
 
 [core]
 # Add your preferred servers here, they will be used first
-Include = /etc/pacman.d/core
+Include = @sysconfdir@/pacman.d/mirrorlist
 
 [extra]
 # Add your preferred servers here, they will be used first
-Include = /etc/pacman.d/extra
+Include = @sysconfdir@/pacman.d/mirrorlist
 
 [community]
 # Add your preferred servers here, they will be used first
-Include = /etc/pacman.d/community
+Include = @sysconfdir@/pacman.d/mirrorlist
 
 #[unstable]
 # Add your preferred servers here, they will be used first
-#Include = /etc/pacman.d/unstable
+#Include = @sysconfdir@/pacman.d/mirrorlist
 
 # An example of a custom package repository.  See the pacman manpage for
 # tips on creating your own repositories.
diff --git a/etc/pacman.d/.gitignore b/etc/pacman.d/.gitignore
index 32b2d700..b47959b7 100644
--- a/etc/pacman.d/.gitignore
+++ b/etc/pacman.d/.gitignore
@@ -1,9 +1 @@
-Makefile
-Makefile.in
-community
-current
-extra
 mirrorlist
-release
-unstable
-testing
diff --git a/etc/pacman.d/Makefile.am b/etc/pacman.d/Makefile.am
index 341b3efa..e1f33c76 100644
--- a/etc/pacman.d/Makefile.am
+++ b/etc/pacman.d/Makefile.am
@@ -1,9 +1,17 @@
 pkgsysconfdir = ${sysconfdir}/pacman.d
-dist_pkgsysconf_DATA = community core extra release testing unstable
+dist_pkgsysconf_DATA = mirrorlist
+EXTRA_DIST = mirrorlist.in
+#
+# Files that should be removed, but which Automake does not know.
+MOSTLYCLEANFILES = $(dist_pkgsysconf_DATA)
 
-$(dist_pkgsysconf_DATA): mirrorlist
-	sed "s|@@REPO@@|$@|g" <$< >$@
+$(dist_pkgsysconf_DATA): Makefile
+	rm -f $@ $@.tmp
+	sed \
+		-e 's|@CARCH[@]|$(CARCH)|g' \
+		$(srcdir)/mirrorlist.in >$@.tmp
+	mv $@.tmp $@
 
-clean-local:
-	rm -f $(dist_pkgsysconf_DATA)
+mirrorlist: $(srcdir)/mirrorlist.in
 
+# vim:set ts=2 sw=2 noet:
diff --git a/etc/pacman.d/mirrorlist.in b/etc/pacman.d/mirrorlist.in
index 39716a6d..554ed4eb 100644
--- a/etc/pacman.d/mirrorlist.in
+++ b/etc/pacman.d/mirrorlist.in
@@ -1,83 +1,84 @@
 #
-# @@REPO@@: Arch Linux @@REPO@@ repository
+# $repo: Arch Linux @REPO@ repository
 #
 
 # United States
-Server = ftp://ftp.archlinux.org/@@REPO@@/os/@CARCH@
-Server = ftp://ftp.nethat.com/pub/linux/archlinux/@@REPO@@/os/@CARCH@
-Server = ftp://locke.suu.edu/linux/dist/archlinux/@@REPO@@/os/@CARCH@
-Server = ftp://mirrors.unixheads.org/archlinux/@@REPO@@/os/@CARCH@
-Server = ftp://ftp-linux.cc.gatech.edu/pub/linux/distributions/archlinux/@@REPO@@/os/@CARCH@
-Server = ftp://mirror.cs.vt.edu/pub/ArchLinux/@@REPO@@/os/@CARCH@
-Server = http://mirrors.easynews.com/linux/archlinux/@@REPO@@/os/@CARCH@
-Server = ftp://ftp.ibiblio.org/pub/linux/distributions/archlinux/@@REPO@@/os/@CARCH@
+Server = ftp://ftp.archlinux.org/$repo/os/@CARCH@
+Server = ftp://ftp.nethat.com/pub/linux/archlinux/$repo/os/@CARCH@
+Server = ftp://locke.suu.edu/linux/dist/archlinux/$repo/os/@CARCH@
+Server = ftp://mirrors.unixheads.org/archlinux/$repo/os/@CARCH@
+Server = ftp://ftp-linux.cc.gatech.edu/pub/linux/distributions/archlinux/$repo/os/@CARCH@
+Server = ftp://mirror.cs.vt.edu/pub/ArchLinux/$repo/os/@CARCH@
+Server = http://mirrors.easynews.com/linux/archlinux/$repo/os/@CARCH@
+Server = ftp://ftp.ibiblio.org/pub/linux/distributions/archlinux/$repo/os/@CARCH@
+Server = http://holmes.umflint.edu/archlinux/$repo/os/@CARCH@
 
 # South America
 # - Brazil
-Server = http://archlinux.c3sl.ufpr.br/@@REPO@@/os/@CARCH@
+Server = http://archlinux.c3sl.ufpr.br/$repo/os/@CARCH@
+Server = ftp://archlinux.c3sl.ufpr.br/archlinux/$repo/os/@CARCH@
 
 # Europe
 # - Austria
-Server = ftp://gd.tuwien.ac.at/opsys/linux/archlinux/@@REPO@@/os/@CARCH@
+Server = ftp://gd.tuwien.ac.at/opsys/linux/archlinux/$repo/os/@CARCH@
 # - Belgium
-Server = ftp://ftp.belnet.be/packages/archlinux/@@REPO@@/os/@CARCH@
+Server = ftp://ftp.belnet.be/packages/archlinux/$repo/os/@CARCH@
 # - Czech Republic
-Server = ftp://ftp.sh.cvut.cz/MIRRORS/arch/@@REPO@@/os/@CARCH@
+Server = ftp://ftp.sh.cvut.cz/MIRRORS/arch/$repo/os/@CARCH@
 # - Estonia
-Server = ftp://ftp.estpak.ee/pub/archlinux/@@REPO@@/os/@CARCH@
+Server = ftp://ftp.estpak.ee/pub/archlinux/$repo/os/@CARCH@
 # - Finland
-Server = ftp://ftp.sixnix.net/pub/archlinux/@@REPO@@/os/@CARCH@
+Server = ftp://ftp.sixnix.net/pub/archlinux/$repo/os/@CARCH@
 # - France
-Server = ftp://ftp.rez-gif.supelec.fr/pub/Linux/distrib/archlinux/@@REPO@@/os/@CARCH@
-Server = ftp://mir1.archlinuxfr.org/archlinux/@@REPO@@/os/@CARCH@
-Server = ftp://mir2.archlinuxfr.org/archlinux/@@REPO@@/os/@CARCH@
-Server = ftp://distrib-coffee.ipsl.jussieu.fr/pub/linux/archlinux/@@REPO@@/os/@CARCH@
+Server = ftp://mir1.archlinuxfr.org/archlinux/$repo/os/@CARCH@
+Server = ftp://mir2.archlinuxfr.org/archlinux/$repo/os/@CARCH@
+Server = ftp://distrib-coffee.ipsl.jussieu.fr/pub/linux/archlinux/$repo/os/@CARCH@
+Server = http://mir.archlinux.fr/$repo/os/@CARCH@
+Server = ftp://ftp.free.fr/mirrors/ftp.archlinux.org/$repo/os/@CARCH@
 # - Germany
-Server = ftp://ftp.tu-chemnitz.de/pub/linux/sunsite.unc-mirror/distributions/archlinux/@@REPO@@/os/@CARCH@
-Server = ftp://ftp.hosteurope.de/mirror/ftp.archlinux.org/@@REPO@@/os/@CARCH@
-Server = ftp://ftp.archlinuxppc.org/i686/@@REPO@@/os/@CARCH@
+Server = ftp://ftp.tu-chemnitz.de/pub/linux/sunsite.unc-mirror/distributions/archlinux/$repo/os/@CARCH@
+Server = ftp://ftp.hosteurope.de/mirror/ftp.archlinux.org/$repo/os/@CARCH@
+Server = ftp://ftp.archlinuxppc.org/i686/$repo/os/@CARCH@
 # - Great Britain
-Server = http://ftp.parrswood.manchester.sch.uk/Mirrors/ftp.archlinux.org/@@REPO@@/os/@CARCH@
+Server = http://www.mirrorservice.org/sites/ftp.archlinux.org/$repo/os/@CARCH@
 # - Greece
-Server = ftp://ftp.ntua.gr/pub/linux/archlinux/@@REPO@@/os/@CARCH@
+Server = ftp://ftp.ntua.gr/pub/linux/archlinux/$repo/os/@CARCH@
+# - Hungary
+Server = ftp://ftp.mfa.kfki.hu/pub/mirrors/ftp.archlinux.org/$repo/os/@CARCH@
 # - Ireland
-Server = ftp://ftp.heanet.ie/mirrors/ftp.archlinux.org/@@REPO@@/os/@CARCH@
+Server = ftp://ftp.heanet.ie/mirrors/ftp.archlinux.org/$repo/os/@CARCH@
 # - Italy
-Server = ftp://mi.mirror.garr.it/mirrors/archlinux/@@REPO@@/os/@CARCH@
-# - Lithuania
-Server = ftp://saule.mintis.lt/pub/linux/@@REPO@@/os/@CARCH@
+Server = ftp://mi.mirror.garr.it/mirrors/archlinux/$repo/os/@CARCH@
 # - Netherlands
-Server = ftp://ftp.nluug.nl/pub/metalab/distributions/archlinux/@@REPO@@/os/@CARCH@
-Server = ftp://ftp.surfnet.nl/pub/os/Linux/distr/archlinux/@@REPO@@/os/@CARCH@
-# - Norway
-Server = ftp://mirror.djzradio.net/archlinux/@@REPO@@/os/@CARCH@
+Server = ftp://ftp.nluug.nl/pub/metalab/distributions/archlinux/$repo/os/@CARCH@
+Server = ftp://ftp.surfnet.nl/pub/os/Linux/distr/archlinux/$repo/os/@CARCH@
 # - Poland
-Server = ftp://sunsite.icm.edu.pl/site/linux-sunsite/distributions/archlinux/@@REPO@@/os/@CARCH@
-Server = ftp://mirror.icis.pcz.pl/archlinux/@@REPO@@/os/@CARCH@
+Server = ftp://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/archlinux/$repo/os/@CARCH@
+Server = ftp://mirror.icis.pcz.pl/archlinux/$repo/os/@CARCH@
 # - Portugal
-Server = ftp://gul.est.ips.pt/repos/archlinux/@@REPO@@/os/@CARCH@
-Server = ftp://cesium.di.uminho.pt/pub/archlinux/@@REPO@@/os/@CARCH@
-Server = ftp://darkstar.ist.utl.pt/pub/archlinux/@@REPO@@/os/@CARCH@
+Server = ftp://cesium.di.uminho.pt/pub/archlinux/$repo/os/@CARCH@
 # - Romania
-Server = ftp://ftp.iasi.roedu.net/mirrors/archlinux.org/@@REPO@@/os/@CARCH@
+Server = ftp://ftp.iasi.roedu.net/mirrors/archlinux.org/$repo/os/@CARCH@
 # - Russia
-Server = http://archlinux.freeside.ru/@@REPO@@/os/@CARCH@
-Server = ftp://mirror.yandex.ru/archlinux/@@REPO@@/os/@CARCH@
+Server = ftp://archlinux.org.ru/pub/archlinux/$repo/os/@CARCH@
+Server = ftp://mirror.yandex.ru/archlinux/$repo/os/@CARCH@
+Server = http://archlinux.freeside.ru/$repo/os/@CARCH@
 # - Sweden
-Server = ftp://ftp.ds.hj.se/pub/os/linux/archlinux/@@REPO@@/os/@CARCH@
-Server = ftp://ftp.gigabit.nu/@@REPO@@/os/@CARCH@
+Server = ftp://ftp.ds.hj.se/pub/os/linux/archlinux/$repo/os/@CARCH@
+Server = ftp://ftp.gigabit.nu/$repo/os/@CARCH@
 # - Switzerland
-Server = ftp://archlinux.puzzle.ch/@@REPO@@/os/@CARCH@
+Server = ftp://archlinux.puzzle.ch/$repo/os/@CARCH@
 # - Turkey
-Server = ftp://ftp.linux.org.tr/pub/archlinux/@@REPO@@/os/@CARCH@
+Server = http://server.elsistech.com/archlinux/$repo/os/@CARCH@
 # - Ukraine
-Server = ftp://ftp.linux.kiev.ua/pub/Linux/ArchLinux/@@REPO@@/os/@CARCH@
-Server = ftp://hell.org.ua/archlinux/@@REPO@@/os/@CARCH@
+Server = ftp://hell.org.ua/archlinux/$repo/os/@CARCH@
+Server = ftp://ftp.linux.kiev.ua/pub/Linux/ArchLinux/$repo/os/@CARCH@
 
 # Asia
 # - Israel
-Server = http://mirror.isoc.org.il/pub/archlinux/@@REPO@@/os/@CARCH@
+Server = http://mirror.isoc.org.il/pub/archlinux/$repo/os/@CARCH@
 
 # Australia
-Server = ftp://mirror.pacific.net.au/linux/archlinux/@@REPO@@/os/@CARCH@
+Server = ftp://mirror.pacific.net.au/linux/archlinux/$repo/os/@CARCH@
+Server = ftp://mirror.aarnet.edu.au/pub/archlinux/$repo/os/@CARCH@