Testing ppc-macos. Makefile and source patches added for Darwin compatibility.

Package-Manager: portage-2.0.51.19

5 files changed, 119 insertions, 30 deletions

diff --git a/app-text/ghostscript/ChangeLog b/app-text/ghostscript/ChangeLog
index 018ee4e04924..a1f271a9ca1c 100644
--- a/app-text/ghostscript/ChangeLog
+++ b/app-text/ghostscript/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/ghostscript
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript/ChangeLog,v 1.101 2005/03/27 11:59:24 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript/ChangeLog,v 1.102 2005/04/03 05:50:26 j4rg0n Exp $
+
+  03 Apr 2005; Lina Pezzella <j4rg0n@gentoo.org> +files/gs-osx-ijs.patch,
+  +files/gs-osx-unix-dll.patch, ghostscript-7.07.1-r8.ebuild:
+  Testing ppc-macos. Source and Makefile patches added for Darwin compatibility.
 
   27 Mar 2005; Bryan Østergaard <kloeri@gentoo.org>
   ghostscript-7.07.1-r8.ebuild:
diff --git a/app-text/ghostscript/Manifest b/app-text/ghostscript/Manifest
index 0a3e4b455d25..be3b36b9dd7e 100644
--- a/app-text/ghostscript/Manifest
+++ b/app-text/ghostscript/Manifest
@@ -1,35 +1,27 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 7fd4dfbfa9ce4a9349364cba6f1384ec ghostscript-7.05.6-r2.ebuild 2936
-MD5 c8306437112cda3294dd45b486cffed7 ChangeLog 16082
-MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
+MD5 9427e307b6c92e6b38888f2ec12f9bd1 ChangeLog 16300
+MD5 e90d355ff2a102e85f8e68497432981b ghostscript-7.07.1-r8.ebuild 5478
 MD5 566fe86c5f5d7d8809e383b1430e26af ghostscript-7.07.1-r7.ebuild 4273
-MD5 69049542872bdffbdcc978a2feea74d0 ghostscript-7.07.1-r8.ebuild 5058
+MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
+MD5 7fd4dfbfa9ce4a9349364cba6f1384ec ghostscript-7.05.6-r2.ebuild 2936
+MD5 186fc94fd3208e808026580e7436dbdc files/gs-osx-ijs.patch 1566
+MD5 b2ca914ffcff3e5296d6b5acc7fac182 files/gs7.07.1-ps2ps.patch 244
+MD5 212a5ece7d789ef9d04e15fd7d36eea3 files/gs-osx-unix-dll.patch 1930
+MD5 b7ca313a24a8adf4c527c0a097354f60 files/digest-ghostscript-7.07.1-r7 212
 MD5 fd34b2b7a029f19eab4ba3f69afe295e files/ghostscript-7.05.6.man.patch 1231
 MD5 8c6a3d7e8897b4297ef853dbd89e408b files/gs-fix-gc.patch 5627
-MD5 6807c3b6025d5b09e8eb6349769162d1 files/digest-ghostscript-7.05.6-r2 212
-MD5 b2ca914ffcff3e5296d6b5acc7fac182 files/gs7.07.1-ps2ps.patch 244
+MD5 291c8895063b8ecee12b68d45a705ab4 files/gs7.05-gdevhl12.c.bz2 7406
+MD5 343b6a60e15e35d0c5f825b4f361fd29 files/gs7.05.6-cjk.diff.bz2 3287
+MD5 68fa21d11a860c222c8ba89c39ce578e files/gs7.05.6-gdevpx.patch 402
 MD5 5f1b04ca58928a339b749703e067e2ba files/gs7.05.6-kochi-substitute.patch 3774
+MD5 06fe485954243190f4f0f4d8e1542f92 files/gs7.07.1-cjk.diff.bz2 3055
+MD5 3d1cdf07dabc4a05bde9a2dc6f7da2de files/gs7.07.1-fontconfig-rh.patch.bz2 6121
 MD5 ac6af6bf67095500ea043aea27062d62 files/gs7.07.1-ijs.patch 401
-MD5 b7ca313a24a8adf4c527c0a097354f60 files/digest-ghostscript-7.07.1-r8 212
-MD5 291c8895063b8ecee12b68d45a705ab4 files/gs7.05-gdevhl12.c.bz2 7406
-MD5 0cb94835c5d49c5eeeba6e11b2cd65ed files/gs7.07.1-fontconfig-rh.patch.2.bz2 6113
 MD5 370d4bcd16d8acd03190ba84e2f61a41 files/gs7.07.1-ijsdestdir.patch 1418
-MD5 b7ca313a24a8adf4c527c0a097354f60 files/digest-ghostscript-7.07.1-r7 212
-MD5 3d1cdf07dabc4a05bde9a2dc6f7da2de files/gs7.07.1-fontconfig-rh.patch.bz2 6121
+MD5 acda8ddfde1efeaf451cb28a67dcc773 files/gs7.07.1-krgb.patch.gz 5569
 MD5 1d5618d793799f7247d624ced0dea493 files/gs7.07.1-tempfile.patch 3123
-MD5 68fa21d11a860c222c8ba89c39ce578e files/gs7.05.6-gdevpx.patch 402
-MD5 51736590c7ec64f9029fa9524e1ab50c files/gs7.07.1-destdir.patch 12261
+MD5 6807c3b6025d5b09e8eb6349769162d1 files/digest-ghostscript-7.05.6-r2 212
 MD5 d3f26c93b9fb75b509c375cbf841da9a files/gs7.05.6-tempfile.patch 2763
-MD5 acda8ddfde1efeaf451cb28a67dcc773 files/gs7.07.1-krgb.patch.gz 5569
-MD5 06fe485954243190f4f0f4d8e1542f92 files/gs7.07.1-cjk.diff.bz2 3055
+MD5 51736590c7ec64f9029fa9524e1ab50c files/gs7.07.1-destdir.patch 12261
+MD5 b7ca313a24a8adf4c527c0a097354f60 files/digest-ghostscript-7.07.1-r8 212
+MD5 0cb94835c5d49c5eeeba6e11b2cd65ed files/gs7.07.1-fontconfig-rh.patch.2.bz2 6113
 MD5 92fa24960f2c7802749ce6908aeaf60d files/gs7.07.1-nogtk2.patch 1419
-MD5 343b6a60e15e35d0c5f825b4f361fd29 files/gs7.05.6-cjk.diff.bz2 3287
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCRqA2ugEuf3OQ0akRAj44AJ4hWzkjXVLh5ngodnoHsX4FplqyCACeMkgv
-YeE/yiZhDn/WwvV74e9lnUs=
-=p/v9
------END PGP SIGNATURE-----
diff --git a/app-text/ghostscript/files/gs-osx-ijs.patch b/app-text/ghostscript/files/gs-osx-ijs.patch
new file mode 100644
index 000000000000..332a74af5a15
--- /dev/null
+++ b/app-text/ghostscript/files/gs-osx-ijs.patch
@@ -0,0 +1,40 @@
+--- ghostscript-7.07.1-r8-orig/work/espgs-7.07.1/ijs/Makefile.in	Tue Apr 23 07:58:32 2002
++++ ghostscript-7.07.1-r8/work/espgs-7.07.1/ijs/Makefile.in	Thu Mar 24 22:59:28 2005
+@@ -11,6 +11,12 @@
+ SHARED_OBJ=.so
+ #SHARED_LDFLAGS=-dylib
+ #SHARED_OBJ=.dylib
++
++CPU = $(shell uname)
++ifeq ($(CPU),Darwin)
++SHARED_LDFLAGS=-dynamiclib
++SHARED_OBJ=.dylib
++endif
+ 
+ FE=-o 
+ IJS_EXEC_SERVER=ijs_exec_unix$(OBJ)
+@@ -60,8 +64,13 @@
+ 	$(RM) *~ gmon.out core ijs_spec.log ijs_spec.tex ijs_spec.aux libijs.a libijs$(SHARED_OBJ) config.cache config.log config.status ijs-config
+ 
+ install:	all
++ifeq ($(CPU),Darwin)
++	$(INSTALL) ijs_client_example$(EXE) $(DESTDIR)$(bindir)/ijs_client_example$(EXE)
++	$(INSTALL) ijs-config $(DESTDIR)$(bindir)/ijs-config
++else
+ 	$(INSTALL) ijs_client_example$(EXE) -c $(DESTDIR)$(bindir)/ijs_client_example$(EXE)
+ 	$(INSTALL) ijs-config -c $(DESTDIR)$(bindir)/ijs-config
++endif
+ 	$(INSTALL) libijs.a $(DESTDIR)$(libdir)/libijs.a
+ 	$(INSTALL) libijs$(SHARED_OBJ) $(DESTDIR)$(libdir)/libijs$(SHARED_OBJ)
+ 	-mkdir $(DESTDIR)$(pkgincludedir)
+diff -Naur ghostscript-7.07.1-r8-orig/work/espgs-7.07.1/ijs/ijs_server_example.c ghostscript-7.07.1-r8/work/espgs-7.07.1/ijs/ijs_server_example.c
+--- ghostscript-7.07.1-r8-orig/work/espgs-7.07.1/ijs/ijs_server_example.c	Tue Apr 23 10:01:17 2002
++++ ghostscript-7.07.1-r8/work/espgs-7.07.1/ijs/ijs_server_example.c	Thu Mar 24 22:59:46 2005
+@@ -25,7 +25,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+-#include <malloc.h>
++#include <malloc/malloc.h>
+ #include "ijs.h"
+ #include "ijs_server.h"
diff --git a/app-text/ghostscript/files/gs-osx-unix-dll.patch b/app-text/ghostscript/files/gs-osx-unix-dll.patch
new file mode 100644
index 000000000000..832394f51ebb
--- /dev/null
+++ b/app-text/ghostscript/files/gs-osx-unix-dll.patch
@@ -0,0 +1,42 @@
+diff -Naur ghostscript-7.07.1-r8-orig/work/espgs-7.07.1/src/unix-dll.mak ghostscript-7.07.1-r8/work/espgs-7.07.1/src/unix-dll.mak
+--- ghostscript-7.07.1-r8-orig/work/espgs-7.07.1/src/unix-dll.mak	Tue Apr 23 08:43:44 2002
++++ ghostscript-7.07.1-r8/work/espgs-7.07.1/src/unix-dll.mak	Thu Mar 24 23:00:57 2005
+@@ -45,12 +45,12 @@
+ GSSOX=$(BINDIR)/$(SOBINRELDIR)/$(GSSOX_XENAME)
+ 
+ # shared library
+-GS_SONAME=lib$(GS).so
+-GS_SONAME_MAJOR=$(GS_SONAME).$(GS_VERSION_MAJOR)
+-GS_SONAME_MAJOR_MINOR= $(GS_SONAME).$(GS_VERSION_MAJOR).$(GS_VERSION_MINOR)
++GS_SONAME=lib$(GS).dylib
++GS_SONAME_MAJOR=lib$(GS).$(GS_VERSION_MAJOR).dylib
++GS_SONAME_MAJOR_MINOR=lib$(GS).$(GS_VERSION_MAJOR).$(GS_VERSION_MINOR).dylib
+ GS_SO=$(BINDIR)/$(GS_SONAME)
+-GS_SO_MAJOR=$(GS_SO).$(GS_VERSION_MAJOR)
+-GS_SO_MAJOR_MINOR=$(GS_SO_MAJOR).$(GS_VERSION_MINOR)
++GS_SO_MAJOR=$(BINDIR)/$(GS_SONAME_MAJOR)
++GS_SO_MAJOR_MINOR=$(BINDIR)/$(GS_SONAME_MAJOR_MINOR)
+ 
+ # Shared object is built by redefining GS_XE in a recursive make.
+ 
+@@ -74,7 +74,7 @@
+ 
+ # ------------------------- Recursive make targets ------------------------- #
+ 
+-SODEFS=LDFLAGS='$(LDFLAGS) $(CFLAGS_SO) -shared -Wl,-soname,$(GS_SONAME_MAJOR)'\
++SODEFS=LDFLAGS='$(LDFLAGS) $(CFLAGS_SO) -dynamiclib -install_name $(GS_SO_MAJOR)'\
+  GS_XE=$(BINDIR)/$(SOBINRELDIR)/$(GS_SONAME_MAJOR_MINOR)\
+  STDIO_IMPLEMENTATION=c\
+  DISPLAY_DEV=$(DD)$(SOOBJRELDIR)/display.dev\
+--- ghostscript-7.07.1-r8-orig/work/espgs-7.07.1/src/unixinst.mak.orig       Tue Apr 23 08:43:44 2002
++++ ghostscript-7.07.1-r8/work/espgs-7.07.1/src/unixinst.mak    Thu Mar 24 23:00:57 2005
+@@ -134,7 +134,7 @@
+ 			  ln -s ps2pdf.$(man1ext) $$f.$(man1ext) ) ;\
+ 	      done ;\
+ 	    fi ;\
+-	    if ( test -f $$man1dir/ps2ps.$(man1ext) ) ;\
++	    if ( test -f $$man1dir/gslp.$(man1ext) ) ;\
+ 	      then for f in $(MAN1_LINKS_GSLP) ;\
+ 	        do ( cd $$man1dir; rm -f $$f.$(man1ext) ;\
+ 			  ln -s gslp.$(man1ext) $$f.$(man1ext) ) ;\
+
diff --git a/app-text/ghostscript/ghostscript-7.07.1-r8.ebuild b/app-text/ghostscript/ghostscript-7.07.1-r8.ebuild
index f1538e84ffb4..b08c419f3635 100644
--- a/app-text/ghostscript/ghostscript-7.07.1-r8.ebuild
+++ b/app-text/ghostscript/ghostscript-7.07.1-r8.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript/ghostscript-7.07.1-r8.ebuild,v 1.11 2005/03/27 11:59:24 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript/ghostscript-7.07.1-r8.ebuild,v 1.12 2005/04/03 05:50:26 j4rg0n Exp $
 
-inherit flag-o-matic eutils gcc
+inherit flag-o-matic eutils gcc libtool
 
 DESCRIPTION="ESP Ghostscript -- an enhanced version of GNU Ghostscript with better printer support"
 HOMEPAGE="http://www.cups.org/ghostscript.php"
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/espgs/espgs-${PV}-source.tar.bz2
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ~ppc ~ppc64 s390 sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ~ppc ~ppc64 ~ppc-macos s390 sparc x86"
 IUSE="X cups cjk emacs gtk"
 
 DEP="virtual/libc
@@ -44,6 +44,15 @@ src_unpack() {
 
 	cd ${S}
 
+	if use ppc-macos; then
+		epatch ${FILESDIR}/gs-osx-unix-dll.patch
+		cp src/unix-gcc.mak Makefile.in
+		sed -i -e "s:SHARE_JPEG=0:SHARE_JPEG=1:" Makefile.in || die
+		sed -i -e "s:SHARE_ZLIB=0:SHARE_ZLIB=1:" Makefile.in || die
+		sed -i -e "s:SHARE_LIBPNG=0:SHARE_LIBPNG=1:" Makefile.in || die
+		sed -i -e "s:usr/local:usr:" Makefile.in || die
+	fi
+
 	if use cjk ; then
 		epatch ${FILESDIR}/gs7.07.1-cjk.diff.bz2
 		epatch ${FILESDIR}/gs7.05.6-kochi-substitute.patch
@@ -66,6 +75,8 @@ src_unpack() {
 	epatch ${FILESDIR}/gs${PV}-destdir.patch
 	epatch ${FILESDIR}/gs${PV}-ijsdestdir.patch
 
+	use ppc-macos && epatch ${FILESDIR}/gs-osx-ijs.patch
+
 	# search path fix
 	sed -i -e "s:\$\(gsdatadir\)/lib:/usr/share/ghostscript/7.07/$(get_libdir):"\
 	Makefile.in || die "sed failed"