Merge branch '2.2' into 2.3

htop/.md5sum

@@ -1 +1 @@
-989905bb2559cf6404c1b8e8ffa48b15  htop-0.6.4.tar.gz
+180aa7c9db7106ed1197b1e408660a0e  htop-0.6.5.tar.gz

htop/Pkgfile

@@ -5,7 +5,7 @@
 # Depends:      ncurses
 
 name=htop
-version=0.6.4
+version=0.6.5
 release=1
 source=(http://dl.sourceforge.net/sourceforge/${name}/${name}-${version}.tar.gz)
 

licq/.md5sum

@@ -1 +1 @@
-d922537a11e7a1712478e159b479ccc8  licq-1.3.4.tar.bz2
+3bab0c9d1977f9b14421d36110e17e0c  licq-1.3.4.tar.bz2

licq/Pkgfile

@@ -7,13 +7,10 @@
 name=licq
 version=1.3.4
 release=1
-source=(http://www.fanfic.org/~jon/licq-$version.tar.bz2)
+source=(http://dl.sourceforge.net/sourceforge/$name/$name-$version.tar.bz2)
 
 build () {
 	cd $name-$version
-        sed -i -e "s|VERSION=1.3.2|VERSION=$version|g" configure
-        sed -i -e "s|VERSION=1.3.2|VERSION=$version|g" plugins/qt-gui/configure
-        sed -i -e "s|VERSION=1.3.2|VERSION=$version|g" plugins/msn/configure
 	./configure --prefix=/usr \
 		    --disable-debug \
 		    --disable-gpgme 

nmap/.footprint

@@ -7,6 +7,7 @@ drwxr-xr-x	root/root	usr/man/man1/
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/nmap/
 -rw-r--r--	root/root	usr/share/nmap/nmap-mac-prefixes
+-rw-r--r--	root/root	usr/share/nmap/nmap-os-db
 -rw-r--r--	root/root	usr/share/nmap/nmap-os-fingerprints
 -rw-r--r--	root/root	usr/share/nmap/nmap-protocols
 -rw-r--r--	root/root	usr/share/nmap/nmap-rpc

nmap/.md5sum

@@ -1 +1 @@
-69bdaa9995f32247b5da7c6b6c41df9b  nmap-4.11.tar.bz2
+ea50419f99472200c4184a304e3831ea  nmap-4.20.tar.bz2

nmap/Pkgfile

@@ -4,7 +4,7 @@
 # Packager: sten, nick dot steeves at shaw dot ca
 
 name=nmap
-version=4.11
+version=4.20
 release=1
 source=(http://download.insecure.org/$name/dist/$name-$version.tar.bz2)