Merge branch '2.2' into 2.3

git/.md5sum

@@ -1,2 +1,2 @@
-504521167df43146e1f5d69aa5c5e023  git-1.4.4.1.tar.bz2
-3573e8bb863fa1d74a83aa1d47ba601c  git-manpages-1.4.4.1.tar.bz2
+c4f72d96f62ae97c6e8d5cdb4afd55ca  git-1.4.4.2.tar.bz2
+27a9192d91af69ae27691e360649cd7d  git-manpages-1.4.4.2.tar.bz2

git/Pkgfile

@@ -5,7 +5,7 @@
 # Nice to have: tk
 
 name=git
-version=1.4.4.1
+version=1.4.4.2
 release=1
 source=(http://www.kernel.org/pub/software/scm/$name/$name-{,manpages-}$version.tar.bz2)
 

gnupg/Pkgfile

@@ -13,10 +13,7 @@ source=(ftp://ftp.gnupg.org/gcrypt/$name/$name-$version.tar.bz2 \
 build () {
     cd $name-$version
 
-    ( 
-	cd g10
-	patch -p0 < $SRC/filter-context-20-small.diff 
-    )
+    patch -p0 -d g10 -i $SRC/filter-context-20-small.diff
 
     ./configure \
 	--prefix=/usr \

rxvt-unicode/.footprint

@@ -11,6 +11,7 @@ drwxr-xr-x	root/root	usr/lib/urxvt/perl/
 -rw-r--r--	root/root	usr/lib/urxvt/perl/digital-clock
 -rw-r--r--	root/root	usr/lib/urxvt/perl/example-refresh-hooks
 -rw-r--r--	root/root	usr/lib/urxvt/perl/kuake
+-rw-r--r--	root/root	usr/lib/urxvt/perl/macosx-clipboard
 -rw-r--r--	root/root	usr/lib/urxvt/perl/matcher
 -rw-r--r--	root/root	usr/lib/urxvt/perl/option-popup
 -rw-r--r--	root/root	usr/lib/urxvt/perl/readline

rxvt-unicode/.md5sum

@@ -1 +1 @@
-e349f3d2bc8f4dfdf052cf63b4baa065  rxvt-unicode-8.0.tar.bz2
+35b40231ea62b9ad4340080d34781927  rxvt-unicode-8.1.tar.bz2

rxvt-unicode/Pkgfile

@@ -4,7 +4,7 @@
 # Depends on: xorg-libxft, xorg-libxpm, perl
 
 name=rxvt-unicode
-version=8.0
+version=8.1
 release=1
 source=(http://dist.schmorp.de/$name/$name-$version.tar.bz2)
 

wine/.md5sum

@@ -1 +1 @@
-4a3a41e0ac26417a7ad981b89b0c10ce  wine-0.9.26.tar.bz2
+7b5aca2682acc01cd94872072f7a7f1c  wine-0.9.27.tar.bz2

wine/Pkgfile

@@ -5,7 +5,7 @@
 # Depends on: fontforge
 
 name=wine
-version=0.9.26
+version=0.9.27
 release=1
 source=(http://dl.sourceforge.net/sourceforge/$name/wine-$version.tar.bz2)