* Change to correctly use MACHINE instead of MACHINE_ARCH.

* Pass in Abi version number from top-level Makefile to simplify
  future updates.

5 files changed, 12 insertions, 11 deletions

diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile
index 2f236a1034e..e6b84d09c8f 100644
--- a/editors/abiword/Makefile
+++ b/editors/abiword/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 1999/09/11 18:27:48 jlam Exp $
+# $NetBSD: Makefile,v 1.2 1999/09/14 02:19:14 jlam Exp $
 #
 
 DISTNAME=	abi-${ABIWORD_VERS}
@@ -41,7 +41,8 @@ LIBPNG_DIR=	${LOCALBASE}/lib
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LIBPNG_DIR}
 
-MAKE_ENV+=	MACHINE_ARCH="${MACHINE_ARCH}" \
+MAKE_ENV+=	ABI_BUILD_VERSION="${ABIWORD_VERS}" \
+		MACHINE="${MACHINE}" \
 		ABISUITE_HOME="${ABISUITE_HOME}" \
 		ABISUITE_LIBEXEC="${ABISUITE_LIBEXEC}" \
 		ZLIB_DIR="${ZLIB_DIR}" \
diff --git a/editors/abiword/files/md5 b/editors/abiword/files/md5
index f3482743352..5d42910ea00 100644
--- a/editors/abiword/files/md5
+++ b/editors/abiword/files/md5
@@ -1,4 +1,4 @@
-$NetBSD: md5,v 1.1.1.1 1999/09/11 18:27:49 jlam Exp $
+$NetBSD: md5,v 1.2 1999/09/14 02:19:15 jlam Exp $
 
 MD5 (abisuite/abi-0.7.5.tar.gz) = 8ae9d28cbd5905b2f0869114f1259510
 MD5 (abisuite/abidistfiles-0.7.5.tar.gz) = 57bf3b793de91edb6fc0f06c483c66ed
diff --git a/editors/abiword/files/patch-sum b/editors/abiword/files/patch-sum
index 7cd81878eca..f03b7064fe5 100644
--- a/editors/abiword/files/patch-sum
+++ b/editors/abiword/files/patch-sum
@@ -1,9 +1,9 @@
-$NetBSD: patch-sum,v 1.1.1.1 1999/09/11 18:27:49 jlam Exp $
+$NetBSD: patch-sum,v 1.2 1999/09/14 02:19:15 jlam Exp $
 
 MD5 (patch-aa) = 9083af68a39aa7760c1d63776bad501f
 MD5 (patch-ab) = 8d985a606820cd5e8baf6bcc9f77b01f
-MD5 (patch-ac) = 845ead38015793713d0237dc8c178f81
-MD5 (patch-ad) = 10a00574dae636394970511801cc2716
+MD5 (patch-ac) = c12b687d99d2986e85e45dda6bbe0c8b
+MD5 (patch-ad) = 0c924572b32d9297251550633ff828be
 MD5 (patch-ae) = ff7d5b3bcbf315987ccc1f38c6024afe
 MD5 (patch-af) = b68e0ef50cca301a9e2e59a1902e1be8
 MD5 (patch-ag) = 29b8ee5c764e4800010240bd0f9b8d2a
diff --git a/editors/abiword/patches/patch-ac b/editors/abiword/patches/patch-ac
index 8fae4fe0f97..b01075ed10e 100644
--- a/editors/abiword/patches/patch-ac
+++ b/editors/abiword/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.1.1.1 1999/09/11 18:27:49 jlam Exp $
+$NetBSD: patch-ac,v 1.2 1999/09/14 02:19:15 jlam Exp $
 
 --- src/config/abi_defs.mk.orig	Tue Jul 27 11:18:52 1999
 +++ src/config/abi_defs.mk	Sat Sep 11 13:47:32 1999
@@ -7,7 +7,7 @@ $NetBSD: patch-ac,v 1.1.1.1 1999/09/11 18:27:49 jlam Exp $
  ##
  
 -ABI_BUILD_VERSION	= unnumbered
-+ABI_BUILD_VERSION	= 0.7.5
++ABI_BUILD_VERSION	?= unnumbered
  ABI_BUILD_ID		=
  
  DIST			= $(ABI_ROOT)/dist
diff --git a/editors/abiword/patches/patch-ad b/editors/abiword/patches/patch-ad
index 84b4eefe69b..14aea32137b 100644
--- a/editors/abiword/patches/patch-ad
+++ b/editors/abiword/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.1.1.1 1999/09/11 18:27:49 jlam Exp $
+$NetBSD: patch-ad,v 1.2 1999/09/14 02:19:15 jlam Exp $
 
 --- src/config/platforms/netbsd.mk.orig	Fri Jul  9 15:13:57 1999
 +++ src/config/platforms/netbsd.mk	Sat Sep 11 11:17:45 1999
@@ -7,9 +7,9 @@ $NetBSD: patch-ad,v 1.1.1.1 1999/09/11 18:27:49 jlam Exp $
  ## in constructing the name object file destination directory.
  
 -OS_ARCH		:= $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/ | sed "s/\//-/")
-+# Get value of MACHINE_ARCH from environment.
++# Get value of OS_ARCH from environment variable MACHINE.
 +#
-+OS_ARCH		= ${MACHINE_ARCH}
++OS_ARCH		= ${MACHINE}
 +
 +# Set OS_ENDIAN to appropriate value.  For NetBSD, most architectures are
 +# big-endian, so test for the architectures which are little-endian and