Add support for NetBSD on SPARC systems.

11 files changed, 99 insertions, 57 deletions

diff --git a/lang/gprolog/Makefile b/lang/gprolog/Makefile
index 9573ee7c326..9af3d27e659 100644
--- a/lang/gprolog/Makefile
+++ b/lang/gprolog/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2003/06/23 19:48:19 jtb Exp $
-#
+# $NetBSD: Makefile,v 1.7 2003/07/07 21:31:52 jtb Exp $
 
 DISTNAME=		gprolog-1.2.16
 WRKSRC=			${WRKDIR}/${DISTNAME}/src
@@ -10,8 +9,9 @@ MAINTAINER=		brook@nmsu.edu
 HOMEPAGE=		http://gnu-prolog.inria.fr/
 COMMENT=		GNU prolog compiler and interpreter
 
-ONLY_FOR_PLATFORM=	*-*-i386 *-*-sparc *-*-powerpc
+ONLY_FOR_PLATFORM=	*-*-i386 *-*-powerpc *-*-sparc
 
+USE_BUILDLINK2=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-install-dir=${PREFIX}/libexec/${PKGNAME} \
 			--with-doc-dir=${PREFIX}/share/doc/gprolog \
diff --git a/lang/gprolog/distinfo b/lang/gprolog/distinfo
index 9e1990b791a..97d19dad904 100644
--- a/lang/gprolog/distinfo
+++ b/lang/gprolog/distinfo
@@ -1,16 +1,17 @@
-$NetBSD: distinfo,v 1.4 2003/06/23 19:48:19 jtb Exp $
+$NetBSD: distinfo,v 1.5 2003/07/07 21:31:53 jtb Exp $
 
 SHA1 (gprolog-1.2.16.tar.gz) = 128071ff640be38782b943218762e09ef0287dc6
 Size (gprolog-1.2.16.tar.gz) = 2478633 bytes
 SHA1 (patch-aa) = 11cef0fd91bcfa21c264f5d2f44d1a06c6075177
-SHA1 (patch-ab) = 34d13265085198d4ccbc0bcd9c1d33e02fc5090f
-SHA1 (patch-ac) = 46c8eda2f3128deea650a1967208d3d79589c051
+SHA1 (patch-ab) = 550411d2c52b31b7a747ad2bf30c4439a8e71d0a
+SHA1 (patch-ac) = ae2d6ee1e0fe94e7602b8db9e4127ea82b56dcfe
 SHA1 (patch-ad) = 3a83cf6a9ab48830237ee8ac5d162ac5260775bc
-SHA1 (patch-ae) = fbee8e3314e1a1f34019ce5f4721b54ad7e1acf4
-SHA1 (patch-af) = 73b0fa41a4502e7094daac1afa920e009227585f
-SHA1 (patch-ag) = 6899456ea20d3830c1ef8722143cfb8e53596992
-SHA1 (patch-ah) = 36647d4498942748489c7547e2d1582ad9d3b9a2
-SHA1 (patch-ai) = 00a69fc3254a2bc4635c500d70ca787ac93fac33
+SHA1 (patch-ae) = a832ac080488e1e9a155d135af4e87eafb03d0de
+SHA1 (patch-af) = 72d0bfe0128c153886c4b356cce5b9bac902cd87
+SHA1 (patch-ag) = fffdc682ca58d5530108b9e2f3ba22a46c114b09
+SHA1 (patch-ah) = 1893c4c9b7f8a31487029455a47872aa1ffc4ccd
+SHA1 (patch-ai) = 789b465de0c768dbfcdcb063998256d7931726fd
+SHA1 (patch-aj) = 0fea4c886bbc9f94d53edb04d3f6a93a7fab5431
 SHA1 (patch-al) = 5745b485e5cfc82142148f49ab69f307fe7b71cf
 SHA1 (patch-am) = 6c12d78cbf6d2763ad7bf0f40cee2025f2362961
-SHA1 (patch-an) = de2f07898aeffab6780a7ae8a227a82c2c45483c
+SHA1 (patch-an) = 1eb7c3c03ab323ddcc7884cb5234448eaa3f1cb7
diff --git a/lang/gprolog/patches/patch-ab b/lang/gprolog/patches/patch-ab
index 80516de495c..03836089b96 100644
--- a/lang/gprolog/patches/patch-ab
+++ b/lang/gprolog/patches/patch-ab
@@ -1,8 +1,16 @@
-$NetBSD: patch-ab,v 1.3 2003/06/23 19:48:20 jtb Exp $
+$NetBSD: patch-ab,v 1.4 2003/07/07 21:31:53 jtb Exp $
 
 --- configure.in.orig
 +++ configure.in
-@@ -319,6 +319,7 @@
+@@ -311,6 +311,7 @@
+ 		mips*irix*)      AC_DEFINE(M_mips_irix);;
+ 		sparc*sunos*)    AC_DEFINE(M_sparc_sunos);;
+ 		sparc*solaris*)  AC_DEFINE(M_sparc_solaris);;
++		sparc*bsd*)	 AC_DEFINE(M_sparc_bsd);;
+ 	        alpha*osf*)      AC_DEFINE(M_alpha_osf);;
+ 	        alpha*linux*)    AC_DEFINE(M_alpha_linux);;
+ 		i*86*linux*)     AC_DEFINE(M_ix86_linux);;
+@@ -319,6 +320,7 @@
  		i*86*bsd*)       AC_DEFINE(M_ix86_bsd);;
          	powerpc*linux*)  AC_DEFINE(M_powerpc_linux);;
  		powerpc*darwin*) AC_DEFINE(M_powerpc_darwin);;
diff --git a/lang/gprolog/patches/patch-ac b/lang/gprolog/patches/patch-ac
index 4a73b019931..577a92231d9 100644
--- a/lang/gprolog/patches/patch-ac
+++ b/lang/gprolog/patches/patch-ac
@@ -1,15 +1,26 @@
-$NetBSD: patch-ac,v 1.3 2003/06/23 19:48:21 jtb Exp $
+$NetBSD: patch-ac,v 1.4 2003/07/07 21:31:53 jtb Exp $
 
 --- configure.orig
 +++ configure
-@@ -2359,6 +2359,10 @@
- #define M_powerpc_darwin 1
+@@ -2327,6 +2327,10 @@
+ #define M_sparc_solaris 1
  EOF
  ;;
-+		powerpc*bsd*) cat >>confdefs.h <<\EOF
-+#define M_powerpc_bsd 1
++		sparc*bsd*)  cat >>confdefs.h <<\EOF
++#define M_sparc_bsd 1
 +EOF
 +;;
- 		*86*cygwin*)     cat >>confdefs.h <<\EOF
- #define M_ix86_cygwin 1
+ 	        alpha*osf*)      cat >>confdefs.h <<\EOF
+ #define M_alpha_osf 1
  EOF
+@@ -2357,6 +2361,10 @@
+ ;;
+ 		powerpc*darwin*) cat >>confdefs.h <<\EOF
+ #define M_powerpc_darwin 1
++EOF
++;;
++		powerpc*bsd*) cat >>confdefs.h <<\EOF
++#define M_powerpc_bsd 1
+ EOF
+ ;;
+ 		*86*cygwin*)     cat >>confdefs.h <<\EOF
diff --git a/lang/gprolog/patches/patch-ae b/lang/gprolog/patches/patch-ae
index 2ffee6f6120..b26729b736b 100644
--- a/lang/gprolog/patches/patch-ae
+++ b/lang/gprolog/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.3 2003/06/23 19:48:22 jtb Exp $
+$NetBSD: patch-ae,v 1.4 2003/07/07 21:31:53 jtb Exp $
 
 --- EnginePl/gp_config.h.in.orig
 +++ EnginePl/gp_config.h.in
@@ -14,17 +14,22 @@ $NetBSD: patch-ae,v 1.3 2003/06/23 19:48:22 jtb Exp $
  #undef HAVE_MALLOC_H
  
  /* Define if you have a working `mmap' system call */
-@@ -151,9 +154,12 @@
+@@ -148,11 +151,17 @@
+ /* Define if the system is a sparc/sunos */
+ #undef M_sparc_sunos
+ 
++/* Define if the system is a sparc/bsd */
++#undef M_sparc_bsd
++
  /* Define if the system is a powerpc/linux */
  #undef M_powerpc_linux
  
 -/* Define if the system is a powerpc/bsd */
 +/* Define if the system is a powerpc/darwin */
  #undef M_powerpc_darwin
- 
++
 +/* Define if the system is a powerpc/bsd */
 +#undef M_powerpc_bsd
-+
  
  
- /* Constant definitions */
+ 
diff --git a/lang/gprolog/patches/patch-af b/lang/gprolog/patches/patch-af
index dd9eb9051bd..df174471606 100644
--- a/lang/gprolog/patches/patch-af
+++ b/lang/gprolog/patches/patch-af
@@ -1,13 +1,13 @@
-$NetBSD: patch-af,v 1.3 2003/06/23 19:48:22 jtb Exp $
+$NetBSD: patch-af,v 1.4 2003/07/07 21:31:53 jtb Exp $
 
 --- EnginePl/engine1.c.orig
 +++ EnginePl/engine1.c
-@@ -78,7 +78,7 @@
-   register WamWord *rb asm("$9") = reg_bank;
-   ensure_reserved = (WamWord *) rb; /* to avoid gcc warning */
+@@ -97,7 +97,7 @@
  
--#elif defined(M_powerpc_linux)
-+#elif defined(M_powerpc_linux) || defined(M_powerpc_bsd)
+ #endif
  
-   register WamWord *rb asm("15") = reg_bank;
-   ensure_reserved = (WamWord *) rb; /* to avoid gcc warning */
+-#ifdef M_sparc
++#if defined(M_sparc) && !defined(M_sparc_bsd)
+   register long *rfl asm("%l2") = base_fl;
+   register double *rfd asm("%l3") = base_fd;
+ #endif
diff --git a/lang/gprolog/patches/patch-ag b/lang/gprolog/patches/patch-ag
index f51d67584b1..05bd2fa99fd 100644
--- a/lang/gprolog/patches/patch-ag
+++ b/lang/gprolog/patches/patch-ag
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.3 2003/06/23 19:48:22 jtb Exp $
+$NetBSD: patch-ag,v 1.4 2003/07/07 21:31:53 jtb Exp $
 
 --- BipsPl/os_interf_c.c.orig
 +++ BipsPl/os_interf_c.c
@@ -7,7 +7,7 @@ $NetBSD: patch-ag,v 1.3 2003/06/23 19:48:22 jtb Exp $
    tsig[nb_sig++].sig = SIGIO;
  #endif
 -#if !defined( M_ix86_bsd ) && !defined( M_powerpc_darwin )
-+#if !defined( M_ix86_bsd ) && !defined( M_powerpc_darwin ) && !defined( M_powerpc_bsd )
++#if !defined( M_ix86_bsd ) && !defined( M_powerpc_darwin ) && !defined( M_powerpc_bsd ) && !defined( M_sparc_bsd )
    tsig[nb_sig].atom = Create_Atom("SIGPOLL");
    tsig[nb_sig++].sig = SIGPOLL;
  #endif
diff --git a/lang/gprolog/patches/patch-ah b/lang/gprolog/patches/patch-ah
index c22c9abaaa3..57d920fde0b 100644
--- a/lang/gprolog/patches/patch-ah
+++ b/lang/gprolog/patches/patch-ah
@@ -1,13 +1,17 @@
-$NetBSD: patch-ah,v 1.3 2003/06/23 19:48:23 jtb Exp $
+$NetBSD: patch-ah,v 1.4 2003/07/07 21:31:54 jtb Exp $
 
---- EnginePl/gprolog.h.orig
-+++ EnginePl/gprolog.h
-@@ -686,7 +686,7 @@
- #else
+--- EnginePl/machine.h.orig
++++ EnginePl/machine.h
+@@ -125,11 +125,7 @@
  #    define M_USED_REGS            {"ebx", "ebp", 0}
  #endif
+ 
 -#elif defined(M_powerpc_linux)
-+#elif defined(M_powerpc_linux) || defined(M_powerpc_bsd)
- #    define M_USED_REGS            {"15", "20", 0}
- #elif defined(M_powerpc_darwin)
+-
+-#    define M_USED_REGS            {"15", "20", 0}
+-
+-#elif defined(M_powerpc_darwin)
++#elif defined(M_powerpc_linux) || defined(M_powerpc_darwin) || defined(M_powerpc_bsd)
+ 
  #    define M_USED_REGS            {"15", "20", 0}
+ 
diff --git a/lang/gprolog/patches/patch-ai b/lang/gprolog/patches/patch-ai
index 7b661a01778..72074f3c2b6 100644
--- a/lang/gprolog/patches/patch-ai
+++ b/lang/gprolog/patches/patch-ai
@@ -1,4 +1,4 @@
-$NetBSD: patch-ai,v 1.3 2003/06/23 19:48:24 jtb Exp $
+$NetBSD: patch-ai,v 1.4 2003/07/07 21:31:54 jtb Exp $
 
 --- EnginePl/machine.c.orig
 +++ EnginePl/machine.c
@@ -7,16 +7,7 @@ $NetBSD: patch-ai,v 1.3 2003/06/23 19:48:24 jtb Exp $
  static void
  SIGSEGV_Handler(int sig, siginfo_t * si)
 -#elif defined(M_ix86_bsd)
-+#elif defined(M_ix86_bsd) || defined(M_powerpc_bsd)
++#elif defined(M_ix86_bsd) || defined(M_powerpc_bsd) || defined(M_sparc_bsd)
  
  static void
  SIGSEGV_Handler(int sig, int code, struct sigcontext *scp)
-@@ -528,7 +528,7 @@
- 
-   WamWord *addr = (WamWord *) si->si_addr;
- 
--#elif defined(M_ix86_bsd)
-+#elif defined(M_ix86_bsd) || defined(M_powerpc_bsd)
- 
-   WamWord *addr = (WamWord *) scp->sc_err;
- 
diff --git a/lang/gprolog/patches/patch-aj b/lang/gprolog/patches/patch-aj
new file mode 100644
index 00000000000..099ed55bca3
--- /dev/null
+++ b/lang/gprolog/patches/patch-aj
@@ -0,0 +1,22 @@
+$NetBSD: patch-aj,v 1.3 2003/07/07 21:31:54 jtb Exp $
+
+--- Ma2Asm/sparc_any.c.orig
++++ Ma2Asm/sparc_any.c
+@@ -171,7 +171,7 @@
+ {
+   Label_Printf("");
+   Inst_Printf(".align", "4");
+-#ifdef M_sparc_solaris
++#if defined(M_sparc_solaris) || defined(M_sparc_bsd)
+   Inst_Printf(".type", UN "%s,#function", label);
+ #endif
+   Inst_Printf(".proc", "020");
+@@ -915,7 +915,7 @@
+       break;
+ 
+     case INITIAL_VALUE:
+-#ifdef M_sparc_solaris
++#if defined(M_sparc_solaris) || defined(M_sparc_bsd)
+       Inst_Printf(".type", UN "%s,#object", name);
+       Inst_Printf(".size", UN "%s,4", name);
+ #endif
diff --git a/lang/gprolog/patches/patch-an b/lang/gprolog/patches/patch-an
index dc231411a2e..aec7a6e9dbe 100644
--- a/lang/gprolog/patches/patch-an
+++ b/lang/gprolog/patches/patch-an
@@ -1,4 +1,4 @@
-$NetBSD: patch-an,v 1.3 2003/06/23 19:48:25 jtb Exp $
+$NetBSD: patch-an,v 1.4 2003/07/07 21:31:54 jtb Exp $
 
 --- Ma2Asm/FromC/mach.h.orig
 +++ Ma2Asm/FromC/mach.h
@@ -8,7 +8,7 @@ $NetBSD: patch-an,v 1.3 2003/06/23 19:48:25 jtb Exp $
  #if defined(M_sony_news) || defined(M_ultrix_dec) || defined(M_alpha_osf) ||\
 -    defined(M_ix86_linux) || defined(M_ix86_sco) || defined(M_ix86_bsd)
 +    defined(M_ix86_linux) || defined(M_ix86_sco) || defined(M_ix86_bsd) ||\
-+    defined(M_powerpc_bsd) || defined(__ELF__)
++    defined(M_powerpc_bsd) || defined(M_sparc_bsd) || defined(__ELF__)
  
  #   define M_Asm_Symbol1(name)     #name
  #   define M_Asm_Symbol(name)      M_Asm_Symbol1(name)