X-Git-Url: http://gitweb/?a=blobdiff_plain;f=slim%2FPkgfile;h=b34b818f4544d1a2a51fd684d82a8d696fac54e1;hb=66f14d1b176b5ff40ae27ef4c96347d3f761915a;hp=908c21e61618c936e749f53ba33edb198311d6f6;hpb=9c5d2f8c427587cd187ba484b9b3487f371340c0;p=attic%2Fports%2Fopt-cross.git

diff --git a/slim/Pkgfile b/slim/Pkgfile
index 908c21e..b34b818 100644
--- a/slim/Pkgfile
+++ b/slim/Pkgfile
@@ -2,15 +2,14 @@
 # URL: http://slim.berlios.de
 # 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
+# Arch Maintainer: CRUX-ARM System Team, devel at crux-arm dot nu
+# 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/*
 }