xorg-xinit: fixed dependencies and flags

diff --git a/xorg-xinit/Pkgfile b/xorg-xinit/Pkgfile
index c2fb54e0360eae16ba1993e9d8cff16076f48eee..de2601a83df1872791ad3e6d32b84061644122ee 100644 (file)
--- a/xorg-xinit/Pkgfile
+++ b/xorg-xinit/Pkgfile
@@ -1,27 +1,24 @@
 # Description: X Window System initializer
 # URL: http://xorg.freedesktop.org
 # Maintainer: Tilman Sauerbeck tilman at crux dot nu
-# Arch Maintainer System Team crux-arm at mikeux dot dyndns dot org
-# Depends on: xorg-server
+# Arch Maintainer: System Team crux-arm at mikeux dot dyndns dot org
+# Depends on: xorg-libx11
 
 name=xorg-xinit
 version=1.2.0
-release=1
+release=2
 source=(http://xorg.freedesktop.org/releases/individual/app/xinit-$version.tar.bz2)
 
 build() {
   cd xinit-$version
 
-  export DEFAULT_LIBS="-L$CLFS/lib -L$CLFS/usr/lib -L$CLFS/usr/lib/xorg -L$CLFS/usr/lib/xorg/modules"
-  export DEFAULT_CFLAGS="-I$CLFS/usr/include -I$CLFS/usr/include/X11 -I$CLFS/usr/include/X11/extensions"
-  export XORG_LIBS="$DEFAULT_LIBS -lXfont -lXrender -lXau -lpixman-1 -lXdmcp -lXv -lcrypt"
-  export XORG_CFLAGS="$DEFAULT_CFLAGS -I$CLFS/usr/include/xorg -fvisibility=hidden -DRENDER -DRANDR -D_BSD_SOURCE -DHAS_FCHOWN -DHAS_STICKY_DIR_BIT -I$CLFS/usr/include/freetype2 -I$CLFS/usr/include/pixman-1"
-  export XINIT_LIBS="$XORG_LIBS"
-  export XINIT_CFLAGS="$XORG_CFLAGS"
+  export XINIT_LIBS="-L$CLFS/usr/lib -lX11"
+  export XINIT_CFLAGS="-I$CLFS/usr/include -I$CLFS/usr/include/X11 -I$CLFS/usr/include/X11/extensions"
 
   ./configure --build=$CHOST \
               --host=$CTARGET \
-              --prefix=/usr --mandir=/usr/man
+              --prefix=/usr \
+              --mandir=/usr/man
 
   make
   make DESTDIR=$PKG install