From db769f667d93d9127b570570564589337c793fbe Mon Sep 17 00:00:00 2001
From: Aaron Griffin <aaron@archlinux.org>
Date: Sun, 15 Oct 2006 21:06:08 +0000
Subject: Added alpm function docs along pacman.c : Removed link to frugalware
 wiki sync.c : do not display Uncompressed size if 0 (archlinux has no USIZE)

---
 etc/makepkg.conf | 77 ++++++++++++++++++++++++++++++--------------------------
 etc/pacman.conf  |  6 +++++
 2 files changed, 47 insertions(+), 36 deletions(-)

(limited to 'etc')

diff --git a/etc/makepkg.conf b/etc/makepkg.conf
index 792d1dac..e97c1f50 100644
--- a/etc/makepkg.conf
+++ b/etc/makepkg.conf
@@ -2,58 +2,63 @@
 # /etc/makepkg.conf
 #
 
-#########################################################################
-# SOURCE ACQUISITION
-#########################################################################
-#
-#-- The FTP/HTTP download utility that makepkg should use to acquire sources
-export FTPAGENT="/usr/bin/wget --continue --passive-ftp --tries=3 --waitretry=3 --no-check-certificate"
+# The FTP/HTTP download utility that makepkg should use to acquire sources
+export FTPAGENT="/usr/bin/wget -U makepkg --continue --passive-ftp --tries=3 --waitretry=3 --no-check-certificate"
 #export FTPAGENT="/usr/bin/snarf"
 #export FTPAGENT="/usr/bin/lftpget -c"
 
-#########################################################################
-# ARCHITECTURE, COMPILE FLAGS
-#########################################################################
-#
 export CARCH="i686"
 export CHOST="i686-pc-linux-gnu"
-#-- Exclusive: will only run on i686 or higher (P6, Athlon)
+
+# Pentium Pro/Pentium II/Pentium III+/Pentium 4/Athlon exclusive (binaries
+# will use the P6 instruction set and only run on P6+ systems)
 export CFLAGS="-march=i686 -O2 -pipe"
 export CXXFLAGS="-march=i686 -O2 -pipe"
-#-- Optimized: will run on any x86, but optimized for i686
+# Pentium Pro/Pentium II/Pentium III+/Pentium 4/Athlon optimized (but binaries
+# will run on any x86 system)
 #export CFLAGS="-mcpu=i686 -O2 -pipe"
 #export CXXFLAGS="-mcpu=i686 -O2 -pipe"
-#-- Make Flags: change this for DistCC/SMP systems
+
+# SMP Systems
 #export MAKEFLAGS="-j2"
 
-#########################################################################
-# BUILD ENVIRONMENT
-#########################################################################
-#
-#-- Fakeroot: for building packages as a non-root user
+# Enable fakeroot for building packages as a non-root user
 export USE_FAKEROOT="y"
-#-- DistCC: a distributed C/C++/ObjC compiler (modify MAKEFLAGS too)
+
+# Specify a directory for the chroot environment.
+export CHROOTDIR="/var/chroot"
+# Core package list to be installed in the chroot.
+export COREPKGS="core chroot-core devel-core"
+
+# Enable distributed C/C++/ObjC compiler
+# Don't forget to modify MAKEFLAGS to include -jN, where N is twice the
+# number of CPUs +1 available
 export DISTCC="n"
-#-- A space-delimited list of hosts running in the DistCC cluster
+# Space-separated list of volunteer host specifications.
 export DISTCC_HOSTS=""
-#-- Colorized output messages
+
+# Enable colorized output messages
 export USE_COLOR="y"
 
-#########################################################################
-# GLOBAL PACKAGE OPTIONS
-#########################################################################
-#
-#-- Don't strip symbols from binaries/libraries
+# Specify a fixed directory where all packages will be placed
+#export PKGDEST=/home/packages
+
+# If you want your name to show up in the packages you build, change this.
+export PACKAGER="Archlinux (http://archlinux.org)"
+
+# Don't strip symbols from binaries/libraries
 #export NOSTRIP="1"
-#-- Keep doc and info directories
-#export KEEPDOCS="1"
+# Don't prepare documentation
+#export NODOCS="1"
 
-#########################################################################
-# PACKAGE OUTPUT
-#########################################################################
-#
-#-- Destination: specify a fixed directory where all packages will be placed
-#export PKGDEST=/home/packages
-#-- Packager: name/email of the person or organization building packages
-#export PACKAGER="John Doe <john@doe.com>"
+# LOGDIR is the location where you would like to store a
+# permanant copy of the build log.
+# filename = [LOGDIR_APPEND]-[pkgname]-[pkgver]-[pkgrel]
+LOGDIR_APPEND=`date +%Y-%m-%d-%s`
+LOGDIR=/var/log/builds
 
+# The Standard Build Unit of this machine
+# If 1, then the build time will be displayed in seconds
+# Build the "binutils" package, and then write here the result you got,
+# so that makepkg will could the right SBU value for you.
+SBU="1"
diff --git a/etc/pacman.conf b/etc/pacman.conf
index 345eb8c1..72b1eec0 100644
--- a/etc/pacman.conf
+++ b/etc/pacman.conf
@@ -44,8 +44,14 @@ Include = /etc/pacman.d/current
 # Add your preferred servers here, they will be used first
 Include = /etc/pacman.d/extra
 
+#[unstable]
+# Add your preferred servers here, they will be used first
 #Include = /etc/pacman.d/unstable
 
+[community]
+# Add your preferred servers here, they will be used first
+Include = /etc/pacman.d/community
+
 # An example of a custom package repository.  See the pacman manpage for
 # tips on creating your own repositories.
 #[custom]
-- 
cgit v1.2.3-24-g4f1b