[csw-devel] SF.net SVN: gar:[16974] csw/mgar/pkg/ghostscript/trunk
wahwah at users.sourceforge.net
wahwah at users.sourceforge.net
Thu Feb 2 15:25:57 CET 2012
Revision: 16974
http://gar.svn.sourceforge.net/gar/?rev=16974&view=rev
Author: wahwah
Date: 2012-02-02 14:25:57 +0000 (Thu, 02 Feb 2012)
Log Message:
-----------
ghostscript/trunk: A reckless update to 9.04
Modified Paths:
--------------
csw/mgar/pkg/ghostscript/trunk/Makefile
csw/mgar/pkg/ghostscript/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/ghostscript/trunk/files/0007-libidn-needs-L-opt-csw-lib.patch
csw/mgar/pkg/ghostscript/trunk/files/0008-Wrong-place-in-configure.patch
Modified: csw/mgar/pkg/ghostscript/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ghostscript/trunk/Makefile 2012-02-02 13:56:09 UTC (rev 16973)
+++ csw/mgar/pkg/ghostscript/trunk/Makefile 2012-02-02 14:25:57 UTC (rev 16974)
@@ -1,9 +1,11 @@
+# $Id$
+
NAME = ghostscript
-VERSION = 8.70
+VERSION = 9.04
CATEGORIES = apps
GARTYPE = v2
-DESCRIPTION = Ghostscript, a PostScript and PDF interpreter for previewing, conversion and printing
+DESCRIPTION = PostScript and PDF interpreter
define BLURB
endef
@@ -12,17 +14,46 @@
PACKAGES = CSWgs
CATALOGNAME_CSWgs = ghostscript
-SPKG_DESC_CSWgs = Ghostscript, a PostScript and PDF interpreter for previewing, conversion and printing
+SPKG_DESC_CSWgs = PostScript and PDF interpreter
-RUNTIME_DEP_PKGS_CSWgs += CSWfconfig CSWjpeg CSWlibcairo CSWgsfonts
-RUNTIME_DEP_PKGS_CSWgs += CSWftype2 CSWggettextrt CSWglib2 CSWgnutls CSWgtk2
-RUNTIME_DEP_PKGS_CSWgs += CSWkrb5lib CSWlibatk CSWlibcups CSWpango CSWperl CSWzlib
+
+RUNTIME_DEP_PKGS_CSWgs += CSWlibjpeg7
+RUNTIME_DEP_PKGS_CSWgs += CSWlibz1
+RUNTIME_DEP_PKGS_CSWgs += CSWlibssl0-9-8
+RUNTIME_DEP_PKGS_CSWgs += CSWlibcom-err3
+RUNTIME_DEP_PKGS_CSWgs += CSWlibkrb5support0
+RUNTIME_DEP_PKGS_CSWgs += CSWlibcups2
+RUNTIME_DEP_PKGS_CSWgs += CSWlibkrb5-3
+RUNTIME_DEP_PKGS_CSWgs += CSWlibcupsimage2
+RUNTIME_DEP_PKGS_CSWgs += CSWlibidn11
+RUNTIME_DEP_PKGS_CSWgs += CSWlibk5crypto3
+
+RUNTIME_DEP_PKGS_CSWgs += CSWfconfig
+RUNTIME_DEP_PKGS_CSWgs += CSWgnutls
+RUNTIME_DEP_PKGS_CSWgs += CSWgtk2
+RUNTIME_DEP_PKGS_CSWgs += CSWjpeg
+RUNTIME_DEP_PKGS_CSWgs += CSWpango
+RUNTIME_DEP_PKGS_CSWgs += CSWperl
+RUNTIME_DEP_PKGS_CSWgs += CSWgsfonts
RUNTIME_DEP_PKGS_CSWgs += CSWjbig2dec
+
+# I'm dubious about this one. Maybe unnecessary?
+# RUNTIME_DEP_PKGS_CSWgs += CSWlibcairo
+
+CHECKPKG_OVERRIDES_CSWgs += surplus-dependency|CSWperl
+# Fonts are definitely necessary.
+CHECKPKG_OVERRIDES_CSWgs += surplus-dependency|CSWgsfonts
+
+# Only docs and man pages.
+CHECKPKG_OVERRIDES_CSWgs += file-with-bad-content
+# Historical reasons.
+CHECKPKG_OVERRIDES_CSWgs += catalogname-does-not-match-pkgname|pkgname=CSWgs|catalogname=ghostscript|expected-catalogname=gs
+
# Pending release of libpaper
#RUNTIME_DEP_PKGS_CSWgs += CSWlibpaper
-CHECKPKG_OVERRIDES_CSWgs += symbol-not-found|gsc
-CHECKPKG_OVERRIDES_CSWgs += symbol-not-found|gsx
+# CHECKPKG_OVERRIDES_CSWgs += symbol-not-found|gsc
+# CHECKPKG_OVERRIDES_CSWgs += symbol-not-found|gsx
SPKG_SOURCEURL = http://www.ghostscript.com
@@ -30,33 +61,34 @@
UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=
UPSTREAM_USE_SF = 1
-UFILES_REGEX = (\d+(?:\.\d+)*)
-#PATCHFILES += 0001-Support-libjpeg7.patch
+# PATCHFILES += 0001-Support-libjpeg7.patch
PATCHFILES += 0002-Rearrange-compiler-flags.patch
PATCHFILES += 0003-Change-gcc-flags-to-sun.patch
-PATCHFILES += 0004-PLATFORM-is-used-by-GAR.patch
+# PATCHFILES += 0004-PLATFORM-is-used-by-GAR.patch
PATCHFILES += 0005-Fix-pathes-according-to-old-package.patch
-PATCHFILES += 0006-Fix-dynamic-link-flag.patch
+# PATCHFILES += 0006-Fix-dynamic-link-flag.patch
+PATCHFILES += 0007-libidn-needs-L-opt-csw-lib.patch
+PATCHFILES += 0008-Wrong-place-in-configure.patch
# Not until libcupsimage.so libcups.so libkrb5.so libk5crypto.so
# libcom_err.so libkrb5support.so are 64-bit
-EXTRA_INC = $(prefix)/X11/include
-EXTRA_LIB = $(prefix)/X11/lib
-EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib
+# EXTRA_INC = $(prefix)/X11/include
+# EXTRA_LIB = $(prefix)/X11/lib
+# EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib
# We want to be linked with Xrender from $(prefix)/X11/lib not
# $(prefix)/lib since the latter is linked to /usr/openwin/lib/libX11.so.4
-EXTRA_SOS_LD_FLAGS = -L$(abspath $(prefix)/X11/lib/$(MM_LIBDIR))
+# EXTRA_SOS_LD_FLAGS = -L$(abspath $(prefix)/X11/lib/$(MM_LIBDIR))
-EXTRA_BUILD_ISAS = sparcv8plus+vis pentium_pro+mmx
+# EXTRA_BUILD_ISAS = sparcv8plus+vis pentium_pro+mmx
CONFIGURE_ARGS = $(DIRPATHS)
CONFIGURE_ARGS += --enable-dynamic
CONFIGURE_ARGS += --enable-cups
CONFIGURE_ARGS += --with-fontpath=$(datadir)/ghostscript/fonts
-CONFIGURE_ARGS += --x-includes=$(prefix)/X11/include
-CONFIGURE_ARGS += --x-libraries=$(prefix)/X11/lib
+# CONFIGURE_ARGS += --x-includes=$(prefix)/X11/include
+# CONFIGURE_ARGS += --x-libraries=$(prefix)/X11/lib
# This fails due to ghostscript using PLATFORM for internal use which gets set
# by GAR
@@ -65,12 +97,12 @@
include gar/category.mk
-BUILD_ARGS = std so
-INSTALL_ARGS = install install-so
+# BUILD_ARGS = std so
+# INSTALL_ARGS = install install-so
# Use CSW build packages instead of bundled stuff
pre-configure-$(MODULATION):
- @(echo "~~~ Removing bundled stuff ~~~")
- @rm -rf $(WORKSRC)/jpeg
- @rm -rf $(WORKSRC)/jbig2dec
+ @(echo "~~~ Removing bundled binaries ~~~")
+ rm -rf $(WORKSRC)/jpeg
+ rm -rf $(WORKSRC)/jbig2dec
# @rm -rf $(WORKSRC)/jasper
Modified: csw/mgar/pkg/ghostscript/trunk/checksums
===================================================================
--- csw/mgar/pkg/ghostscript/trunk/checksums 2012-02-02 13:56:09 UTC (rev 16973)
+++ csw/mgar/pkg/ghostscript/trunk/checksums 2012-02-02 14:25:57 UTC (rev 16974)
@@ -1,7 +1 @@
-251419464651542627742f241455a935 0001-Support-libjpeg7.patch
-5ebe8476ccc2170e4f2d620fe284f875 0002-Rearrange-compiler-flags.patch
-5c142b23f91c2b2f48ba1f354e26346f 0003-Change-gcc-flags-to-sun.patch
-c3b8108ba2a09ce9473e785cdea12662 0004-PLATFORM-is-used-by-GAR.patch
-b4957c4667d2bf767c2a18707429477d 0005-Fix-pathes-according-to-old-package.patch
-0ac8a3bc8cc018a695c892328f65f2cf 0006-Fix-dynamic-link-flag.patch
-526366f8cb4fda0d3d293597cc5b984b ghostscript-8.70.tar.bz2
+9f6899e821ab6d78ab2c856f10fa3023 ghostscript-9.04.tar.bz2
Added: csw/mgar/pkg/ghostscript/trunk/files/0007-libidn-needs-L-opt-csw-lib.patch
===================================================================
--- csw/mgar/pkg/ghostscript/trunk/files/0007-libidn-needs-L-opt-csw-lib.patch (rev 0)
+++ csw/mgar/pkg/ghostscript/trunk/files/0007-libidn-needs-L-opt-csw-lib.patch 2012-02-02 14:25:57 UTC (rev 16974)
@@ -0,0 +1,25 @@
+From ded20c08df2aee8ab5cc43cbe2287784c7f82162 Mon Sep 17 00:00:00 2001
+From: Maciej Blizinski <maciej at opencsw.org>
+Date: Thu, 2 Feb 2012 14:43:12 +0100
+Subject: [PATCH] libidn needs -L/opt/csw/lib
+
+---
+ configure | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/configure b/configure
+index 9ccd15d..ecd8317 100755
+--- a/configure
++++ b/configure
+@@ -5116,7 +5116,7 @@ if test "${ac_cv_lib_idn_stringprep+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lidn $LIBS"
++LIBS="-L/opt/csw/lib -lidn $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+--
+1.7.8.3
+
Added: csw/mgar/pkg/ghostscript/trunk/files/0008-Wrong-place-in-configure.patch
===================================================================
--- csw/mgar/pkg/ghostscript/trunk/files/0008-Wrong-place-in-configure.patch (rev 0)
+++ csw/mgar/pkg/ghostscript/trunk/files/0008-Wrong-place-in-configure.patch 2012-02-02 14:25:57 UTC (rev 16974)
@@ -0,0 +1,25 @@
+From f44f599849020abd2cbff12de84f36e4087316f6 Mon Sep 17 00:00:00 2001
+From: Maciej Blizinski <maciej at opencsw.org>
+Date: Thu, 2 Feb 2012 14:56:52 +0100
+Subject: [PATCH] Wrong place in configure
+
+---
+ configure | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/configure b/configure
+index ecd8317..e98175e 100755
+--- a/configure
++++ b/configure
+@@ -5170,7 +5170,7 @@ HAVE_LIBIDN=''
+ UTF8DEVS=''
+ if test x$with_libidn != xno; then
+ HAVE_LIBIDN=-DHAVE_LIBIDN
+- LIBS="$LIBS -lidn"
++ LIBS="$LIBS -L/opt/csw/lib -lidn"
+
+ if test x$found_iconv != xno; then
+ UTF8DEVS='$(PSD)utf8.dev'
+--
+1.7.8.3
+
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