Busybox --> 1.2.2

[people/pmueller/ipfire-2.x.git] / lfs / cups

diff --git a/lfs/cups b/lfs/cups
index 1dcc55b53f7820742854a7caa025308d646e1f1e..47d7c54e8cc95163f411669b35cec2e315387d1b 100644 (file)
--- a/lfs/cups
+++ b/lfs/cups
@@ -18,12 +18,6 @@
 # Makefiles are based on LFSMake, which is                                    #
 # Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
 #                                                                             #
-# Modifications by:                                                           #
-# ??-12-2003 Mark Wormgoor < mark@wormgoor.com>                               #
-#          - Modified Makefile for IPCop build                                #
-#                                                                             #
-# $Id: ntp,v 1.6.2.3 2005/02/05 15:38:15 gespinasse Exp $
-#                                                                             #
 ###############################################################################
 
 ###############################################################################
@@ -32,13 +26,15 @@
 
 include Config
 
-VER        = 1.1.23
+VER        = 1.2.2
 
-THISAPP    = cups-$(VER)-source
-DL_FILE    = $(THISAPP).tar.bz2
-DL_FROM    = ftp://ftp.easysw.com/pub/cups/$(VER)
+THISAPP    = cups-$(VER)
+DL_FILE    = $(THISAPP)-source.tar.bz2
+DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/cups-$(VER)
 TARGET     = $(DIR_INFO)/$(THISAPP)
+PROG       = cups
+PAK_VER    = 1
 
 ###############################################################################
 # Top-level Rules
@@ -48,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 4ce09b1dce09b6b9398af0daae9adf63
+$(DL_FILE)_MD5 = 091de9109c9252cb37427859e90190ad
 
 install : $(TARGET)
 
@@ -59,7 +55,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
 md5 : $(subst %,%_MD5,$(objects))
 
 dist: 
-       make-packages.sh cups $(THISAPP)-ipfire-beta-1
+       @$(PAK)
 
 ###############################################################################
 # Downloading, checking, md5sum
@@ -81,11 +77,9 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && sed -i -e "s@pam/pam@security/pam@g" {config-scripts/cups-pam.m4,scheduler/auth.c,configure}
-#      cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/patches/cups-1.1.23-testsuite_fix-1.patch
+#      cd $(DIR_APP) && sed -i -e "s@pam/pam@security/pam@g" {config-scripts/cups-pam.m4,scheduler/auth.c,configure}
        cd $(DIR_APP) && ./configure --disable-nls --sysconfdir=/var/ipfire
        cd $(DIR_APP) && make
-#      cd $(DIR_APP) && make check
        cd $(DIR_APP) && make install
        cd $(DIR_APP) && ln -v -sf /usr/bin/smbspool /usr/lib/cups/backend/smb
        @rm -rf $(DIR_APP)