From 22bc7e6f2094f83d5b47472c4323b657468efd08 Mon Sep 17 00:00:00 2001
From: etheisen <etheisen@openbsd.org>
Date: Sat, 16 Mar 1996 04:20:13 +0000
Subject: [PATCH] Allow standard GNU build with openbsd.

---
 gnu/lib/libg++/config.guess                    | 18 ++++++++++++++++++
 gnu/lib/libg++/config.sub                      |  6 +++++-
 gnu/lib/libg++/configure.in                    |  3 +++
 gnu/lib/libg++/etc/Makefile.in                 |  4 ++--
 .../libg++/etc/{configure.man => configure.1}  |  0
 gnu/lib/libg++/libg++/src/CursesW.h            |  2 +-
 6 files changed, 29 insertions(+), 4 deletions(-)
 rename gnu/lib/libg++/etc/{configure.man => configure.1} (100%)

diff --git a/gnu/lib/libg++/config.guess b/gnu/lib/libg++/config.guess
index 2ff0eba28ac..985cae0ee93 100644
--- a/gnu/lib/libg++/config.guess
+++ b/gnu/lib/libg++/config.guess
@@ -65,6 +65,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     amiga:NetBSD:*:*)
       echo m68k-cbm-netbsd${UNAME_RELEASE}
       exit 0 ;;
+    amiga:OpenBSD:*:*)
+      echo m68k-cbm-openbsd${UNAME_RELEASE}
+      exit 0 ;;
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
 	exit 0;;
@@ -108,6 +111,15 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     mac68k:NetBSD:*:*)
 	echo m68k-apple-netbsd${UNAME_RELEASE}
 	exit 0 ;;
+    atari*:OpenBSD:*:*)
+	echo m68k-atari-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    sun3*:OpenBSD:*:*)
+	echo m68k-sun-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mac68k:OpenBSD:*:*)
+	echo m68k-apple-openbsd${UNAME_RELEASE}
+	exit 0 ;;
     RISC*:ULTRIX:*:*)
 	echo mips-dec-ultrix${UNAME_RELEASE}
 	exit 0 ;;
@@ -303,6 +315,9 @@ EOF
     hp3[0-9][05]:NetBSD:*:*)
 	echo m68k-hp-netbsd${UNAME_RELEASE}
 	exit 0 ;;
+    hp3[0-9][05]:OpenBSD:*:*)
+	echo m68k-hp-openbsd${UNAME_RELEASE}
+	exit 0 ;;
     i[34]86:BSD/386:*:* | *:BSD/OS:*:*)
 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
 	exit 0 ;;
@@ -312,6 +327,9 @@ EOF
     *:NetBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
 	exit 0 ;;
+    *:OpenBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+	exit 0 ;;
     *:GNU:*:*)
 	echo `echo ${UNAME_MACHINE}|sed -e 's,/.*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
 	exit 0 ;;
diff --git a/gnu/lib/libg++/config.sub b/gnu/lib/libg++/config.sub
index d731da06f7b..a1da2a9f0c2 100644
--- a/gnu/lib/libg++/config.sub
+++ b/gnu/lib/libg++/config.sub
@@ -461,6 +461,10 @@ case $basic_machine in
 		basic_machine=i386-unknown		# CYGNUS LOCAL
 		os=-netbsd
 		;;
+	openbsd386)
+		basic_machine=i386-unknown		# CYGNUS LOCAL
+		os=-openbsd
+		;;
 	news | news700 | news800 | news900)
 		basic_machine=m68k-sony
 		os=-newsos
@@ -809,7 +813,7 @@ case $os in
 	      | -amigados* | -msdos* | -moss* | -newsos* | -unicos* | -aos* \
 	      | -nindy* | -vxworks* | -ebmon* | -hms* | -mvs* | -clix* \
 	      | -riscos* | -linux* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -netbsd* | -freebsd* | -riscix*  | -lites* \
+	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix*  | -lites* \
 	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta | -udi | -eabi*)
 		;;
diff --git a/gnu/lib/libg++/configure.in b/gnu/lib/libg++/configure.in
index 5f665354b67..3032d10cc2b 100644
--- a/gnu/lib/libg++/configure.in
+++ b/gnu/lib/libg++/configure.in
@@ -446,6 +446,9 @@ case "${target}" in
   m68k-*-netbsd*)
     noconfigdirs="$noconfigdirs gdb"
     ;;
+  m68k-*-openbsd*)
+    noconfigdirs="$noconfigdirs gdb"
+    ;;
   m68k-apollo-*)
     noconfigdirs="$noconfigdirs ld binutils gprof"
     ;;
diff --git a/gnu/lib/libg++/etc/Makefile.in b/gnu/lib/libg++/etc/Makefile.in
index 699ada6ae9a..add43804f7d 100644
--- a/gnu/lib/libg++/etc/Makefile.in
+++ b/gnu/lib/libg++/etc/Makefile.in
@@ -43,8 +43,8 @@ DVIFILES = configure.dvi standards.dvi cfg-paper.dvi
 
 all:
 
-install:  $(srcdir)/configure.man
-	$(INSTALL_DATA) $(srcdir)/configure.man $(man1dir)/configure.1
+install:  $(srcdir)/configure.1
+	$(INSTALL_DATA) $(srcdir)/configure.1 $(man1dir)/configure.1
 
 uninstall:
 	cd $(infodir) && rm -f configure.info* standards.info* cfg-paper.info*
diff --git a/gnu/lib/libg++/etc/configure.man b/gnu/lib/libg++/etc/configure.1
similarity index 100%
rename from gnu/lib/libg++/etc/configure.man
rename to gnu/lib/libg++/etc/configure.1
diff --git a/gnu/lib/libg++/libg++/src/CursesW.h b/gnu/lib/libg++/libg++/src/CursesW.h
index 5bff08df258..b2564699c46 100644
--- a/gnu/lib/libg++/libg++/src/CursesW.h
+++ b/gnu/lib/libg++/libg++/src/CursesW.h
@@ -25,7 +25,7 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 #include   <_G_config.h>
 
-#if defined(__bsdi__) || defined(__NetBSD__) || defined(__FreeBSD__)
+#if defined(__bsdi__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__)
 #define _begx begx
 #define _begy begy
 #define _maxx maxx
-- 
2.20.1