Use endian.mk to build on more platforms.

4 files changed, 30 insertions, 19 deletions

diff --git a/cad/magic/Makefile b/cad/magic/Makefile
index b0472449fcf..70d1bb66219 100644
--- a/cad/magic/Makefile
+++ b/cad/magic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/06/01 18:02:40 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2005/09/22 15:28:35 minskim Exp $
 #
 
 DISTNAME=	magic-7.1
@@ -13,6 +13,13 @@ COMMENT=	Integrated circuit layout system
 USE_TOOLS+=	gmake
 MAKE_ENV+=	MAGIC_HOME=${PREFIX}
 
+.include "../../mk/endian.mk"
+.if ${MACHINE_ENDIAN} == "big"
+CPPFLAGS+=	-DIS_BIG_ENDIAN
+.else
+CPPFLAGS+=	-DIS_LITTLE_ENDIAN
+.endif
+
 .include "../../mk/x11.buildlink3.mk"
 
 post-patch:
diff --git a/cad/magic/distinfo b/cad/magic/distinfo
index 14de5e8ab07..15174953b6e 100644
--- a/cad/magic/distinfo
+++ b/cad/magic/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.5 2005/02/23 14:59:25 agc Exp $
+$NetBSD: distinfo,v 1.6 2005/09/22 15:28:35 minskim Exp $
 
 SHA1 (magic-7.1.tar.gz) = 176eb4c6a0ff33c6e265e61360c02da4f454f101
 RMD160 (magic-7.1.tar.gz) = 7ab03ba23243817b168254f8c6f7a50d8ea2a4db
 Size (magic-7.1.tar.gz) = 3860487 bytes
-SHA1 (patch-aa) = bfd5101deed8e5626311798f7dd4e8c80c3d63e7
-SHA1 (patch-ab) = 4168f956b665672ec79e11875f7b948a5be715ba
+SHA1 (patch-aa) = 6c25c20e7c23e86c8f4ddd2931cb2fa1decc9ff7
+SHA1 (patch-ab) = 4e6405e8c5ce551c6999a43da2bd0591bd096f0f
 SHA1 (patch-ac) = 270cbb68cb3b1ff5e635490ac1dfe13e3dcfc0d0
 SHA1 (patch-ad) = e9db83580fc1b34906d9f5e151479e46f7da444a
 SHA1 (patch-ae) = 27555db8f06d1f8a7a6f002e7dfccf14a4db2765
diff --git a/cad/magic/patches/patch-aa b/cad/magic/patches/patch-aa
index 17f40460d15..6e43dadf1b3 100644
--- a/cad/magic/patches/patch-aa
+++ b/cad/magic/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2004/01/23 11:43:33 agc Exp $
+$NetBSD: patch-aa,v 1.3 2005/09/22 15:28:35 minskim Exp $
 
---- misc/magic.h.orig	Fri Sep 21 11:15:45 2001
-+++ misc/magic.h	Wed Mar 13 12:37:46 2002
-@@ -99,7 +99,7 @@
+--- misc/magic.h.orig	2001-09-21 08:15:45.000000000 -0700
++++ misc/magic.h
+@@ -99,7 +99,7 @@ extern char *SysLibPath;	/* Path for fin
  	: FALSE)
  #else
  #define	ASSERT(p, where)	(FALSE)
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.2 2004/01/23 11:43:33 agc Exp $
  
  
  /* ------------------------ Malloc/free ------------------------------- */
-@@ -146,71 +146,13 @@
+@@ -146,71 +146,6 @@ extern char AbortMessage[];
   *
   */
  
@@ -70,13 +70,8 @@ $NetBSD: patch-aa,v 1.2 2004/01/23 11:43:33 agc Exp $
 -
 -#ifdef	ALPHA
 -#define	IS_LITTLE_ENDIAN	/* Digital Alpha AXP */
-+#include <sys/endian.h>
-+#if BYTE_ORDER==BIG_ENDIAN
-+#define IS_BIG_ENDIAN
-+#else
-+#define IS_LITTLE_ENDIAN
- #endif
- 
+-#endif
+-
 -/* Well, how'd we do? */
 -
 -#if	!defined(IS_BIG_ENDIAN) && !defined(IS_LITTLE_ENDIAN)
diff --git a/cad/magic/patches/patch-ab b/cad/magic/patches/patch-ab
index 17e6bab8207..5e9ca5bfedc 100644
--- a/cad/magic/patches/patch-ab
+++ b/cad/magic/patches/patch-ab
@@ -1,8 +1,17 @@
-$NetBSD: patch-ab,v 1.3 2004/01/23 11:43:33 agc Exp $
+$NetBSD: patch-ab,v 1.4 2005/09/22 15:28:35 minskim Exp $
 
---- scripts/config.orig	Sat Jul 13 23:25:57 2002
+--- scripts/config.orig	2005-09-22 08:13:16.000000000 -0700
 +++ scripts/config
-@@ -191,15 +191,21 @@
+@@ -52,7 +52,7 @@ Magic works with the following window co
+ CAT_EOF
+ 
+ set cflags=
+-set cppflags='-I. -I${MAGICDIR}'
++set cppflags="${CPPFLAGS} "'-I. -I${MAGICDIR}'
+ set dflags=
+ set oflags=
+ 
+@@ -191,15 +191,21 @@ case "1":
      breaksw
  case "2":
      echo "NetBSD 1.x selected"