X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fsane;h=9e456f017f9419c98793ffba9c8407ce1be77f33;hb=0f458e4df0c6d99b957d6d175cdd241cff176a6b;hp=742fc70dbf39dfdce4249db8d72295c7bc111195;hpb=85e27660840da15b104f4aa1156ae90a2ba23a18;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/lfs/sane b/lfs/sane
index 742fc70dbf..9e456f017f 100644
--- a/lfs/sane
+++ b/lfs/sane
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2014  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,25 +24,18 @@
 
 include Config
 
-VER        = 1.0.19
+VER        = 1.0.24
 
 THISAPP    = sane-$(VER)
 DL_FILE    = sane-backends-$(VER).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/sane-backends-$(VER)
-ifeq "$(KMOD)" "1"
-ifeq "$(SMP)" "1"
-TARGET     = $(DIR_INFO)/$(THISAPP)-kmod-smp
-else
-TARGET     = $(DIR_INFO)/$(THISAPP)-kmod
-endif
-else
 TARGET     = $(DIR_INFO)/$(THISAPP)
-endif
+
 PROG       = sane
-PAK_VER    = 1
+PAK_VER    = 5
 
-DEPS       = "libtiff"
+DEPS       = "cups libtiff"
 
 ###############################################################################
 # Top-level Rules
@@ -52,7 +45,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 8c0936272dcfd4e98c51512699f1c06f
+$(DL_FILE)_MD5 = 1ca68e536cd7c1852322822f5f6ac3a4
 
 install : $(TARGET)
 
@@ -85,21 +78,6 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-ifeq "$(KMOD)" "1"
-	cd $(DIR_APP)/doc/plustek && cp -vf Makefile.kernel26 \
-				$(DIR_APP)/backend/Makefile
-ifeq "$(SMP)" "1"
-	cd $(DIR_APP)/backend && make -C /lib/modules/$(KVER)-ipfire-smp/build/ \
-				    SUBDIRS=$(DIR_APP)/backend modules
-	cd $(DIR_APP)/backend && install -m 644 pt_drv.ko \
-	    /lib/modules/$(KVER)-ipfire-smp/kernel/drivers/parport/
-else
-	cd $(DIR_APP)/backend && make -C /lib/modules/$(KVER)-ipfire/build/ \
-				    SUBDIRS=$(DIR_APP)/backend modules
-	cd $(DIR_APP)/backend && install -m 644 pt_drv.ko \
-	    /lib/modules/$(KVER)-ipfire/kernel/drivers/parport/
-endif
-else
 	cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc \
 				     --disable-ipv6 \
 				     --enable-parport-directio
@@ -107,12 +85,14 @@ else
 	cd $(DIR_APP) && make install
 	chmod 4755 /usr/bin/scanimage
 	cp -vf $(DIR_SRC)/config/sane/saned.conf /etc/sane.d/
+
+	#install initscripts
+	$(call INSTALL_INITSCRIPT,sane)
+
 	ln -sf ../init.d/sane /etc/rc.d/rc3.d/S95sane
 	ln -sf ../init.d/sane /etc/rc.d/rc0.d/K10sane
 	ln -sf ../init.d/sane /etc/rc.d/rc6.d/K10sane
 	install -v -m 644 $(DIR_SRC)/config/backup/includes/sane  \
 			/var/ipfire/backup/addons/includes/sane
-endif
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
-	
\ No newline at end of file