Merge branch '2.6' of crux:/home/crux/scm/ports/contrib into 2.6

19 files changed, 198 insertions, 98 deletions

diff --git a/dev86/.md5sum b/dev86/.md5sum
index a46b27a35..b64df922e 100644
--- a/dev86/.md5sum
+++ b/dev86/.md5sum
@@ -1,3 +1,2 @@
 e7bbfdbe61c2fb964994a087e29b0087  Dev86src-0.16.17.tar.gz
-1b750c5561a4bde5f83f65e5827feb73  dev86-pic.patch
-552181d806af398f7b7fe54d2b486f82  nostrict.patch
+4b5cc0a5b85bbf79130a11a641ad6ba9  dev86-0.16.17.patch
diff --git a/dev86/Pkgfile b/dev86/Pkgfile
index 98b8c5426..0ba59c656 100644
--- a/dev86/Pkgfile
+++ b/dev86/Pkgfile
@@ -1,21 +1,21 @@
 # Description: cross development C compiler environment for the production of 8086 executables.
 # URL: http://homepage.ntlworld.com/robert.debath/dev86/
-# Maintainer: Jose V Beneyto, sepen at users dot sourceforge dot net
-# Packager: Jose V Beneyto, sepen at users dot sourceforge dot net
-# Depends on: 
+# Maintainer: Jose V Beneyto, sepen at crux dot nu
+# Packager: Jose V Beneyto, sepen at crux dot nu
+# Depends on:
 
 name=dev86
 version=0.16.17
-release=5
+release=6
 source=(http://homepage.ntlworld.com/robert.debath/$name/Dev86src-$version.tar.gz \
-        dev86-pic.patch nostrict.patch)
+        $name-$version.patch)
 
 build() {
   cd $name-$version
-  patch -p0 < $SRC/dev86-pic.patch
-  patch -p1 < $SRC/nostrict.patch
-  echo quit | make -j1 PREFIX=/usr
+  patch -p1 -i $SRC/$name-$version.patch
+  echo quit | make -j1 PREFIX=/usr GCCFLAG="$CFLAGS"
   make -j1 install-all DIST=$PKG
   rm -f $PKG/usr/bin/{as,ld,nm,objdump,size}86
   rm -f $PKG/usr/man/man1/{as,ld}86.1
 }
+
diff --git a/dev86/dev86-0.16.17.patch b/dev86/dev86-0.16.17.patch
new file mode 100644
index 000000000..b682b2b34
--- /dev/null
+++ b/dev86/dev86-0.16.17.patch
@@ -0,0 +1,89 @@
+diff -purN dev86-0.16.17.orig/bootblocks/Makefile dev86-0.16.17/bootblocks/Makefile
+--- dev86-0.16.17.orig/bootblocks/Makefile	2009-10-26 08:51:58.502794823 +0100
++++ dev86-0.16.17/bootblocks/Makefile	2009-10-26 08:55:41.134794770 +0100
+@@ -1,6 +1,6 @@
+ 
+ HOSTCC=cc
+-HOSTCCFLAGS=-O
++HOSTCCFLAGS=
+ BCC=bcc
+ AS86=as86
+ 
+diff -purN dev86-0.16.17.orig/elksemu/elks.c dev86-0.16.17/elksemu/elks.c
+--- dev86-0.16.17.orig/elksemu/elks.c	2009-10-26 08:51:58.518794797 +0100
++++ dev86-0.16.17/elksemu/elks.c	2009-10-26 08:58:26.186795371 +0100
+@@ -15,7 +15,7 @@
+ #include <signal.h>
+ #include <errno.h>
+ #include <sys/stat.h>
+-#include <sys/vm86.h>
++#include <asm/vm86.h>
+ #include <sys/mman.h>
+ #include "elks.h" 
+ 
+@@ -129,8 +129,17 @@ static int load_elks(int fd)
+ static inline int vm86_mine(struct vm86_struct* v86)
+ {
+ 	int __res;
++#ifndef __PIC__
+ 	__asm__ __volatile__("int $0x80\n"
+ 	:"=a" (__res):"a" ((int)OLD_SYS_vm86), "b" ((int)v86));
++#else
++	__asm__ __volatile__(
++		"movl	%%ebx,%%ecx\n\t"
++		"movl	%2,%%ebx\n\t"
++		"int	$0x80\n\t"
++		"movl	%%ecx,%%ebx\n\t"
++		:"=a" (__res):"a" ((int)OLD_SYS_vm86), "r" ((int)v86) : "ecx");
++#endif
+ 	return __res;
+ } 
+ #endif
+diff -purN dev86-0.16.17.orig/elksemu/elks_signal.c dev86-0.16.17/elksemu/elks_signal.c
+--- dev86-0.16.17.orig/elksemu/elks_signal.c	2009-10-26 08:51:58.518794797 +0100
++++ dev86-0.16.17/elksemu/elks_signal.c	2009-10-26 08:58:26.182795456 +0100
+@@ -7,7 +7,7 @@
+ #include <signal.h>
+ #include <errno.h>
+ #include <sys/stat.h>
+-#include <sys/vm86.h>
++#include <asm/vm86.h>
+ #include "elks.h" 
+ 
+ static int elks_sigtrap= -1;
+diff -purN dev86-0.16.17.orig/elksemu/elks_sys.c dev86-0.16.17/elksemu/elks_sys.c
+--- dev86-0.16.17.orig/elksemu/elks_sys.c	2009-10-26 08:51:58.518794797 +0100
++++ dev86-0.16.17/elksemu/elks_sys.c	2009-10-26 08:58:26.182795456 +0100
+@@ -9,7 +9,7 @@
+ #include <unistd.h>
+ #include <fcntl.h>
+ #include <sys/stat.h>
+-#include <sys/vm86.h>
++#include <asm/vm86.h>
+ #include <sys/times.h>
+ #include <utime.h>
+ #include <termios.h>
+diff -purN dev86-0.16.17.orig/elksemu/minix.c dev86-0.16.17/elksemu/minix.c
+--- dev86-0.16.17.orig/elksemu/minix.c	2009-10-26 08:51:58.518794797 +0100
++++ dev86-0.16.17/elksemu/minix.c	2009-10-26 08:58:26.186795371 +0100
+@@ -4,7 +4,7 @@
+ #include <unistd.h>
+ #include <fcntl.h>
+ #include <sys/stat.h>
+-#include <sys/vm86.h>
++#include <asm/vm86.h>
+ #include <sys/times.h>
+ #include <utime.h>
+ #include <termios.h>
+diff -purN dev86-0.16.17.orig/makefile.in dev86-0.16.17/makefile.in
+--- dev86-0.16.17.orig/makefile.in	2009-10-26 08:51:58.598795590 +0100
++++ dev86-0.16.17/makefile.in	2009-10-26 08:55:41.134794770 +0100
+@@ -42,7 +42,7 @@ WALL  =-Wall -Wtraditional -Wshadow -Wid
+ WALL  =-Wall -Wstrict-prototypes
+ 
+ CC	=%CC%
+-CFLAGS	=$(GCCFLAG) $(WALL) -O2 -g
++CFLAGS	=$(GCCFLAG) $(WALL) -fno-strict-aliasing
+ #endif
+ 
+ #ifndef GNUMAKE
diff --git a/dev86/dev86-pic.patch b/dev86/dev86-pic.patch
deleted file mode 100644
index 439c2648b..000000000
--- a/dev86/dev86-pic.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- elksemu/elks.c.orig	2005-11-04 01:35:37.000000000 +0100
-+++ elksemu/elks.c	2005-11-04 01:45:28.000000000 +0100
-@@ -129,8 +129,17 @@
- static inline int vm86_mine(struct vm86_struct* v86)
- {
- 	int __res;
-+#ifndef __PIC__
- 	__asm__ __volatile__("int $0x80\n"
- 	:"=a" (__res):"a" ((int)OLD_SYS_vm86), "b" ((int)v86));
-+#else
-+	__asm__ __volatile__(
-+		"movl	%%ebx,%%ecx\n\t"
-+		"movl	%2,%%ebx\n\t"
-+		"int	$0x80\n\t"
-+		"movl	%%ecx,%%ebx\n\t"
-+		:"=a" (__res):"a" ((int)OLD_SYS_vm86), "r" ((int)v86) : "ecx");
-+#endif
- 	return __res;
- } 
- #endif
diff --git a/dev86/nostrict.patch b/dev86/nostrict.patch
deleted file mode 100644
index 641d35782..000000000
--- a/dev86/nostrict.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -puNr dev86-0.16.17/bootblocks/Makefile dev86-0.16.17.new/bootblocks/Makefile
---- dev86-0.16.17/bootblocks/Makefile	2004-01-24 11:55:38.000000000 +0100
-+++ dev86-0.16.17.new/bootblocks/Makefile	2008-03-17 10:36:24.000000000 +0100
-@@ -1,6 +1,6 @@
- 
- HOSTCC=cc
--HOSTCCFLAGS=-O
-+HOSTCCFLAGS=
- BCC=bcc
- AS86=as86
- 
-diff -puNr dev86-0.16.17/makefile.in dev86-0.16.17.new/makefile.in
---- dev86-0.16.17/makefile.in	2004-10-02 15:00:53.000000000 +0200
-+++ dev86-0.16.17.new/makefile.in	2008-03-17 10:36:13.000000000 +0100
-@@ -42,7 +42,7 @@ WALL  =-Wall -Wtraditional -Wshadow -Wid
- WALL  =-Wall -Wstrict-prototypes
- 
- CC	=%CC%
--CFLAGS	=$(GCCFLAG) $(WALL) -O2 -g
-+CFLAGS	=$(GCCFLAG) $(WALL) -fno-strict-aliasing
- #endif
- 
- #ifndef GNUMAKE
diff --git a/gnome-mplayer/.footprint b/gnome-mplayer/.footprint
new file mode 100644
index 000000000..9daf209b2
--- /dev/null
+++ b/gnome-mplayer/.footprint
@@ -0,0 +1,29 @@
+drwxr-xr-x	root/root	usr/
+drwxr-xr-x	root/root	usr/bin/
+-rwxr-xr-x	root/root	usr/bin/gnome-mplayer
+drwxr-xr-x	root/root	usr/man/
+drwxr-xr-x	root/root	usr/man/man1/
+-rw-r--r--	root/root	usr/man/man1/gnome-mplayer.1.gz
+drwxr-xr-x	root/root	usr/share/
+drwxr-xr-x	root/root	usr/share/applications/
+-rw-r--r--	root/root	usr/share/applications/gnome-mplayer.desktop
+drwxr-xr-x	root/root	usr/share/icons/
+drwxr-xr-x	root/root	usr/share/icons/hicolor/
+drwxr-xr-x	root/root	usr/share/icons/hicolor/16x16/
+drwxr-xr-x	root/root	usr/share/icons/hicolor/16x16/apps/
+-rw-r--r--	root/root	usr/share/icons/hicolor/16x16/apps/gnome-mplayer.png
+drwxr-xr-x	root/root	usr/share/icons/hicolor/22x22/
+drwxr-xr-x	root/root	usr/share/icons/hicolor/22x22/apps/
+-rw-r--r--	root/root	usr/share/icons/hicolor/22x22/apps/gnome-mplayer.png
+drwxr-xr-x	root/root	usr/share/icons/hicolor/24x24/
+drwxr-xr-x	root/root	usr/share/icons/hicolor/24x24/apps/
+-rw-r--r--	root/root	usr/share/icons/hicolor/24x24/apps/gnome-mplayer.png
+drwxr-xr-x	root/root	usr/share/icons/hicolor/32x32/
+drwxr-xr-x	root/root	usr/share/icons/hicolor/32x32/apps/
+-rw-r--r--	root/root	usr/share/icons/hicolor/32x32/apps/gnome-mplayer.png
+drwxr-xr-x	root/root	usr/share/icons/hicolor/48x48/
+drwxr-xr-x	root/root	usr/share/icons/hicolor/48x48/apps/
+-rw-r--r--	root/root	usr/share/icons/hicolor/48x48/apps/gnome-mplayer.png
+drwxr-xr-x	root/root	usr/share/icons/hicolor/scalable/
+drwxr-xr-x	root/root	usr/share/icons/hicolor/scalable/apps/
+-rw-r--r--	root/root	usr/share/icons/hicolor/scalable/apps/gnome-mplayer.svg
diff --git a/gnome-mplayer/.md5sum b/gnome-mplayer/.md5sum
new file mode 100644
index 000000000..ede3d67d2
--- /dev/null
+++ b/gnome-mplayer/.md5sum
@@ -0,0 +1 @@
+540630654db044198c435f32c04b1b53  gnome-mplayer-0.9.8.tar.gz
diff --git a/gnome-mplayer/Pkgfile b/gnome-mplayer/Pkgfile
new file mode 100644
index 000000000..4e52d66f5
--- /dev/null
+++ b/gnome-mplayer/Pkgfile
@@ -0,0 +1,23 @@
+# Description: GTK2 interface to MPlayer (GNOME independent)
+# URL:         http://code.google.com/p/gnome-mplayer/
+# Maintainer:  Bartlomiej Palmowski, rotwang at crux dot org dot pl
+# Packager:    Fredrik Rinnestam, fredrik at obra dot se
+# Depends on:  gtk mplayer dbus-glib
+
+name=gnome-mplayer
+version=0.9.8
+release=1
+source=(http://$name.googlecode.com/files/$name-$version.tar.gz)
+
+build() {
+    cd $name-$version
+    ./configure --prefix=/usr \
+                --mandir=/usr/man \
+                --disable-schemas-install \
+                --without-gconf
+
+    make
+    make DESTDIR=$PKG install
+    rm -rf $PKG/usr/share/doc
+    rm -rf $PKG/usr/share/locale
+}
diff --git a/lighttpd/.md5sum b/lighttpd/.md5sum
index 394463189..a4463996b 100644
--- a/lighttpd/.md5sum
+++ b/lighttpd/.md5sum
@@ -1,3 +1,3 @@
-41dfad5c366d34d83c3d2b46d4c08f5c  lighttpd-1.4.23.tar.gz
+cb2155230f5738bf56d14131874c36fe  lighttpd-1.4.24.tar.gz
 0ca699210055a3e137ffefdcd5441c09  lighttpd.conf
 b9e97858fc836c3b37c3f1b480155ccb  lighttpd.rc
diff --git a/lighttpd/Pkgfile b/lighttpd/Pkgfile
index eb7cfb55a..bc5b14409 100644
--- a/lighttpd/Pkgfile
+++ b/lighttpd/Pkgfile
@@ -5,7 +5,7 @@
 # Depends on: libpcre
 
 name=lighttpd
-version=1.4.23
+version=1.4.24
 release=1
 source=(http://www.$name.net/download/$name-$version.tar.gz \
         $name.conf \
diff --git a/pcmanfm/.md5sum b/pcmanfm/.md5sum
index 372fcf925..387b05703 100644
--- a/pcmanfm/.md5sum
+++ b/pcmanfm/.md5sum
@@ -1 +1 @@
-72daf7c19c66d365b000170d7b254f40  pcmanfm-0.5.1.tar.bz2
+750f89cbe7496e5f4c09e4c5a95dec6e  pcmanfm-0.5.2.tar.bz2
diff --git a/pcmanfm/Pkgfile b/pcmanfm/Pkgfile
index 7bf04e1f9..7ac761087 100644
--- a/pcmanfm/Pkgfile
+++ b/pcmanfm/Pkgfile
@@ -5,12 +5,14 @@
 # Depends on:  gtk hal startup-notification gamin shared-mime-info desktop-file-utils xorg-libxcomposite intltool
 
 name=pcmanfm
-version=0.5.1
+version=0.5.2
 release=1
 source=(http://sourceforge.net/projects/$name/files/$name/$name-$version.tar.bz2)
 
 build() {
     cd $name-$version
+    # ca translation is fscked up
+    sed -i 's/ca/ /' po/LINGUAS
     ./configure \
         --prefix=/usr \
         --enable-hal
diff --git a/rhapsody/Pkgfile b/rhapsody/Pkgfile
index b963ce183..2c56950ce 100644
--- a/rhapsody/Pkgfile
+++ b/rhapsody/Pkgfile
@@ -1,18 +1,18 @@
 # Description: Text console IRC client with intuitive menu driven user interface.
 # URL: http://rhapsody.sourceforge.net/
-# Maintainer: Jose V Beneyto, sepen at users dot sourceforge dot net
-# Packager: Jose V Beneyto, sepen at users dot sourceforge dot net
+# Maintainer: Jose V Beneyto, sepen at crux dot nu
+# Packager: Jose V Beneyto, sepen at crux dot nu
 # Depends on: ncurses
 
 name=rhapsody
 version=0.28b
-release=1
-source=(http://dl.sourceforge.net/sourceforge/$name/${name}_${version}.tgz)
+release=2
+source=(http://dl.sourceforge.net/sourceforge/$name/${name}_$version.tgz)
 
 build() {
   cd $name-$version
   ./configure
   make clean
-  make
-	install -D -m 0755 $name $PKG/usr/bin/$name 
+  make LOCALFLAGS="$CFLAGS"
+  install -D -m 0755 $name $PKG/usr/bin/$name 
 }
diff --git a/subversion-perl/.footprint b/subversion-perl/.footprint
index e808afae4..67cfc99a5 100644
--- a/subversion-perl/.footprint
+++ b/subversion-perl/.footprint
@@ -7,33 +7,33 @@ lrwxrwxrwx	root/root	usr/lib/libsvn_swig_perl-1.so.0 -> libsvn_swig_perl-1.so.0.
 -rwxr-xr-x	root/root	usr/lib/libsvn_swig_perl-1.so.0.0.0
 drwxr-xr-x	root/root	usr/lib/perl5/
 drwxr-xr-x	root/root	usr/lib/perl5/site_perl/
-drwxr-xr-x	root/root	usr/lib/perl5/site_perl/5.10.0/
-drwxr-xr-x	root/root	usr/lib/perl5/site_perl/5.10.0/linux/
-drwxr-xr-x	root/root	usr/lib/perl5/site_perl/5.10.0/linux/SVN/
--r--r--r--	root/root	usr/lib/perl5/site_perl/5.10.0/linux/SVN/Base.pm
--r--r--r--	root/root	usr/lib/perl5/site_perl/5.10.0/linux/SVN/Client.pm
--r--r--r--	root/root	usr/lib/perl5/site_perl/5.10.0/linux/SVN/Core.pm
--r--r--r--	root/root	usr/lib/perl5/site_perl/5.10.0/linux/SVN/Delta.pm
--r--r--r--	root/root	usr/lib/perl5/site_perl/5.10.0/linux/SVN/Fs.pm
--r--r--r--	root/root	usr/lib/perl5/site_perl/5.10.0/linux/SVN/Ra.pm
--r--r--r--	root/root	usr/lib/perl5/site_perl/5.10.0/linux/SVN/Repos.pm
--r--r--r--	root/root	usr/lib/perl5/site_perl/5.10.0/linux/SVN/Wc.pm
-drwxr-xr-x	root/root	usr/lib/perl5/site_perl/5.10.0/linux/auto/
-drwxr-xr-x	root/root	usr/lib/perl5/site_perl/5.10.0/linux/auto/SVN/
-drwxr-xr-x	root/root	usr/lib/perl5/site_perl/5.10.0/linux/auto/SVN/_Client/
--r-xr-xr-x	root/root	usr/lib/perl5/site_perl/5.10.0/linux/auto/SVN/_Client/_Client.so
-drwxr-xr-x	root/root	usr/lib/perl5/site_perl/5.10.0/linux/auto/SVN/_Core/
--r-xr-xr-x	root/root	usr/lib/perl5/site_perl/5.10.0/linux/auto/SVN/_Core/_Core.so
-drwxr-xr-x	root/root	usr/lib/perl5/site_perl/5.10.0/linux/auto/SVN/_Delta/
--r-xr-xr-x	root/root	usr/lib/perl5/site_perl/5.10.0/linux/auto/SVN/_Delta/_Delta.so
-drwxr-xr-x	root/root	usr/lib/perl5/site_perl/5.10.0/linux/auto/SVN/_Fs/
--r-xr-xr-x	root/root	usr/lib/perl5/site_perl/5.10.0/linux/auto/SVN/_Fs/_Fs.so
-drwxr-xr-x	root/root	usr/lib/perl5/site_perl/5.10.0/linux/auto/SVN/_Ra/
--r-xr-xr-x	root/root	usr/lib/perl5/site_perl/5.10.0/linux/auto/SVN/_Ra/_Ra.so
-drwxr-xr-x	root/root	usr/lib/perl5/site_perl/5.10.0/linux/auto/SVN/_Repos/
--r-xr-xr-x	root/root	usr/lib/perl5/site_perl/5.10.0/linux/auto/SVN/_Repos/_Repos.so
-drwxr-xr-x	root/root	usr/lib/perl5/site_perl/5.10.0/linux/auto/SVN/_Wc/
--r-xr-xr-x	root/root	usr/lib/perl5/site_perl/5.10.0/linux/auto/SVN/_Wc/_Wc.so
+drwxr-xr-x	root/root	usr/lib/perl5/site_perl/5.10.1/
+drwxr-xr-x	root/root	usr/lib/perl5/site_perl/5.10.1/linux/
+drwxr-xr-x	root/root	usr/lib/perl5/site_perl/5.10.1/linux/SVN/
+-r--r--r--	root/root	usr/lib/perl5/site_perl/5.10.1/linux/SVN/Base.pm
+-r--r--r--	root/root	usr/lib/perl5/site_perl/5.10.1/linux/SVN/Client.pm
+-r--r--r--	root/root	usr/lib/perl5/site_perl/5.10.1/linux/SVN/Core.pm
+-r--r--r--	root/root	usr/lib/perl5/site_perl/5.10.1/linux/SVN/Delta.pm
+-r--r--r--	root/root	usr/lib/perl5/site_perl/5.10.1/linux/SVN/Fs.pm
+-r--r--r--	root/root	usr/lib/perl5/site_perl/5.10.1/linux/SVN/Ra.pm
+-r--r--r--	root/root	usr/lib/perl5/site_perl/5.10.1/linux/SVN/Repos.pm
+-r--r--r--	root/root	usr/lib/perl5/site_perl/5.10.1/linux/SVN/Wc.pm
+drwxr-xr-x	root/root	usr/lib/perl5/site_perl/5.10.1/linux/auto/
+drwxr-xr-x	root/root	usr/lib/perl5/site_perl/5.10.1/linux/auto/SVN/
+drwxr-xr-x	root/root	usr/lib/perl5/site_perl/5.10.1/linux/auto/SVN/_Client/
+-r-xr-xr-x	root/root	usr/lib/perl5/site_perl/5.10.1/linux/auto/SVN/_Client/_Client.so
+drwxr-xr-x	root/root	usr/lib/perl5/site_perl/5.10.1/linux/auto/SVN/_Core/
+-r-xr-xr-x	root/root	usr/lib/perl5/site_perl/5.10.1/linux/auto/SVN/_Core/_Core.so
+drwxr-xr-x	root/root	usr/lib/perl5/site_perl/5.10.1/linux/auto/SVN/_Delta/
+-r-xr-xr-x	root/root	usr/lib/perl5/site_perl/5.10.1/linux/auto/SVN/_Delta/_Delta.so
+drwxr-xr-x	root/root	usr/lib/perl5/site_perl/5.10.1/linux/auto/SVN/_Fs/
+-r-xr-xr-x	root/root	usr/lib/perl5/site_perl/5.10.1/linux/auto/SVN/_Fs/_Fs.so
+drwxr-xr-x	root/root	usr/lib/perl5/site_perl/5.10.1/linux/auto/SVN/_Ra/
+-r-xr-xr-x	root/root	usr/lib/perl5/site_perl/5.10.1/linux/auto/SVN/_Ra/_Ra.so
+drwxr-xr-x	root/root	usr/lib/perl5/site_perl/5.10.1/linux/auto/SVN/_Repos/
+-r-xr-xr-x	root/root	usr/lib/perl5/site_perl/5.10.1/linux/auto/SVN/_Repos/_Repos.so
+drwxr-xr-x	root/root	usr/lib/perl5/site_perl/5.10.1/linux/auto/SVN/_Wc/
+-r-xr-xr-x	root/root	usr/lib/perl5/site_perl/5.10.1/linux/auto/SVN/_Wc/_Wc.so
 drwxr-xr-x	root/root	usr/man/
 drwxr-xr-x	root/root	usr/man/man3/
 -r--r--r--	root/root	usr/man/man3/SVN::Base.3pm.gz
diff --git a/subversion-perl/.md5sum b/subversion-perl/.md5sum
index 4f27b2064..cfb214d08 100644
--- a/subversion-perl/.md5sum
+++ b/subversion-perl/.md5sum
@@ -1 +1 @@
-1a53a0e72bee0bf814f4da83a9b6a636  subversion-1.6.5.tar.bz2
+e5109da756d74c7d98f683f004a539af  subversion-1.6.6.tar.bz2
diff --git a/subversion-perl/Pkgfile b/subversion-perl/Pkgfile
index b0049829f..6f66697e1 100644
--- a/subversion-perl/Pkgfile
+++ b/subversion-perl/Pkgfile
@@ -5,7 +5,7 @@
 # Depends on: subversion swig
 
 name=subversion-perl
-version=1.6.5
+version=1.6.6
 release=1
 source=(http://subversion.tigris.org/tarballs/subversion-$version.tar.bz2)
 
diff --git a/subversion-python/.md5sum b/subversion-python/.md5sum
index 4f27b2064..cfb214d08 100644
--- a/subversion-python/.md5sum
+++ b/subversion-python/.md5sum
@@ -1 +1 @@
-1a53a0e72bee0bf814f4da83a9b6a636  subversion-1.6.5.tar.bz2
+e5109da756d74c7d98f683f004a539af  subversion-1.6.6.tar.bz2
diff --git a/subversion-python/Pkgfile b/subversion-python/Pkgfile
index 0bb06094e..3ff23a04e 100644
--- a/subversion-python/Pkgfile
+++ b/subversion-python/Pkgfile
@@ -5,7 +5,7 @@
 # Depends on: subversion swig
 
 name=subversion-python
-version=1.6.5
+version=1.6.6
 release=1
 source=(http://subversion.tigris.org/tarballs/subversion-$version.tar.bz2)
 
diff --git a/xalan-c/Pkgfile b/xalan-c/Pkgfile
index 347a3f14d..5d824828c 100644
--- a/xalan-c/Pkgfile
+++ b/xalan-c/Pkgfile
@@ -1,12 +1,12 @@
 # Description: XSLT processor for transforming XML documents into HTML, text, or other XML document types.
 # URL: http://xml.apache.org/xalan-c/
-# Maintainer: Jose V Beneyto, sepen at users dot sourceforge dot net
-# Packager: Jose V Beneyto, sepen at users dot sourceforge dot net
+# Maintainer: Jose V Beneyto, sepen at crux dot nu
+# Packager: Jose V Beneyto, sepen at crux dot nu
 # Depends on: xerces-c 
 
 name=xalan-c
 version=1.10.0
-release=2
+release=3
 source=(http://www.apache.org/dist/xml/${name}/Xalan-C_1_10_0-src.tar.gz \
         xalandomstring.hpp.patch)
 
@@ -17,7 +17,7 @@ build() {
   autoconf
   ./runConfigure -P/usr \
     -plinux -cgcc -xg++ -minmem -rpthread
-  make
+  make -j1 CXXFLAGS="$CXXFLAGS"
   make DESTDIR=${PKG} install
   unset XALANCROOT
 }