Merge branch '2.8' into 3.0

14 files changed, 54 insertions, 11 deletions

diff --git a/apr/Pkgfile b/apr/Pkgfile
index f27d7a4ab..b4b5680be 100644
--- a/apr/Pkgfile
+++ b/apr/Pkgfile
@@ -1,7 +1,7 @@
 # Description: Apache Portable Runtime library
 # Maintainer:  Juergen Daubert, jue at crux dot nu
 # URL:         http://apr.apache.org/
-# Depends on:  util-linux-ng, expat, db, gdbm
+# Depends on:  util-linux, expat, db, gdbm
 
 name=apr
 version=1.4.6
diff --git a/cryptsetup/Pkgfile b/cryptsetup/Pkgfile
index 84bd5436d..2aa2d95b4 100644
--- a/cryptsetup/Pkgfile
+++ b/cryptsetup/Pkgfile
@@ -2,7 +2,7 @@
 # URL: http://code.google.com/p/cryptsetup/
 # Maintainer:  Thomas Penteker, tek at serverop dot de
 # Packager: Tilman Sauerbeck, tilman at crux dot nu
-# Depends on: libdevmapper,  util-linux-ng, libgcrypt, popt
+# Depends on: libdevmapper,  util-linux, libgcrypt, popt
 
 name=cryptsetup
 version=1.5.1
diff --git a/dnsmasq/.md5sum b/dnsmasq/.md5sum
index bfb830d5d..1ca6ecf2e 100644
--- a/dnsmasq/.md5sum
+++ b/dnsmasq/.md5sum
@@ -1,3 +1,3 @@
 d1b2a1f31cea2c529358d7e73bcda6bd  dnsmasq
-46b2b2dceddab5553b9211b5cbc9d73e  dnsmasq-2.63.tar.xz
+2bbf1c7bf708abfed52e59101f796fe2  dnsmasq-2.64.tar.xz
 7849643871a6de02fd04214fef307248  dnsmasq-config.patch
diff --git a/dnsmasq/Pkgfile b/dnsmasq/Pkgfile
index 70f1ff0c2..ac250d037 100644
--- a/dnsmasq/Pkgfile
+++ b/dnsmasq/Pkgfile
@@ -3,7 +3,7 @@
 # Maintainer:  Juergen Daubert, jue at crux dot nu
 
 name=dnsmasq
-version=2.63
+version=2.64
 release=1
 source=(http://www.thekelleys.org.uk/$name/$name-$version.tar.xz \
         $name-config.patch dnsmasq)
@@ -11,7 +11,6 @@ source=(http://www.thekelleys.org.uk/$name/$name-$version.tar.xz \
 build () {
     cd $name-$version
 
-    sed -i 's/rc6//' VERSION
     patch -p1 -i $SRC/$name-config.patch
     
     make
diff --git a/ghostscript/Pkgfile b/ghostscript/Pkgfile
index 8b5c0e021..afd9d5ebf 100644
--- a/ghostscript/Pkgfile
+++ b/ghostscript/Pkgfile
@@ -1,7 +1,7 @@
 # Description: Postscript interpreter
 # URL:         http://www.ghostscript.com
 # Maintainer:  Juergen Daubert, jue at crux dot nu
-# Depends on:  util-linux-ng, cups, fontconfig, xorg-libxt, xorg-libxext
+# Depends on:  util-linux, cups, fontconfig, xorg-libxt, xorg-libxext
 
 name=ghostscript
 version=9.06
diff --git a/gkrellm/.footprint b/gkrellm/.footprint
new file mode 100644
index 000000000..8c8fe9eb4
--- /dev/null
+++ b/gkrellm/.footprint
@@ -0,0 +1,19 @@
+drwxr-xr-x	root/root	usr/
+drwxr-xr-x	root/root	usr/bin/
+-rwxr-xr-x	root/root	usr/bin/gkrellm
+-rwxr-xr-x	root/root	usr/bin/gkrellmd
+drwxr-xr-x	root/root	usr/include/
+drwxr-xr-x	root/root	usr/include/gkrellm2/
+-rw-r--r--	root/root	usr/include/gkrellm2/gkrellm-public-proto.h
+-rw-r--r--	root/root	usr/include/gkrellm2/gkrellm.h
+-rw-r--r--	root/root	usr/include/gkrellm2/gkrellmd.h
+-rw-r--r--	root/root	usr/include/gkrellm2/log.h
+drwxr-xr-x	root/root	usr/lib/
+drwxr-xr-x	root/root	usr/lib/gkrellm2/
+drwxr-xr-x	root/root	usr/lib/gkrellm2/plugins/
+drwxr-xr-x	root/root	usr/lib/pkgconfig/
+-rw-r--r--	root/root	usr/lib/pkgconfig/gkrellm.pc
+drwxr-xr-x	root/root	usr/man/
+drwxr-xr-x	root/root	usr/man/man1/
+-rw-r--r--	root/root	usr/man/man1/gkrellm.1.gz
+-rw-r--r--	root/root	usr/man/man1/gkrellmd.1.gz
diff --git a/gkrellm/.md5sum b/gkrellm/.md5sum
new file mode 100644
index 000000000..1d141485a
--- /dev/null
+++ b/gkrellm/.md5sum
@@ -0,0 +1 @@
+e43a9416a6975e3be63d591bdeb33b04  gkrellm-2.3.5.tar.bz2
diff --git a/gkrellm/Pkgfile b/gkrellm/Pkgfile
new file mode 100644
index 000000000..d7fec2310
--- /dev/null
+++ b/gkrellm/Pkgfile
@@ -0,0 +1,18 @@
+# Description: GTK+ system monitor and more.
+# URL: http://freecode.com/projects/gkrellm
+# Maintainer: Danny Rawlins, monster dot romster at gmail dot com
+# Packager: Daniel Mueller, daniel at danm dot de
+# Depends on: gtk lm_sensors util-linux
+
+name=gkrellm
+version=2.3.5
+release=2
+source=(http://www.hvlinux.net/crux/distfiles/$name/$name-$version.tar.bz2)
+
+build() {
+    cd $name-$version
+    export PREFIX=/usr
+    make enable_nls=0 SYS_LIBS+=-lgmodule-2.0
+    make enable_nls=0 DESTDIR=$PKG MANDIR=$PKG/usr/man/man1 install
+    install -d $PKG/usr/lib/gkrellm2/plugins 
+}
diff --git a/nfs-utils/Pkgfile b/nfs-utils/Pkgfile
index 0138e8d66..3f09d5b98 100644
--- a/nfs-utils/Pkgfile
+++ b/nfs-utils/Pkgfile
@@ -1,7 +1,7 @@
 # Description: NFS utilities 
 # URL:         http://nfs.sourceforge.net/
 # Maintainer:  Juergen Daubert, jue at crux dot nu
-# Depends on:  util-linux-ng tcp_wrappers libcap rpcbind libnfsidmap libevent keyutils
+# Depends on:  util-linux tcp_wrappers libcap rpcbind libnfsidmap libevent keyutils
 
 name=nfs-utils
 version=1.2.7
diff --git a/parted/Pkgfile b/parted/Pkgfile
index c4d87d6bd..2780c3902 100644
--- a/parted/Pkgfile
+++ b/parted/Pkgfile
@@ -1,7 +1,7 @@
 # Description: A library and frontend to manipulate partition tables
 # URL: http://www.gnu.org/software/parted/
 # Maintainer: Matt Housh, jaeger at morpheus dot net
-# Depends on: libdevmapper, readline, udev, util-linux-ng
+# Depends on: libdevmapper, readline, udev, util-linux
 
 name=parted
 version=3.1
diff --git a/task/Pkgfile b/task/Pkgfile
index 17d6f26d6..110b01902 100644
--- a/task/Pkgfile
+++ b/task/Pkgfile
@@ -1,7 +1,7 @@
 # Description: Powerful task manager for the command-line 
 # URL:         http://taskwarrior.org/projects/show/taskwarrior/ 
 # Maintainer:  Juergen Daubert, jue at crux dot nu
-# Depends on:  util-linux-ng cmake
+# Depends on:  util-linux cmake
 
 name=task
 version=2.1.2
diff --git a/wine/.footprint b/wine/.footprint
index 7177aae04..cf6ce380c 100644
--- a/wine/.footprint
+++ b/wine/.footprint
@@ -102,8 +102,10 @@ drwxr-xr-x	root/root	usr/include/wine/windows/
 -rw-r--r--	root/root	usr/include/wine/windows/asptlb.idl
 -rw-r--r--	root/root	usr/include/wine/windows/asynot.idl
 -rw-r--r--	root/root	usr/include/wine/windows/asysta.idl
+-rw-r--r--	root/root	usr/include/wine/windows/atlbase.h
 -rw-r--r--	root/root	usr/include/wine/windows/atliface.h
 -rw-r--r--	root/root	usr/include/wine/windows/atliface.idl
+-rw-r--r--	root/root	usr/include/wine/windows/atlwin.h
 -rw-r--r--	root/root	usr/include/wine/windows/audevcod.h
 -rw-r--r--	root/root	usr/include/wine/windows/audioclient.h
 -rw-r--r--	root/root	usr/include/wine/windows/audioclient.idl
@@ -753,6 +755,7 @@ drwxr-xr-x	root/root	usr/lib/wine/
 -rwxr-xr-x	root/root	usr/lib/wine/appwiz.cpl.so
 -rwxr-xr-x	root/root	usr/lib/wine/aspnet_regiis.exe.so
 -rwxr-xr-x	root/root	usr/lib/wine/atl.dll.so
+-rwxr-xr-x	root/root	usr/lib/wine/atl100.dll.so
 -rwxr-xr-x	root/root	usr/lib/wine/atl80.dll.so
 -rwxr-xr-x	root/root	usr/lib/wine/attrib.exe.so
 -rwxr-xr-x	root/root	usr/lib/wine/authz.dll.so
@@ -887,6 +890,7 @@ drwxr-xr-x	root/root	usr/lib/wine/fakedlls/
 -rw-r--r--	root/root	usr/lib/wine/fakedlls/appwiz.cpl
 -rw-r--r--	root/root	usr/lib/wine/fakedlls/aspnet_regiis.exe
 -rw-r--r--	root/root	usr/lib/wine/fakedlls/atl.dll
+-rw-r--r--	root/root	usr/lib/wine/fakedlls/atl100.dll
 -rw-r--r--	root/root	usr/lib/wine/fakedlls/atl80.dll
 -rw-r--r--	root/root	usr/lib/wine/fakedlls/attrib.exe
 -rw-r--r--	root/root	usr/lib/wine/fakedlls/authz.dll
@@ -1364,6 +1368,7 @@ drwxr-xr-x	root/root	usr/lib/wine/fakedlls/
 -rw-r--r--	root/root	usr/lib/wine/libadvapi32.def
 -rw-r--r--	root/root	usr/lib/wine/libadvpack.def
 -rw-r--r--	root/root	usr/lib/wine/libatl.def
+-rw-r--r--	root/root	usr/lib/wine/libatl100.def
 -rw-r--r--	root/root	usr/lib/wine/libavicap32.def
 -rw-r--r--	root/root	usr/lib/wine/libavifil32.def
 -rw-r--r--	root/root	usr/lib/wine/libavrt.def
@@ -1416,6 +1421,7 @@ drwxr-xr-x	root/root	usr/lib/wine/fakedlls/
 -rw-r--r--	root/root	usr/lib/wine/libglu32.def
 -rw-r--r--	root/root	usr/lib/wine/libhid.def
 -rw-r--r--	root/root	usr/lib/wine/libhlink.def
+-rw-r--r--	root/root	usr/lib/wine/libhtmlhelp.def
 -rw-r--r--	root/root	usr/lib/wine/libieframe.def
 -rw-r--r--	root/root	usr/lib/wine/libimagehlp.def
 -rw-r--r--	root/root	usr/lib/wine/libimm32.def
diff --git a/wine/.md5sum b/wine/.md5sum
index 713ecd44a..4400c3bc8 100644
--- a/wine/.md5sum
+++ b/wine/.md5sum
@@ -1,4 +1,4 @@
-6d7c2a55673423b7318db392ba7a7da9  wine-1.5.18.tar.bz2
+713ad4e383abf4288c48c3cf9743a503  wine-1.5.19.tar.bz2
 a79eb547bcb562aea5c7096bc97fff11  wine-mono-0.0.8.msi
 c2f19f07e399d8b9d75a14f37fdddca7  wine_gecko-1.8-x86.msi
 5ce40ef8e3fd56d2c8c4e8d938f10f7b  wine_gecko-1.8-x86_64.msi
diff --git a/wine/Pkgfile b/wine/Pkgfile
index edbdea21a..caf2573c1 100644
--- a/wine/Pkgfile
+++ b/wine/Pkgfile
@@ -5,7 +5,7 @@
 # Depends on: fontconfig-32 freeglut-32 xorg-libxcomposite-32 xorg-libxcursor-32 xorg-libxinerama-32 xorg-libxrandr-32 xorg-libxxf86dga-32 alsa-lib-32 libpng-32 libjpeg-32 prelink
 
 name=wine
-version=1.5.18
+version=1.5.19
 release=1
 source=(http://downloads.sourceforge.net/wine/$name-$version.tar.bz2
 	http://downloads.sourceforge.net/wine/wine_gecko-1.8-x86.msi