From c05de0c06c8a98a1599f26e448d153d6fc7f971c Mon Sep 17 00:00:00 2001
From: kueller <kueller@504e572c-2e33-0410-9681-be2bf7408885>
Date: Fri, 12 Aug 2011 09:51:11 +0000
Subject: [PATCH] Anpassung an neue Version

git-svn-id: svn://svn.compuextreme.de/Viitor/V963/ViitorMake@6152 504e572c-2e33-0410-9681-be2bf7408885
---
 SysBuild/development/swftools |  1 +
 SysBuild/guibased/kuickshow   |  5 +++--
 SysBuild/multimedia/transcode | 10 +++-------
 SysBuild/network/bacula       | 17 +----------------
 4 files changed, 8 insertions(+), 25 deletions(-)

diff --git a/SysBuild/development/swftools b/SysBuild/development/swftools
index 67c3cb2..e7190ea 100644
--- a/SysBuild/development/swftools
+++ b/SysBuild/development/swftools
@@ -92,6 +92,7 @@ mk() {
 }
 
 postmk() {
+	ClearHostSysNameing $TMPROOT
         rm /lib/cpp
         mkdir -p $TMPROOT/usr/doc/swftools
 	cp doc/* $TMPROOT/usr/doc/swftools
diff --git a/SysBuild/guibased/kuickshow b/SysBuild/guibased/kuickshow
index 8b5bb49..0d33f28 100644
--- a/SysBuild/guibased/kuickshow
+++ b/SysBuild/guibased/kuickshow
@@ -56,10 +56,10 @@
 #	  frisch installierten Packet verwendet (wie z.B. postgresql)
 # 64	: sourcetree aufräumen nach packeterstellung unterbinden.
 #
-#Module zur Erstellung des Packetes: kdelibs-experimental
+#Module zur Erstellung des Packetes: kuickshow
 #Quelle der Source Archive: www.kde.org
 #Kurzbeschreibung:
-#Support Library für das Kommon Desktop Environment (KDE)
+#Bild Betrachter fuer den KDE
 #
 #Letzte Änderung von: $Author$
 #Datum der letzten Änderung: $Date: 2010-01-10 17:32:14 +0100 (So, 10. Jan 2010) $
@@ -96,6 +96,7 @@ mk32() {
 	      -DOPENGL_gl_LIBRARY=/usr/X11R7/lib \
 	      -DOPENGL_glu_LIBRARY=/usr/X11R7/lib \
 	      -DOPENGL_xmesa_INCLUDE_DIR=/usr/X11R7/include/GL \
+	      -DCMAKE_SKIP_RPATH:BOOL=YES \
 	      -DLIB_SUFFIX= \
 	      .. &&
 	sed -i "s/\(CXX_FLAGS =.*$\)/\1 -I\/usr\/X11R7\/include/" \
diff --git a/SysBuild/multimedia/transcode b/SysBuild/multimedia/transcode
index 1a68096..dd25861 100644
--- a/SysBuild/multimedia/transcode
+++ b/SysBuild/multimedia/transcode
@@ -79,14 +79,11 @@ premk() {
 }
 
 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=\${prefix}/lib64"
-	fi
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
 	USE_ARCH=$UARCH \
 	LDFLAGS="-L/$LIBDIR -L/usr/$LIBDIR -L/usr/X11R7/$LIBDIR" \
-	./configure $ADDOPTIONS \
+	./configure --libdir=\${prefix}/${LIBDIR} \
                     --prefix=/usr \
 		    --enable-lzo \
 		    --with-lzo-includes=/usr/include/lzo \
@@ -102,9 +99,8 @@ mk() {
 		    --enable-vorbis \
 		    --enable-libdv \
 		    --enable-libxml2
-	sed -i "s%\(/lib\)\([/ ]\)%\164\2/g" libtool
-	make &&
-	make prefix=$TMPROOT/usr install 
+	make -j $NUMCPU &&
+	make DESTDIR=$TMPROOT install 
 }
 
 #Funktion wird nach Ablauf des Make Prozesses ausgeführt, und kann
diff --git a/SysBuild/network/bacula b/SysBuild/network/bacula
index 582fe5a..f0f7dec 100644
--- a/SysBuild/network/bacula
+++ b/SysBuild/network/bacula
@@ -72,17 +72,6 @@
 SRCPATH=Network/Servers
 
 premk() {
-	# acl.h stored in xfs for Viitor
-	#mv src/filed/acl.c src/filed/acl.c.orig
-	#sed -e "s/sys\/acl.h/xfs\/sys\/acl.h/g" src/filed/acl.c.orig >src/filed/acl.c
-
-	# Linkbug in wx-config
-	#/bin/ls -l /usr/X11R7/bin/wx-config  | grep -q tmpinstsys 
-	#if [ $? -eq 0 ]; then
-	#  LINKDEST=`/bin/ls -l /usr/X11R7/bin/wx-config | awk  '{ print $10; }' | sed -e "s/\/usr\/tmpinstsys\/.*\/usr/\/usr/g"`
-	#  rm /usr/X11R7/bin/wx-config
-	#  ln -s $LINKDEST /usr/X11R7/bin/wx-config
-	#fi
 	if ! getent group bacula; then
 		groupadd -g 26 bacula
 		BACULAGROUP=true
@@ -94,17 +83,13 @@ premk() {
 }
 
 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=\${prefix}/lib64"
-	fi
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
 	USE_ARCH=$UARCH \
-	./configure $ADDOPTIONS \
+	./configure --libdir=\${prefix}/${LIBDIR} \
 	            --with-x \
 		    --x-includes=/usr/X11R7/include \
 		    --x-libraries=/usr/X11R7/$LIBDIR \
-		    --enable-gnome \
 		    --enable-wx-console \
 		    --enable-tray-monitor \
 		    --with-openssl \