From 64d2b0ed73143b52c5f342239095fb317fa192b2 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Thu, 30 Oct 2008 17:36:21 -0500
Subject: add subversion and neon
---
abs/extra-testing/neon/PKGBUILD | 22 ++++++
abs/extra-testing/subversion/ChangeLog | 18 +++++
abs/extra-testing/subversion/PKGBUILD | 90 ++++++++++++++++++++++
abs/extra-testing/subversion/subversion-neon.patch | 62 +++++++++++++++
abs/extra-testing/subversion/svn | 11 +++
abs/extra-testing/subversion/svnserve | 42 ++++++++++
abs/extra-testing/subversion/svnserve.conf | 7 ++
7 files changed, 252 insertions(+)
create mode 100644 abs/extra-testing/neon/PKGBUILD
create mode 100644 abs/extra-testing/subversion/ChangeLog
create mode 100644 abs/extra-testing/subversion/PKGBUILD
create mode 100644 abs/extra-testing/subversion/subversion-neon.patch
create mode 100644 abs/extra-testing/subversion/svn
create mode 100755 abs/extra-testing/subversion/svnserve
create mode 100644 abs/extra-testing/subversion/svnserve.conf
diff --git a/abs/extra-testing/neon/PKGBUILD b/abs/extra-testing/neon/PKGBUILD
new file mode 100644
index 0000000..868e493
--- /dev/null
+++ b/abs/extra-testing/neon/PKGBUILD
@@ -0,0 +1,22 @@
+# $Id: PKGBUILD 10269 2008-08-25 13:23:04Z andyrtr $
+# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
+# Maintainer: Andreas Radke <andyrtr@archlinux.org>
+
+# KEEP LIBTOOL FILES!
+pkgname=neon
+pkgver=0.28.3
+pkgrel=1
+pkgdesc="HTTP and WebDAV client library with a C interface"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL')
+depends=('openssl>=0.9.8g-4' 'heimdal>=1.2-1' 'zlib' 'expat>=2.0.1' 'db>=4.7.25')
+url="http://www.webdav.org/neon/"
+source=(http://www.webdav.org/neon/${pkgname}-${pkgver}.tar.gz)
+md5sums=('47599a328862ce64ac3c52726d6daa12')
+
+build() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ ./configure --prefix=/usr --with-ssl --with-expat --enable-shared --disable-static
+ make || return 1
+ make DESTDIR=${pkgdir} install
+}
diff --git a/abs/extra-testing/subversion/ChangeLog b/abs/extra-testing/subversion/ChangeLog
new file mode 100644
index 0000000..369cb3b
--- /dev/null
+++ b/abs/extra-testing/subversion/ChangeLog
@@ -0,0 +1,18 @@
+
+2008-10-10 Douglas Soares de Andrade <douglas@archlinux.org>
+
+ * Updated for i686: 1.5.3
+
+2008-09-04 Douglas Soares de Andrade <douglas@archlinux.org>
+
+ * 1.5.2: Finally updated for i686 as it does not break the
+ devtools.
+
+2008-08-13 Douglas Soares de Andrade <dsa@aur.archlinux.org>
+
+ * Updated for i686: 1.5.1
+
+2008-07-23 Douglas Soares de Andrade <douglas@archlinux.org>
+
+ * Updated for i686: 1.5.0
+
diff --git a/abs/extra-testing/subversion/PKGBUILD b/abs/extra-testing/subversion/PKGBUILD
new file mode 100644
index 0000000..dec8845
--- /dev/null
+++ b/abs/extra-testing/subversion/PKGBUILD
@@ -0,0 +1,90 @@
+# $Id: PKGBUILD 15639 2008-10-16 10:28:54Z douglas $
+# Contributer: Jason Chu <jason@archlinux.org>
+# Maintainer: Jason Chu <jason@archlinux.org>
+
+pkgname=subversion
+pkgver=1.5.3
+pkgrel=1
+pkgdesc="Replacement for CVS, another versioning system (svn)"
+arch=(i686 x86_64)
+license=('apache' 'bsd')
+depends=('neon>=0.28.2-2' 'apr-util>=1.3.2-2')
+makedepends=('heimdal>=1.2' 'db>=4.7' 'python>=2.5.2-4'
+ 'perl>=5.10.0-3' 'autoconf')
+source=(http://svn.collab.net/tarballs/${pkgname}-${pkgver}.tar.gz
+ svnserve svn svnserve.conf)
+
+md5sums=('37533b0435caaa3e4e1be359389fcbb9'
+ 'c5a2e490b3e58c6bd2ca3a2e72b71845'
+ 'a0db6dd43af33952739b6ec089852630'
+ 'c459e299192552f61578f3438abf0664')
+
+backup=('etc/xinetd.d/svn' 'etc/conf.d/svnserve')
+url="http://subversion.tigris.org/"
+provides=('svn')
+options=('!makeflags' 'libtool')
+
+md5sums=('6a57efcc9e487e9bffc554931c98d3a0'
+ 'c5a2e490b3e58c6bd2ca3a2e72b71845'
+ 'a0db6dd43af33952739b6ec089852630'
+ 'c459e299192552f61578f3438abf0664')
+
+build() {
+ cd $startdir/src/${pkgname}-${pkgver}
+
+
+ #patch -Np1 -i $startdir/src/subversion-neon.patch
+
+ #sed -e 's/\(NEON_ALLOWED_LIST=.* 0.26.4\)"/\1 0.27.2 0.28.0 0.28.1 0.28.2"/' -i configure.in
+
+# libtoolize --force --copy
+# aclocal -I build/ac-macros
+# autoconf
+
+ autoreconf
+ ./configure --prefix=/usr --with-apr=/usr --with-apr-util=/usr \
+ --with-zlib=/usr --with-neon=/usr
+
+ (make external-all && make LT_LDFLAGS="-L$Fdestdir/usr/lib" local-all ) || return 1
+
+ export LD_LIBRARY_PATH=$startdir/pkg/usr/lib:$LD_LIBRARY_PATH
+ make DESTDIR=$startdir/pkg install || return 1
+
+# make DESTDIR=$startdir/pkg swig-py || return 1
+# make install-swig-py DESTDIR=$startdir/pkg || return 1
+
+ # mkdir -p $startdir/pkg/usr/lib/python2.5
+ # mv $startdir/pkg/usr/lib/svn-python/ $startdir/pkg/usr/lib/python2.5/site-packages
+
+
+ mkdir -p $startdir/pkg/usr/share/subversion
+ install -d -m 755 tools/hook-scripts $startdir/pkg/usr/share/subversion/
+ rm -f $startdir/pkg/usr/share/subversion/hook-scripts/*.in
+
+# make DESTDIR=$startdir/pkg swig-pl || return 1
+# make install-swig-pl DESTDIR=$startdir/pkg INSTALLDIRS=vendor || return 1
+ rm -f $startdir/pkg/usr/lib/perl5/vendor_perl/auto/SVN/_Core/.packlist
+ rm -rf $startdir/pkg/usr/lib/perl5/core_perl
+
+# make DESTDIR=$startdir/pkg swig-rb || return 1
+# make install-swig-rb DESTDIR=$startdir/pkg || return 1
+
+# make DESTDIR=$startdir/pkg javahl || return 1
+# make DESTDIR=$startdir/pkg install-javahl || return 1
+
+ mkdir -p $startdir/pkg/etc/rc.d
+ mkdir -p $startdir/pkg/etc/xinetd.d
+ mkdir -p $startdir/pkg/etc/conf.d
+
+ install -m 755 $startdir/src/svnserve $startdir/pkg/etc/rc.d
+ install -m 644 $startdir/src/svn $startdir/pkg/etc/xinetd.d
+ install -m 644 $startdir/src/svnserve.conf $startdir/pkg/etc/conf.d/svnserve
+ install -m 755 $startdir/src/subversion-$pkgver/contrib/client-side/svnmerge/svnmerge.py $startdir/pkg/usr/bin/svnmerge
+ install -D -m 644 $startdir/src/subversion-$pkgver/COPYING $startdir/pkg/usr/share/licenses/$pkgname/LICENSE
+
+ #libtoolslay not all because of kdesdk
+# find ${startdir}/pkg/usr/lib/httpd/modules -name '*.la' -exec rm {} \;
+# find ${startdir}/pkg/usr/lib/ruby -name '*.la' -exec rm {} \;
+# find ${startdir}/pkg/usr/lib/python2.5 -name '*.la' -exec rm {} \;
+}
+
diff --git a/abs/extra-testing/subversion/subversion-neon.patch b/abs/extra-testing/subversion/subversion-neon.patch
new file mode 100644
index 0000000..7dc23c5
--- /dev/null
+++ b/abs/extra-testing/subversion/subversion-neon.patch
@@ -0,0 +1,62 @@
+Index: subversion-1.4.6/build/ac-macros/neon.m4
+===================================================================
+--- subversion-1.4.6.orig/build/ac-macros/neon.m4
++++ subversion-1.4.6/build/ac-macros/neon.m4
+@@ -50,14 +50,18 @@ AC_DEFUN(SVN_LIB_NEON,
+ NEON_VERSION=`cat $abs_srcdir/neon/.version`
+ AC_MSG_RESULT([$NEON_VERSION])
+
+- if test -n "`echo \"$NEON_VERSION\" | grep '^0\.2[[56]]\.'`" ; then
++ if test -n ["`echo "$NEON_VERSION" | grep '^0\.2[5-8]\.'`"] ; then
+ AC_DEFINE_UNQUOTED([SVN_NEON_0_25], [1],
+ [Define to 1 if you have Neon 0.25 or later.])
+ fi
+- if test -n "`echo \"$NEON_VERSION\" | grep '^0\.26\.'`" ; then
++ if test -n ["`echo "$NEON_VERSION" | grep '^0\.2[6-8]\.'`"] ; then
+ AC_DEFINE_UNQUOTED([SVN_NEON_0_26], [1],
+ [Define to 1 if you have Neon 0.26 or later.])
+ fi
++ if test -n ["`echo "$NEON_VERSION" | grep '^0\.2[7-8]\.'`"] ; then
++ AC_DEFINE_UNQUOTED([SVN_NEON_0_27], [1],
++ [Define to 1 if you have Neon 0.27 or later.])
++ fi
+
+ for svn_allowed_neon in $NEON_ALLOWED_LIST; do
+ if test "$NEON_VERSION" = "$svn_allowed_neon" ||
+@@ -127,14 +131,18 @@ AC_DEFUN(SVN_NEON_CONFIG,
+ NEON_VERSION=`$neon_config --version | sed -e 's/^neon //'`
+ AC_MSG_RESULT([$NEON_VERSION])
+
+- if test -n "`echo \"$NEON_VERSION\" | grep '^0\.2[[56]]\.'`" ; then
++ if test -n ["`echo "$NEON_VERSION" | grep '^0\.2[5-8]\.'`"] ; then
+ AC_DEFINE_UNQUOTED([SVN_NEON_0_25], [1],
+ [Define to 1 if you have Neon 0.25 or later.])
+ fi
+- if test -n "`echo \"$NEON_VERSION\" | grep '^0\.26\.'`" ; then
++ if test -n ["`echo "$NEON_VERSION" | grep '^0\.2[6-8]\.'`"] ; then
+ AC_DEFINE_UNQUOTED([SVN_NEON_0_26], [1],
+ [Define to 1 if you have Neon 0.26 or later.])
+ fi
++ if test -n ["`echo "$NEON_VERSION" | grep '^0\.2[7-8]\.'`"] ; then
++ AC_DEFINE_UNQUOTED([SVN_NEON_0_27], [1],
++ [Define to 1 if you have Neon 0.27 or later.])
++ fi
+
+ for svn_allowed_neon in $NEON_ALLOWED_LIST; do
+ if test "$NEON_VERSION" = "$svn_allowed_neon" ||
+Index: subversion-1.4.6/subversion/libsvn_ra_dav/session.c
+===================================================================
+--- subversion-1.4.6.orig/subversion/libsvn_ra_dav/session.c
++++ subversion-1.4.6/subversion/libsvn_ra_dav/session.c
+@@ -575,7 +575,11 @@ typedef struct neonprogress_baton_t
+ } neonprogress_baton_t;
+
+ static void
++#ifdef SVN_NEON_0_27
++ra_dav_neonprogress(void *baton, ne_off_t progress, ne_off_t total)
++#else
+ ra_dav_neonprogress(void *baton, off_t progress, off_t total)
++#endif /* SVN_NEON_0_27 */
+ {
+ const neonprogress_baton_t *neonprogress_baton = baton;
+ if (neonprogress_baton->progress_func)
diff --git a/abs/extra-testing/subversion/svn b/abs/extra-testing/subversion/svn
new file mode 100644
index 0000000..8988aaf
--- /dev/null
+++ b/abs/extra-testing/subversion/svn
@@ -0,0 +1,11 @@
+service svn
+{
+ flags = REUSE
+ socket_type = stream
+ wait = no
+ user = root
+ server = /usr/bin/svnserve
+ server_args = -i
+ log_on_failure += USERID
+ disable = yes
+}
diff --git a/abs/extra-testing/subversion/svnserve b/abs/extra-testing/subversion/svnserve
new file mode 100755
index 0000000..2f433b6
--- /dev/null
+++ b/abs/extra-testing/subversion/svnserve
@@ -0,0 +1,42 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+. /etc/conf.d/svnserve
+
+PID=`pidof -o %PPID /usr/bin/svnserve`
+case "$1" in
+ start)
+ stat_busy "Starting svnserve"
+ if [ -z "$PID" ]; then
+ if [ -n "$SVNSERVE_USER" ]; then
+ su $SVNSERVE_USER -c "/usr/bin/svnserve -d $SVNSERVE_ARGS" &
+ else
+ /usr/bin/svnserve -d $SVNSERVE_ARGS &
+ fi
+ fi
+ if [ ! -z "$PID" -o $? -gt 0 ]; then
+ stat_fail
+ else
+ add_daemon svnserve
+ stat_done
+ fi
+ ;;
+ stop)
+ stat_busy "Stopping svnserve"
+ [ ! -z "$PID" ] && kill $PID &> /dev/null
+ if [ $? -gt 0 ]; then
+ stat_fail
+ else
+ rm_daemon svnserve
+ stat_done
+ fi
+ ;;
+ restart)
+ $0 stop
+ sleep 1
+ $0 start
+ ;;
+ *)
+ echo "usage: $0 {start|stop|restart}"
+esac
diff --git a/abs/extra-testing/subversion/svnserve.conf b/abs/extra-testing/subversion/svnserve.conf
new file mode 100644
index 0000000..37fb7ea
--- /dev/null
+++ b/abs/extra-testing/subversion/svnserve.conf
@@ -0,0 +1,7 @@
+#
+# Parameters to be passed to svnserve
+#
+#SVNSERVE_ARGS="-r /path/to/some/repos"
+SVNSERVE_ARGS=""
+
+#SVNSERVE_USER="svn"
--
cgit v0.12