Updated core/pacman to 3.4.3-1

core/pacman/PKGBUILD

@@ -1,16 +1,15 @@
-# Maintainer: Mike Staszel <mikestaszel@plugboxlinux.org>
+# $Id: PKGBUILD 107252 2011-01-22 20:53:38Z dan $
 # Maintainer: Dan McGee <dan@archlinux.org>
 
 pkgname=pacman
-pkgver=3.4.1
+pkgver=3.4.3
 pkgrel=1
-plugrel=1
 pkgdesc="A library-based package manager with dependency support"
-arch=('arm')
+arch=('i686' 'x86_64')
 url="http://www.archlinux.org/pacman/"
 license=('GPL')
 groups=('base')
-depends=('bash' 'libarchive>=2.7.1' 'libfetch>=2.25' 'pacman-mirrorlist' 'plugapps-scripts')
+depends=('bash' 'libarchive>=2.7.1' 'libfetch>=2.25' 'pacman-mirrorlist')
 optdepends=('fakeroot: for makepkg usage as normal user'
             'curl: for rankmirrors usage')
 backup=(etc/pacman.conf etc/makepkg.conf)
@@ -19,9 +18,9 @@ options=(!libtool)
 source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz
         pacman.conf
         makepkg.conf)
-md5sums=('4e4e8e4f636d9878fbed9cf840f162cf'
-         '1d7e70d6a90de78777d82261182bad4c'
-         '0b347c2e3d2732dcdd055dcd144015ee')
+md5sums=('3656a4a05346e28bafa5342879fa278a'
+         'dacb1aedacf56fb11e0dea22f7a1d519'
+         'a267116d3b4fd28daf98416f45739a27')
 
 # keep an upgrade path for older installations
 PKGEXT='.pkg.tar.gz'
@@ -29,17 +28,27 @@ PKGEXT='.pkg.tar.gz'
 build() {
   cd $srcdir/$pkgname-$pkgver
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --enable-doc
-  make || return 1
+  make
 }
 
 package() {
   cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir install || return 1
+  make DESTDIR=$pkgdir install
 
   # install Arch specific stuff
   mkdir -p $pkgdir/etc
   install -m644 $srcdir/pacman.conf $pkgdir/etc/pacman.conf
+
+  mycarch="arm"
+  mychost="arm-unknown-linux-gnueabi"
+  myflags="-march=armv5te"
+
   install -m644 $srcdir/makepkg.conf $pkgdir/etc/
+  # set things correctly in the default conf file
+  sed -i $pkgdir/etc/makepkg.conf \
+    -e "s|@CARCH[@]|$mycarch|g" \
+    -e "s|@CHOST[@]|$mychost|g" \
+    -e "s|@CARCHFLAGS[@]|$myflags|g"
 
   # install completion files
   mkdir -p $pkgdir/etc/bash_completion.d/
@@ -47,3 +56,5 @@ package() {
   mkdir -p $pkgdir/usr/share/zsh/site-functions/
   install -m644 contrib/zsh_completion $pkgdir/usr/share/zsh/site-functions/_pacman
 }
+
+# vim: set ts=2 sw=2 et:

core/pacman/makepkg.conf

@@ -23,17 +23,17 @@ DLAGENTS=('ftp::/usr/bin/wget -c --passive-ftp -t 3 --waitretry=3 -O %o %u'
 # ARCHITECTURE, COMPILE FLAGS
 #########################################################################
 #
-CARCH="arm"
-CHOST="arm-none-linux-gnueabi"
+CARCH="@CARCH@"
+CHOST="@CHOST@"
 
-#-- Exclusive: will only run on arm
+#-- Exclusive: will only run on @CARCH@
 # -march (or -mcpu) builds exclusively for an architecture
 # -mtune optimizes for an architecture, but builds for whole processor family
-CFLAGS="-march=armv5te -O2 -pipe"
-CXXFLAGS="-march=armv5te -O2 -pipe"
-LDFLAGS="-Wl,--hash-style=gnu -Wl,--as-needed"
+CFLAGS="@CARCHFLAGS@ -O2 -pipe"
+CXXFLAGS="@CARCHFLAGS@ -O2 -pipe"
+LDFLAGS=""
 #-- Make Flags: change this for DistCC/SMP systems
-MAKEFLAGS="-j2"
+#MAKEFLAGS="-j2"
 
 #########################################################################
 # BUILD ENVIRONMENT
@@ -83,7 +83,7 @@ MAN_DIRS=({usr{,/local}{,/share},opt/*}/{man,info})
 #-- Doc directories to remove (if !docs is specified)
 DOC_DIRS=(usr/{,local/}{,share/}{doc,gtk-doc} opt/*/{doc,gtk-doc})
 #-- Directories to be searched for the strip option (if strip is specified)
-STRIP_DIRS=(bin lib sbin usr/{bin,lib,sbin,local/{bin,lib,sbin}} opt/*/{bin,lib,sbin})
+STRIP_DIRS=(bin lib sbin usr/{bin,lib,lib32,sbin,local/{bin,lib,sbin}} opt/*/{bin,lib,sbin})
 #-- Files to be removed from all packages (if purge is specified)
 PURGE_TARGETS=(usr/{,share}/info/dir .packlist *.pod)
 
@@ -97,6 +97,8 @@ PURGE_TARGETS=(usr/{,share}/info/dir .packlist *.pod)
 #PKGDEST=/home/packages
 #-- Source cache: specify a fixed directory where source files will be cached
 #SRCDEST=/home/sources
+#-- Source packages: specify a fixed directory where all src packages will be placed
+#SRCPKGDEST=/home/srcpackages
 #-- Packager: name/email of the person or organization building packages
 #PACKAGER="John Doe <john@doe.com>"
 
@@ -104,5 +106,10 @@ PURGE_TARGETS=(usr/{,share}/info/dir .packlist *.pod)
 # EXTENSION DEFAULTS
 #########################################################################
 #
+# WARNING: Do NOT modify these variables unless you know what you are
+#          doing.
+#
 PKGEXT='.pkg.tar.xz'
 SRCEXT='.src.tar.gz'
+
+# vim: set ft=sh ts=2 sw=2 et:

core/pacman/pacman.conf

@@ -17,7 +17,7 @@ HoldPkg     = pacman glibc
 # If upgrades are available for these packages they will be asked for first
 SyncFirst   = pacman
 #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
-#XferCommand = /usr/bin/curl %u > %o
+#XferCommand = /usr/bin/curl -C - %u > %o
 #CleanMethod = KeepInstalled
 Architecture = arm
 
@@ -36,13 +36,37 @@ Architecture = arm
 
 #
 # REPOSITORIES
+#   - can be defined here or included from another file
+#   - pacman will search repositories in the order defined here
+#   - local/custom mirrors can be added here or in separate files
+#   - repositories listed first will take precedence when packages
+#     have identical names, regardless of version number
+#   - URLs will have $repo replaced by the name of the current repo
+#   - URLs will have $arch replaced by the name of the architecture
+#
+# Repository entries are of the format:
+#       [repo-name]
+#       Server = ServerName
+#       Include = IncludePath
+#
+# The header [repo-name] is crucial - it must be present and
+# uncommented to enable the repo.
 #
 
 [core]
-Include=/etc/pacman.d/mirrorlist
+Include = /etc/pacman.d/mirrorlist
 
 [extra]
-Include=/etc/pacman.d/mirrorlist
+Include = /etc/pacman.d/mirrorlist
 
 [community]
-Include=/etc/pacman.d/mirrorlist
+Include = /etc/pacman.d/mirrorlist
+
+[aur]
+Include = /etc/pacman.d/mirrorlist
+
+# An example of a custom package repository.  See the pacman manpage for
+# tips on creating your own repositories.
+#[custom]
+#Server = file:///home/custompkgs
+