slim: improved and cleaned up

diff --git a/slim/.footprint b/slim/.footprint
index 23eb9032394e411f1685f76dd251bd7df5c50c70..a118830b338173053bae4961d3001870c2ac672d 100644 (file)
--- a/slim/.footprint
+++ b/slim/.footprint
@@ -11,10 +11,6 @@ drwxr-xr-x   root/root       usr/man/man1/
 drwxr-xr-x     root/root       usr/share/
 drwxr-xr-x     root/root       usr/share/slim/
 drwxr-xr-x     root/root       usr/share/slim/themes/
-drwxr-xr-x     root/root       usr/share/slim/themes/crux-smooth/
--rw-r--r--     root/root       usr/share/slim/themes/crux-smooth/background.jpg
--rw-r--r--     root/root       usr/share/slim/themes/crux-smooth/panel.png
--rw-r--r--     root/root       usr/share/slim/themes/crux-smooth/slim.theme
 drwxr-xr-x     root/root       usr/share/slim/themes/default/
 -rw-r--r--     root/root       usr/share/slim/themes/default/background.jpg
 -rw-r--r--     root/root       usr/share/slim/themes/default/panel.png

diff --git a/slim/.md5sum b/slim/.md5sum
index 66922f2bcd33bb52503b7abead0d8b655db98897..35bac81ec0bf4783d5d0d990d79fb9f515512b13 100644 (file)
--- a/slim/.md5sum
+++ b/slim/.md5sum
@@ -1,4 +1,3 @@
 727d0acb24c0fbf0751134c37a9c895f  slim-1.3.1.tar.gz
-46349c2dc378b17d5857c5c1d904a636  slim-crux-smooth.tar.gz
 dcc7e99ca74d6b93bca75b5dee95138b  slim.diff
 476ce747c77f1a7e116a7f63bfb7d8d3  slim.rc

diff --git a/slim/Pkgfile b/slim/Pkgfile
index 908c21e61618c936e749f53ba33edb198311d6f6..aff0c68718c3d320ff02ad28d3a6d033c40a74bd 100644 (file)
--- a/slim/Pkgfile
+++ b/slim/Pkgfile
@@ -3,14 +3,13 @@
 # Packager: Simone Rota sip at crux dot nu
 # Maintainer: Thomas Penteker tek at serverop dot de
 # Arch Maintainer: CRUX-ARM System Team, crux-arm at mikeux dot dyndns dot org
-# Depends on: xorg-xauth libjpeg libpng
+# Depends on: xorg-xauth
 
 name=slim
 version=1.3.1
-release=2
+release=3
 source=(http://download.berlios.de/$name/$name-$version.tar.gz \
-        http://jw.tks6.net/files/slim-crux-smooth.tar.gz $name.rc
-        $name.diff)
+        $name.rc $name.diff)
 
 build () {
   cd $name-$version
@@ -18,11 +17,11 @@ build () {
   # fix the build with g++ 4.4
   patch -p1 -i $SRC/$name.diff
   
-  INC="-I$CLFS/usr/include -I$CLFS/usr/include/X11 -I$CLFS/usr/include/libpng12"
-  INC="$INC -I$CLFS/usr/include/X11/extensions -I$CLFS/usr/include/X11/Xft"
-  INC="$INC -I$CLFS/usr/include/freetype2 -I$CLFS/usr/include/freetype2/config"
+  sed -i Makefile \
+      -e "s|CFLAGS=|CFLAGS=$CFLAGS |" \
+      -e "s|-I/usr|-I$CLFS/usr|g"
 
-  make CC="$CC" CXX="$CXX" CFLAGS="$CFLAGS -Wall -I. $INC"
+  make CC="$CC" CXX="$CXX"
   make DESTDIR=$PKG install
    
   mkdir $PKG/etc/rc.d
@@ -30,6 +29,4 @@ build () {
   cd ../
 
   rm -f slim-crux-smooth/README
-  cp -r slim-crux-smooth $PKG/usr/share/slim/themes/crux-smooth
-  chmod 0644 $PKG/usr/share/slim/themes/crux-smooth/*
 }