SF.net SVN: gar:[24558] csw/mgar/pkg/ghostscript/trunk
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Fri Jan 9 15:59:51 CET 2015
Revision: 24558
http://sourceforge.net/p/gar/code/24558
Author: dmichelsen
Date: 2015-01-09 14:59:50 +0000 (Fri, 09 Jan 2015)
Log Message:
-----------
ghostscript/trunk: Remove libijs building as it is not needed and general cleanup
Modified Paths:
--------------
csw/mgar/pkg/ghostscript/trunk/Makefile
Removed Paths:
-------------
csw/mgar/pkg/ghostscript/trunk/files/0001-Fix-for-latest-autotools.patch
csw/mgar/pkg/ghostscript/trunk/files/0001-Use-ksh-and-GNU-sed-as-reported-in-4913.patch
csw/mgar/pkg/ghostscript/trunk/files/map.ghostscript
Modified: csw/mgar/pkg/ghostscript/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ghostscript/trunk/Makefile 2015-01-09 14:08:13 UTC (rev 24557)
+++ csw/mgar/pkg/ghostscript/trunk/Makefile 2015-01-09 14:59:50 UTC (rev 24558)
@@ -10,25 +10,13 @@
MASTER_SITES = http://downloads.ghostscript.com/public/
DISTFILES = $(NAME)-$(VERSION).tar.gz
-#DISTFILES += map.ghostscript
-# See for details https://www.opencsw.org/mantis/view.php?id=4913
-#PATCHFILES += 0001-Use-ksh-and-GNU-sed-as-reported-in-4913.patch
-
-# Use patch until this is fixed:
-# http://bugs.ghostscript.com/show_bug.cgi?id=695692
-PATCHFILES += 0001-Fix-for-latest-autotools.patch
-
VENDOR_URL = http://www.ghostscript.com
LICENSE = LICENSE
GARCOMPILER = GCC4
-#GARFLAVOR = DBG
-
-#LINKER_MAPS ?= -M "$(abspath $(WORKDIR)/map.ghostscript)"
-
# Many more missing
BUILD_DEP_PKGS += CSWlibpng-dev
BUILD_DEP_PKGS += CSWlibz-dev
@@ -39,7 +27,7 @@
BUILD_DEP_PKGS += CSWfontconfig-dev
BUILD_DEP_PKGS += CSWlibjpeg-dev
BUILD_DEP_PKGS += CSWlibpaper-dev
-BUILD_DEP_PKGS += CSWlibcairo2
+BUILD_DEP_PKGS += CSWlibcairo-dev
FOREIGN_PACKAGES += CSWlibgs8
@@ -65,7 +53,6 @@
RUNTIME_DEP_PKGS_CSWghostscript += CSWlibglib2-0-0
RUNTIME_DEP_PKGS_CSWghostscript += CSWlibgtk-x11-2-0-0
RUNTIME_DEP_PKGS_CSWghostscript += CSWliblcms2-2
-RUNTIME_DEP_PKGS_CSWghostscript += CSWlibijs0-35
RUNTIME_DEP_PKGS_CSWghostscript-sparc += CSWlibintl8
RUNTIME_DEP_PKGS_CSWghostscript += $(RUNTIME_DEP_PKGS_CSWghostscript-$(GARCH))
@@ -74,7 +61,7 @@
CHECKPKG_OVERRIDES_CSWghostscript += file-with-bad-content|/usr/local|root/opt/csw/bin/sparcv9/unix-lpr.sh
CHECKPKG_OVERRIDES_CSWghostscript += file-with-bad-content|/usr/local|root/opt/csw/bin/sparcv8plus/lprsetup.sh
CHECKPKG_OVERRIDES_CSWghostscript += file-with-bad-content|/usr/local|root/opt/csw/bin/sparcv8plus/unix-lpr.sh
-CHECKPKG_OVERRIDES_CSWghostscript += file-with-bad-content|/usr/local|root/opt/csw/bin/pentium_pro/unix-lpr.sh
+CHECKPKG_OVERRIDES_CSWghostscript += file-with-bad-content|/usr/local|root/opt/csw/bin/pentium_pro/unix-lpr.sh
CHECKPKG_OVERRIDES_CSWghostscript += file-with-bad-content|/usr/local|root/opt/csw/bin/pentium_pro/lprsetup.sh
CHECKPKG_OVERRIDES_CSWghostscript += file-with-bad-content|/usr/local|root/opt/csw/bin/amd64/lprsetup.sh
CHECKPKG_OVERRIDES_CSWghostscript += file-with-bad-content|/usr/local|root/opt/csw/bin/amd64/unix-lpr.sh
@@ -107,14 +94,6 @@
RUNTIME_DEP_PKGS_CSWlibgs9-sparc += CSWlibintl8
RUNTIME_DEP_PKGS_CSWlibgs9 += $(RUNTIME_DEP_PKGS_CSWlibgs9-$(GARCH))
-# This used to be a separate library and is now maintained as part of Ghostscript
-PACKAGES += CSWlibijs0-35
-PKGFILES_CSWlibijs0-35 += $(call pkgfiles_lib,libijs-0.35.so)
-SPKG_DESC_CSWlibijs0-35 = $(DESCRIPTION), libijs-0.35.so
-RUNTIME_DEP_PKGS_CSWlibijs0-35 += CSWlibgcc-s1
-OBSOLETED_BY_CSWlibijs0-35 = CSWijs
-CHECKPKG_OVERRIDES_CSWlibijs0-35 += soname-equals-filename
-
PACKAGES += CSWghostscript-dev
SPKG_DESC_CSWghostscript-dev = Development files for ghostscript and libgs.so.9
# This remove all the .so symlinks for PKGFILES_DEVEL
@@ -123,16 +102,9 @@
PKGFILES_DEVEL_SHAREDLIBLINK =
PKGFILES_CSWghostscript-dev += $(PKGFILES_DEVEL)
PKGFILES_CSWghostscript-dev += $(call baseisadirs,$(libdir),libgs\.so)
-PKGFILES_CSWghostscript-dev += $(call baseisadirs,$(libdir),libijs\.so)
RUNTIME_DEP_PKGS_CSWghostscript-dev += CSWlibgs9
-RUNTIME_DEP_PKGS_CSWghostscript-dev += CSWlibijs0-35
RUNTIME_DEP_PKGS_CSWghostscript-dev += CSWghostscript
-REINPLACEMENTS += fontpath
-REINPLACE_MATCH_fontpath = /usr/share/cups/fonts
-REINPLACE_WITH_fontpath = $(sharedstatedir)/cups/fonts
-REINPLACE_FILES_fontpath += cups/gstopxl.in
-
# This is for cups/gstoraster.c which doesn't seem to honour --with-fontpath
EXTRA_CPPFLAGS += -DCUPS_FONTPATH=\\\"$(datadir)/ghostscript/fonts\\\"
@@ -152,26 +124,19 @@
CONFIGURE_ARGS-DBG += --disable-compile-inits
CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(GARFLAVOR))
-# The arguments used for libijs
-CONFIGURE_ARGS_ijs = $(DIRPATHS)
-CONFIGURE_ARGS_ijs += --enable-shared
-CONFIGURE_ARGS_ijs += --disable-static
+# We do not bootstrap and compile libijs any more as Ghostscript statically compiles
+# against the local ijs sources and the libijs library is not useful. See for details
+# http://bugs.ghostscript.com/show_bug.cgi?id=695692
# We want the shared library
BUILD_ARGS += so
-# This is needed because libidn.so and libpaper.so are not linked with LDFLAGS set
-#BUILD_ARGS += XTRALIBS="$(strip $(LINKER_FLAGS))"
-
-#TEST_ARGS += XTRALIBS="$(strip $(LINKER_FLAGS))"
-
INSTALL_ARGS += soinstall
include gar/category.mk
+# Remove local versions of libraies we want to link against system-wide
post-extract:
- # http://www.linuxfromscratch.org/blfs/view/svn/pst/gs.html
- gsed -i 's/ZLIBDIR=src/ZLIBDIR=$$includedir/' $(WORKSRC)/configure.ac $(WORKSRC)/configure
rm -rf $(WORKSRC)/lcms2
rm -rf $(WORKSRC)/zlib
rm -rf $(WORKSRC)/jpeg
@@ -183,25 +148,3 @@
rm -rf $(WORKSRC)/expat
@$(MAKECOOKIE)
-# For building IJS take this into account:
-# http://bugs.ghostscript.com/show_bug.cgi?id=692040
-
-post-configure:
- # Specific for libijs
- cd $(WORKSRC)/ijs && ./autogen.sh
- cd $(WORKSRC)/ijs && \
- /usr/bin/env -i $(CONFIGURE_ENV) PWD=$(abspath $(WORKSRC)/ijs) \
- ./configure $(CONFIGURE_ARGS_ijs)
- @$(MAKECOOKIE)
-
-post-build:
- # Specific for libijs
- cd $(WORKSRC)/ijs && \
- /usr/bin/env -i $(BUILD_ENV) $(MAKE) MAKEFLAGS= $(PARALLELMFLAGS) $(foreach TTT,$(BUILD_OVERRIDE_VARS),$(TTT)="$(BUILD_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $(OBJDIR) $(BUILD_ARGS_ijs)
- @$(MAKECOOKIE)
-
-post-install:
- # Specific for libijs
- cd $(WORKSRC)/ijs && \
- /usr/bin/env -i $(INSTALL_ENV) $(MAKE) DESTDIR=$(DESTDIR) $(foreach TTT,$(INSTALL_OVERRIDE_VARS),$(TTT)="$(INSTALL_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(INSTALL_OVERRIDE_DIRS),$(TTT)="$(DESTDIR)$($(TTT))") -C $(OBJDIR) $(INSTALL_ARGS_ijs) install
- @$(MAKECOOKIE)
Deleted: csw/mgar/pkg/ghostscript/trunk/files/0001-Fix-for-latest-autotools.patch
===================================================================
--- csw/mgar/pkg/ghostscript/trunk/files/0001-Fix-for-latest-autotools.patch 2015-01-09 14:08:13 UTC (rev 24557)
+++ csw/mgar/pkg/ghostscript/trunk/files/0001-Fix-for-latest-autotools.patch 2015-01-09 14:59:50 UTC (rev 24558)
@@ -1,97 +0,0 @@
-From 5732afdaaa749b7caf4757c1d6f7b92c87bf5e5b Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <dam at opencsw.org>
-Date: Tue, 11 Nov 2014 15:27:55 +0100
-Subject: [PATCH] Fix for latest autotools
-
----
- ijs/Makefile.am | 4 +++-
- ijs/autogen.sh | 4 ++--
- ijs/configure.ac | 7 ++++---
- 3 files changed, 9 insertions(+), 6 deletions(-)
-
-diff --git a/ijs/Makefile.am b/ijs/Makefile.am
-index 6ca2adf..50c5755 100644
---- a/ijs/Makefile.am
-+++ b/ijs/Makefile.am
-@@ -23,7 +23,9 @@
-
- ## Process this file with automake to produce Makefile.in.
-
--AUTOMAKE_OPTIONS = 1.8 foreign dist-bzip2 no-dependencies
-+AUTOMAKE_OPTIONS = 1.6 foreign dist-bzip2 no-dependencies
-+
-+ACLOCAL_AMFLAGS = -I m4
-
- @SET_MAKE@
-
-diff --git a/ijs/autogen.sh b/ijs/autogen.sh
-index 4e346eb..3b3c509 100755
---- a/ijs/autogen.sh
-+++ b/ijs/autogen.sh
-@@ -51,7 +51,7 @@ VERSIONGREP="sed -e s/.*[^0-9\.]\([0-9]\.[0-9]\).*/\1/"
- echo
- else
- echo -n "checking for automake $AM_NEEDED or later... "
-- for am in automake-$AM_NEEDED automake$AM_NEEDED automake; do
-+ for am in automake automake-$AM_NEEDED automake$AM_NEEDED automake; do
- ($am --version < /dev/null > /dev/null 2>&1) || continue
- AM_MAJOR=`echo $AM_NEEDED |cut -d. -f1`
- AM_MINOR=`echo $AM_NEEDED |cut -d. -f2`
-@@ -65,7 +65,7 @@ VERSIONGREP="sed -e s/.*[^0-9\.]\([0-9]\.[0-9]\).*/\1/"
- done
- test -z $AUTOMAKE && echo "no"
- echo -n "checking for aclocal $AM_NEEDED or later... "
-- for ac in aclocal-$AM_NEEDED aclocal$AM_NEEDED aclocal; do
-+ for ac in aclocal aclocal-$AM_NEEDED aclocal$AM_NEEDED aclocal; do
- ($ac --version < /dev/null > /dev/null 2>&1) || continue
- AM_MAJOR=`echo $AM_NEEDED |cut -d. -f1`
- AM_MINOR=`echo $AM_NEEDED |cut -d. -f2`
-diff --git a/ijs/configure.ac b/ijs/configure.ac
-index df0260f..f0fae9f 100644
---- a/ijs/configure.ac
-+++ b/ijs/configure.ac
-@@ -51,6 +51,7 @@ pushdef([IJS_VERSION], IJS_MAJOR_VERSION.IJS_MINOR_VERSION[]IJS_EXTRA_VERSION)
-
- AC_INIT(IJS_NAME, IJS_VERSION, [inkjet-list at linuxprinting.org])
- AC_PREREQ(2.53)
-+AC_CONFIG_MACRO_DIR([m4])
- AC_CONFIG_SRCDIR(ijs.c)
- AC_REVISION($Revision: 5783 $)
-
-@@ -84,7 +85,7 @@ popdef([IJS_INTERFACE_AGE])
- popdef([IJS_BINARY_AGE])
-
- dnl Initialize automake stuff.
--AM_INIT_AUTOMAKE(IJS_NAME, IJS_VERSION)
-+AM_INIT_AUTOMAKE
- popdef([IJS_NAME])
- popdef([IJS_VERSION])
-
-@@ -117,7 +118,7 @@ AC_SUBST(LIBTOOL_DEPS)
- dnl Checks for programs
-
- AC_PROG_CC
--AM_PROG_LIBTOOL
-+AC_PROG_LIBTOOL
- AC_SUBST(LIBTOOL_DEPS)
- AC_ISC_POSIX
- AC_PROG_INSTALL
-@@ -140,6 +141,7 @@ case ${host_os} in
- cygwin | mingw32 | pw32 | interix3 | interix | uwin) libijs_sysdeps="windows";;
- *) libijs_sysdeps="unix";;
- esac
-+
- AM_CONDITIONAL(SYSDEPS_WINDOWS, test x$libijs_sysdeps = xwindows)
-
-
-@@ -151,7 +153,6 @@ AC_SUBST(IJS_VERSION)
- AC_SUBST(ijs_cflags)
- ijs_libs="${IJS_LIBS} ${IJS_DEPLIBS}"
- AC_SUBST(ijs_libs)
--AC_SUBST(INCLUDES)
- LIBIJS_LIBS="${LIBIJS_LIBS} ${IJS_DEPLIBS}"
- AC_SUBST(LIBIJS_LIBS)
-
---
-2.0.3
-
Deleted: csw/mgar/pkg/ghostscript/trunk/files/0001-Use-ksh-and-GNU-sed-as-reported-in-4913.patch
===================================================================
--- csw/mgar/pkg/ghostscript/trunk/files/0001-Use-ksh-and-GNU-sed-as-reported-in-4913.patch 2015-01-09 14:08:13 UTC (rev 24557)
+++ csw/mgar/pkg/ghostscript/trunk/files/0001-Use-ksh-and-GNU-sed-as-reported-in-4913.patch 2015-01-09 14:59:50 UTC (rev 24558)
@@ -1,120 +0,0 @@
-From 120c2d04e6e3693608a686bd56f5a71a7cf1a860 Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <dam at opencsw.org>
-Date: Thu, 6 Jun 2013 11:55:38 +0200
-Subject: [PATCH] Use ksh and GNU sed as reported in #4913
-
----
- cups/gstopxl.in | 32 ++++++++++++++++----------------
- 1 file changed, 16 insertions(+), 16 deletions(-)
-
-diff --git a/cups/gstopxl.in b/cups/gstopxl.in
-index 7c4fe88..4e5972b 100755
---- a/cups/gstopxl.in
-+++ b/cups/gstopxl.in
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/bin/ksh
- #
- #
- # CUPS PCL XL/PCL 6 filter script for Ghostscript.
-@@ -50,9 +50,9 @@ ps_code=
- ppd_opts=
-
- resolution=
--eval "$(printf "%s" "$5" | sed @SED_EXTENDED_REGEX_OPT@ 's/.*(^|[[:space:]])Resolution=([0-9.]+(x[0-9.]+)?).*/resolution="${resolution:-\2}"/p')"
-+eval "$(printf "%s" "$5" | /opt/csw/bin/sed @SED_EXTENDED_REGEX_OPT@ 's/.*(^|[[:space:]])Resolution=([0-9.]+(x[0-9.]+)?).*/resolution="${resolution:-\2}"/p')"
- if test -e "$PPD"; then
-- eval "$(sed @SED_EXTENDED_REGEX_OPT@ 's/^\*DefaultResolution:[[:space:]]+([0-9.]+(x[0-9.]+)?).*/resolution="${resolution:-\1}"/p' "$PPD")"
-+ eval "$(/opt/csw/bin/sed @SED_EXTENDED_REGEX_OPT@ 's/^\*DefaultResolution:[[:space:]]+([0-9.]+(x[0-9.]+)?).*/resolution="${resolution:-\1}"/p' "$PPD")"
- fi
- echo "DEBUG: Resolution: $resolution" >&2
- if test -n "$resolution"; then
-@@ -60,15 +60,15 @@ if test -n "$resolution"; then
- fi
-
- pagesize=
--eval "$(printf "%s" "$5" | sed @SED_EXTENDED_REGEX_OPT@ 's/.*(^|[[:space:]])(media|PageSize)=([^[:space:]]+).*/pagesize="${pagesize:-\3}"/p')"
-+eval "$(printf "%s" "$5" | /opt/csw/bin/sed @SED_EXTENDED_REGEX_OPT@ 's/.*(^|[[:space:]])(media|PageSize)=([^[:space:]]+).*/pagesize="${pagesize:-\3}"/p')"
- if test -e "$PPD"; then
-- eval "$(sed @SED_EXTENDED_REGEX_OPT@ 's/^\*DefaultPageSize:[[:space:]]+([^[:space:]]+).*/pagesize="${pagesize:-\1}"/p' "$PPD")"
-+ eval "$(/opt/csw/bin/sed @SED_EXTENDED_REGEX_OPT@ 's/^\*DefaultPageSize:[[:space:]]+([^[:space:]]+).*/pagesize="${pagesize:-\1}"/p' "$PPD")"
- fi
- echo "DEBUG: Page size: $pagesize" >&2
- width=
- height=
- if test -n "$pagesize" && test -e "$PPD"; then
-- eval "$(sed @SED_EXTENDED_REGEX_OPT@ 's|^\*PaperDimension[[:space:]]+'"$pagesize"'/[^:]+:[[:space:]]+"([^[:space:]]+)[[:space:]]+([^[:space:]]+)".*|width="\1"; height="\2"|p' "$PPD")"
-+ eval "$(/opt/csw/bin/sed @SED_EXTENDED_REGEX_OPT@ 's|^\*PaperDimension[[:space:]]+'"$pagesize"'/[^:]+:[[:space:]]+"([^[:space:]]+)[[:space:]]+([^[:space:]]+)".*|width="\1"; height="\2"|p' "$PPD")"
- fi
- echo "DEBUG: Width: $width, height: $height" >&2
- if test -n "$width"; then
-@@ -83,7 +83,7 @@ bl_y=
- tr_x=
- tr_y=
- if test -n "$pagesize" && test -e "$PPD"; then
-- eval "$(sed @SED_EXTENDED_REGEX_OPT@ 's|^\*ImageableArea[[:space:]]+'"$pagesize"'/[^:]+:[[:space:]]+"([^[:space:]]+)[[:space:]]+([^[:space:]]+)[[:space:]]+([^[:space:]]+)[[:space:]]+([^[:space:]]+)".*|bl_x="\1"; bl_y="\2"; tr_x="\3"; tr_y="\4"|p' "$PPD")"
-+ eval "$(/opt/csw/bin/sed @SED_EXTENDED_REGEX_OPT@ 's|^\*ImageableArea[[:space:]]+'"$pagesize"'/[^:]+:[[:space:]]+"([^[:space:]]+)[[:space:]]+([^[:space:]]+)[[:space:]]+([^[:space:]]+)[[:space:]]+([^[:space:]]+)".*|bl_x="\1"; bl_y="\2"; tr_x="\3"; tr_y="\4"|p' "$PPD")"
- fi
- echo "DEBUG: Absolute margins: $bl_x, $bl_y, $tr_x, $tr_y" >&2
- margin_l=
-@@ -105,14 +105,14 @@ if test -n "$margin_l" && test -n "$margin_b" && \
- fi
-
- inputslot=
--eval "$(printf "%s" "$5" | sed @SED_EXTENDED_REGEX_OPT@ 's/.*(^|[[:space:]])(InputSlot)=([^[:space:]]+).*/inputslot="${inputslot:-\3}"/p')"
-+eval "$(printf "%s" "$5" | /opt/csw/bin/sed @SED_EXTENDED_REGEX_OPT@ 's/.*(^|[[:space:]])(InputSlot)=([^[:space:]]+).*/inputslot="${inputslot:-\3}"/p')"
- if test -e "$PPD"; then
-- eval "$(sed @SED_EXTENDED_REGEX_OPT@ 's/^\*DefaultInputSlot:[[:space:]]+([^[:space:]]+).*/inputslot="${inputslot:-\1}"/p' "$PPD")"
-+ eval "$(/opt/csw/bin/sed @SED_EXTENDED_REGEX_OPT@ 's/^\*DefaultInputSlot:[[:space:]]+([^[:space:]]+).*/inputslot="${inputslot:-\1}"/p' "$PPD")"
- fi
- echo "DEBUG: InputSlot: $inputslot" >&2
- inputslot_val=
- if test -n "$inputslot" && test -e "$PPD"; then
-- eval "$(sed @SED_EXTENDED_REGEX_OPT@ 's|^\*InputSlot[[:space:]]+'"$inputslot"'/[^:]+:[[:space:]]+"[[:space:]]*<[[:space:]]*<[[:space:]]*/MediaPosition[[:space:]]*([0-9]+)[[:space:]]*>[[:space:]]*>[[:space:]]*setpagedevice[[:space:]]*".*|inputslot_val="\1"|p' "$PPD")"
-+ eval "$(/opt/csw/bin/sed @SED_EXTENDED_REGEX_OPT@ 's|^\*InputSlot[[:space:]]+'"$inputslot"'/[^:]+:[[:space:]]+"[[:space:]]*<[[:space:]]*<[[:space:]]*/MediaPosition[[:space:]]*([0-9]+)[[:space:]]*>[[:space:]]*>[[:space:]]*setpagedevice[[:space:]]*".*|inputslot_val="\1"|p' "$PPD")"
- fi
- echo "DEBUG: Value for MediaPosition: $inputslot_val" >&2
- if test -n "$inputslot_val"; then
-@@ -120,9 +120,9 @@ if test -n "$inputslot_val"; then
- fi
-
- colormodel=
--eval "$(printf "%s" "$5" | sed @SED_EXTENDED_REGEX_OPT@ 's/.*(^|[[:space:]])(ColorModel)=([^[:space:]]+).*/colormodel="${colormodel:-\3}"/p')"
-+eval "$(printf "%s" "$5" | /opt/csw/bin/sed @SED_EXTENDED_REGEX_OPT@ 's/.*(^|[[:space:]])(ColorModel)=([^[:space:]]+).*/colormodel="${colormodel:-\3}"/p')"
- if test -e "$PPD"; then
-- eval "$(sed @SED_EXTENDED_REGEX_OPT@ 's/^\*DefaultColorModel:[[:space:]]+([^[:space:]]+).*/colormodel="${colormodel:-\1}"/p' "$PPD")"
-+ eval "$(/opt/csw/bin/sed @SED_EXTENDED_REGEX_OPT@ 's/^\*DefaultColorModel:[[:space:]]+([^[:space:]]+).*/colormodel="${colormodel:-\1}"/p' "$PPD")"
- fi
- echo "DEBUG: ColorModel: $colormodel" >&2
- if test "$colormodel" = "Gray"; then
-@@ -130,7 +130,7 @@ if test "$colormodel" = "Gray"; then
- fi
- colormodel_val=
- if test -n "$colormodel" && test -e "$PPD"; then
-- eval "$(sed @SED_EXTENDED_REGEX_OPT@ 's|^\*ColorModel[[:space:]]+'"$colormodel"'/[^:]+:[[:space:]]+"[[:space:]]*<[[:space:]]*<[[:space:]]*/BitsPerPixel[[:space:]]*([0-9]*)[[:space:]]*>[[:space:]]*>[[:space:]]*setpagedevice[[:space:]]*".*|colormodel_val="\1"|p' "$PPD")"
-+ eval "$(/opt/csw/bin/sed @SED_EXTENDED_REGEX_OPT@ 's|^\*ColorModel[[:space:]]+'"$colormodel"'/[^:]+:[[:space:]]+"[[:space:]]*<[[:space:]]*<[[:space:]]*/BitsPerPixel[[:space:]]*([0-9]*)[[:space:]]*>[[:space:]]*>[[:space:]]*setpagedevice[[:space:]]*".*|colormodel_val="\1"|p' "$PPD")"
- fi
- echo "DEBUG: Value for BitsPerPixel: $colormodel_val" >&2
- if test -n "$colormodel_val"; then
-@@ -138,15 +138,15 @@ if test -n "$colormodel_val"; then
- fi
-
- duplex=
--eval "$(printf "%s" "$5" | sed @SED_EXTENDED_REGEX_OPT@ 's/.*(^|[[:space:]])(Duplex)=([^[:space:]]+).*/duplex="${duplex:-\3}"/p')"
-+eval "$(printf "%s" "$5" | /opt/csw/bin/sed @SED_EXTENDED_REGEX_OPT@ 's/.*(^|[[:space:]])(Duplex)=([^[:space:]]+).*/duplex="${duplex:-\3}"/p')"
- if test -e "$PPD"; then
-- eval "$(sed @SED_EXTENDED_REGEX_OPT@ 's/^\*DefaultDuplex:[[:space:]]+([^[:space:]]+).*/duplex="${duplex:-\1}"/p' "$PPD")"
-+ eval "$(/opt/csw/bin/sed @SED_EXTENDED_REGEX_OPT@ 's/^\*DefaultDuplex:[[:space:]]+([^[:space:]]+).*/duplex="${duplex:-\1}"/p' "$PPD")"
- fi
- echo "DEBUG: Duplex: $duplex" >&2
- duplex_val=
- tumble_val=
- if test -n "$duplex" && test -e "$PPD"; then
-- eval "$(sed @SED_EXTENDED_REGEX_OPT@ 's|^\*Duplex[[:space:]]+'"$duplex"'/[^:]+:[[:space:]]+"[[:space:]]*<[[:space:]]*<[[:space:]]*/Duplex[[:space:]]*([^[:space:]]*)[[:space:]]*(/Tumble[[:space:]]*([^[:space:]]*)[[:space:]]*)?>[[:space:]]*>[[:space:]]*setpagedevice[[:space:]]*".*|duplex_val="\1"; tumble_val="\3"|p' "$PPD")"
-+ eval "$(/opt/csw/bin/sed @SED_EXTENDED_REGEX_OPT@ 's|^\*Duplex[[:space:]]+'"$duplex"'/[^:]+:[[:space:]]+"[[:space:]]*<[[:space:]]*<[[:space:]]*/Duplex[[:space:]]*([^[:space:]]*)[[:space:]]*(/Tumble[[:space:]]*([^[:space:]]*)[[:space:]]*)?>[[:space:]]*>[[:space:]]*setpagedevice[[:space:]]*".*|duplex_val="\1"; tumble_val="\3"|p' "$PPD")"
- fi
- echo "DEBUG: Value for Duplex: $duplex_val; Value for Tumble: $tumble_val" >&2
- if test -n "$duplex_val"; then
---
-1.8.1.4
-
Deleted: csw/mgar/pkg/ghostscript/trunk/files/map.ghostscript
===================================================================
--- csw/mgar/pkg/ghostscript/trunk/files/map.ghostscript 2015-01-09 14:08:13 UTC (rev 24557)
+++ csw/mgar/pkg/ghostscript/trunk/files/map.ghostscript 2015-01-09 14:59:50 UTC (rev 24558)
@@ -1 +0,0 @@
-libc.so - SUNW_1.22.5 SUNWprivate_1.1 $ADDVERS=SUNW_1.22.5;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list