4 files changed, 47 insertions, 55 deletions
diff --git a/etc/makepkg.conf b/etc/makepkg.conf
index 375851f3..c73d9889 100644
--- a/etc/makepkg.conf
+++ b/etc/makepkg.conf
@@ -2,8 +2,23 @@
 # /etc/makepkg.conf
 #
 
-export CFLAGS="-O2 -march=i686 -pipe"
-export CXXFLAGS="-O2 -march=i686 -pipe"
+# the top-level directory of all your PKGBUILDs
+export ABSROOT="/usr/abs"
 
+# Pentium Pro/Pentium II/Pentium III+/Pentium 4/Athlon optimized (but binaries
+# will run on any x86 system)
+#export CHOST="i686-pc-linux-gnu"
+#export CFLAGS="-mcpu=i686 -O2 -pipe"
+#export CXXFLAGS="-mcpu=i686 -O2 -pipe"
+
+# Pentium Pro/Pentium II/Pentium III+/Pentium 4/Athlon exclusive (binaries
+# will use the P6 instruction set and only run on P6+ systems)
+export CHOST="i686-pc-linux-gnu"
+export CFLAGS="-march=i686 -O2 -pipe"
+export CXXFLAGS="-march=i686 -O2 -pipe"
+
+# SMP Systems
 #export MAKEFLAGS="-j 2"
 
+# if you want your name to show up in the packages you build, set this.
+#export PACKAGER="John Doe <john@doe.com>"
diff --git a/etc/pacman.conf b/etc/pacman.conf
index 491520b2..ad77cfec 100644
--- a/etc/pacman.conf
+++ b/etc/pacman.conf
@@ -8,42 +8,58 @@
 [options]
 NoUpgrade = etc/passwd etc/group etc/shadow
 NoUpgrade = etc/fstab etc/rc.conf etc/rc.local
-NoUpgrade = etc/lilo.conf
+NoUpgrade = etc/lilo.conf etc/raidtab
 
 [current]
+Server = ftp://ftp.archlinux.org/current
 Server = ftp://ftp.ibiblio.org/pub/linux/distributions/archlinux/current
 Server = ftp://ftp.webtrek.com/pub/mirrors/archlinux/current
 Server = ftp://ftp.mpi-sb.mpg.de/pub/linux/mirror/ftp.ibiblio.org/pub/Linux/distributions/archlinux/current
 Server = ftp://ftp.oit.unc.edu/pub/Linux/distributions/archlinux/current
 Server = ftp://ftp.tu-chemnitz.de/pub/linux/sunsite.unc-mirror/distributions/archlinux/current
-Server = ftp://ftp.archlinux.org/current
 Server = ftp://gd.tuwien.ac.at/opsys/linux/archlinux/current
 Server = ftp://saule.mintis.lt/pub/linux/current
+Server = ftp://ftp.rez-gif.supelec.fr/pub/Linux/distrib/archlinux/current
+
+# If you use the 'stable' tree, you should disable the 'current'
+# tree to avoid conflicts
+#
+#[stable]
+#Server = ftp://ftp.archlinux.org/stable
+#Server = ftp://ftp.ibiblio.org/pub/linux/distributions/archlinux/stable
+#Server = ftp://ftp.webtrek.com/pub/mirrors/archlinux/stable
+#Server = ftp://ftp.mpi-sb.mpg.de/pub/linux/mirror/ftp.ibiblio.org/pub/Linux/distributions/archlinux/stable
+#Server = ftp://ftp.oit.unc.edu/pub/Linux/distributions/archlinux/stable
+#Server = ftp://ftp.tu-chemnitz.de/pub/linux/sunsite.unc-mirror/distributions/archlinux/stable
+#Server = ftp://gd.tuwien.ac.at/opsys/linux/archlinux/stable
+#Server = ftp://saule.mintis.lt/pub/linux/stable
+#Server = ftp://ftp.rez-gif.supelec.fr/pub/Linux/distrib/archlinux/stable
 
 # Uncomment this block to access the 'unofficial' package set
 #
 #[unofficial]
 #Server = ftp://ftp.ibiblio.org/pub/linux/distributions/archlinux/unofficial
 #Server = ftp://ftp.webtrek.com/pub/mirrors/archlinux/unofficial
+#Server = ftp://ftp.archlinux.org/unofficial
 #Server = ftp://ftp.mpi-sb.mpg.de/pub/linux/mirror/ftp.ibiblio.org/pub/Linux/distributions/archlinux/unofficial
 #Server = ftp://ftp.oit.unc.edu/pub/Linux/distributions/archlinux/unofficial
 #Server = ftp://ftp.tu-chemnitz.de/pub/linux/sunsite.unc-mirror/distributions/archlinux/unofficial
-#Server = ftp://ftp.archlinux.org/unofficial
 #Server = ftp://gd.tuwien.ac.at/opsys/linux/archlinux/unofficial
 #Server = ftp://saule.mintis.lt/pub/linux/unofficial
+#Server = ftp://ftp.rez-gif.supelec.fr/pub/Linux/distrib/archlinux/unofficial
 
-# If you use the 'stable' tree, you should disable the 'current'
-# tree to avoid conflicts
+# Uncomment this block to access the 'unstable' package set
 #
-#[stable]
-#Server = ftp://ftp.ibiblio.org/pub/linux/distributions/archlinux/stable
-#Server = ftp://ftp.webtrek.com/pub/mirrors/archlinux/stable
-#Server = ftp://ftp.mpi-sb.mpg.de/pub/linux/mirror/ftp.ibiblio.org/pub/Linux/distributions/archlinux/stable
-#Server = ftp://ftp.oit.unc.edu/pub/Linux/distributions/archlinux/stable
-#Server = ftp://ftp.tu-chemnitz.de/pub/linux/sunsite.unc-mirror/distributions/archlinux/stable
-#Server = ftp://ftp.archlinux.org/stable
-#Server = ftp://gd.tuwien.ac.at/opsys/linux/archlinux/stable
-#Server = ftp://saule.mintis.lt/pub/linux/stable
+#[unstable]
+#Server = ftp://ftp.ibiblio.org/pub/linux/distributions/archlinux/unstable
+#Server = ftp://ftp.webtrek.com/pub/mirrors/archlinux/unstable
+#Server = ftp://ftp.archlinux.org/unstable
+#Server = ftp://ftp.mpi-sb.mpg.de/pub/linux/mirror/ftp.ibiblio.org/pub/Linux/distributions/archlinux/unstable
+#Server = ftp://ftp.oit.unc.edu/pub/Linux/distributions/archlinux/unstable
+#Server = ftp://ftp.tu-chemnitz.de/pub/linux/sunsite.unc-mirror/distributions/archlinux/unstable
+#Server = ftp://gd.tuwien.ac.at/opsys/linux/archlinux/unstable
+#Server = ftp://saule.mintis.lt/pub/linux/unstable
+#Server = ftp://ftp.rez-gif.supelec.fr/pub/Linux/distrib/archlinux/unstable
 
 # This is a typical setup for a local package repository.  To have pacman
 # resolve dependencies and install your custom packages with the --sync
diff --git a/etc/supfile.arch b/etc/supfile.arch
deleted file mode 100644
index 5fe3f4b9..00000000
--- a/etc/supfile.arch
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# /etc/abs/supfile
-#
-
-# this is the host containing the master ABS files
-*default host=cvs.archlinux.org
-
-*default base=/usr/abs
-*default prefix=/usr/abs
-*default release=cvs
-*default delete
-*default use-rel-suffix
-*default compress
-
-#
-# Set tag equal to the package tree you wish to follow.  CURRENT and
-# STABLE are the most commonly used, but you can specify specific
-# versions or tag names.  Examples are RELEASE_0_2, VEGA, RELEASE_0_3,
-# FIREFLY, etc.
-#
-*default tag=CURRENT
-
-arch
diff --git a/etc/supfile.unofficial b/etc/supfile.unofficial
deleted file mode 100644
index 2ed2ef0c..00000000
--- a/etc/supfile.unofficial
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# /etc/abs/supfile.unofficial
-#
-
-# this is the host containing the unofficial PKGBUILD files
-*default host=unofficial.archlinux.org
-
-*default base=/usr/abs
-*default prefix=/usr/abs
-*default release=cvs
-*default delete
-*default use-rel-suffix
-*default compress
-
-*default tag=CURRENT
-unofficial