Merge branch '2.2' into 2.3

imagemagick/.md5sum

@@ -1 +1 @@
-c34dfc6ee070c481e1cba305623fc358  ImageMagick-6.3.1-3.tar.bz2
+ac75102e649f94e33c05df80b031dfcc  ImageMagick-6.3.1-5.tar.bz2

imagemagick/Pkgfile

@@ -5,8 +5,8 @@
 # Depends on: freetype ghostscript lcms libungif libxml2
 
 name=imagemagick
-version=6.3.1-3
-release=2
+version=6.3.1-5
+release=1
 source=(ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-$version.tar.bz2)
 
 build () {

maildrop/.footprint

@@ -1,10 +1,10 @@
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/deliverquota
--rwxr-xr-x	root/mail	usr/bin/lockmail
+-rwxr-xr-x	root/root	usr/bin/lockmail
 -rwxr-xr-x	root/root	usr/bin/mailbot
 -rwxr-xr-x	root/root	usr/bin/maildirmake
--rwsr-xr-x	root/mail	usr/bin/maildrop
+-rwxr-xr-x	root/root	usr/bin/maildrop
 -rwxr-xr-x	root/root	usr/bin/makemime
 -rwxr-xr-x	root/root	usr/bin/reformail
 -rwxr-xr-x	root/root	usr/bin/reformime

maildrop/.md5sum

@@ -1,2 +1,2 @@
-69c7cb0c93669c0831eb3ee304da8eac  maildrop-2.0.2.tar.bz2
-dbbec9d178ce199e67e98c9a4f994f90  pcre-6.7.tar.bz2
+800ad722584ae5b9b012f912d5353f14  maildrop-2.0.3.tar.bz2
+b97e3bb84bd665e0fbb7a90344d65a43  pcre-7.0.tar.bz2

maildrop/Pkgfile

@@ -4,13 +4,13 @@
 # Depends on:  gdbm
 
 name=maildrop
-version=2.0.2
+version=2.0.3
 release=1
 source=(http://dl.sourceforge.net/sourceforge/courier/$name-$version.tar.bz2 \
-        ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-6.7.tar.bz2)
+        ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-7.0.tar.bz2)
 
 build () {
-    cd pcre-6.7 
+    cd pcre-7.0
     ./configure --prefix=/ --enable-shared=no
     make
     make DESTDIR=$SRC install
@@ -22,6 +22,6 @@ build () {
                 --disable-tempdir
     make 
     make DESTDIR=$PKG install
-    chmod u+s $PKG/usr/bin/maildrop
+    chown root:root $PKG/usr/bin/{maildrop,lockmail}
     rm -r $PKG/usr/{include,lib,man/man3,share}
 }

samba/Pkgfile

@@ -6,7 +6,7 @@
 name=samba
 version=3.0.23d
 release=1
-source=(http://us1.samba.org/samba/ftp/stable/$name-$version.tar.gz \
+source=(http://www.samba.org/samba/ftp/stable/$name-$version.tar.gz \
         samba)
 
 build () {