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

git/.md5sum

@@ -1,2 +1,2 @@
-25e4bcdc528b3ffadc6e59908a513881  git-1.6.6.tar.bz2
-2f31c767576fa693b5b45244a022fdd3  git-manpages-1.6.6.tar.bz2
+9d254bfdae56c6fa124d8a1312a1b034  git-1.6.6.1.tar.bz2
+18cbc20056058ef4d336896f628fc3b8  git-manpages-1.6.6.1.tar.bz2

git/Pkgfile

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

pinentry/.footprint

@@ -3,4 +3,3 @@ drwxr-xr-x	root/root	usr/bin/
 lrwxrwxrwx	root/root	usr/bin/pinentry -> pinentry-gtk-2
 -rwxr-xr-x	root/root	usr/bin/pinentry-curses
 -rwxr-xr-x	root/root	usr/bin/pinentry-gtk-2
--rwxr-xr-x	root/root	usr/bin/pinentry-qt

pinentry/Pkgfile

@@ -7,7 +7,7 @@
 
 name=pinentry
 version=0.7.5
-release=2
+release=3
 source=(ftp://ftp.gnupg.org/gcrypt/$name/$name-$version.tar.gz $name-$version.patch)
 
 build() {
@@ -20,10 +20,6 @@ build() {
   --with-qt-dir=/usr/share/qt3 \
   --enable-fallback-curses \
   --disable-pinentry-gtk
-    cd qt
-    moc-qt3 pinentrydialog.h > pinentrydialog.moc
-    moc-qt3  secqlineedit.h >  secqlineedit.moc
-    cd ..
     make
     make DESTDIR=$PKG install
 

xterm/.md5sum

@@ -1,2 +1,2 @@
 2bc971a1753fe57aca05fde7c005a16c  configure.diff
-933bff842e173ecab1e8d668d22711f4  xterm-254.tgz
+158c6b39ea8934a11e4376a3a9741252  xterm-255.tgz

xterm/Pkgfile

@@ -5,7 +5,7 @@
 # Depends on: xorg-libxaw xorg-font-alias xorg-font-misc-misc
 
 name=xterm
-version=254
+version=255
 release=1
 source=(ftp://invisible-island.net/$name/$name-$version.tgz \
         configure.diff)