Browse Source

lprng: Updated (3-8.29-RC1 -> 3.8.35)

user/chris/test/early-mdev
Aldas Nabazas 14 years ago
parent
commit
226aceeae2
  1. 7
      printing/lprng/lprng.desc
  2. 28
      printing/lprng/makefile-fix.patch
  3. 70
      printing/lprng/no-lpd-killing.patch
  4. 82
      printing/lprng/no_multiline_in_makefile.patch

7
printing/lprng/lprng.desc

@ -1,9 +1,8 @@
[COPY] --- SDE-COPYRIGHT-NOTE-BEGIN ---
[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
[COPY]
[COPY] Filename: package/.../lprng/lprng.desc
[COPY] Copyright (C) 2006 The OpenSDE Project
[COPY] Copyright (C) 2006 - 2010 The OpenSDE Project
[COPY] Copyright (C) 2004 - 2006 The T2 SDE Project
[COPY] Copyright (C) 1998 - 2003 Clifford Wolf
[COPY]
@ -40,7 +39,7 @@
[L] GPL
[S] Beta
[V] 3-8.29-RC1
[V] 3.8.35
[P] X -----5---9 118.500
[D] 1723463517 LPRng-3-8.29-RC1.tar.gz http://dl.sourceforge.net/sourceforge/lprng/
[D] 3497744016 LPRng-3.8.35.tgz ftp://ftp.lprng.com/pub/LPRng/LPRng/

28
printing/lprng/makefile-fix.patch

@ -0,0 +1,28 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../lprng/makefile-fix.patch
# Copyright (C) 2010 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
diff -Nur LPRng-3.8.35-orig/Makefile.in LPRng-3.8.35/Makefile.in
--- LPRng-3.8.35-orig/Makefile.in 2010-11-30 18:13:12.256055776 +0100
+++ LPRng-3.8.35/Makefile.in 2010-11-30 18:13:30.240055809 +0100
@@ -45,7 +45,7 @@
LPD_CONF_PATH=\"@LPD_CONF_PATH@\"
PRINTCAP_PATH=\"@PRINTCAP_PATH@\"
LPD_PATH=\"@LPD_DIR@/lpd\"
-SHELL="@SHELL@"
+SHELL=@SHELL@
LOCKFILE=\"@LOCKFILE@\"
CONFIG_SUBDIR="@CONFIG_SUBDIR@"
PSHOWALL="@PSHOWALL@"

70
printing/lprng/no-lpd-killing.patch

@ -2,6 +2,7 @@
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../lprng/no-lpd-killing.patch
# Copyright (C) 2010 The OpenSDE Project
# Copyright (C) 2004 - 2006 The T2 SDE Project
# Copyright (C) 1998 - 2003 Clifford Wolf
#
@ -32,72 +33,3 @@
- rm $i;
- done
-fi
--- ./postinstall.linux.sh.orig 2003-11-14 13:36:02.000000000 -0300
+++ ./postinstall.linux.sh 2003-11-29 10:26:57.000000000 -0300
@@ -68,66 +68,3 @@
${INSTALL} -m 755 $f `dirname ${DESTDIR}${LPD_CONF_PATH}`/lpd
fi
-if [ "X$MAKEPACKAGE" != "XYES" -a "$INIT" != no ] ; then
- echo "Running startup scripts"
- if [ ! -f $init ] ; then
- echo "Missing $init";
- exit 1
- fi
- if [ -f /sbin/chkconfig ] ; then
- echo "Stopping CUPS server"
- service cups stop || /bin/true
- service cups-lpd stop || /bin/true
- echo "Stopping LPD server"
- service lpr stop || service lprng stop || service lpd stop || /bin/true
- echo "running chkconfig"
- (
- /sbin/chkconfig lpr off
- /sbin/chkconfig lpd off
- /sbin/chkconfig lprng off
- /sbin/chkconfig cups off
- /sbin/chkconfig cups-lpd off
- /sbin/chkconfig `basename $init` off
- )
- echo "Checking Printcap"
- ${SBINDIR}/checkpc -f
- echo "Running LPRng Startup Scripts"
- /sbin/chkconfig --add `basename $init`
- /sbin/chkconfig --list `basename $init`
- /sbin/chkconfig `basename $init` on
- echo "Starting Printer"
- service `basename $init` start
- echo "Printer Started"
- else
- echo "Stopping server"
- kill -INT `ps ${PSHOWALL} | awk '/lpd/{ print $1;}'` >/dev/null 2>&1
- sleep 2
- echo "Checking Printcap"
- ${SBINDIR}/checkpc -f
- echo "Starting Printer"
- sh `dirname ${DESTDIR}${LPD_CONF_PATH}`/lpd start
- echo "Printer Started"
- m=`dirname ${DESTDIR}${LPD_CONF_PATH}`/lpd
- cat <<EOF
-#
-# You will have to install the run time startup files by hand.
-# The $m file contains the standard startup/shutdown code.
-# You should put this file in the file in common set of rc startup
-# scripts and then make symbolic links to it from the run level
-# directories.
-#
-# You can use the following a template for your installation
-#
- initdir=/etc/rc.d
- cp `dirname ${DESTDIR}${LPD_CONF_PATH}`/lpd \${initdir}/lpd
- ln -s ../init.d/lpd \${initdir}/rc0.d/K60lprng
- ln -s ../init.d/lpd \${initdir}/rc1.d/K60lprng
- ln -s ../init.d/lpd \${initdir}/rc2.d/S60lprng
- ln -s ../init.d/lpd \${initdir}/rc3.d/S60lprng
- ln -s ../init.d/lpd \${initdir}/rc4.d/S60lprng
- ln -s ../init.d/lpd \${initdir}/rc5.d/S60lprng
- ln -s ../init.d/lpd \${initdir}/rc6.d/K60lprng
-
-EOF
- fi;
-fi;

82
printing/lprng/no_multiline_in_makefile.patch

@ -1,82 +0,0 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../lprng/no_multiline_in_makefile.patch
# Copyright (C) 2006 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
I don't understand it but this makefile doesn't support multiline
shell commands, so i merged them.
--- ./Makefile.in.orig 2004-09-24 16:19:52.000000000 -0400
+++ ./Makefile.in 2006-09-28 06:12:31.000000000 -0400
@@ -92,23 +92,13 @@
@echo "MANDIR=$(mandir)" >>$@
./postinstall: $(SCRIPTS) Makefile
- OSNAME=@OSNAME@; case "@OSNAME@" in \
- *linux* ) OSNAME=linux;; \
- *freebsd* ) OSNAME=freebsd;; \
- *solaris* ) OSNAME=solaris;; \
- esac; \
- if test -f postinstall.$${OSNAME} ; then s=postinstall.$${OSNAME} ; else s=postinstall.generic; fi; \
- echo POSTINSTALL "'$$s'"; cp $$s postinstall;
+ OSNAME=@OSNAME@; case "@OSNAME@" in *linux* ) OSNAME=linux;; *freebsd* ) OSNAME=freebsd;; *solaris* ) OSNAME=solaris;; esac; if test -f postinstall.$${OSNAME} ; then s=postinstall.$${OSNAME} ; else s=postinstall.generic; fi; echo POSTINSTALL "'$$s'"; cp $$s postinstall;
./preremove: $(SCRIPTS) Makefile
- OSNAME=@OSNAME@; case "@OSNAME@" in *linux* ) OSNAME=linux;; esac; \
- if test -f preremove.$${OSNAME} ; then s=preremove.$${OSNAME} ; else s=preremove.generic; fi; \
- echo PREREMOVE "'$$s'"; cp $$s preremove;
+ OSNAME=@OSNAME@; case "@OSNAME@" in *linux* ) OSNAME=linux;; esac; if test -f preremove.$${OSNAME} ; then s=preremove.$${OSNAME} ; else s=preremove.generic; fi; echo PREREMOVE "'$$s'"; cp $$s preremove;
./postremove: $(SCRIPTS) Makefile
- OSNAME=@OSNAME@; case "@OSNAME@" in *linux* ) OSNAME=linux;; esac; \
- if test -f postremove.$${OSNAME} ; then s=postremove.$${OSNAME} ; else s=postremove.generic; fi; \
- echo POSTREMOVE "'$$s'"; cp $$s postremove;
+ OSNAME=@OSNAME@; case "@OSNAME@" in *linux* ) OSNAME=linux;; esac; if test -f postremove.$${OSNAME} ; then s=postremove.$${OSNAME} ; else s=postremove.generic; fi; echo POSTREMOVE "'$$s'"; cp $$s postremove;
# define default target
.PHONY: all warn TAGS clean uninstall install info dvi check \
@@ -118,20 +108,8 @@
###############################################################################
$(ALLDIRS):
- if [ "$@" = po ] ; then \
- for i in po/Makefile* ; do \
- if [ -f "$$i" ] ; then \
- if grep '^mkinstalldirs.*=.*case' $$i ; then \
- echo "fixing broken $$i which causes wrong path to mkinstalldirs to be used"; \
- perl -spi -e 's:^mkinstalldirs\s*=\s*.*:mkinstalldirs = \$$(SHELL) \$$(MKINSTALLDIRS):' $$i; \
- fi \
- fi \
- done \
- fi
- if [ "$@" != po -o "$(USE_NLS)" != "no" ] ; then \
- cd $@; $(MAKE) localedir=${LOCALEDIR} \
- DESTDIR=$(DESTDIR) $(MAKETARGET) ; \
- fi
+ if [ "$@" = po ] ; then for i in po/Makefile* ; do if [ -f "$$i" ] ; then if grep '^mkinstalldirs.*=.*case' $$i ; then echo "fixing broken $$i which causes wrong path to mkinstalldirs to be used"; perl -spi -e 's:^mkinstalldirs\s*=\s*.*:mkinstalldirs = \$$(SHELL) \$$(MKINSTALLDIRS):' $$i; fi fi done fi
+ if [ "$@" != po -o "$(USE_NLS)" != "no" ] ; then cd $@; $(MAKE) localedir=${LOCALEDIR} DESTDIR=$(DESTDIR) $(MAKETARGET) ; fi
TAGS clean::
-$(MAKE) MAKETARGET=$@ DESTDIR=$(DESTDIR) $(DIRS)
@@ -143,9 +121,7 @@
install: all
$(MAKE) MAKETARGET=$@ DESTDIR=$(DESTDIR) $(INSTALLDIRS)
- if [ "${POSTINSTALL}" != "NO" -a "${POSTINSTALL}" != "no" ] ; then \
- MAKEINSTALL=YES DESTDIR=$(DESTDIR) $(SHELL) postinstall ; \
- fi;
+ if [ "${POSTINSTALL}" != "NO" -a "${POSTINSTALL}" != "no" ] ; then MAKEINSTALL=YES DESTDIR=$(DESTDIR) $(SHELL) postinstall ; fi;
@echo "";
info dvi check:
Loading…
Cancel
Save