From bf53bc095ad47aadfb3e745ca1fb0d1650f5c953 Mon Sep 17 00:00:00 2001
From: kueller <kueller@504e572c-2e33-0410-9681-be2bf7408885>
Date: Fri, 5 Feb 2010 10:38:12 +0000
Subject: [PATCH] =?UTF-8?q?Aenderungen=20an=20hplip=20(build=20with=20foom?=
 =?UTF-8?q?atic)=20erm=C3=B6glichen=20auch=20die=20benutzung=20von=20"Nich?=
 =?UTF-8?q?t-Postscript"=20Printern=20mit=20hplip=20Dazu=20muss=20foomatic?=
 =?UTF-8?q?=20vor=20hplip=20gebaut=20werden.=20Mit=20debugging=20die=20ent?=
 =?UTF-8?q?sprechenden=20aenderungen=20an=20den=20dmk=20file=20vorgenommen?=
 =?UTF-8?q?,=20und=20die=20notwendigen=20flags=20in=20hplip=20aktiviert?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: svn://svn.compuextreme.de/Viitor/V962/ViitorMake@5343 504e572c-2e33-0410-9681-be2bf7408885
---
 SysBuild/BuildCluster/Apps.dmk  |  3 ---
 SysBuild/BuildCluster/Tools.dmk |  5 ++++-
 SysBuild/tools/hplip            | 10 ++++++----
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/SysBuild/BuildCluster/Apps.dmk b/SysBuild/BuildCluster/Apps.dmk
index e3778bb..0ca9cb3 100644
--- a/SysBuild/BuildCluster/Apps.dmk
+++ b/SysBuild/BuildCluster/Apps.dmk
@@ -18,9 +18,6 @@
 0	guibased/gimp
 0	guibased/gimp-data-extras
 0	guibased/xsane
-0	tools/foomatic-filters
-0	tools/foomatic-db-engine
-0	tools/foomatic-db
 0	guibased/xv
 0	guibased/povray
 0	multimedia/mplayer-export
diff --git a/SysBuild/BuildCluster/Tools.dmk b/SysBuild/BuildCluster/Tools.dmk
index a79a8af..0e78ccb 100644
--- a/SysBuild/BuildCluster/Tools.dmk
+++ b/SysBuild/BuildCluster/Tools.dmk
@@ -65,8 +65,11 @@
 0	tools/aspell-de
 0	tools/enchant
 0	tools/heartbeat
+32	tools/foomatic-filters
+0	tools/foomatic-db-engine
+0	tools/foomatic-db
 0	tools/hplip
-0	tools/pth
+64	tools/pth
 0	tools/libassuan
 0	security/libksba
 0	security/gnupg
diff --git a/SysBuild/tools/hplip b/SysBuild/tools/hplip
index fe1be08..7f46f5d 100644
--- a/SysBuild/tools/hplip
+++ b/SysBuild/tools/hplip
@@ -99,7 +99,12 @@ mk() {
 	./configure --target=$TARGET \
 		    --prefix=/usr \
 		    $ADDOPTIONS \
-		    --sysconfdir=/etc/sysconfig/hplip
+		    --sysconfdir=/etc/sysconfig/hplip \
+		    --enable-foomatic-ppd-install \
+		    --enable-foomatic-drv-install \
+		    --enable-cups-ppd-install \
+		    --enable-cups-drv-install \
+		    --enable-foomatic-rip-hplip-install 
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
 }
@@ -111,9 +116,6 @@ postmk() {
 	mv HP ../cups/model
 	ln -s ../cups/model/HP .
 	mv $TMPROOT/etc/sane.d $TMPROOT/etc/sysconfig/
-	sed -e "s/daemon /loadproc /" $TMPROOT/etc/init.d/hplip >/tmp/hplip
-	mv /tmp/hplip $TMPROOT/etc/init.d/hplip
-	chmod 755 $TMPROOT/etc/init.d/hplip
 	if [ "$MK64BIT" == "true" ]; then
 		mv $TMPROOT/usr/lib $TMPROOT/usr/lib64
 		mv $TMPROOT/usr/lib32 $TMPROOT/usr/lib