From 8fc2e7a6302d32764d409d438a2c4e98ed3b9c2b Mon Sep 17 00:00:00 2001
From: espie <espie@openbsd.org>
Date: Tue, 13 Oct 1998 14:58:39 +0000
Subject: [PATCH] Generate dummy rswitch.c for architectures w/o coexpr. Remove
 debug clutter.

---
 lang/icon/Makefile                  | 9 +++++++--
 lang/icon/files/openbsd/common.hdr  | 2 +-
 lang/icon/files/openbsd/iconc.hdr   | 2 +-
 lang/icon/files/openbsd/icont.hdr   | 2 +-
 lang/icon/files/openbsd/pi.hdr      | 2 +-
 lang/icon/files/openbsd/preproc.hdr | 2 +-
 lang/icon/files/openbsd/status      | 2 +-
 lang/icon/scripts/configure         | 1 -
 8 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/lang/icon/Makefile b/lang/icon/Makefile
index fe75972830a..d122c482c68 100644
--- a/lang/icon/Makefile
+++ b/lang/icon/Makefile
@@ -1,5 +1,5 @@
 # Simple Icon port, does not yet support variant translators
-# $OpenBSD: Makefile,v 1.1.1.1 1998/10/02 17:10:51 espie Exp $
+# $OpenBSD: Makefile,v 1.2 1998/10/13 14:58:39 espie Exp $
 
 DISTNAME=icon-9.3.1
 DIST_SUBDIR=icon
@@ -18,12 +18,17 @@ WRKSRC=${WRKDIR}
 SCRIPTS_ENV=ARCH="${ARCH}"
 MAKE_ENV=ARCH="${ARCH}"
 
+CONF_DIR=${WRKSRC}/config/unix/openbsd
 
 ALL_TARGET=Icon-icont
 
 pre-configure:
 	cp -R ${FILESDIR}/openbsd ${WRKSRC}/config/unix
-	ln ${WRKSRC}/config/unix/openbsd/${ARCH}_rswitch.c ${WRKSRC}/config/unix/openbsd/rswitch.c
+	if [ -f ${CONF_DIR}/${ARCH}_rswitch.c ] ; then \
+		ln -f ${CONF_DIR}/${ARCH}_rswitch.c ${CONF_DIR}/rswitch.c ;\
+	else \
+		touch ${CONF_DIR}/rswitch.c ;\
+	fi 
 
 
 # We put a wrapper around icont for finding the library files when
diff --git a/lang/icon/files/openbsd/common.hdr b/lang/icon/files/openbsd/common.hdr
index 5b215c31854..a5216932637 100644
--- a/lang/icon/files/openbsd/common.hdr
+++ b/lang/icon/files/openbsd/common.hdr
@@ -5,6 +5,6 @@
 #	make D=Debug
 #
 D=NOTHING
-CFLAGS+= -D$D -I/usr/X11R6/include -Wall
+CFLAGS+= -D$D -I/usr/X11R6/include 
 SHELL=/bin/sh
 RSWITCH=rswitch.c
diff --git a/lang/icon/files/openbsd/iconc.hdr b/lang/icon/files/openbsd/iconc.hdr
index cb99eafe3ae..a2f27513a84 100644
--- a/lang/icon/files/openbsd/iconc.hdr
+++ b/lang/icon/files/openbsd/iconc.hdr
@@ -5,5 +5,5 @@
 #	make D=Debug
 #
 D=NOTHING
-CFLAGS+= -D$D -Wall -I/usr/X11R6/include
+CFLAGS+= -D$D -I/usr/X11R6/include
 SHELL=/bin/sh
diff --git a/lang/icon/files/openbsd/icont.hdr b/lang/icon/files/openbsd/icont.hdr
index 0bf3c237040..8834b6e3007 100644
--- a/lang/icon/files/openbsd/icont.hdr
+++ b/lang/icon/files/openbsd/icont.hdr
@@ -1,2 +1,2 @@
 SHELL=/bin/sh
-CFLAGS+=-I/usr/X11R6/include -Wall
+CFLAGS+=-I/usr/X11R6/include 
diff --git a/lang/icon/files/openbsd/pi.hdr b/lang/icon/files/openbsd/pi.hdr
index 7e3a2f1385b..35601708ee2 100644
--- a/lang/icon/files/openbsd/pi.hdr
+++ b/lang/icon/files/openbsd/pi.hdr
@@ -1,2 +1,2 @@
 SHELL=/bin/sh
-CFLAGS+=-DPersInterp -Wall -I/usr/X11R6/include
+CFLAGS+=-DPersInterp -I/usr/X11R6/include
diff --git a/lang/icon/files/openbsd/preproc.hdr b/lang/icon/files/openbsd/preproc.hdr
index 3ab545dc1d9..9c5b23a9832 100644
--- a/lang/icon/files/openbsd/preproc.hdr
+++ b/lang/icon/files/openbsd/preproc.hdr
@@ -6,5 +6,5 @@
 #
 D=NOTHING
 CC=cc
-CFLAGS+= -O -D$D -Wall
+CFLAGS+= -O -D$D 
 SHELL=/bin/sh
diff --git a/lang/icon/files/openbsd/status b/lang/icon/files/openbsd/status
index e8ede93c435..8beb94ade06 100644
--- a/lang/icon/files/openbsd/status
+++ b/lang/icon/files/openbsd/status
@@ -1,6 +1,6 @@
 System configuration:
 
-	OpenBSD >= .23
+	OpenBSD >= 2.4
 
 Latest Icon version:
 
diff --git a/lang/icon/scripts/configure b/lang/icon/scripts/configure
index 883f62de2f7..ae5341b5572 100644
--- a/lang/icon/scripts/configure
+++ b/lang/icon/scripts/configure
@@ -1,2 +1 @@
-env
 cd ${WRKSRC} && make X-Configure name=openbsd