Rather than messing around with the special happy variables that control

the special happy MAKEOBJDIR behavior, make gs build in ./object instead
of ./obj.  That's just as effective in not confusing make(1) and prevents
the package-links target from creating pkgsrc/print/packages/print and making
bogus symlinks in there.

3 files changed, 24 insertions, 11 deletions

diff --git a/print/ghostscript-nox11/Makefile.common b/print/ghostscript-nox11/Makefile.common
index 41765ca5457..8346a2884da 100644
--- a/print/ghostscript-nox11/Makefile.common
+++ b/print/ghostscript-nox11/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.18 2001/07/14 16:41:22 wiz Exp $
+# $NetBSD: Makefile.common,v 1.19 2001/07/15 22:19:11 bad Exp $
 
 DISTNAME=		ghostscript-${GS_VERS}
 GS_VERS=		6.01
@@ -117,11 +117,6 @@ LDFLAGS+=		-L${LOCALBASE}/bsd/lib -Wl,-R${LOCALBASE}/bsd/lib
 
 MAKE_ENV+=		XLDFLAGS="${LDFLAGS}"
 
-# Ghostscript builds in ./obj, which confuses make, so explicitly set
-# MAKEOBJDIR so as not to descend into ./obj.
-#
-MAKE_ENV+=		MAKEOBJDIR="."
-
 # Define whether this platform has floating point hardware:
 #	FPU_TYPE=2 means floating point is faster than fixed point.
 # (This is the case on some RISCs with multiple instruction dispatch.)
diff --git a/print/ghostscript-nox11/distinfo b/print/ghostscript-nox11/distinfo
index 4513ebb411f..9ba0afd0c0d 100644
--- a/print/ghostscript-nox11/distinfo
+++ b/print/ghostscript-nox11/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2001/05/03 05:11:43 jlam Exp $
+$NetBSD: distinfo,v 1.5 2001/07/15 22:19:11 bad Exp $
 
 SHA1 (ghostscript/ghostscript-6.01.tar.bz2) = 405a8ab16453a8c3f846eae2aa4abbea6a093300
 Size (ghostscript/ghostscript-6.01.tar.bz2) = 2974476 bytes
@@ -27,6 +27,7 @@ Size (ghostscript/gdevprsc-0.2.1.tar.gz) = 12206 bytes
 SHA1 (ghostscript/gs6.01-jpdf-exp.patch.gz) = 21f427a4c80871edab8c4d748b1fe1b7796cd876
 Size (ghostscript/gs6.01-jpdf-exp.patch.gz) = 59034 bytes
 SHA1 (patch-bug-workaround) = 99f4e197b35a8f33b8a1219a38f6d9fc2c307eb6
+SHA1 (patch-bug-workaround) = 99f4e197b35a8f33b8a1219a38f6d9fc2c307eb6
 SHA1 (patch-aa) = 0d3591e0b50530c2b2dc517979757c9b6304bf3d
 SHA1 (patch-ab) = 26cea522dbe2e2cc57a5fdc60130f309c76c6991
 SHA1 (patch-ac) = 576e0bc659d771f9d634921a0cc6752ab9739a92
@@ -46,7 +47,7 @@ SHA1 (patch-ap) = f742c454b1a058786be0239d84e5fc0b09dc538f
 SHA1 (patch-aq) = 5ff3c415eaae3398a2f39037e439955b95161942
 SHA1 (patch-ar) = 71d21692dfcbd95798743169d73f6b0611f4c007
 SHA1 (patch-as) = 9c1581562be288aba109a2c42db50e1923d60f02
-SHA1 (patch-at) = f92ad91b5a8278f019a2b4f496447a58e5abf299
+SHA1 (patch-at) = 80d12fa5104dbf19c7c8e26da9bdf414b64a657c
 SHA1 (patch-au) = 07c99b2988c34396901594ab635a209e08766303
 SHA1 (patch-av) = 87f3c9e01a4e2fa63c75c348b1a5ec2be07948a5
 SHA1 (patch-aw) = 9855cacc48db068f87aa37568b198e22e6c391a0
diff --git a/print/ghostscript-nox11/patches/patch-at b/print/ghostscript-nox11/patches/patch-at
index 3971c847772..d3fc4b94bd7 100644
--- a/print/ghostscript-nox11/patches/patch-at
+++ b/print/ghostscript-nox11/patches/patch-at
@@ -1,7 +1,24 @@
-$NetBSD: patch-at,v 1.2 2001/05/03 05:11:43 jlam Exp $
+$NetBSD: patch-at,v 1.3 2001/07/15 22:19:12 bad Exp $
 
---- src/unix-gcc.mak.orig	Mon May  1 22:07:38 2000
-+++ src/unix-gcc.mak	Mon May  1 22:08:39 2000
+--- src/unix-gcc.mak.orig	Sun Jul 15 23:47:57 2001
++++ src/unix-gcc.mak	Sun Jul 15 23:49:00 2001
+@@ -30,12 +30,12 @@
+ 
+ BINDIR=./bin
+ GLSRCDIR=./src
+-GLGENDIR=./obj
+-GLOBJDIR=./obj
++GLGENDIR=./object
++GLOBJDIR=./object
+ PSSRCDIR=./src
+ PSLIBDIR=./lib
+-PSGENDIR=./obj
+-PSOBJDIR=./obj
++PSGENDIR=./object
++PSOBJDIR=./object
+ 
+ # Do not edit the next group of lines.
+ 
 @@ -58,7 +58,7 @@
  INSTALL_PROGRAM = $(INSTALL) -m 755
  INSTALL_DATA = $(INSTALL) -m 644