[csw-devel] SF.net SVN: gar:[8162] csw/mgar/pkg/ghostscript/trunk
hson at users.sourceforge.net
hson at users.sourceforge.net
Mon Jan 25 04:03:22 CET 2010
Revision: 8162
http://gar.svn.sourceforge.net/gar/?rev=8162&view=rev
Author: hson
Date: 2010-01-25 03:03:21 +0000 (Mon, 25 Jan 2010)
Log Message:
-----------
ghostscript: Final fixes for GAR package
Modified Paths:
--------------
csw/mgar/pkg/ghostscript/trunk/Makefile
csw/mgar/pkg/ghostscript/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/ghostscript/trunk/files/0004-PLATFORM-is-used-by-GAR.patch
csw/mgar/pkg/ghostscript/trunk/files/0005-Fix-pathes-according-to-old-package.patch
csw/mgar/pkg/ghostscript/trunk/files/0006-Fix-dynamic-link-flag.patch
Modified: csw/mgar/pkg/ghostscript/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ghostscript/trunk/Makefile 2010-01-25 02:47:29 UTC (rev 8161)
+++ csw/mgar/pkg/ghostscript/trunk/Makefile 2010-01-25 03:03:21 UTC (rev 8162)
@@ -9,11 +9,17 @@
MASTER_SITES = $(SF_MIRRORS)
DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2
-SPKG_SOURCEURL = http://www.ghostscript.com
+PACKAGES = CSWgs
+CATALOGNAME_CSWgs = ghostscript
+SPKG_DESC_CSWgs = Ghostscript, a PostScript and PDF interpreter for previewing, conversion and printing
-LICENSE = COPYING
+REQUIRED_PKGS_CSWgs += CSWfconfig CSWjpeg CSWlibcairo CSWgsfonts
+REQUIRED_PKGS_CSWgs += CSWftype2 CSWggettextrt CSWglib2 CSWgnutls CSWgtk2
+REQUIRED_PKGS_CSWgs += CSWkrb5lib CSWlibatk CSWlibcups CSWpango CSWperl CSWzlib
+# Pending release of libpaper
+#REQUIRED_PKGS_CSWgs += CSWlibpaper
-REQUIRED_PKGS +=
+SPKG_SOURCEURL = http://www.ghostscript.com
UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=
UPSTREAM_USE_SF = 1
@@ -22,21 +28,40 @@
#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 += 0005-Fix-pathes-according-to-old-package.patch
+PATCHFILES += 0006-Fix-dynamic-link-flag.patch
-#BUILD64 = 1
+# 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
+# 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))
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
+# This fails due to ghostscript using PLATFORM for internal use which gets set
+# by GAR
+#TEST_TARGET = check
+TEST_TARGET =
+
include gar/category.mk
+BUILD_ARGS = std so
+INSTALL_ARGS = install install-so
+
+# Use CSW build packages instead of bundled stuff
pre-configure-$(MODULATION):
- @(echo "~~~ Removing bundled jpeglib ~~~")
+ @(echo "~~~ Removing bundled stuff ~~~")
@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 2010-01-25 02:47:29 UTC (rev 8161)
+++ csw/mgar/pkg/ghostscript/trunk/checksums 2010-01-25 03:03:21 UTC (rev 8162)
@@ -1,3 +1,7 @@
+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
Added: csw/mgar/pkg/ghostscript/trunk/files/0004-PLATFORM-is-used-by-GAR.patch
===================================================================
--- csw/mgar/pkg/ghostscript/trunk/files/0004-PLATFORM-is-used-by-GAR.patch (rev 0)
+++ csw/mgar/pkg/ghostscript/trunk/files/0004-PLATFORM-is-used-by-GAR.patch 2010-01-25 03:03:21 UTC (rev 8162)
@@ -0,0 +1,116 @@
+diff -Nru ghostscript-8.70.orig/base/gs.mak ghostscript-8.70/base/gs.mak
+--- ghostscript-8.70.orig/base/gs.mak 2009-01-27 21:43:37.000000000 +0100
++++ ghostscript-8.70/base/gs.mak 2010-01-10 23:24:54.511788159 +0100
+@@ -363,7 +363,7 @@
+ FEATURE_DEVS_EXTRA=
+ DEVICE_DEVS_EXTRA=
+
+-DEVS_ALL=$(GLGENDIR)$(D)$(PLATFORM).dev\
++DEVS_ALL=$(GLGENDIR)$(D)$(BUILD_PLATFORM).dev\
+ $(FEATURE_DEVS) $(FEATURE_DEVS_EXTRA) \
+ $(DEVICE_DEVS) $(DEVICE_DEVS1) \
+ $(DEVICE_DEVS2) $(DEVICE_DEVS3) $(DEVICE_DEVS4) $(DEVICE_DEVS5) \
+@@ -375,7 +375,7 @@
+
+ devs_tr=$(GLGENDIR)$(D)devs.tr
+ $(devs_tr) : $(GS_MAK) $(TOP_MAKEFILES) $(ECHOGS_XE)
+- $(EXP)$(ECHOGS_XE) -w $(devs_tr) - -include $(GLGENDIR)$(D)$(PLATFORM)
++ $(EXP)$(ECHOGS_XE) -w $(devs_tr) - -include $(GLGENDIR)$(D)$(BUILD_PLATFORM)
+ $(EXP)$(ECHOGS_XE) -a $(devs_tr) -+ $(FEATURE_DEVS)
+ $(EXP)$(ECHOGS_XE) -a $(devs_tr) -+ $(FEATURE_DEVS_EXTRA)
+ $(EXP)$(ECHOGS_XE) -a $(devs_tr) -+ $(DEVICE_DEVS)
+diff -Nru ghostscript-8.70.orig/base/macos-mcp.mak ghostscript-8.70/base/macos-mcp.mak
+--- ghostscript-8.70.orig/base/macos-mcp.mak 2009-01-08 10:17:18.000000000 +0100
++++ ghostscript-8.70/base/macos-mcp.mak 2010-01-10 23:25:55.154224777 +0100
+@@ -75,7 +75,7 @@
+
+ # Define the platform name.
+
+-PLATFORM=macos_
++BUILD_PLATFORM=macos_
+
+
+ # don't use any shared libraries, they are compiled into the Ghostscript Lib
+@@ -267,7 +267,7 @@
+ include $(GLSRCDIR)/unixhead.mak
+
+ # Redefine the platform name before going on
+-PLATFORM=macos_
++BUILD_PLATFORM=macos_
+
+ include $(GLSRCDIR)/gs.mak
+ # psromfs.mak must precede lib.mak
+diff -Nru ghostscript-8.70.orig/base/msvclib.mak ghostscript-8.70/base/msvclib.mak
+--- ghostscript-8.70.orig/base/msvclib.mak 2008-08-29 01:16:39.000000000 +0200
++++ ghostscript-8.70/base/msvclib.mak 2010-01-10 23:26:01.887097616 +0100
+@@ -445,7 +445,7 @@
+
+ LIB_ONLY=$(GLOBJDIR)\gslib.obj $(GLOBJDIR)\gsnogc.obj $(GLOBJDIR)\gconfig.obj $(GLOBJDIR)\gscdefs.obj $(GLOBJDIR)\gsromfs$(COMPILE_INITS).obj
+ MAKEDLL=0
+-PLATFORM=mslib32_
++BUILD_PLATFORM=mslib32_
+
+ !include $(GLSRCDIR)\version.mak
+ !include $(GLSRCDIR)\msvccmd.mak
+diff -Nru ghostscript-8.70.orig/base/openvms.mak ghostscript-8.70/base/openvms.mak
+--- ghostscript-8.70.orig/base/openvms.mak 2009-01-08 10:17:18.000000000 +0100
++++ ghostscript-8.70/base/openvms.mak 2010-01-10 23:25:36.911773955 +0100
+@@ -270,7 +270,7 @@
+
+ # Define the platform name.
+
+-PLATFORM=openvms_
++BUILD_PLATFORM=openvms_
+
+ # Define the name of the makefile -- used in dependencies.
+
+diff -Nru ghostscript-8.70.orig/base/openvms.mmk ghostscript-8.70/base/openvms.mmk
+--- ghostscript-8.70.orig/base/openvms.mmk 2009-01-08 10:17:18.000000000 +0100
++++ ghostscript-8.70/base/openvms.mmk 2010-01-10 23:25:27.461102799 +0100
+@@ -298,7 +298,7 @@
+
+ # Define the platform name.
+
+-PLATFORM=openvms_
++BUILD_PLATFORM=openvms_
+
+ # Define the name of the makefile -- used in dependencies.
+
+diff -Nru ghostscript-8.70.orig/base/unixhead.mak ghostscript-8.70/base/unixhead.mak
+--- ghostscript-8.70.orig/base/unixhead.mak 2007-12-31 19:07:59.000000000 +0100
++++ ghostscript-8.70/base/unixhead.mak 2010-01-10 23:22:33.391601312 +0100
+@@ -21,7 +21,7 @@
+ # Define the platform name. For a "stock" System V platform,
+ # use sysv_ instead of unix_.
+
+-PLATFORM=unix_
++BUILD_PLATFORM=unix_
+
+ # Define the syntax for command, object, and executable files.
+
+diff -Nru ghostscript-8.70.orig/base/watclib.mak ghostscript-8.70/base/watclib.mak
+--- ghostscript-8.70.orig/base/watclib.mak 2009-01-08 10:17:18.000000000 +0100
++++ ghostscript-8.70/base/watclib.mak 2010-01-10 23:25:03.490859364 +0100
+@@ -115,7 +115,7 @@
+ SYNC=winsync
+ !endif
+
+-PLATFORM=watclib_
++BUILD_PLATFORM=watclib_
+ MAKEFILE=$(GLSRCDIR)\watclib.mak
+ TOP_MAKEFILES=$(MAKEFILE) $(GLSRCDIR)\wccommon.mak
+ PLATOPT=
+diff -Nru ghostscript-8.70.orig/base/winlib.mak ghostscript-8.70/base/winlib.mak
+--- ghostscript-8.70.orig/base/winlib.mak 2009-02-21 21:59:34.000000000 +0100
++++ ghostscript-8.70/base/winlib.mak 2010-01-10 23:25:12.830496306 +0100
+@@ -28,8 +28,8 @@
+
+ # Define the platform name.
+
+-!ifndef PLATFORM
+-PLATFORM=mswin32_
++!ifndef BUILD_PLATFORM
++BUILD_PLATFORM=mswin32_
+ !endif
+
+ # Define the auxiliary program dependency. We use this to
Added: csw/mgar/pkg/ghostscript/trunk/files/0005-Fix-pathes-according-to-old-package.patch
===================================================================
--- csw/mgar/pkg/ghostscript/trunk/files/0005-Fix-pathes-according-to-old-package.patch (rev 0)
+++ csw/mgar/pkg/ghostscript/trunk/files/0005-Fix-pathes-according-to-old-package.patch 2010-01-25 03:03:21 UTC (rev 8162)
@@ -0,0 +1,27 @@
+--- ../../../work.old/solaris8-sparc/build-isa-sparcv8/ghostscript-8.70.orig/Makefile.in 2009-05-22 01:46:45.000000000 +0200
++++ ghostscript-8.70/Makefile.in 2010-01-11 04:36:20.575145752 +0100
+@@ -67,11 +67,11 @@
+ # The following must be substituted using @datadir@ and @libdir@
+ # to avoid adding RPM generation paths (CUPS STR #1112)
+ gsdir = @datadir@/ghostscript
+-gsdatadir = $(gsdir)/$(GS_DOT_VERSION)
++gsdatadir = $(gsdir)
+ gssharedir = @libdir@/ghostscript/$(GS_DOT_VERSION)
+ gsincludedir = @includedir@/ghostscript/
+
+-docdir=$(gsdatadir)/doc
++docdir=$(gsdir)/doc/ghostscript
+ exdir=$(gsdatadir)/examples
+ GS_DOCDIR=$(docdir)
+
+@@ -342,8 +342,8 @@
+ RM=rm -f
+
+ # ------ Dynamic loader options ------- #
+-SOC_CFLAGS = @SOC_CFLAGS@
+-SOC_LIBS = @SOC_LIBS@
++SOC_CFLAGS = -I/opt/csw/X11/include @SOC_CFLAGS@
++SOC_LIBS = -L/opt/csw/X11/lib @SOC_LIBS@
+ SOC_LOADER = @SOC_LOADER@
+
+
Added: csw/mgar/pkg/ghostscript/trunk/files/0006-Fix-dynamic-link-flag.patch
===================================================================
--- csw/mgar/pkg/ghostscript/trunk/files/0006-Fix-dynamic-link-flag.patch (rev 0)
+++ csw/mgar/pkg/ghostscript/trunk/files/0006-Fix-dynamic-link-flag.patch 2010-01-25 03:03:21 UTC (rev 8162)
@@ -0,0 +1,11 @@
+--- ghostscript-8.70.orig/base/unix-dll.mak 2008-09-13 22:22:25.000000000 +0200
++++ ghostscript-8.70/base/unix-dll.mak 2010-01-11 03:00:54.165762459 +0100
+@@ -49,7 +49,7 @@
+ GS_SONAME=$(GS_SONAME_BASE).$(GS_SOEXT)
+ GS_SONAME_MAJOR=$(GS_SONAME).$(GS_VERSION_MAJOR)
+ GS_SONAME_MAJOR_MINOR=$(GS_SONAME).$(GS_VERSION_MAJOR).$(GS_VERSION_MINOR)
+-LDFLAGS_SO=-shared -Wl,-soname=$(GS_SONAME_MAJOR)
++LDFLAGS_SO=-G -h$(GS_SONAME_MAJOR)
+
+ # MacOS X
+ #GS_SOEXT=dylib
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