Stefan Fiedler:

17 years ago · b51603c18d
4 changed files with 55 additions and 143 deletions
--- a/package/base/cups/cups.conf
+++ b/package/base/cups/cups.conf
@ -1,3 +1,4 @@
 #!/bin/bash
 # --- ROCK-COPYRIGHT-NOTE-BEGIN ---
 # 
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
@ -20,6 +21,7 @@
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---

 hook_add postmake 5 cups_pm
 cups_pm(){
 	install_init cups $confdir/cups.init

@ -33,8 +35,58 @@ fi

 var_append extraconfopt " " "--with-cups-user=daemon --with-cups-group=daemon"

 # Don't add files for the configuration front-end to :doc packages.
 splitreg 70 . "${docdir#/}"
 splitreg 75 doc "(CHANGES|CREDITS|INSTALL|LICENSE|README)"

 # Force same compiler version for C and C++
 export CC="${CXX/[cg]++/gcc}"

 hook_add postmake 5 cups_pm
 # Don't install the init scripts provided by cups.
 var_append makeinstopt " " 'INITDIR=""'

 # Install binaries to temp. directory and rename to *_cups.
 bindir="$dummydir/bin"
 sbindir="$dummydir/sbin"

 # Install man pages to temp. directory and rename to *_cups.*.
 mandir="$dummydir/man"

 # hook_add inmake 5 'mkdir -p "$dummydir"/{bin,sbin,man}'
 hook_add postinstall 5 'cups_postinstall'

 cups_postinstall() {
 	for x in bin sbin ; do
 		for y in $( cd "$dummydir/$x" ; ls -dA * ) ; do
 			file="$dummydir/$x/$y"
 			if [ ! -f "$file" ] ; then continue ; fi
 			echo $x $y

 			case "$y" in
 			lpc|lpq|lpr|lprm|accept|reject|lpadmin|lpinfo|lpmove|cancel|lp|lpoptions|lpstat|lppasswd)
 				cp -a "$file" "$root/$prefix/$x/${y}_cups"
 				;;
 			*)
 				cp -a "$file" "$root/$prefix/$x/"
 				;;
 			esac
 		done
 	done

 	for x in $( cd $dummydir ; ls -dA man/* ) ; do
 		mkdir -p "$root/$prefix/$x"
 		for y in $( cd $dummydir/$x ; ls -dA * ) ; do
 			file="$dummydir/$x/$y"
 			if [ ! -f "$file" ] ; then continue ; fi
 			
 			case "${y%%.*}" in
 			lpc|lpq|lpr|lprm|accept|reject|lpadmin|lpinfo|lpmove|cancel|lp|lpoptions|lpstat|lppasswd)
 				cp -a "$file" "$root/$prefix/$x/${y%%.*}_cups.${y#*.}"
 				;;
 			*)
 				cp -a "$file" "$root/$prefix/$x/"
 				;;
 			esac
 		done
 	done
 }
--- a/package/base/cups/cups.desc
+++ b/package/base/cups/cups.desc
@ -52,8 +52,8 @@

 [L] GPL
 [S] Stable
 [V] 1.2.7
 [V] 1.3.5
 [P] X --?--5---9 151.600

 [D] 3129531199 cups-1.2.7-source.tar.bz2 ftp://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/cups/1.2.7/
 [D] 2106747631 cups-1.3.5-source.tar.bz2 http://dl.sourceforge.net/cups/

--- a/package/base/cups/noinit.patch
+++ b/package/base/cups/noinit.patch
@ -1,39 +0,0 @@
 --- cups-1.2.4-orig/Makefile	2006-08-29 17:51:19.000000000 +0200
 +++ cups-1.2.4/Makefile	2006-10-12 22:09:13.000000000 +0200
@@ -99,36 +99,6 @@
 	echo Installing cups-config script...
 	$(INSTALL_DIR) -m 755 $(BINDIR)
 	$(INSTALL_SCRIPT) cups-config $(BINDIR)/cups-config
 -	if test "x$(INITDIR)" != x; then \
 -		echo Installing init scripts...; \
 -		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/init.d; \
 -		$(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/init.d/cups; \
 -		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc0.d; \
 -		$(INSTALL_SCRIPT) init/cups.sh  $(BUILDROOT)$(INITDIR)/rc0.d/K00cups; \
 -		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc2.d; \
 -		$(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/rc2.d/S99cups; \
 -		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc3.d; \
 -		$(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/rc3.d/S99cups; \
 -		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc5.d; \
 -		$(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/rc5.d/S99cups; \
 -	fi
 -	if test "x$(INITDIR)" = x -a "x$(INITDDIR)" != x; then \
 -		$(INSTALL_DIR) $(BUILDROOT)$(INITDDIR); \
 -		if test "$(INITDDIR)" = "/System/Library/StartupItems/PrintingServices"; then \
 -			echo Installing StartupItems files...; \
 -			$(INSTALL_SCRIPT) init/PrintingServices $(BUILDROOT)$(INITDDIR)/PrintingServices; \
 -			$(INSTALL_DATA) init/StartupParameters.plist $(BUILDROOT)$(INITDDIR)/StartupParameters.plist; \
 -			$(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDDIR)/Resources/English.lproj; \
 -			$(INSTALL_DATA) init/Localizable.strings $(BUILDROOT)$(INITDDIR)/Resources/English.lproj/Localizable.strings; \
 -		elif test "$(INITDDIR)" = "/System/Library/LaunchDaemons"; then \
 -			echo Installing LaunchDaemons configuration files...; \
 -			$(INSTALL_DATA) init/org.cups.cupsd.plist $(BUILDROOT)$(DEFAULT_LAUNCHD_CONF); \
 -			$(INSTALL_DATA) init/org.cups.cups-lpd.plist $(BUILDROOT)/System/Library/LaunchDaemons; \
 -		else \
 -			echo Installing RC script...; \
 -			$(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDDIR)/cups; \
 -		fi \
 -	fi
 	if test "x$(DBUSDIR)" != x; then \
 		echo Installing cups.conf in $(DBUSDIR)...;\
 		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(DBUSDIR); \
--- a/package/base/cups/setprinter.patch
+++ b/package/base/cups/setprinter.patch
@ -1,101 +0,0 @@
 diff -dur cups-1.2.4-orig/berkeley/Makefile cups-1.2.4/berkeley/Makefile
 --- cups-1.2.4-orig/berkeley/Makefile	2006-03-05 17:48:12.000000000 +0100
 +++ cups-1.2.4/berkeley/Makefile	2006-10-12 22:11:29.000000000 +0200
@@ -57,11 +57,11 @@
 
 install:	all
 	$(INSTALL_DIR) -m 755 $(BINDIR)
 -	$(INSTALL_BIN) lpq $(BINDIR)
 -	$(INSTALL_BIN) lpr $(BINDIR)
 -	$(INSTALL_BIN) lprm $(BINDIR)
 +	$(INSTALL_BIN) lpq $(BINDIR)/lpq_cups
 +	$(INSTALL_BIN) lpr $(BINDIR)/lpr_cups
 +	$(INSTALL_BIN) lprm $(BINDIR)/lprm_cups
 	$(INSTALL_DIR) -m 755 $(SBINDIR)
 -	$(INSTALL_BIN) lpc $(SBINDIR)
 +	$(INSTALL_BIN) lpc $(SBINDIR)/lpc_cups
 
 
 #
 diff -dur cups-1.2.4-orig/man/Makefile cups-1.2.4/man/Makefile
 --- cups-1.2.4-orig/man/Makefile	2006-07-12 22:45:13.000000000 +0200
 +++ cups-1.2.4/man/Makefile	2006-10-12 22:11:29.000000000 +0200
@@ -107,27 +107,28 @@
 install:	all
 	$(INSTALL_DIR) -m 755 $(MANDIR)/man1
 	for file in $(MAN1); do \
 -		echo Installing $$file in $(MANDIR)/man1...; \
 -		$(INSTALL_MAN) $$file $(MANDIR)/man1; \
 +		inst=`echo $$file | sed -e 's/\\.[0-9a-z]*$$//'`; \
 +		$(INSTALL_MAN) $$file $(MANDIR)/man1/$$inst'_cups.1'; \
 	done
 	$(INSTALL_DIR) -m 755 $(MANDIR)/man5
 	for file in $(MAN5); do \
 -		echo Installing $$file in $(MANDIR)/man5...; \
 -		$(INSTALL_MAN) $$file $(MANDIR)/man5; \
 +		inst=`echo $$file | sed -e 's/\\.[0-9a-z]*$$//'`; \
 +		$(INSTALL_MAN) $$file $(MANDIR)/man5/$$inst'_cups.5'; \
 	done
 	$(INSTALL_DIR) -m 755 $(MANDIR)/man7
 	for file in $(MAN7); do \
 -		echo Installing $$file in $(MANDIR)/man7...; \
 -		$(INSTALL_MAN) $$file $(MANDIR)/man7; \
 +		inst=`echo $$file | sed -e 's/\\.[0-9a-z]*$$//'`; \
 +		$(INSTALL_MAN) $$file $(MANDIR)/man7/$$inst'_cups.7'; \
 	done
 	$(INSTALL_DIR) -m 755 $(AMANDIR)/man$(MAN8DIR)
 	for file in $(MAN8); do \
 -		echo Installing $$file in $(AMANDIR)/man$(MAN8DIR)...; \
 -		$(INSTALL_MAN) $$file $(AMANDIR)/man$(MAN8DIR); \
 +		echo $$file; \
 +		inst=`echo $$file | sed -e 's/\\.[0-9a-z]*$$//'`; \
 +		$(INSTALL_MAN) $$file $(AMANDIR)/man8/$$inst'_cups'.$(MAN8EXT); \
 	done
 -	$(RM) $(AMANDIR)/man$(MAN8DIR)/reject.$(MAN8EXT)
 -	$(LN) accept.$(MAN8EXT) $(AMANDIR)/man$(MAN8DIR)/reject.$(MAN8EXT)
 -	$(RM) $(AMANDIR)/man$(MAN8DIR)/cupsdisable.$(MAN8EXT)
 +	$(RM) $(AMANDIR)/man$(MAN8DIR)/reject_cups.$(MAN8EXT)
 +	$(LN) accept_cups.$(MAN8EXT) $(AMANDIR)/man$(MAN8DIR)/reject_cups.$(MAN8EXT)
 +	$(RM) $(AMANDIR)/man8/cupsdisable.$(MAN8EXT)
 	$(LN) cupsenable.$(MAN8EXT) $(AMANDIR)/man$(MAN8DIR)/cupsdisable.$(MAN8EXT)
 
 
 diff -dur cups-1.2.4-orig/systemv/Makefile cups-1.2.4/systemv/Makefile
 --- cups-1.2.4-orig/systemv/Makefile	2006-06-05 17:25:23.000000000 +0200
 +++ cups-1.2.4/systemv/Makefile	2006-10-12 22:14:25.000000000 +0200
@@ -60,25 +60,25 @@
 
 install:	all
 	$(INSTALL_DIR) -m 755 $(SBINDIR)
 -	$(INSTALL_BIN) accept $(SBINDIR)
 +	$(INSTALL_BIN) accept $(SBINDIR)/accept_cups
 	$(RM) $(SBINDIR)/reject
 -	$(LN) accept $(SBINDIR)/reject
 +	$(LN) accept $(SBINDIR)/reject_cups
 	$(INSTALL_BIN) cupsaddsmb $(SBINDIR)
 -	$(INSTALL_BIN) lpadmin $(SBINDIR)
 -	$(INSTALL_BIN) lpinfo $(SBINDIR)
 -	$(INSTALL_BIN) lpmove $(SBINDIR)
 +	$(INSTALL_BIN) lpadmin $(SBINDIR)/lpadmin_cups
 +	$(INSTALL_BIN) lpinfo $(SBINDIR)/lpinfo_cups
 +	$(INSTALL_BIN) lpmove $(SBINDIR)/lpmove_cups
 	$(INSTALL_DIR) -m 755 $(BINDIR)
 -	$(INSTALL_BIN) cancel $(BINDIR)
 +	$(INSTALL_BIN) cancel $(BINDIR)/cancel_cups
 	$(INSTALL_BIN) cupstestdsc $(BINDIR)
 	$(INSTALL_BIN) cupstestppd $(BINDIR)
 	$(RM) $(SBINDIR)/cupsdisable
 	$(LN) accept $(SBINDIR)/cupsdisable
 	$(RM) $(SBINDIR)/cupsenable
 	$(LN) accept $(SBINDIR)/cupsenable
 -	$(INSTALL_BIN) lp $(BINDIR)
 -	$(INSTALL_BIN) lpoptions $(BINDIR)
 -	$(INSTALL_BIN) lpstat $(BINDIR)
 -	$(INSTALL_BIN) -m 4755 -o root lppasswd $(BINDIR) || $(INSTALL_BIN) lppasswd $(BINDIR)
 +	$(INSTALL_BIN) lp $(BINDIR)/lp_cups
 +	$(INSTALL_BIN) lpoptions $(BINDIR)/lpoptions_cups
 +	$(INSTALL_BIN) lpstat $(BINDIR)/lpstat_cups
 +	$(INSTALL_BIN) -m 4755 -o root lppasswd $(BINDIR)/lppasswd_cups || $(INSTALL_BIN) lppasswd $(BINDIR)/lppasswd_cups
 
 
 #