Sun Nov 13 20:13:01 CET 2005 voroskoi <[EMAIL PROTECTED]>
* cups-1.1.23-4
moved to apps from base (also changed the group)
added espgs to depends()
haven't rebuild yet
diff -rN -u old-frugalware-current-2/source/apps/cups/cups-gcc4-amd64.patch
new-frugalware-current-2/source/apps/cups/cups-gcc4-amd64.patch
--- old-frugalware-current-2/source/apps/cups/cups-gcc4-amd64.patch
1970-01-01 01:00:00.000000000 +0100
+++ new-frugalware-current-2/source/apps/cups/cups-gcc4-amd64.patch
2005-10-13 13:26:34.000000000 +0200
@@ -0,0 +1,12 @@
+diff -Npaur cups-1.1.23/pdftops/GfxFont.cxx
cups-1.1.23-patched/pdftops/GfxFont.cxx
+--- cups-1.1.23/pdftops/GfxFont.cxx 2004-02-02 23:41:09.000000000 +0100
++++ cups-1.1.23-patched/pdftops/GfxFont.cxx 2005-01-28 02:04:15.613249488
+0100
+@@ -969,7 +969,7 @@ Gushort *Gfx8BitFont::getCodeToGIDMap(Tr
+ if ((nameToGID = ff->getNameToGID())) {
+ for (i = 0; i < 256; ++i) {
+ if (!map[i] && (charName = enc[i])) {
+- map[i] = (Gushort)(int)nameToGID->lookup(charName);
++ map[i] = (Gushort)(long)nameToGID->lookup(charName);
+ }
+ }
+ delete nameToGID;
diff -rN -u old-frugalware-current-2/source/apps/cups/cups.install
new-frugalware-current-2/source/apps/cups/cups.install
--- old-frugalware-current-2/source/apps/cups/cups.install 1970-01-01
01:00:00.000000000 +0100
+++ new-frugalware-current-2/source/apps/cups/cups.install 2004-11-05
16:29:00.000000000 +0100
@@ -0,0 +1,24 @@
+# arg 1: the new package version
+post_install() {
+ chkconfig --add rc.cups
+}
+
+# arg 1: the new package version
+# arg 2: the old package version
+post_upgrade() {
+ /bin/true
+}
+
+# arg 1: the old package version
+pre_remove() {
+ chkconfig --del rc.cups
+}
+
+# arg 1: the old package version
+post_remove() {
+ /bin/true
+}
+
+op=$1
+shift
+$op $*
diff -rN -u old-frugalware-current-2/source/apps/cups/FrugalBuild
new-frugalware-current-2/source/apps/cups/FrugalBuild
--- old-frugalware-current-2/source/apps/cups/FrugalBuild 1970-01-01
01:00:00.000000000 +0100
+++ new-frugalware-current-2/source/apps/cups/FrugalBuild 2005-11-13
20:16:47.000000000 +0100
@@ -0,0 +1,62 @@
+# Last Modified: Thu, 13 Oct 2005 13:20:31 +0200
+# Compiling Time: 0.42 SBU
+# Maintainer: VMiklos <[EMAIL PROTECTED]>
+
+pkgname=cups
+pkgver=1.1.23
+pkgrel=4
+pkgdesc="The CUPS Printing System"
+url="http://www.cups.org/";
+depends=('openssl' 'libtiff' 'libpng' 'espgs')
+groups=('apps')
+archs=('i686' 'x86_64')
+backup=(etc/cups/{printers.conf,classes.conf,client.conf,cupsd.conf,mime.types,mime.convs,ppds.dat}
etc/printcap)
+install=$pkgname.install
+up2date="lynx -dump http://www.cups.org/software.php|grep tar.bz2$|sed -n
's/.*-\(.*\)\-.*/\1/;2 p'"
+source=(ftp://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/$pkgname/$pkgver/cups-$pkgver-source.tar.bz2
\
+ rc.cups printcap ppds.dat.gz \
+ cups-gcc4-amd64.patch)
+sha1sums=('32d5bfb44c4edc1b54ccb014b5a44499295c6c5c' \
+ '0ce4a500a3fcd1129c3dc856afeb94f05fe3c456' \
+ '2a27795cc4eaee7ba39425585ef470ae220adb07' \
+ '07542c757de8226fef9dc0dffa4c6711834c060c' \
+ '9e23ed973685c279edfee76fc0a7a9c6fd94a103')
+
+build() {
+ Fcd
+ [ "$CARCH" == "x86_64" ] && Fpatch cups-gcc4-amd64.patch
+ Fmake --with-logdir=/var/log/cups \
+ --with-docdir=/usr/share/cups/doc --enable-ssl=yes \
+ --disable-pam
+ make BUILDROOT=$startdir/pkg install
+ Ffile /etc/cups/ppds.dat
+
+ # init scripts
+ Frm /etc/rc.d/{init.d,rc?.d}
+ Fmkdir /etc/rc.d/rc.messages
+ Fexe /etc/rc.d/rc.$pkgname
+ Ffile ../messages/$pkgname.* /etc/rc.d/rc.messages/
+
+ # printcap
+ Ffile /etc/printcap
+ Fmkdir /usr/etc
+ Fln /etc/printcap /usr/etc/printcap
+
+ # samba support
+ ( if [ ! -r $Fdestdir/usr/lib/cups/backend/smb ]; then
+ Fln /usr/bin/smbspool /usr/lib/cups/backend/smb
+ fi )
+
+ # fix perms on /var/spool
+ chmod 755 $Fdestdir/var/spool
+
+ # remove 'cat?'
+ for i in `find $Fdestdir -type d -name cat?`
+ do
+ Frm $i
+ done
+}
+
+# optimalization OK
+
+# vim: ft=sh
diff -rN -u old-frugalware-current-2/source/apps/cups/messages/cups.de
new-frugalware-current-2/source/apps/cups/messages/cups.de
--- old-frugalware-current-2/source/apps/cups/messages/cups.de 1970-01-01
01:00:00.000000000 +0100
+++ new-frugalware-current-2/source/apps/cups/messages/cups.de 2005-06-16
19:09:29.000000000 +0200
@@ -0,0 +1,2 @@
+stopcups="Stoppe Cups-Dienste"
+startcups="Starte Cups-Dienste"
diff -rN -u old-frugalware-current-2/source/apps/cups/messages/cups.en
new-frugalware-current-2/source/apps/cups/messages/cups.en
--- old-frugalware-current-2/source/apps/cups/messages/cups.en 1970-01-01
01:00:00.000000000 +0100
+++ new-frugalware-current-2/source/apps/cups/messages/cups.en 2004-11-05
16:29:00.000000000 +0100
@@ -0,0 +1,2 @@
+stopcups="Stopping cups services"
+startcups="Starting cups services"
diff -rN -u old-frugalware-current-2/source/apps/cups/messages/cups.hu
new-frugalware-current-2/source/apps/cups/messages/cups.hu
--- old-frugalware-current-2/source/apps/cups/messages/cups.hu 1970-01-01
01:00:00.000000000 +0100
+++ new-frugalware-current-2/source/apps/cups/messages/cups.hu 2005-01-04
15:59:00.000000000 +0100
@@ -0,0 +1,2 @@
+stopcups="A cups szolgáltatások leállítása"
+startcups="A cups szolgáltatások indítása"
Binary files old-frugalware-current-2/source/apps/cups/ppds.dat.gz and
new-frugalware-current-2/source/apps/cups/ppds.dat.gz differ
diff -rN -u old-frugalware-current-2/source/apps/cups/printcap
new-frugalware-current-2/source/apps/cups/printcap
--- old-frugalware-current-2/source/apps/cups/printcap 1970-01-01
01:00:00.000000000 +0100
+++ new-frugalware-current-2/source/apps/cups/printcap 2004-11-05
16:29:00.000000000 +0100
@@ -0,0 +1,8 @@
+# /etc/printcap
+#
+# See "man printcap" for information on editing this file.
+#
+# In most cases it is better to use a tool to write the printcap
+# for you (at least initially), with the web interface provided by the
+# cupsd print daemon at this URL: http://localhost:631.
+#
diff -rN -u old-frugalware-current-2/source/apps/cups/rc.cups
new-frugalware-current-2/source/apps/cups/rc.cups
--- old-frugalware-current-2/source/apps/cups/rc.cups 1970-01-01
01:00:00.000000000 +0100
+++ new-frugalware-current-2/source/apps/cups/rc.cups 2005-07-30
18:18:53.000000000 +0200
@@ -0,0 +1,25 @@
+#!/bin/sh
+
+# (c) 2003 Vajna Miklos <[EMAIL PROTECTED]>
+# rc.cups for FrugalWare
+# distributed under GPL License
+
+. /etc/rc.d/rc.functions
+
+# chkconfig: 2345 99 01
+# description: Startup/shutdown script for the Common UNIX \
+# Printing System (CUPS).
+
+if [ "$1" = "stop" ]; then
+ stop "$stopcups"
+ killall cupsd
+ ok $?
+elif [ "$1" = "restart" ]; then
+ "$0" stop
+ sleep 1
+ "$0" start
+else # start
+ start "$startcups"
+ /usr/sbin/cupsd
+ ok $?
+fi
diff -rN -u old-frugalware-current-2/source/apps/cups/rc.cups.new
new-frugalware-current-2/source/apps/cups/rc.cups.new
--- old-frugalware-current-2/source/apps/cups/rc.cups.new 1970-01-01
01:00:00.000000000 +0100
+++ new-frugalware-current-2/source/apps/cups/rc.cups.new 2005-11-11
18:53:21.000000000 +0100
@@ -0,0 +1,44 @@
+#!/bin/bash
+
+# (c) 2005 Marcus Habermehl <[EMAIL PROTECTED]>
+# (c) 2003 Vajna Miklos <[EMAIL PROTECTED]>
+# rc.cups for FrugalWare
+# distributed under GPL License
+
+# chkconfig: 2345 99 01
+# description: Startup/shutdown script for the Common UNIX \
+# Printing System (CUPS).
+
+source /lib/initscripts/functions
+TEXTDOMAIN=cups
+
+actions=(restart start status stop)
+daemon=$"cups services"
+
+pid="$(pidof cupsd 2> /dev/null)"
+
+rc_start()
+{
+ start_msg
+ if [ -z ${pid} ] ; then
+ /usr/sbin/cupsd
+ ok $?
+ else
+ ok 999
+ fi
+}
+
+rc_stop()
+{
+ stop_msg
+ if [ ! -z ${pid} ] ; then
+ killall cupsd
+ ok $?
+ else
+ ok 999
+ fi
+}
+
+rc_exec $1
+
+# vim: ft=sh
diff -rN -u old-frugalware-current-2/source/base/cups/cups-gcc4-amd64.patch
new-frugalware-current-2/source/base/cups/cups-gcc4-amd64.patch
--- old-frugalware-current-2/source/base/cups/cups-gcc4-amd64.patch
2005-10-13 13:26:34.000000000 +0200
+++ new-frugalware-current-2/source/base/cups/cups-gcc4-amd64.patch
1970-01-01 01:00:00.000000000 +0100
@@ -1,12 +0,0 @@
-diff -Npaur cups-1.1.23/pdftops/GfxFont.cxx
cups-1.1.23-patched/pdftops/GfxFont.cxx
---- cups-1.1.23/pdftops/GfxFont.cxx 2004-02-02 23:41:09.000000000 +0100
-+++ cups-1.1.23-patched/pdftops/GfxFont.cxx 2005-01-28 02:04:15.613249488
+0100
-@@ -969,7 +969,7 @@ Gushort *Gfx8BitFont::getCodeToGIDMap(Tr
- if ((nameToGID = ff->getNameToGID())) {
- for (i = 0; i < 256; ++i) {
- if (!map[i] && (charName = enc[i])) {
-- map[i] = (Gushort)(int)nameToGID->lookup(charName);
-+ map[i] = (Gushort)(long)nameToGID->lookup(charName);
- }
- }
- delete nameToGID;
diff -rN -u old-frugalware-current-2/source/base/cups/cups.install
new-frugalware-current-2/source/base/cups/cups.install
--- old-frugalware-current-2/source/base/cups/cups.install 2004-11-05
16:29:00.000000000 +0100
+++ new-frugalware-current-2/source/base/cups/cups.install 1970-01-01
01:00:00.000000000 +0100
@@ -1,24 +0,0 @@
-# arg 1: the new package version
-post_install() {
- chkconfig --add rc.cups
-}
-
-# arg 1: the new package version
-# arg 2: the old package version
-post_upgrade() {
- /bin/true
-}
-
-# arg 1: the old package version
-pre_remove() {
- chkconfig --del rc.cups
-}
-
-# arg 1: the old package version
-post_remove() {
- /bin/true
-}
-
-op=$1
-shift
-$op $*
diff -rN -u old-frugalware-current-2/source/base/cups/FrugalBuild
new-frugalware-current-2/source/base/cups/FrugalBuild
--- old-frugalware-current-2/source/base/cups/FrugalBuild 2005-11-13
20:51:21.000000000 +0100
+++ new-frugalware-current-2/source/base/cups/FrugalBuild 1970-01-01
01:00:00.000000000 +0100
@@ -1,62 +0,0 @@
-# Last Modified: Thu, 13 Oct 2005 13:20:31 +0200
-# Compiling Time: 0.42 SBU
-# Maintainer: VMiklos <[EMAIL PROTECTED]>
-
-pkgname=cups
-pkgver=1.1.23
-pkgrel=4
-pkgdesc="The CUPS Printing System"
-url="http://www.cups.org/";
-depends=('openssl' 'libtiff' 'libpng')
-groups=('base')
-archs=('i686' 'x86_64')
-backup=(etc/cups/{printers.conf,classes.conf,client.conf,cupsd.conf,mime.types,mime.convs,ppds.dat}
etc/printcap)
-install=$pkgname.install
-up2date="lynx -dump http://www.cups.org/software.php|grep tar.bz2$|sed -n
's/.*-\(.*\)\-.*/\1/;2 p'"
-source=(ftp://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/$pkgname/$pkgver/cups-$pkgver-source.tar.bz2
\
- rc.cups printcap ppds.dat.gz \
- cups-gcc4-amd64.patch)
-sha1sums=('32d5bfb44c4edc1b54ccb014b5a44499295c6c5c' \
- '0ce4a500a3fcd1129c3dc856afeb94f05fe3c456' \
- '2a27795cc4eaee7ba39425585ef470ae220adb07' \
- '07542c757de8226fef9dc0dffa4c6711834c060c' \
- '9e23ed973685c279edfee76fc0a7a9c6fd94a103')
-
-build() {
- Fcd
- [ "$CARCH" == "x86_64" ] && Fpatch cups-gcc4-amd64.patch
- Fmake --with-logdir=/var/log/cups \
- --with-docdir=/usr/share/cups/doc --enable-ssl=yes \
- --disable-pam
- make BUILDROOT=$startdir/pkg install
- Ffile /etc/cups/ppds.dat
-
- # init scripts
- Frm /etc/rc.d/{init.d,rc?.d}
- Fmkdir /etc/rc.d/rc.messages
- Fexe /etc/rc.d/rc.$pkgname
- Ffile ../messages/$pkgname.* /etc/rc.d/rc.messages/
-
- # printcap
- Ffile /etc/printcap
- Fmkdir /usr/etc
- Fln /etc/printcap /usr/etc/printcap
-
- # samba support
- ( if [ ! -r $Fdestdir/usr/lib/cups/backend/smb ]; then
- Fln /usr/bin/smbspool /usr/lib/cups/backend/smb
- fi )
-
- # fix perms on /var/spool
- chmod 755 $Fdestdir/var/spool
-
- # remove 'cat?'
- for i in `find $Fdestdir -type d -name cat?`
- do
- Frm $i
- done
-}
-
-# optimalization OK
-
-# vim: ft=sh
diff -rN -u old-frugalware-current-2/source/base/cups/messages/cups.de
new-frugalware-current-2/source/base/cups/messages/cups.de
--- old-frugalware-current-2/source/base/cups/messages/cups.de 2005-06-16
19:09:29.000000000 +0200
+++ new-frugalware-current-2/source/base/cups/messages/cups.de 1970-01-01
01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-stopcups="Stoppe Cups-Dienste"
-startcups="Starte Cups-Dienste"
diff -rN -u old-frugalware-current-2/source/base/cups/messages/cups.en
new-frugalware-current-2/source/base/cups/messages/cups.en
--- old-frugalware-current-2/source/base/cups/messages/cups.en 2004-11-05
16:29:00.000000000 +0100
+++ new-frugalware-current-2/source/base/cups/messages/cups.en 1970-01-01
01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-stopcups="Stopping cups services"
-startcups="Starting cups services"
diff -rN -u old-frugalware-current-2/source/base/cups/messages/cups.hu
new-frugalware-current-2/source/base/cups/messages/cups.hu
--- old-frugalware-current-2/source/base/cups/messages/cups.hu 2005-01-04
15:59:00.000000000 +0100
+++ new-frugalware-current-2/source/base/cups/messages/cups.hu 1970-01-01
01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-stopcups="A cups szolgáltatások leállítása"
-startcups="A cups szolgáltatások indítása"
Binary files old-frugalware-current-2/source/base/cups/ppds.dat.gz and
new-frugalware-current-2/source/base/cups/ppds.dat.gz differ
diff -rN -u old-frugalware-current-2/source/base/cups/printcap
new-frugalware-current-2/source/base/cups/printcap
--- old-frugalware-current-2/source/base/cups/printcap 2004-11-05
16:29:00.000000000 +0100
+++ new-frugalware-current-2/source/base/cups/printcap 1970-01-01
01:00:00.000000000 +0100
@@ -1,8 +0,0 @@
-# /etc/printcap
-#
-# See "man printcap" for information on editing this file.
-#
-# In most cases it is better to use a tool to write the printcap
-# for you (at least initially), with the web interface provided by the
-# cupsd print daemon at this URL: http://localhost:631.
-#
diff -rN -u old-frugalware-current-2/source/base/cups/rc.cups
new-frugalware-current-2/source/base/cups/rc.cups
--- old-frugalware-current-2/source/base/cups/rc.cups 2005-07-30
18:18:53.000000000 +0200
+++ new-frugalware-current-2/source/base/cups/rc.cups 1970-01-01
01:00:00.000000000 +0100
@@ -1,25 +0,0 @@
-#!/bin/sh
-
-# (c) 2003 Vajna Miklos <[EMAIL PROTECTED]>
-# rc.cups for FrugalWare
-# distributed under GPL License
-
-. /etc/rc.d/rc.functions
-
-# chkconfig: 2345 99 01
-# description: Startup/shutdown script for the Common UNIX \
-# Printing System (CUPS).
-
-if [ "$1" = "stop" ]; then
- stop "$stopcups"
- killall cupsd
- ok $?
-elif [ "$1" = "restart" ]; then
- "$0" stop
- sleep 1
- "$0" start
-else # start
- start "$startcups"
- /usr/sbin/cupsd
- ok $?
-fi
diff -rN -u old-frugalware-current-2/source/base/cups/rc.cups.new
new-frugalware-current-2/source/base/cups/rc.cups.new
--- old-frugalware-current-2/source/base/cups/rc.cups.new 2005-11-11
18:53:21.000000000 +0100
+++ new-frugalware-current-2/source/base/cups/rc.cups.new 1970-01-01
01:00:00.000000000 +0100
@@ -1,44 +0,0 @@
-#!/bin/bash
-
-# (c) 2005 Marcus Habermehl <[EMAIL PROTECTED]>
-# (c) 2003 Vajna Miklos <[EMAIL PROTECTED]>
-# rc.cups for FrugalWare
-# distributed under GPL License
-
-# chkconfig: 2345 99 01
-# description: Startup/shutdown script for the Common UNIX \
-# Printing System (CUPS).
-
-source /lib/initscripts/functions
-TEXTDOMAIN=cups
-
-actions=(restart start status stop)
-daemon=$"cups services"
-
-pid="$(pidof cupsd 2> /dev/null)"
-
-rc_start()
-{
- start_msg
- if [ -z ${pid} ] ; then
- /usr/sbin/cupsd
- ok $?
- else
- ok 999
- fi
-}
-
-rc_stop()
-{
- stop_msg
- if [ ! -z ${pid} ] ; then
- killall cupsd
- ok $?
- else
- ok 999
- fi
-}
-
-rc_exec $1
-
-# vim: ft=sh
_______________________________________________
Frugalware-darcs mailing list
Frugalware-darcs@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-darcs
