Fix build on SunOS.

Define endianess in Makefile, make sure it finds the tcl libraries.

4 files changed, 17 insertions, 8 deletions

diff --git a/cad/magic/Makefile b/cad/magic/Makefile
index d305b8f414e..b4e29ebbc05 100644
--- a/cad/magic/Makefile
+++ b/cad/magic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2010/03/08 17:24:24 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.25 2012/02/28 16:14:45 hans Exp $
 #
 
 DISTNAME=	magic-7.5.188
@@ -24,6 +24,15 @@ CONFIG_DIRS=	scripts
 
 MAKE_ENV+=	X11_LDFLAGS=${X11_LDFLAGS:Q}
 
+CFLAGS.SunOS=	-DSYSV
+
+.include "../../mk/endian.mk"
+.if ${MACHINE_ENDIAN} == "big"
+CPPFLAGS+=	-DIS_BIG_ENDIAN
+.else
+CPPFLAGS+=	-DIS_LITTLE_ENDIAN
+.endif
+
 USE_TOOLS+=		awk:run
 REPLACE_INTERPRETER+=	awk
 REPLACE.awk.old=	/bin/awk
diff --git a/cad/magic/distinfo b/cad/magic/distinfo
index a32748db058..38654d47de3 100644
--- a/cad/magic/distinfo
+++ b/cad/magic/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.13 2010/12/23 07:47:18 obache Exp $
+$NetBSD: distinfo,v 1.14 2012/02/28 16:14:45 hans Exp $
 
 SHA1 (magic-7.5.188.tgz) = f7a8dfb90f1d1416bdaf4b056972bc6d406c75d4
 RMD160 (magic-7.5.188.tgz) = b677df676ba2aa9f9e9b211445d577a85a309e27
 Size (magic-7.5.188.tgz) = 3691582 bytes
-SHA1 (patch-aa) = 689d451b1322ebeffb604e8d336c2a559359a97b
-SHA1 (patch-ab) = d63a0c36bdaa81979f2ec58ab459fdd900aa2a14
+SHA1 (patch-aa) = 8e187ee059636910dd2270db2512ec00bc011c1e
+SHA1 (patch-ab) = c7736f6721a20ed8a8c85e2bd139a88bae22231b
 SHA1 (patch-ac) = 133d924663b0866c011ae98e7c54c0587723f167
 SHA1 (patch-ad) = a6882499d36a5171dc30274bd2e3e2cd2683e005
 SHA1 (patch-ae) = a07c2f7600e93abc133847d614be27e674f4a54f
diff --git a/cad/magic/patches/patch-aa b/cad/magic/patches/patch-aa
index 889faac73b1..093b586006c 100644
--- a/cad/magic/patches/patch-aa
+++ b/cad/magic/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.6 2010/12/23 07:47:19 obache Exp $
+$NetBSD: patch-aa,v 1.7 2012/02/28 16:14:45 hans Exp $
 
 --- scripts/configure.in.orig	2009-12-30 13:45:48.000000000 +0000
 +++ scripts/configure.in
@@ -10,7 +10,7 @@ $NetBSD: patch-aa,v 1.6 2010/12/23 07:47:19 obache Exp $
  if test $usingTcl ; then
    case $target in
 -    *-sunos4*|*-*-netbsd|NetBSD-*|FreeBSD-*|OpenBSD-*)
-+    *-sunos4*|*-*-netbsd*|*-*-dragonfly|NetBSD-*|FreeBSD-*|OpenBSD-*)
++    *-sunos4*|*-*-solaris2*|*-*-netbsd*|*-*-dragonfly|NetBSD-*|FreeBSD-*|OpenBSD-*)
        TCL_LIB_NAME="tcl${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}"
        TK_LIB_NAME="tk${TK_MAJOR_VERSION}${TK_MINOR_VERSION}"
        ;;
diff --git a/cad/magic/patches/patch-ab b/cad/magic/patches/patch-ab
index 5cc9fe7bc5c..c6bc6dbbd1b 100644
--- a/cad/magic/patches/patch-ab
+++ b/cad/magic/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.9 2010/12/23 07:47:19 obache Exp $
+$NetBSD: patch-ab,v 1.10 2012/02/28 16:14:45 hans Exp $
 
 --- scripts/configure.orig	2009-12-30 13:45:48.000000000 +0000
 +++ scripts/configure
@@ -7,7 +7,7 @@ $NetBSD: patch-ab,v 1.9 2010/12/23 07:47:19 obache Exp $
  if test $usingTcl ; then
    case $target in
 -    *-sunos4*|*-*-netbsd|NetBSD-*|FreeBSD-*|OpenBSD-*)
-+    *-sunos4*|*-*-netbsd*|*-*-dragonfly|NetBSD-*|FreeBSD-*|OpenBSD-*)
++    *-sunos4*|*-*-solaris2*|*-*-netbsd*|*-*-dragonfly|NetBSD-*|FreeBSD-*|OpenBSD-*)
        TCL_LIB_NAME="tcl${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}"
        TK_LIB_NAME="tk${TK_MAJOR_VERSION}${TK_MINOR_VERSION}"
        ;;