Update of /cvsroot/fink/experimental/todai/ecc/main/finkinfo/text
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21736

Modified Files:
        ghostscript-esp.info ghostscript-esp.patch 
Log Message:
Now supports OMNI driver.

Index: ghostscript-esp.patch
===================================================================
RCS file: 
/cvsroot/fink/experimental/todai/ecc/main/finkinfo/text/ghostscript-esp.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- ghostscript-esp.patch       27 Feb 2006 19:00:13 -0000      1.6
+++ ghostscript-esp.patch       28 Feb 2006 06:46:01 -0000      1.7
@@ -67,18 +67,29 @@
        }
      }
      spputc(s, pxtSetLineDash);
-diff -ruN espgs-7.07.1.orig/src/configure.ac espgs-7.07.1/src/configure.ac
---- espgs-7.07.1.orig/src/configure.ac Thu Mar 24 01:00:21 2005
-+++ espgs-7.07.1/src/configure.ac      Thu Mar 24 01:15:03 2005
-@@ -448,7 +448,7 @@
+diff -ruN espgs-7.07.1.orig/src/configure espgs-7.07.1/src/configure
+--- espgs-7.07.1-orig/configure        2003-10-10 04:54:02.000000000 +0900
++++ espgs-7.07.1/configure     2006-02-28 14:20:23.000000000 +0900
+@@ -5192,7 +5192,7 @@
+ fi
+ 
        if test "x$CUPSCONFIG" != x; then
-           dnl Use values from CUPS config...
- #         LIBS="`$CUPSCONFIG --ldflags` `$CUPSCONFIG --static --image --libs 
| sed -e '1,$s/-lssl//'` $LIBS"
--          LIBS="`$CUPSCONFIG --ldflags` `$CUPSCONFIG --image --libs` $LIBS"
-+          LIBS="`$CUPSCONFIG --ldflags` `$CUPSCONFIG --image --libs | sed -e 
'1,$s/-lssl//' | sed -e '1,$s/-lcrypto//'` $LIBS"
+-          #       LIBS="`$CUPSCONFIG --ldflags` `$CUPSCONFIG --static --image 
--libs | sed -e '1,$s/-lssl//'` $LIBS"
++          #       LIBS="`$CUPSCONFIG --ldflags` `$CUPSCONFIG --static --image 
--libs | sed -e '1,$s/-lssl//' -e '1,$s/-lcrypto//'` $LIBS"
+           LIBS="`$CUPSCONFIG --ldflags` `$CUPSCONFIG --image --libs` $LIBS"
            CFLAGS="`$CUPSCONFIG --cflags` $CFLAGS"
            cups_serverroot="`$CUPSCONFIG --serverroot`"
-           cups_serverbin="`$CUPSCONFIG --serverbin`"
+@@ -5568,8 +5568,8 @@
+ echo "${ECHO_T}yes" >&6
+ 
+         OMNIDEVS='$(DD)omni.dev'
+-        CFLAGS="$CFLAGS `$GLIB_CONFIG --cflags gmodule`"
+-        LIBS="$LIBS `$GLIB_CONFIG --libs gmodule`"
++        CFLAGS="$CFLAGS `$GLIB_CONFIG --cflags gmodule-2.0`"
++        LIBS="$LIBS `$GLIB_CONFIG --libs gmodule-2.0`"
+ 
+         if test -n "$GCC"; then
+           LIBS="$LIBS -lstdc++"
 diff -ruN espgs-7.07.1-orig/pstoraster/cups.mak 
espgs-7.07.1/pstoraster/cups.mak
 --- espgs-7.07.1-orig/pstoraster/cups.mak      2003-08-21 00:12:43.000000000 
+0900
 +++ espgs-7.07.1/pstoraster/cups.mak   2006-02-25 15:52:09.000000000 +0900
@@ -716,7 +727,7 @@
 +      fi
 +}
 +
-+function backup_file () {
++function backup () {
 +
 +      if [ -f ${1} ]
 +      then
@@ -724,7 +735,7 @@
 +      fi
 +}
 +
-+function restore_file () {
++function restore () {
 +
 +      if [ -f ${1}.finksave ]
 +      then
@@ -732,68 +743,68 @@
 +      fi
 +}
 +
-+function remove_symlink () {
++function unlink () {
 +
-+      if [ -L ${1} -a -f ${1}.finksave ]
++      if [ -L ${1} ]
 +      then
 +              show_and_run /bin/rm ${1}
 +      fi
 +}
 +
-+function link_to_system () {
++function make_links () {
 +
 +      get_cups_location
 +
 +      /bin/mkdir -p ${CUPSSERVER}/filter
 +      for file in <PREFIX>/lib/cups/filter/*
 +      do
-+              backup_file ${CUPSSERVER}/filter/${file##*/}
++              backup ${CUPSSERVER}/filter/${file##*/}
 +              show_and_run /bin/ln -s ${file} ${CUPSSERVER}/filter
 +      done
 +
 +      /bin/mkdir -p ${CUPSCONFIG}
 +      for file in <PREFIX>/etc/cups/*
 +      do
-+              backup_file ${CUPSCONFIG}/${file##*/}
++              backup ${CUPSCONFIG}/${file##*/}
 +              show_and_run /bin/ln -s ${file} ${CUPSCONFIG}
 +      done
 +
 +      /bin/mkdir -p ${CUPSDATA}/model
 +      for file in <PREFIX>/share/cups/model/*
 +      do
-+              backup_file ${CUPSDATA}/model/${file##*/}
++              backup ${CUPSDATA}/model/${file##*/}
 +              show_and_run /bin/ln -s ${file} ${CUPSDATA}/model
 +      done
 +}
 +
-+function unlink_from_system () {
++function remove_links () {
 +
 +      get_cups_location
 +
 +      for file in <PREFIX>/lib/cups/filter/*
 +      do
-+              remove_symlink ${CUPSSERVER}/filter/${file##*/}
-+              restore_file   ${CUPSSERVER}/filter/${file##*/}
++              unlink  ${CUPSSERVER}/filter/${file##*/}
++              restore ${CUPSSERVER}/filter/${file##*/}
 +      done
 +
 +      for file in <PREFIX>/etc/cups/*
 +      do
-+              remove_symlink ${CUPSCONFIG}/${file##*/}
-+              restore_file   ${CUPSCONFIG}/${file##*/}
++              unlink  ${CUPSCONFIG}/${file##*/}
++              restore ${CUPSCONFIG}/${file##*/}
 +      done
 +
 +      for file in <PREFIX>/share/cups/model/*
 +      do
-+              remove_symlink ${CUPSDATA}/model/${file##*/}
-+              restore_file   ${CUPSDATA}/model/${file##*/}
++              unlink  ${CUPSDATA}/model/${file##*/}
++              restore ${CUPSDATA}/model/${file##*/}
 +      done
 +}
 +
 +case "$1" in
 +      add)
-+              link_to_system ;;
++              make_links ;;
 +      remove)
-+              unlink_from_system ;;
++              remove_links ;;
 +      *)
 +              ${show} "usage: ${0##*/} {add|remove}" ;;
 +esac

Index: ghostscript-esp.info
===================================================================
RCS file: 
/cvsroot/fink/experimental/todai/ecc/main/finkinfo/text/ghostscript-esp.info,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- ghostscript-esp.info        27 Feb 2006 19:00:13 -0000      1.8
+++ ghostscript-esp.info        28 Feb 2006 06:46:01 -0000      1.9
@@ -1,9 +1,9 @@
 Package: ghostscript-esp
 Version: 7.07.1
-Revision: 23
+Revision: 25
 Description: Enhanced GNU Ghostscript with better CJK and printer support
-Depends: x11, ghostscript-fonts, libpng3-shlibs (>= 1.2.5-3), gettext, 
applesystemfonts, appleotffonts, ipafonts
-BuildDepends: x11-dev, libpng3 (>= 1.2.5-3), gimp-print-dev | gimp-print7-dev, 
cups-dev, gettext-dev
+Depends: x11, ghostscript-fonts, libpng3-shlibs (>= 1.2.5-3), gettext, 
applesystemfonts, appleotffonts, ipafonts, glib2
+BuildDepends: x11-dev, libpng3 (>= 1.2.5-3), gimp-print-dev | gimp-print7-dev, 
cups-dev, gettext-dev, glib2-dev, pkgconfig
 Conflicts: ghostscript, ghostscript-nox, ghostscript6, ghostscript6-nox, 
ghostscript7, system-ghostscript, system-ghostscript8, system-ghostscript6
 Replaces: ghostscript, ghostscript-nox, ghostscript6, ghostscript6-nox, 
ghostscript7
 Provides: ghostscript
@@ -28,6 +28,7 @@
 Source18: 
http://www.aihara.co.jp/~taiji/gyve/tmp/fix_cidfonttype2_Adobe-Japan1-6.patch
 Source19: 
http://www.aihara.co.jp/~taiji/gyve/tmp/modify_ps2pdfwr-20050921.patch
 Source20: 
http://gentoo.cites.uiuc.edu/pub/gentoo-portage/app-text/ghostscript-esp/files/gs-fix-gc.patch
+Source21: 
http://gentoo.cites.uiuc.edu/pub/gentoo-portage/app-text/ghostscript-esp/files/gs7.07.1-nogtk2.patch
 Source-MD5:  d30bf5c09f2c7caa8291f6305cf03044
 Source2-MD5: dbd5f3b47ed13132f04c685d608a7547
 Source3-MD5: dfc93dd2aaaf2b86d2fd55f654c13261
@@ -48,12 +49,12 @@
 Source18-MD5: 8bac43d7cdd1c503557b3209469c06d5
 Source19-MD5: 27903349daf2046d4e244d3d6f81bfaf
 Source20-MD5: 8c6a3d7e8897b4297ef853dbd89e408b
+Source21-MD5: 92fa24960f2c7802749ce6908aeaf60d
 SourceDirectory: espgs-%v
+Source2ExtractDir: espgs-%v
 Source3ExtractDir: Resource
 Source4ExtractDir: Resource
 PatchScript: <<
- mv ../jpeg-6b jpeg
-
  # apply tagoh-san's patch series, required for NeverEmbed
  patch -p1 < ../ghostscript-7.07-bigposttable.patch
  patch -p1 < ../ghostscript-7.07-gsublookuptable.patch
@@ -100,14 +101,17 @@
  # Fix the garbage collector on ia64 and ppc
  patch -p1 < ../gs-fix-gc.patch
 
+ # Build the small Ghostscript loaders without GTK+
+ sed 's|$(DESTDIR)||g' < ../gs7.07.1-nogtk2.patch | patch -p0
+
  sed 's|<PREFIX>|%p|g' < %a/%n.patch | patch -p1
 <<
 NoSetMAKEFLAGS: true
 SetMAKEFLAGS: -j1
 SetCFLAGS: -I%p/include
-ConfigureParams: --mandir='${prefix}/share/man' --with-x --with-gimp-print 
--with-cups --without-omni
+ConfigureParams: --mandir='${prefix}/share/man' --with-x --with-gimp-print 
--with-cups --with-omni
 CompileScript: <<
- ./configure %c
+ GLIB_CONFIG=%p/bin/pkg-config ./configure %c
  make CFLAGS_STANDARD="-O2 -I%p/include" XLDFLAGS="-L%p/lib -lintl"
 <<
 InstallScript: <<
@@ -139,7 +143,7 @@
 [About CUPS]
  In order to enable ESP GS's CUPS, run the following command manually: 
   $ sudo %p/sbin/finkcups add
- This makes symbolic links to system's CUPS directory. Backup files are
+ This makes symbolic links in system's CUPS directory. Backup files are
  automatically created if files already exist. When this package
  (ghostscript-esp) is removed, original files are restored from those backups.
 <<
@@ -148,10 +152,9 @@
  A patch to gs.1 is based on Gentoo Linux's ghostscript-7.05.6.man.patch.
  A patch to gs_res.ps.in is based on Gentoo Linux's gs7.07.1-cjk.diff.
  A patch to gdevpx.c is based on Gentoo Linux's gs7.05.6-gdevpx.patch.
- Patches to gxalloc.h, gxobj.h, ialloc.c and igcref.c are
-  based on Gentoo Linux's gs-fix-gc.patch.
 
- A patch to configure.ac handles problems of encryption library.
+ A patch to configure handles problems of encryption library on Panther
+  and make GS to use glib2 instead of glib.
  A patch to cups.mak changes install location of files related to CUPS.
  A patch to unixinst.mak adds CIDFnmap.{IPA,Saz,OSX} to install list.
 
@@ -159,6 +162,8 @@
   based on Gentoo Linux's gs7.07.1-cjk.diff (again).
  Patches to CIDFnmap, CIDFnmap.OSX, and most of patches from Web are
   based on Mr. Yamada's Web page: http://www.aihara.co.jp/~taiji/gyve/
+
+ A patch to finkcups makes a shell script for handling CUPS files.
 <<
 Maintainer: Todai Fink Team <[EMAIL PROTECTED]>
 Homepage: http://www.cups.org/ghostscript.php



-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits

Reply via email to