* Numerous mini valgrind fixes.

* Addition of hacky architecture check in the _splitname function
* Removal of libfetch from the archlinux proper - it has been renamed to
  libdownload and can be found at http://phraktured.net/libdownload
* Merge of _some_ of the Frugalware makepkg change - this may still be
  incomplete
* Removal of libftp from cvs proper
* PKGBUILD manpage now says 'PKGBUILD' instead of FrugalBuild (he he)

1 files changed, 61 insertions, 54 deletions

diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in
index 9b0dc96b..7a75cdf3 100644
--- a/etc/makepkg.conf.in
+++ b/etc/makepkg.conf.in
@@ -1,64 +1,71 @@
-#
+# vim: set ft=sh ts=2 sw=2 et:
 # /etc/makepkg.conf
 #
 
-# 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"
-
-export CARCH="@CARCH@"
-export CHOST="@CHOST@"
-
-# 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="-@MARCHFLAG@=@CARCHFLAGS@ -O2 -pipe"
-export CXXFLAGS="-@MARCHFLAG@=@CARCHFLAGS@ -O2 -pipe"
-# 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"
-
-# SMP Systems
-#export MAKEFLAGS="-j2"
-
-# Enable fakeroot for building packages as a non-root user
-export USE_FAKEROOT="y"
-
-# 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"
+#########################################################################
+# 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"
 
-# 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"
-# Space-separated list of volunteer host specifications.
-export DISTCC_HOSTS=""
+#########################################################################
+# ARCHITECTURE, COMPILE FLAGS
+#########################################################################
+#
+CARCH="@CARCH@"
+CHOST="@CHOST@"
 
-# Enable colorized output messages
-export USE_COLOR="y"
+#-- Exclusive: will only run on i686 or higher (P6, Athlon)
+CFLAGS="-@MARCHFLAG@=@CARCHFLAGS@ -O2 -pipe"
+CXXFLAGS="-@MARCHFLAG@=@CARCHFLAGS@ -O2 -pipe"
+#-- Optimized: will run on any x86, but optimized for i686
+#CFLAGS="-mcpu=i686 -O2 -pipe"
+#CXXFLAGS="-mcpu=i686 -O2 -pipe"
+#-- Make Flags: change this for DistCC/SMP systems
+#MAKEFLAGS="-j2"
 
-# Specify a fixed directory where all packages will be placed
-#export PKGDEST=/home/packages
+#########################################################################
+# BUILD ENVIRONMENT
+#########################################################################
+#
+#-- Fakeroot: for building packages as a non-root user
+USE_FAKEROOT="y"
+#-- DistCC: a distributed C/C++/ObjC compiler (modify MAKEFLAGS too)
+DISTCC="n"
+#-- A space-delimited list of hosts running in the DistCC cluster
+DISTCC_HOSTS=""
+#-- Colorized output messages
+USE_COLOR="y"
 
-# If you want your name to show up in the packages you build, change this.
-export PACKAGER="Archlinux (http://archlinux.org)"
+#########################################################################
+# GLOBAL PACKAGE OPTIONS
+#########################################################################
+#
+#-- Don't strip symbols from binaries/libraries
+NOSTRIP=0
+#-- Keep doc and info directories
+KEEPDOCS=0
 
-# Don't strip symbols from binaries/libraries
-#export NOSTRIP="1"
-# Don't prepare documentation
-#export NODOCS="1"
+#########################################################################
+# PACKAGE OUTPUT
+#########################################################################
+#
+#-- Destination: specify a fixed directory where all packages will be placed
+#PKGDEST=/home/packages
+#-- Packager: name/email of the person or organization building packages
+#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
+#########################################################################
+# Functionality Configuration
+#   Most of this will probably not need to be changed by and end user
+#########################################################################
+#
+BUILDSCRIPT="PKGBUILD"
+PKGEXT="pkg.tar.gz"
+INTEGRITY_CHECK="sha1"
 
-# 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"
+source "/etc/abs/abs.conf"
+SRCROOT=$ABSROOT