From eb1f59b535ad4f45b46fedd85d29d72a8f03613d Mon Sep 17 00:00:00 2001
From: agc <agc>
Date: Mon, 6 Oct 1997 15:19:30 +0000
Subject: Add NetBSD RCS Id.

Modify FreeBSD's ecvt patch, so that it's commented out in FreeBSD,
but still short-circuits in other 4.4-lite derived systems.

Add NetBSD/i386-specific files.

Only tested on NetBSD/i386 (1.2G) so far.
---
 lang/icon/Makefile          |  1 +
 lang/icon/patches/patch-ab  | 24 +++++++++++++-----------
 lang/icon/patches/patch-cc  |  7 ++++---
 lang/icon/scripts/configure |  2 +-
 4 files changed, 19 insertions(+), 15 deletions(-)

(limited to 'lang')

diff --git a/lang/icon/Makefile b/lang/icon/Makefile
index dc8c5595a50..4361b016e09 100644
--- a/lang/icon/Makefile
+++ b/lang/icon/Makefile
@@ -1,3 +1,4 @@
+# $NetBSD: Makefile,v 1.2 1997/10/06 15:19:30 agc Exp $
 # New ports collection makefile for:    icon
 # Version required:     9.3
 # Date created:         05 April 1995
diff --git a/lang/icon/patches/patch-ab b/lang/icon/patches/patch-ab
index d20f29f9044..d6b587124f1 100644
--- a/lang/icon/patches/patch-ab
+++ b/lang/icon/patches/patch-ab
@@ -1,18 +1,20 @@
---- src/runtime/rmisc.r.orig	Sat Nov  4 00:26:32 1995
-+++ src/runtime/rmisc.r	Sat Nov  2 16:48:35 1996
-@@ -125,15 +125,6 @@
+--- src/runtime/rmisc.r	1997/10/02 09:28:35	1.1
++++ src/runtime/rmisc.r	1997/10/02 09:30:08
+@@ -123,14 +123,15 @@
     return buf;
  #endif					/* OS2EMX */
  
 -#if FreeBSD
--#define ecvt(w,x,y,z) 0
--
--   sprintf(buf, "%f", number);
--   for(i=strlen(buf); i>1 && buf[i-1]=='0' && buf[i-2]!='.'; i--)
--      buf[i-1] = '\0';
--   return buf;
++#if (defined(GenericBSD) && !defined(FreeBSD))
++/* This is commented out in the FreeBSD ports collection */
+ #define ecvt(w,x,y,z) 0
+ 
+    sprintf(buf, "%f", number);
+    for(i=strlen(buf); i>1 && buf[i-1]=='0' && buf[i-2]!='.'; i--)
+       buf[i-1] = '\0';
+    return buf;
 -#endif					/* FreeBSD */
--
++#endif					/* GenericBSD && !FreeBSD */
+ 
     p1 = ecvt(number, ndigit, &decpt, &sign);
     p2 = buf;
-    if (sign)
diff --git a/lang/icon/patches/patch-cc b/lang/icon/patches/patch-cc
index 86ff84ffe76..c8e3860b4da 100644
--- a/lang/icon/patches/patch-cc
+++ b/lang/icon/patches/patch-cc
@@ -2,11 +2,12 @@
 --- src/h/sys.h	Wed Mar  1 15:43:55 1995
 ***************
 *** 181,192 ****
---- 181,195 ----
+--- 181,196 ----
   #include <sys/ioctl.h>
   #include <errno.h>
   #include <sys/signal.h>
-+ #ifdef __FreeBSD__
++ #include <sys/param.h>
++ #if (defined(BSD) && BSD >= 199306)
 + #include <sgtty.h>
 + #endif
   #endif					/* HaveTioc */
@@ -24,7 +25,7 @@
 *** 24,29 ****
 --- 24,33 ----
   
-  #ifdef FreeBSD
+  #ifdef GenericBSD
   
 + /* Look at the DL_GETERRNO constant, if it exists this is FreeBSD 1.1.5
 +    or 2.0. If it doesn't exist this must be post 2.0 with an dlerror */
diff --git a/lang/icon/scripts/configure b/lang/icon/scripts/configure
index 552ae9f30e2..2eaac22d857 100644
--- a/lang/icon/scripts/configure
+++ b/lang/icon/scripts/configure
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-cd ${WRKSRC}; make Configure name=i386_freebsd
+cd ${WRKSRC}; make Configure name=`uname -m`_`uname -s|tr '[A-Z]' '[a-z]'`
-- 
cgit v1.2.3