Use ${SED} in gimp-print-4.2.0/src/ghost/Makefile, to get /usr/xpg4/bin/sed

on Solaris.

3 files changed, 39 insertions, 7 deletions

diff --git a/print/ghostscript-nox11/Makefile.common b/print/ghostscript-nox11/Makefile.common
index 6d797f23553..aa3ce575323 100644
--- a/print/ghostscript-nox11/Makefile.common
+++ b/print/ghostscript-nox11/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.40 2002/09/29 07:37:54 jlam Exp $
+# $NetBSD: Makefile.common,v 1.41 2002/10/24 17:16:58 bouyer Exp $
 
 DISTNAME=		ghostscript-${GS_VERS}
 GS_VERS=		6.01
@@ -214,7 +214,7 @@ post-patch:
 
 GS_CONF_PREREQ+=	hpijs-configure
 hpijs-configure:
-	@cd ${HPIJS_WRKSRC} &&						\
+	cd ${HPIJS_WRKSRC} &&						\
 	${SETENV} CC="${CC}" CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}"	\
 		${CONFIGURE_ENV}					\
 		${CONFIGURE_SCRIPT} ${HPIJS_CONFIGURE_ARGS} &&		\
@@ -224,21 +224,21 @@ hpijs-configure:
 
 GS_BUILD_PREREQ+=	hpijs-build
 hpijs-build:
-	@cd ${HPIJS_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} all
+	cd ${HPIJS_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} all
 
 GS_INSTALL_PREREQ+=	hpijs-install
 hpijs-install:
-	@cd ${HPIJS_WRKSRC} &&						\
+	cd ${HPIJS_WRKSRC} &&						\
 	${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} install docdir=${HTMLDIR}/hpijs
 
 GS_CONF_PREREQ+=	gimpprint-configure
 gimpprint-configure:
-	@cd ${GIMPPRINT_WRKSRC} &&					\
+	cd ${GIMPPRINT_WRKSRC} &&					\
 	${SETENV} CC="${CC}" CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}"	\
 		${GIMPPRINT_CONFIGURE_ENV}				\
 		${CONFIGURE_SCRIPT} ${GIMPPRINT_CONFIGURE_ARGS} &&	\
 	cd ${GIMPPRINT_WRKSRC}/src/ghost &&				\
-	${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} all-local &&		\
+	${SETENV} ${MAKE_ENV} SED=${SED} ${MAKE_PROGRAM} all-local &&		\
 	( ${ECHO} '#ifndef GIMPPRINT_VERSION_FIX';			\
 	  ${ECHO} '#define GIMPPRINT_VERSION_FIX';			\
 	  ${EGREP} '#define (VERSION|RELEASE_DATE)' ../../config.h;	\
diff --git a/print/ghostscript-nox11/distinfo b/print/ghostscript-nox11/distinfo
index a9a8701eee3..8870ad8be63 100644
--- a/print/ghostscript-nox11/distinfo
+++ b/print/ghostscript-nox11/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2002/03/15 05:04:05 itohy Exp $
+$NetBSD: distinfo,v 1.10 2002/10/24 17:16:59 bouyer Exp $
 
 SHA1 (ghostscript/ghostscript-6.01.tar.bz2) = 405a8ab16453a8c3f846eae2aa4abbea6a093300
 Size (ghostscript/ghostscript-6.01.tar.bz2) = 2974476 bytes
@@ -55,4 +55,5 @@ SHA1 (patch-au) = 07c99b2988c34396901594ab635a209e08766303
 SHA1 (patch-av) = 87f3c9e01a4e2fa63c75c348b1a5ec2be07948a5
 SHA1 (patch-aw) = 9855cacc48db068f87aa37568b198e22e6c391a0
 SHA1 (patch-ay) = a39a1e27a2f8437103a93ac06e5f857ec5e32fa3
+SHA1 (patch-az) = 2bd5ddec9bf82aeca1fc2e928084cadc51bc88be
 SHA1 (patch-bug-workaround) = 99f4e197b35a8f33b8a1219a38f6d9fc2c307eb6
diff --git a/print/ghostscript-nox11/patches/patch-az b/print/ghostscript-nox11/patches/patch-az
new file mode 100644
index 00000000000..014d0d7ca4d
--- /dev/null
+++ b/print/ghostscript-nox11/patches/patch-az
@@ -0,0 +1,31 @@
+--- ../gimp-print-4.2.0/src/ghost/Makefile.in.orig	Thu Oct 24 18:17:52 2002
++++ ../gimp-print-4.2.0/src/ghost/Makefile.in	Thu Oct 24 18:18:25 2002
+@@ -316,22 +316,22 @@
+ all-local: $(ALL_LOCAL_DEPS)
+ 
+ $(srcdir)/gdevstp-print.h: $(top_srcdir)/include/gimp-print/gimp-print.h
+-	sed $(GHCODE) $< > $(srcdir)/$@
++	${SED} $(GHCODE) $< > $(srcdir)/$@
+ 
+ $(srcdir)/gdevstp-print-internal.h: $(top_srcdir)/src/main/gimp-print-internal.h
+-	sed $(GHCODE) $< > $(srcdir)/$@
++	${SED} $(GHCODE) $< > $(srcdir)/$@
+ 
+ $(srcdir)/gdevstp-print-intl-internal.h: $(top_srcdir)/include/gimp-print/gimp-print-intl-internal.h
+-	sed $(GHCODE) $< > $(srcdir)/$@
++	${SED} $(GHCODE) $< > $(srcdir)/$@
+ 
+ gdevstp-%.h: $(srcdir)/../main/%.h Makefile
+-	cd $(srcdir) ; sed $(GHCODE) $< > $@
++	cd $(srcdir) ; ${SED} $(GHCODE) $< > $@
+ 
+ gdevstp-printers.c: ../main/print-printers.c
+-	sed $(GHCODE) $< > $@
++	${SED} $(GHCODE) $< > $@
+ 
+ gdevstp-%: $(srcdir)/../main/print-% Makefile
+-	cd $(srcdir) ; sed $(GHCODE) $< > $@
++	cd $(srcdir) ; ${SED} $(GHCODE) $< > $@
+ 
+ ../main/print-printers.c: ../printdef/printdef $(srcdir)/../main/printers.xml
+ 	../printdef/printdef < $(srcdir)/../main/printers.xml > $(top_builddir)/src/main/print-printers.c