summaryrefslogtreecommitdiffstats
path: root/abs/extra
diff options
context:
space:
mode:
Diffstat (limited to 'abs/extra')
-rw-r--r--abs/extra/crystalhd-firmware/PKGBUILD24
-rw-r--r--abs/extra/crystalhd-git/PKGBUILD44
-rw-r--r--abs/extra/crystalhd-git/crystalhd-git.install6
-rw-r--r--abs/extra/dcraw/PKGBUILD41
-rw-r--r--abs/extra/dcraw/dcraw.install17
-rw-r--r--abs/extra/dcraw/license.txt16
-rw-r--r--abs/extra/libcrystalhd-git/PKGBUILD35
-rw-r--r--abs/extra/perl-class-inspector/PKGBUILD29
-rw-r--r--abs/extra/perl-dbd-mysql/PKGBUILD30
-rw-r--r--abs/extra/perl-net-smtp-ssl/PKGBUILD28
-rw-r--r--abs/extra/perl-sys-mmap/PKGBUILD27
-rw-r--r--abs/extra/perl-time-hires/PKGBUILD26
-rw-r--r--abs/extra/postgresql-libs/PKGBUILD172
-rw-r--r--abs/extra/postgresql-libs/build.patch11
-rwxr-xr-xabs/extra/postgresql-libs/postgresql59
-rw-r--r--abs/extra/postgresql-libs/postgresql.confd5
-rw-r--r--abs/extra/postgresql-libs/postgresql.logrotate4
-rw-r--r--abs/extra/postgresql-libs/postgresql.pam3
-rw-r--r--abs/extra/postgresql/PKGBUILD165
-rwxr-xr-xabs/extra/postgresql/postgresql4
-rw-r--r--abs/extra/postgresql/postgresql.confd3
-rw-r--r--abs/extra/postgresql/postgresql.logrotate4
-rw-r--r--abs/extra/python-imaging/PKGBUILD40
-rw-r--r--abs/extra/python-oauth/PKGBUILD22
-rw-r--r--abs/extra/python-pycurl/PKGBUILD23
-rw-r--r--abs/extra/python2-distribute/PKGBUILD24
-rw-r--r--abs/extra/python2-distribute/distribute-0.6.14_python2_and_3.patch51
27 files changed, 809 insertions, 104 deletions
diff --git a/abs/extra/crystalhd-firmware/PKGBUILD b/abs/extra/crystalhd-firmware/PKGBUILD
new file mode 100644
index 0000000..6fcff54
--- /dev/null
+++ b/abs/extra/crystalhd-firmware/PKGBUILD
@@ -0,0 +1,24 @@
+# Contributor: Lex Rivera <x-demon@x-demon.org>
+pkgname=crystalhd-firmware
+pkgver=20100703
+_intver=07032010
+pkgrel=1
+pkgdesc="Broadcom Crystal HD firmware"
+arch=('i686' 'x86_64')
+url="http://git.wilsonet.com/crystalhd.git/"
+license=('GPL2')
+source=("http://www.broadcom.com/docs/support/crystalhd/crystalhd_linux_${pkgver}.zip")
+
+md5sums=('f14c0e418b36ea14f8d25f9a7d6f7507')
+
+build() {
+ tar zxf crystalhd_${_intver}.tbz2
+ cd $srcdir/${_intver}/linux_lib/libcrystalhd/
+ msg "Building..."
+ #./configure
+ make
+ make DESTDIR=${pkgdir} install
+ rm -rf ${pkgdir}/usr
+
+}
+# vim:syntax=sh
diff --git a/abs/extra/crystalhd-git/PKGBUILD b/abs/extra/crystalhd-git/PKGBUILD
new file mode 100644
index 0000000..538c0ae
--- /dev/null
+++ b/abs/extra/crystalhd-git/PKGBUILD
@@ -0,0 +1,44 @@
+# Contributor: Petteri Tolonen <petteri.tolonen[at]gmail.com>
+# Maintainer: Petteri Tolonen <petteri.tolonen[at]gmail.com>
+
+pkgname=crystalhd-git
+pkgver=`date +%Y%m%d`
+pkgrel=1
+pkgdesc="Broadcom Crystal HD kernel module from git.wilsonet.com"
+arch=('i686' 'x86_64')
+url="http://git.wilsonet.com/crystalhd.git/"
+license=('GPL2')
+depends=()
+makedepends=('autoconf' 'kernel26-headers>=2.6.32.9' 'make' 'git')
+conflicts=('crystalhd')
+install='crystalhd-git.install'
+_gitroot='git://git.wilsonet.com/crystalhd.git'
+_gitname='crystalhd'
+
+build() {
+
+ cd $startdir/src
+
+ msg "Connecting to git.wilsonet.com GIT server...."
+
+ if [ -d $startdir/src/$_gitname ] ; then
+ cd $_gitname && git pull origin
+ msg "The local files are updated."
+ else
+ git clone $_gitroot
+ cd $_gitname
+ fi
+
+ cd driver/linux
+
+ autoconf
+ ./configure --prefix=/usr
+ make KDIR=/lib/modules/2.6.34-LinHES/build || return 1
+ mkdir -p $pkgdir/etc/udev/rules.d
+ mkdir -p $pkgdir/lib/modules/$(uname -r)/kernel/drivers/video/broadcom
+
+ cp -f 20-crystalhd.rules $pkgdir/etc/udev/rules.d/
+ install -d $pkgdir/lib/modules/$(uname -r)/kernel/drivers/video/broadcom
+ install -m 0644 crystalhd.ko $pkgdir/lib/modules/$(uname -r)/kernel/drivers/video/broadcom
+
+}
diff --git a/abs/extra/crystalhd-git/crystalhd-git.install b/abs/extra/crystalhd-git/crystalhd-git.install
new file mode 100644
index 0000000..077905e
--- /dev/null
+++ b/abs/extra/crystalhd-git/crystalhd-git.install
@@ -0,0 +1,6 @@
+post_install () {
+ depmod -a
+}
+post_upgrade() {
+ post_install
+}
diff --git a/abs/extra/dcraw/PKGBUILD b/abs/extra/dcraw/PKGBUILD
new file mode 100644
index 0000000..8468c92
--- /dev/null
+++ b/abs/extra/dcraw/PKGBUILD
@@ -0,0 +1,41 @@
+# $Id: PKGBUILD 84664 2010-07-03 05:41:46Z allan $
+# Maintainer: tobias <tobias@archlinux.org>
+# Contributor: Tobias Kieslich <tobias@justdreams.de>
+
+# Note for rebuilders:
+# dcraw.c is released as pure C file, not as a package with a changing version
+# number in the name. The name of the file to be downloaded is always the same!
+# So if you are a bad boy (Santa knows everything!) and build as root, this file
+# will be saved in /var/cache/pacman/src . Therefore, rebuilding a later version
+# likely will fail due to an MD5 error. If so, delete the files from the cache
+# to force a new download.
+
+pkgname=dcraw
+pkgver=1.438
+pkgrel=1
+pkgdesc="A command line based converter for digicams raw output"
+arch=('i686' 'x86_64')
+url="http://www.cybercom.net/~dcoffin/dcraw/"
+license=('custom')
+depends=('lcms')
+source=(http://www.cybercom.net/~dcoffin/${pkgname}/${pkgname}.c
+ http://www.cybercom.net/~dcoffin/${pkgname}/${pkgname}.1
+ license.txt)
+
+build() {
+ cd "${srcdir}"
+ gcc -o dcraw ${CFLAGS} dcraw.c -lm -ljpeg -llcms
+}
+
+package() {
+ cd "${srcdir}"
+ install -Dm755 ${pkgname} "${pkgdir}"/usr/bin/${pkgname}
+
+ # install a manpage, provided separately on authors homepage
+ install -Dm644 ${pkgname}.1 "${pkgdir}"/usr/share/man/man1/${pkgname}.1
+
+ install -Dm644 license.txt "${pkgdir}"/usr/share/licenses/${pkgname}/license.txt
+}
+md5sums=('108f0c14a5be4d092c7ffa8460044fb3'
+ '6ba2a797c4ad698589f83171d6b36396'
+ '110b4604a6dacd5537339c4082e9e12a')
diff --git a/abs/extra/dcraw/dcraw.install b/abs/extra/dcraw/dcraw.install
new file mode 100644
index 0000000..0b3d1bf
--- /dev/null
+++ b/abs/extra/dcraw/dcraw.install
@@ -0,0 +1,17 @@
+post_install() {
+ cat << EOF
+
+NOTE for drcaw:
+----
+ ==> dcraw provides the simple commandline tools for raw conversion. If you
+ ==> are looking for a more sophisticated way consider gimp-ufraw, which
+ ==> provides a gimp-plugin and a standalone application that can even convert
+ ==> to 16-bit tiff files (which you can use in cinepaint eg.) So please do a
+ ==> 'pacman -S gimp-ufraw' to get it.
+
+EOF
+}
+
+post_upgrade() {
+ post_install $1
+}
diff --git a/abs/extra/dcraw/license.txt b/abs/extra/dcraw/license.txt
new file mode 100644
index 0000000..5803cf6
--- /dev/null
+++ b/abs/extra/dcraw/license.txt
@@ -0,0 +1,16 @@
+This is a command-line ANSI C program to convert raw photos from
+any digital camera on any computer running any operating system.
+
+No license is required to download and use dcraw.c. However,
+to lawfully redistribute this code, you must either (a) include
+full source code* for all executable files containing RESTRICTED
+functions, (b) remove all RESTRICTED functions, re-implement them,
+or copy them from an earlier, unrestricted Revision of dcraw.c,
+or (c) purchase a license from the author.
+
+The functions that process Foveon images have been RESTRICTED
+since Revision 1.237. All other code remains free for all uses.
+
+*If you have not modified dcraw.c in any way, a link to my
+homepage qualifies as "full source code".
+
diff --git a/abs/extra/libcrystalhd-git/PKGBUILD b/abs/extra/libcrystalhd-git/PKGBUILD
new file mode 100644
index 0000000..27d8fff
--- /dev/null
+++ b/abs/extra/libcrystalhd-git/PKGBUILD
@@ -0,0 +1,35 @@
+# Contributor: Petteri Tolonen <petteri.tolonen@gmail.com>
+pkgname=libcrystalhd-git
+pkgver=`date +%Y%m%d`
+pkgrel=1
+pkgdesc="Broadcom Crystal HD library from git.wilsonet.com"
+arch=('i686' 'x86_64')
+url="http://git.wilsonet.com/crystalhd.git/"
+license=('GPL2')
+depends=('gcc-libs')
+makedepends=('git' 'make')
+conflicts=('libcrystalhd')
+
+_gitroot='git://git.wilsonet.com/crystalhd.git'
+_gitname='crystalhd'
+
+build() {
+
+ cd $startdir/src
+
+ msg "Connecting to git.wilsonet.com GIT server...."
+
+ if [ -d $startdir/src/$_gitname ] ; then
+ cd $_gitname && git pull origin
+ msg "The local files are updated."
+ else
+ git clone $_gitroot
+ cd $_gitname
+ fi
+
+ cd linux_lib/libcrystalhd
+
+ make || return 1
+ make install DESTDIR=$pkgdir || return 1
+
+}
diff --git a/abs/extra/perl-class-inspector/PKGBUILD b/abs/extra/perl-class-inspector/PKGBUILD
new file mode 100644
index 0000000..fd138b8
--- /dev/null
+++ b/abs/extra/perl-class-inspector/PKGBUILD
@@ -0,0 +1,29 @@
+#$Id:$
+pkgname=perl-class-inspector
+_realname=Class-Inspector
+pkgver=1.24
+pkgrel=1
+pkgdesc="'Get information about a class and its structure'"
+arch=(i686 x86_64)
+license=('GPL' 'Artistic')
+url="http://search.cpan.org/~adamk/Class-Inspector"
+options=(!emptydirs)
+depends=('perl>=5.10.0')
+provides=('class-inspector=1.24' 'Class::Inspector=1.24' 'perl-class-inspector=1.24' 'Class::Inspector::Functions=1.24' 'perl-class-inspector-functions=1.24')
+source=(http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/Class-Inspector-1.24.tar.gz)
+md5sums=('609189b49f64d329a6e413e0a6d8724a')
+
+build() {
+ cd "${srcdir}/${_realname}-${pkgver}"
+ # install module in vendor directories.
+ PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+ make
+ make install DESTDIR=${pkgdir}
+
+ # remove perllocal.pod and .packlist
+ find ${pkgdir} -name perllocal.pod -delete
+ find ${pkgdir} -name .packlist -delete
+}
+
+# vim:set ts=2 sw=2 et:
+
diff --git a/abs/extra/perl-dbd-mysql/PKGBUILD b/abs/extra/perl-dbd-mysql/PKGBUILD
new file mode 100644
index 0000000..c53aac7
--- /dev/null
+++ b/abs/extra/perl-dbd-mysql/PKGBUILD
@@ -0,0 +1,30 @@
+# $Id: PKGBUILD 82506 2010-06-12 19:27:47Z kevin $
+# Maintainer: Kevin Piche <kevin@archlinux.org>
+# Contributor: Eric Johnson <eric@coding-zone.com>
+
+pkgname=perl-dbd-mysql
+_realname=DBD-mysql
+pkgver=4.018
+pkgrel=1
+pkgdesc="Perl/CPAN DBD::mysql module for interacting with MySQL via DBD"
+arch=(i686 x86_64)
+license=('GPL' 'PerlArtistic')
+url="http://search.cpan.org/dist/${_realname}/"
+depends=('libmysqlclient' 'perl-dbi' 'perl>=5.10.0')
+makedepends=('mysql')
+options=(!emptydirs)
+source=(http://search.cpan.org/CPAN/authors/id/C/CA/CAPTTOFU/${_realname}-${pkgver}.tar.gz)
+
+build() {
+ cd ${srcdir}/${_realname}-${pkgver}
+
+ # install module in vendor directories.
+ perl Makefile.PL INSTALLDIRS=vendor || return 1
+ make || return 1
+ make install DESTDIR=${pkgdir} || return 1
+
+ # remove perllocal.pod and .packlist
+ find ${pkgdir} -name perllocal.pod -delete
+ find ${pkgdir} -name .packlist -delete
+}
+md5sums=('d1d4ee2f20910d6491d1b6216471b2f1')
diff --git a/abs/extra/perl-net-smtp-ssl/PKGBUILD b/abs/extra/perl-net-smtp-ssl/PKGBUILD
new file mode 100644
index 0000000..e4b24bb
--- /dev/null
+++ b/abs/extra/perl-net-smtp-ssl/PKGBUILD
@@ -0,0 +1,28 @@
+# $Id: PKGBUILD 17474 2010-05-24 13:41:50Z cbrannon $
+# Maintainer: Chris Brannon <cmbrannon79@gmail.com>
+# Contributor: Abhishek Dasgupta <abhidg@gmail.com>
+
+pkgname=perl-net-smtp-ssl
+pkgver=1.01
+pkgrel=2
+pkgdesc="SSL support for Net::SMTP"
+arch=(any)
+url="http://search.cpan.org/dist/Net-SMTP-SSL/"
+license=('GPL' 'PerlArtistic')
+depends=('perl-io-socket-ssl')
+source=("http://www.cpan.org/authors/id/C/CW/CWEST/Net-SMTP-SSL-${pkgver}.tar.gz")
+options=(!emptydirs)
+
+build() {
+ cd "${srcdir}/Net-SMTP-SSL-${pkgver}"
+ # Install module into the vendor directories.
+ perl Makefile.PL INSTALLDIRS=vendor || return 1
+ make || return 1
+ make DESTDIR="$pkgdir" install || return 1
+
+ # Remove .packlist and perllocal.pod files.
+ find "$pkgdir" -name '.packlist' -delete
+ find "$pkgdir" -name 'perllocal.pod' -delete
+}
+md5sums=('ba039288ebf7a343feecacd374da8c1a')
+
diff --git a/abs/extra/perl-sys-mmap/PKGBUILD b/abs/extra/perl-sys-mmap/PKGBUILD
new file mode 100644
index 0000000..a5e73f7
--- /dev/null
+++ b/abs/extra/perl-sys-mmap/PKGBUILD
@@ -0,0 +1,27 @@
+# This PKGBUILD was generated by cpan4pacman via CPANPLUS::Dist::Pacman
+# Contributor: Ross melin <rdmelin@gmail.com>
+
+# Required by zoneminder =>1.24.0
+
+pkgname=perl-sys-mmap
+pkgver=0.13
+pkgrel=1
+pkgdesc="uses mmap to map in a file as a Perl variable"
+arch=('i686' 'x86_64')
+url="http://search.cpan.org/~SWALTERS/Sys-Mmap"
+license=('GPL' 'PerlArtistic')
+depends=('perl')
+options=('!emptydirs')
+source=(http://www.cpan.org/authors/id/S/SW/SWALTERS/Sys-Mmap-$pkgver.tar.gz)
+md5sums=('e65a007157e3e26807db52299497109d')
+
+build() {
+ cd $startdir/src/Sys-Mmap-$pkgver
+ PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1
+ make || return 1
+ make install DESTDIR=$startdir/pkg || return 1
+ find $startdir/pkg -name '.packlist' -delete
+ find $startdir/pkg -name '*.pod' -delete
+}
+
+# vim:set ts=2 sw=2 et: \ No newline at end of file
diff --git a/abs/extra/perl-time-hires/PKGBUILD b/abs/extra/perl-time-hires/PKGBUILD
new file mode 100644
index 0000000..2e01636
--- /dev/null
+++ b/abs/extra/perl-time-hires/PKGBUILD
@@ -0,0 +1,26 @@
+# $Id: PKGBUILD 82203 2010-06-09 09:42:03Z jgc $
+# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
+# Contributor: mezcal <fila at pruda dot com>
+
+pkgname=perl-time-hires
+pkgver=1.9721
+pkgrel=2
+pkgdesc="Perl module: high resolution time, sleep, and alarm"
+arch=('i686' 'x86_64')
+license=('PerlArtistic')
+url="http://search.cpan.org/dist/Time-HiRes/"
+depends=('perl')
+options=(!emptydirs)
+source=(http://search.cpan.org/CPAN/authors/id/J/JH/JHI/Time-HiRes-${pkgver}.tar.gz)
+md5sums=('bf09911a36b9481537c8e0d28fbb3aaf')
+
+build() {
+ cd "${srcdir}/Time-HiRes-${pkgver}"
+
+ # install module in vendor directories.
+ perl Makefile.PL INSTALLDIRS=vendor || return 1
+ make || return 1
+ make test || return 1
+ make install DESTDIR="${pkgdir}" || return 1
+}
+
diff --git a/abs/extra/postgresql-libs/PKGBUILD b/abs/extra/postgresql-libs/PKGBUILD
index ac037c7..14ba9f8 100644
--- a/abs/extra/postgresql-libs/PKGBUILD
+++ b/abs/extra/postgresql-libs/PKGBUILD
@@ -1,58 +1,136 @@
-# $Id: PKGBUILD 27764 2009-02-25 16:30:54Z douglas $
-# Maintainer: Paul Mattal <paul@archlinux.org>
-
-pkgname=postgresql-libs
-pkgver=8.3.6
-pkgrel=1
-pkgdesc="Libraries for use with PostgreSQL"
-arch=(i686 x86_64)
+# $Id: PKGBUILD 98184 2010-11-04 14:55:39Z dan $
+# Maintainer: Douglas Soares de Andrade <douglas@archlinux.org>
+
+pkgbase=postgresql
+pkgname=('postgresql-libs' 'postgresql-docs' 'postgresql')
+pkgver=9.0.1
+pkgrel=2.1
+arch=('i686' 'x86_64')
+url="http://www.postgresql.org"
license=('BSD')
-url="http://www.postgresql.org/"
-depends=('openssl>=0.9.8b' 'zlib' 'readline')
-options=('!makeflags')
-source=(ftp://ftp.postgresql.org/pub/source/v${pkgver}/postgresql-${pkgver}.tar.bz2)
+makedepends=('libxml2' 'python2' 'perl')
+source=(ftp://ftp.postgresql.org/pub/source/v${pkgver}/postgresql-${pkgver}.tar.bz2 \
+ postgresql postgresql.confd build.patch postgresql.pam postgresql.logrotate)
build() {
- cd $startdir/src/postgresql-$pkgver || return 1
+ cd "${srcdir}/${pkgbase}-${pkgver}"
+
+ # patch to remove regress/test make target (won't build with it present)
+ patch -Np1 -i ../build.patch
# configure
- ./configure --prefix=/usr --with-openssl --datadir=/usr/share/postgresql \
- --with-pam \
- || return 1
+ ./configure --prefix=/usr --mandir=/usr/share/man --with-libxml \
+ --with-openssl --with-perl \
+ --with-python PYTHON=/usr/bin/python2 --with-pam \
+ --with-system-tzdata=/usr/share/zoneinfo --enable-nls \
+ --datadir=/usr/share/postgresql --enable-thread-safety
+
+ sed -i -e '/interfaces/d' src/Makefile
+
+ # build
+ make world
+
+ # build libs
+ for dir in src/interfaces src/bin/pg_config; do
+ pushd ${dir}
+ make
+ popd
+ done
+}
+
+package_postgresql-libs() {
+ pkgdesc="Libraries for use with PostgreSQL"
+ depends=('openssl>=1.0.0')
+
+ cd "${srcdir}/${pkgbase}-${pkgver}"
+
+ # install license
+ install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
- # make and install
+ # install libs
for dir in src/interfaces src/bin/pg_config; do
- pushd ${dir} || return 1
- make || return 1
- make DESTDIR=${startdir}/pkg install || return 1
+ pushd ${dir}
+ make DESTDIR="${pkgdir}" install
popd
done
- cd src/include || return 1
- make || return 1
-
- set -e
- mkdir -p $startdir/pkg/usr/include/postgresql/{internal,internal/libpq} \
- || return 1
- mkdir -p $startdir/pkg/usr/include/libpq || return 1
-
- # These headers are needed by the public headers of the interfaces.
- install -m644 pg_config.h $startdir/pkg/usr/include/ || return 1
- install -m644 pg_config_os.h $startdir/pkg/usr/include/ || return 1
- install -m644 postgres_ext.h $startdir/pkg/usr/include/ || return 1
- install -m644 libpq/libpq-fs.h $startdir/pkg/usr/include/libpq/ || return 1
- install -m644 pg_config_manual.h $startdir/pkg/usr/include/ || return 1
-
- # These headers are needed by the not-so-public headers of the interfaces.
- install -m644 c.h $startdir/pkg/usr/include/postgresql/internal/ || return 1
- install -m644 port.h $startdir/pkg/usr/include/postgresql/internal/ \
- || return 1
- install -m644 postgres_fe.h $startdir/pkg/usr/include/postgresql/internal/ \
- || return 1
- install -m644 libpq/pqcomm.h $startdir/pkg/usr/include/postgresql/internal/libpq/ || return 1
-
- install -D -m644 ../../COPYRIGHT $startdir/pkg/usr/share/licenses/$pkgname/LICENSE || return 1
-
- set +e
+ install -D -m644 doc/src/sgml/man1/pg_config.1 "${pkgdir}/usr/share/man/man1/pg_config.1"
+
+ cd src/include
+
+ mkdir -p "${pkgdir}"/usr/include/{libpq,postgresql/internal/libpq}
+
+ # these headers are needed by the public headers of the interfaces
+ install -m644 pg_config.h "${pkgdir}/usr/include/"
+ install -m644 pg_config_os.h "${pkgdir}/usr/include/"
+ install -m644 postgres_ext.h "${pkgdir}/usr/include/"
+ install -m644 libpq/libpq-fs.h "${pkgdir}/usr/include/libpq/"
+ install -m644 pg_config_manual.h "${pkgdir}/usr/include/"
+
+ # these headers are needed by the not-so-public headers of the interfaces
+ install -m644 c.h "${pkgdir}/usr/include/postgresql/internal/"
+ install -m644 port.h "${pkgdir}/usr/include/postgresql/internal/"
+ install -m644 postgres_fe.h "${pkgdir}/usr/include/postgresql/internal/"
+ install -m644 libpq/pqcomm.h "${pkgdir}/usr/include/postgresql/internal/libpq/"
}
-md5sums=('4f8c67d802bd03b5b844e268bba7d44a')
+
+package_postgresql-docs() {
+ pkgdesc="HTML documentation for PostgreSQL"
+ options=(docs)
+
+ cd "${srcdir}/${pkgbase}-${pkgver}"
+
+ # install license
+ install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+
+ make -C doc/src/sgml DESTDIR="${pkgdir}" install-html
+ chown -R root:root "${pkgdir}/usr/share/doc/postgresql/html/"
+}
+
+package_postgresql() {
+ pkgdesc="A sophisticated object-relational DBMS"
+ backup=('etc/conf.d/postgresql' 'etc/pam.d/postgresql' 'etc/logrotate.d/postgresql')
+ depends=("postgresql-libs>=${pkgver}" 'libxml2' 'readline>=6.0')
+ optdepends=('python2: for PL/Python support'
+ 'perl: for PL/Perl support')
+ provides=('postgresql-client')
+ conflicts=('postgresql-client')
+
+ cd "${srcdir}/${pkgbase}-${pkgver}"
+
+ # install
+ make DESTDIR="${pkgdir}" install
+ make -C contrib DESTDIR="${pkgdir}" install
+ make -C doc/src/sgml DESTDIR="${pkgdir}" install-man
+ # we don't want this, it is in the -libs package
+ make -C src/bin/pg_config DESTDIR="${pkgdir}" uninstall
+ rm "${pkgdir}/usr/share/man/man1/pg_config.1"
+
+ # install license
+ install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgbase}/LICENSE"
+
+ # clean up unneeded installed items
+ rm -rf "${pkgdir}/usr/include/postgresql/internal"
+ rm -rf "${pkgdir}/usr/include/libpq"
+ find "${pkgdir}/usr/include" -maxdepth 1 -type f -execdir rm {} +
+
+ # install launch script
+ install -D -m755 "${srcdir}/postgresql" "${pkgdir}/etc/rc.d/postgresql"
+
+ # install conf file
+ install -D -m644 ${srcdir}/postgresql.confd \
+ "${pkgdir}/etc/conf.d/postgresql"
+
+ install -D -m644 ${srcdir}/postgresql.pam \
+ "${pkgdir}/etc/pam.d/postgresql"
+
+ install -D -m644 ${srcdir}/postgresql.logrotate \
+ "${pkgdir}/etc/logrotate.d/postgresql"
+}
+
+md5sums=('57ba57e43cfe29e16dacbf5789be98d1'
+ '4153ac0ef4a77e709385b0a13e1c0fad'
+ 'd63a05943cf0a2726aa2070f3033c569'
+ '4d74f4227dc5e12bf95b3490758d86c9'
+ '96f82c38f3f540b53f3e5144900acf17'
+ 'd28e443f9f65a5712c52018b84e27137')
diff --git a/abs/extra/postgresql-libs/build.patch b/abs/extra/postgresql-libs/build.patch
new file mode 100644
index 0000000..c8f665d
--- /dev/null
+++ b/abs/extra/postgresql-libs/build.patch
@@ -0,0 +1,11 @@
+diff -Naur postgresql-8.2.3-orig/src/Makefile postgresql-8.2.3/src/Makefile
+--- postgresql-8.2.3-orig/src/Makefile 2006-06-22 16:50:35.000000000 -0700
++++ postgresql-8.2.3/src/Makefile 2007-03-05 10:46:24.000000000 -0800
+@@ -23,7 +23,6 @@
+ $(MAKE) -C bin $@
+ $(MAKE) -C pl $@
+ $(MAKE) -C makefiles $@
+- $(MAKE) -C test/regress $@
+
+ install: install-local
+
diff --git a/abs/extra/postgresql-libs/postgresql b/abs/extra/postgresql-libs/postgresql
new file mode 100755
index 0000000..b00289e
--- /dev/null
+++ b/abs/extra/postgresql-libs/postgresql
@@ -0,0 +1,59 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+. /etc/conf.d/postgresql
+
+case "$1" in
+ start)
+ stat_busy "Starting PostgreSQL"
+ # initialization
+ if [ ! `egrep '^postgres:' /etc/group` ]; then
+ stat_busy "Adding postgres group"
+ groupadd -g 88 postgres
+ stat_done
+ fi
+ if [ ! `egrep '^postgres:' /etc/passwd` ]; then
+ stat_busy "Adding postgres user"
+ useradd -u 88 -g postgres -d $PGROOT -s /bin/bash postgres
+ [ -d $PGROOT ] && chown -R postgres.postgres $PGROOT
+ stat_done
+ fi
+ if [ ! -d $PGROOT ]; then
+ mkdir -p $PGROOT/data && chown -R postgres.postgres $PGROOT
+ su - postgres -c "/usr/bin/initdb $INITOPTS -D $PGROOT/data"
+ fi
+ if [ ! -e /var/log/postgresql.log ]; then
+ touch /var/log/postgresql.log
+ chown postgres /var/log/postgresql.log
+ fi
+ # start the process
+ su - postgres -c \
+ "/usr/bin/pg_ctl -D $PGROOT/data -l /var/log/postgresql.log -W start"
+ if [ $? -gt 0 ]; then
+ stat_fail
+ else
+ add_daemon postgresql
+ stat_done
+ fi
+ ;;
+ stop)
+ stat_busy "Stopping PostgreSQL"
+ su - postgres -c \
+ "/usr/bin/pg_ctl -D $PGROOT/data -l /var/log/postgresql.log -w stop"
+ if [ $? -gt 0 ]; then
+ stat_fail
+ else
+ rm_daemon postgresql
+ stat_done
+ fi
+ ;;
+ restart)
+ $0 stop
+ sleep 3
+ $0 start
+ ;;
+ *)
+ echo "usage: $0 {start|stop|restart}"
+esac
+exit 0
diff --git a/abs/extra/postgresql-libs/postgresql.confd b/abs/extra/postgresql-libs/postgresql.confd
new file mode 100644
index 0000000..5f8fa03
--- /dev/null
+++ b/abs/extra/postgresql-libs/postgresql.confd
@@ -0,0 +1,5 @@
+#
+# Parameters to be passed to postgresql
+#
+PGROOT="/var/lib/postgres"
+INITOPTS="--locale $LANG"
diff --git a/abs/extra/postgresql-libs/postgresql.logrotate b/abs/extra/postgresql-libs/postgresql.logrotate
new file mode 100644
index 0000000..9c36918
--- /dev/null
+++ b/abs/extra/postgresql-libs/postgresql.logrotate
@@ -0,0 +1,4 @@
+/var/log/postgresql.log {
+ copytruncate
+ missingok
+}
diff --git a/abs/extra/postgresql-libs/postgresql.pam b/abs/extra/postgresql-libs/postgresql.pam
new file mode 100644
index 0000000..53724d1
--- /dev/null
+++ b/abs/extra/postgresql-libs/postgresql.pam
@@ -0,0 +1,3 @@
+auth required pam_unix.so
+account required pam_unix.so
+session required pam_unix.so
diff --git a/abs/extra/postgresql/PKGBUILD b/abs/extra/postgresql/PKGBUILD
index 1fda9a4..14ba9f8 100644
--- a/abs/extra/postgresql/PKGBUILD
+++ b/abs/extra/postgresql/PKGBUILD
@@ -1,79 +1,136 @@
-# $Id: PKGBUILD 27762 2009-02-25 16:29:49Z douglas $
-# Maintainer: Paul Mattal <paul@archlinux.org>
-
-pkgname=postgresql
-pkgver=8.3.6
-pkgrel=1
-pkgdesc="A sophisticated object-relational DBMS"
-arch=(i686 x86_64)
+# $Id: PKGBUILD 98184 2010-11-04 14:55:39Z dan $
+# Maintainer: Douglas Soares de Andrade <douglas@archlinux.org>
+
+pkgbase=postgresql
+pkgname=('postgresql-libs' 'postgresql-docs' 'postgresql')
+pkgver=9.0.1
+pkgrel=2.1
+arch=('i686' 'x86_64')
+url="http://www.postgresql.org"
license=('BSD')
-backup=('etc/conf.d/postgresql' '/etc/pam.d/postgresql')
-url="http://www.postgresql.org/"
-depends=("postgresql-libs>=$pkgver" "libxml2")
-options=('!makeflags')
+makedepends=('libxml2' 'python2' 'perl')
source=(ftp://ftp.postgresql.org/pub/source/v${pkgver}/postgresql-${pkgver}.tar.bz2 \
- postgresql postgresql.confd build.patch postgresql.pam)
+ postgresql postgresql.confd build.patch postgresql.pam postgresql.logrotate)
build() {
- cd ${startdir}/src/$pkgname-$pkgver || return 1
+ cd "${srcdir}/${pkgbase}-${pkgver}"
# patch to remove regress/test make target (won't build with it present)
- patch -Np1 -i ../build.patch || return 1
+ patch -Np1 -i ../build.patch
# configure
- ./configure --prefix=/usr --mandir=/usr/share/man \
- --with-docdir=/usr/share/doc --with-openssl \
- --datadir=/usr/share/postgresql --with-pam --with-libxml || return 1
+ ./configure --prefix=/usr --mandir=/usr/share/man --with-libxml \
+ --with-openssl --with-perl \
+ --with-python PYTHON=/usr/bin/python2 --with-pam \
+ --with-system-tzdata=/usr/share/zoneinfo --enable-nls \
+ --datadir=/usr/share/postgresql --enable-thread-safety
- sed -i -e '/interfaces/d' src/Makefile || return 1
+ sed -i -e '/interfaces/d' src/Makefile
# build
- make || return 1
+ make world
+
+ # build libs
+ for dir in src/interfaces src/bin/pg_config; do
+ pushd ${dir}
+ make
+ popd
+ done
+}
- # install
- make DESTDIR=${startdir}/pkg install || return 1
+package_postgresql-libs() {
+ pkgdesc="Libraries for use with PostgreSQL"
+ depends=('openssl>=1.0.0')
- (
- cd contrib/adminpack;
- make || return 1;
- make DESTDIR=${startdir}/pkg install || return 1;
- );
+ cd "${srcdir}/${pkgbase}-${pkgver}"
+ # install license
+ install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
- # clean up unneeded installed items
- rm -rf $startdir/pkg/usr/include/postgresql/internal || return 1
- rm -rf $startdir/pkg/usr/include/libpq || return 1
- # the below line is expected to produce an error; fix this one day
- rm -f $startdir/pkg/usr/include/*
- rm -f $startdir/pkg/usr/bin/pg_config || return 1
-
- # Maintaining the lib below because of qt
- #rm -f $startdir/pkg/usr/lib/libpgport.a || return 1
+ # install libs
+ for dir in src/interfaces src/bin/pg_config; do
+ pushd ${dir}
+ make DESTDIR="${pkgdir}" install
+ popd
+ done
- # install launch script
- install -D -m755 ../postgresql $startdir/pkg/etc/rc.d/postgresql \
- || return 1
+ install -D -m644 doc/src/sgml/man1/pg_config.1 "${pkgdir}/usr/share/man/man1/pg_config.1"
+
+ cd src/include
+
+ mkdir -p "${pkgdir}"/usr/include/{libpq,postgresql/internal/libpq}
+
+ # these headers are needed by the public headers of the interfaces
+ install -m644 pg_config.h "${pkgdir}/usr/include/"
+ install -m644 pg_config_os.h "${pkgdir}/usr/include/"
+ install -m644 postgres_ext.h "${pkgdir}/usr/include/"
+ install -m644 libpq/libpq-fs.h "${pkgdir}/usr/include/libpq/"
+ install -m644 pg_config_manual.h "${pkgdir}/usr/include/"
+
+ # these headers are needed by the not-so-public headers of the interfaces
+ install -m644 c.h "${pkgdir}/usr/include/postgresql/internal/"
+ install -m644 port.h "${pkgdir}/usr/include/postgresql/internal/"
+ install -m644 postgres_fe.h "${pkgdir}/usr/include/postgresql/internal/"
+ install -m644 libpq/pqcomm.h "${pkgdir}/usr/include/postgresql/internal/libpq/"
+}
+
+package_postgresql-docs() {
+ pkgdesc="HTML documentation for PostgreSQL"
+ options=(docs)
+
+ cd "${srcdir}/${pkgbase}-${pkgver}"
# install license
- install -D -m644 COPYRIGHT $startdir/pkg/usr/share/licenses/$pkgname/LICENSE || return 1
+ install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+
+ make -C doc/src/sgml DESTDIR="${pkgdir}" install-html
+ chown -R root:root "${pkgdir}/usr/share/doc/postgresql/html/"
+}
+
+package_postgresql() {
+ pkgdesc="A sophisticated object-relational DBMS"
+ backup=('etc/conf.d/postgresql' 'etc/pam.d/postgresql' 'etc/logrotate.d/postgresql')
+ depends=("postgresql-libs>=${pkgver}" 'libxml2' 'readline>=6.0')
+ optdepends=('python2: for PL/Python support'
+ 'perl: for PL/Perl support')
+ provides=('postgresql-client')
+ conflicts=('postgresql-client')
+
+ cd "${srcdir}/${pkgbase}-${pkgver}"
+
+ # install
+ make DESTDIR="${pkgdir}" install
+ make -C contrib DESTDIR="${pkgdir}" install
+ make -C doc/src/sgml DESTDIR="${pkgdir}" install-man
+ # we don't want this, it is in the -libs package
+ make -C src/bin/pg_config DESTDIR="${pkgdir}" uninstall
+ rm "${pkgdir}/usr/share/man/man1/pg_config.1"
+
+ # install license
+ install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgbase}/LICENSE"
+
+ # clean up unneeded installed items
+ rm -rf "${pkgdir}/usr/include/postgresql/internal"
+ rm -rf "${pkgdir}/usr/include/libpq"
+ find "${pkgdir}/usr/include" -maxdepth 1 -type f -execdir rm {} +
+
+ # install launch script
+ install -D -m755 "${srcdir}/postgresql" "${pkgdir}/etc/rc.d/postgresql"
# install conf file
- install -D -m644 $startdir/src/postgresql.confd \
- $startdir/pkg/etc/conf.d/postgresql || return 1
+ install -D -m644 ${srcdir}/postgresql.confd \
+ "${pkgdir}/etc/conf.d/postgresql"
- install -D -m644 $startdir/src/postgresql.pam \
- $startdir/pkg/etc/pam.d/postgresql
+ install -D -m644 ${srcdir}/postgresql.pam \
+ "${pkgdir}/etc/pam.d/postgresql"
- chown root:root $startdir/pkg/usr/share/doc/postgresql/html/*
+ install -D -m644 ${srcdir}/postgresql.logrotate \
+ "${pkgdir}/etc/logrotate.d/postgresql"
}
-md5sums=('4f8c67d802bd03b5b844e268bba7d44a'
- '7d8ea2abb6a8cdacf35604bda659a34a'
- 'df6ddf9e2ab4700a3415f17c0f4f4172'
- '4d74f4227dc5e12bf95b3490758d86c9'
- '96f82c38f3f540b53f3e5144900acf17')
-md5sums=('4f8c67d802bd03b5b844e268bba7d44a'
- '7d8ea2abb6a8cdacf35604bda659a34a'
- 'df6ddf9e2ab4700a3415f17c0f4f4172'
+md5sums=('57ba57e43cfe29e16dacbf5789be98d1'
+ '4153ac0ef4a77e709385b0a13e1c0fad'
+ 'd63a05943cf0a2726aa2070f3033c569'
'4d74f4227dc5e12bf95b3490758d86c9'
- '96f82c38f3f540b53f3e5144900acf17')
+ '96f82c38f3f540b53f3e5144900acf17'
+ 'd28e443f9f65a5712c52018b84e27137')
diff --git a/abs/extra/postgresql/postgresql b/abs/extra/postgresql/postgresql
index c6aedfb..b00289e 100755
--- a/abs/extra/postgresql/postgresql
+++ b/abs/extra/postgresql/postgresql
@@ -20,8 +20,8 @@ case "$1" in
stat_done
fi
if [ ! -d $PGROOT ]; then
- mkdir -p $PGROOT/data && chown postgres.postgres $PGROOT/data
- su - postgres -c "/usr/bin/initdb -D $PGROOT/data"
+ mkdir -p $PGROOT/data && chown -R postgres.postgres $PGROOT
+ su - postgres -c "/usr/bin/initdb $INITOPTS -D $PGROOT/data"
fi
if [ ! -e /var/log/postgresql.log ]; then
touch /var/log/postgresql.log
diff --git a/abs/extra/postgresql/postgresql.confd b/abs/extra/postgresql/postgresql.confd
index 7bbf016..5f8fa03 100644
--- a/abs/extra/postgresql/postgresql.confd
+++ b/abs/extra/postgresql/postgresql.confd
@@ -1,4 +1,5 @@
#
# Parameters to be passed to postgresql
#
-PGROOT="/var/lib/postgres" \ No newline at end of file
+PGROOT="/var/lib/postgres"
+INITOPTS="--locale $LANG"
diff --git a/abs/extra/postgresql/postgresql.logrotate b/abs/extra/postgresql/postgresql.logrotate
new file mode 100644
index 0000000..9c36918
--- /dev/null
+++ b/abs/extra/postgresql/postgresql.logrotate
@@ -0,0 +1,4 @@
+/var/log/postgresql.log {
+ copytruncate
+ missingok
+}
diff --git a/abs/extra/python-imaging/PKGBUILD b/abs/extra/python-imaging/PKGBUILD
new file mode 100644
index 0000000..e469a94
--- /dev/null
+++ b/abs/extra/python-imaging/PKGBUILD
@@ -0,0 +1,40 @@
+# $Id: PKGBUILD 87626 2010-08-17 13:21:07Z allan $
+# Maintainer: Allan McRae <allan@archlinux.org>
+# Contributor: simo <simo@archlinux.org>
+
+pkgname=python-imaging
+pkgver=1.1.7
+pkgrel=2
+pkgdesc="PIL. Provides image processing capabilities for python"
+arch=('i686' 'x86_64')
+url="http://www.pythonware.com/products/pil/index.htm"
+license=('custom:"pil"')
+depends=('python2' 'libjpeg' 'freetype2')
+makedepends=('tk')
+optdepends=('tk')
+provides=("pil=$pkgver")
+conflicts=('pil')
+replaces=('pil')
+source=(http://effbot.org/downloads/Imaging-$pkgver.tar.gz)
+md5sums=('fc14a54e1ce02a0225be8854bfba478e')
+
+build() {
+ cd $srcdir/Imaging-$pkgver
+ python2 setup.py build_ext
+}
+
+package() {
+ cd $srcdir/Imaging-$pkgver
+ python2 setup.py install --root=$pkgdir
+ install -dm755 $pkgdir/usr/include/python2.7/
+ install -m644 -t $pkgdir/usr/include/python2.7/ libImaging/*.h
+
+ # do not have files ending in .py in /usr/bin
+ for f in pildriver pilprint pilconvert pilfile pilfont; do
+ mv $pkgdir/usr/bin/$f{.py,}
+ done
+
+ # Install license
+ install -Dm644 $srcdir/Imaging-$pkgver/README \
+ $pkgdir/usr/share/licenses/$pkgname/README
+}
diff --git a/abs/extra/python-oauth/PKGBUILD b/abs/extra/python-oauth/PKGBUILD
new file mode 100644
index 0000000..ca5493a
--- /dev/null
+++ b/abs/extra/python-oauth/PKGBUILD
@@ -0,0 +1,22 @@
+# Maintainer: Snowknight (hopkinsth@gmail.com)
+pkgname=python-oauth
+pkgver=1.0.1
+pkgrel=3
+pkgdesc="An open protocol to allow API authentication in a simple and standard method from desktop and web applications."
+arch=('any')
+url="http://code.google.com/p/oauth/"
+license=('MIT')
+depends=('python2')
+makedepends=('python2-distribute')
+source=(http://pypi.python.org/packages/source/o/oauth/oauth-${pkgver}.tar.gz)
+md5sums=('30ed3cc8c11d7841a89feab437aabf81')
+sha1sums=('b2d7609e4852b33d0d33f0bc6ae5cab8fadca014')
+
+build() {
+ cd ${srcdir}/oauth-${pkgver}
+
+ python2 setup.py build || return 1
+ python2 setup.py install --root=${pkgdir} || return 1
+
+ install -Dm644 LICENSE.txt ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+}
diff --git a/abs/extra/python-pycurl/PKGBUILD b/abs/extra/python-pycurl/PKGBUILD
new file mode 100644
index 0000000..710641d
--- /dev/null
+++ b/abs/extra/python-pycurl/PKGBUILD
@@ -0,0 +1,23 @@
+# $Id: PKGBUILD 25898 2010-09-11 12:22:23Z andrea $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
+# Contributor: kontrast <kontr4st@gmail.com>
+
+pkgname=python-pycurl
+pkgver=7.19.0
+pkgrel=5
+pkgdesc="A Python interface to libcurl"
+arch=('i686' 'x86_64')
+url="http://pycurl.sourceforge.net"
+license=('GPL')
+depends=('python2' 'curl')
+replaces=('pycurl')
+provides=('pycurl')
+source=("http://pycurl.sourceforge.net/download/pycurl-${pkgver}.tar.gz")
+md5sums=('919d58fe37e69fe87ce4534d8b6a1c7b')
+
+package() {
+ cd ${srcdir}/pycurl-${pkgver}
+ python2 setup.py install --curl-config=/usr/bin/curl-config --prefix ${pkgdir}/usr
+}
+
diff --git a/abs/extra/python2-distribute/PKGBUILD b/abs/extra/python2-distribute/PKGBUILD
new file mode 100644
index 0000000..5c84613
--- /dev/null
+++ b/abs/extra/python2-distribute/PKGBUILD
@@ -0,0 +1,24 @@
+# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
+# Contributor: Sebastien Binet <binet@farnsworth>
+pkgname=python2-distribute
+pkgver=0.6.14
+pkgrel=2
+pkgdesc="A collection of extensions to the Python 2 distutils"
+arch=('any')
+license=('PSF')
+url="http://packages.python.org/distribute"
+depends=('python2')
+conflicts=('setuptools')
+replaces=('setuptools')
+provides=('setuptools=0.6c11')
+source=(http://pypi.python.org/packages/source/d/distribute/distribute-${pkgver}.tar.gz
+ distribute-${pkgver}_python2_and_3.patch)
+sha1sums=('6bea50b97f36bf751548bb486a534204a690aa4d'
+ 'de635febfb11dc6878e5bdbac4a0e1d539c19d79')
+
+package() {
+ cd ${srcdir}/distribute-${pkgver}
+ patch -Np1 -i ../distribute-${pkgver}_python2_and_3.patch
+ python2 setup.py install --prefix=/usr --root=${pkgdir}
+}
+# vim: set noexpandtab tabstop=8 shiftwidth=8 textwidth=132 autoindent
diff --git a/abs/extra/python2-distribute/distribute-0.6.14_python2_and_3.patch b/abs/extra/python2-distribute/distribute-0.6.14_python2_and_3.patch
new file mode 100644
index 0000000..dc5da86
--- /dev/null
+++ b/abs/extra/python2-distribute/distribute-0.6.14_python2_and_3.patch
@@ -0,0 +1,51 @@
+diff -Naur distribute-0.6.14.ori//distribute.egg-info/entry_points.txt distribute-0.6.14/distribute.egg-info/entry_points.txt
+--- distribute-0.6.14.ori//distribute.egg-info/entry_points.txt 2010-07-14 20:14:10.000000000 -0400
++++ distribute-0.6.14/distribute.egg-info/entry_points.txt 2010-10-21 09:26:43.386667396 -0400
+@@ -31,7 +31,8 @@
+ depends.txt = setuptools.command.egg_info:warn_depends_obsolete
+
+ [console_scripts]
+-easy_install = setuptools.command.easy_install:main
++easy_install-3.1 = setuptools.command.easy_install:main
++easy_install-2.7 = setuptools.command.easy_install:main
+ easy_install-2.6 = setuptools.command.easy_install:main
+
+ [setuptools.file_finders]
+diff -Naur distribute-0.6.14.ori//distribute_setup.py distribute-0.6.14/distribute_setup.py
+--- distribute-0.6.14.ori//distribute_setup.py 2010-07-14 19:53:38.000000000 -0400
++++ distribute-0.6.14/distribute_setup.py 2010-10-21 09:25:18.356667404 -0400
+@@ -299,8 +299,7 @@
+ log.warn('Could not find the install location')
+ return
+ pyver = '%s.%s' % (sys.version_info[0], sys.version_info[1])
+- setuptools_file = 'setuptools-%s-py%s.egg-info' % \
+- (SETUPTOOLS_FAKED_VERSION, pyver)
++ setuptools_file = 'setuptools-%s.egg-info' % SETUPTOOLS_FAKED_VERSION
+ pkg_info = os.path.join(placeholder, setuptools_file)
+ if os.path.exists(pkg_info):
+ log.warn('%s already exists', pkg_info)
+diff -Naur distribute-0.6.14.ori//setup.py distribute-0.6.14/setup.py
+--- distribute-0.6.14.ori//setup.py 2010-07-14 19:53:38.000000000 -0400
++++ distribute-0.6.14/setup.py 2010-10-21 09:32:44.850000736 -0400
+@@ -96,6 +96,8 @@
+ f.close()
+
+
++console_scripts = ["easy_install-%s = setuptools.command.easy_install:main" % sys.version[:3]]
++
+ # if we are installing Distribute using "python setup.py install"
+ # we need to get setuptools out of the way
+ def _easy_install_marker():
+@@ -182,11 +184,7 @@
+ "dependency_links.txt = setuptools.command.egg_info:overwrite_arg",
+ ],
+
+- "console_scripts": [
+- "easy_install = setuptools.command.easy_install:main",
+- "easy_install-%s = setuptools.command.easy_install:main"
+- % sys.version[:3]
+- ],
++ "console_scripts": console_scripts,
+
+ "setuptools.file_finders":
+ ["svn_cvs = setuptools.command.sdist:_default_revctrl"],