From 23d693c0279b092f3be5d1b6b586a384bb15d1a4 Mon Sep 17 00:00:00 2001
From: form <form@openbsd.org>
Date: Sat, 4 Dec 1999 17:58:38 +0000
Subject: [PATCH] Improve (and fix) UVM checking.

---
 sysutils/xosview/patches/patch-ac | 62 ++++++++++---------------------
 1 file changed, 20 insertions(+), 42 deletions(-)

diff --git a/sysutils/xosview/patches/patch-ac b/sysutils/xosview/patches/patch-ac
index 06eaf81b329..de7511e9fc4 100644
--- a/sysutils/xosview/patches/patch-ac
+++ b/sysutils/xosview/patches/patch-ac
@@ -1,5 +1,5 @@
 --- configure.orig	Wed Nov 17 13:16:57 1999
-+++ configure	Sat Dec  4 23:05:24 1999
++++ configure	Sat Dec  4 23:54:58 1999
 @@ -1635,6 +1635,19 @@
    
  	  host_dir=linux
@@ -20,63 +20,41 @@
  ##  Check for known versions of NetBSD...
  netbsd1.[012345]*)  
  	host_os=netbsd
-@@ -1752,11 +1765,58 @@
+@@ -1747,16 +1760,35 @@
+ 
+ 			host_dir=bsd
+ 	host_os=freebsd ;;
+-openbsd*) 
++openbsd*)
+         EXTRALIBS="-lkvm $XPMLIB"
          INSTALL_ARGS='-s -g kmem -m 02555'
  	cat >> confdefs.h <<\EOF
  #define XOSVIEW_OPENBSD 1
 +#define HAVE_SWAPCTL 1
  EOF
++	## Also check for the existence of UVM.  This is a nasty,
++	## complicated check.  This could be avoided by having the *BSD
++	## platform-specific Makefiles include <bsd.own.mk> on their own.
  
-+  ## Also check for the existence of UVM.  This is a nasty,
-+  ## complicated check.  This could be avoided by having the *BSD
-+  ## platform-specific Makefiles include <bsd.own.mk> on their own.
-+  cat > confmkfile <<\EOF
++	cat > confmkfile <<\EOF
 +.include <bsd.own.mk>
 +all:
-+.if defined(UVM)
++.if defined(UVM) && ${UVM:U} == YES
 +	@echo UVMyes
 +.endif
 +EOF
-+  uvmstring=`make -f confmkfile`
-+  rm confmkfile
-+  if test x$uvmstring != x ; then
-+    cat >> confdefs.h <<\EOF
++	uvmstring=`make -f confmkfile`
++	rm confmkfile
++	if test x$uvmstring != x ; then
++		cat >> confdefs.h <<\EOF
 +#define UVM 1
 +EOF
++	fi
  
 -			host_dir=bsd
 -	host_os=openbsd ;;
-+    echo "configure: warning: 
-+
-+  *Enabling* UVM -- 'UVM=' found in /etc/mk.conf.
-+  If this is in error, remove the define of UVM=1 from CXXFLAGS
-+  in Makefile.config, and mail bgrayson@ece.utexas.edu that
-+  the autoconf script didn't work properly.
-+    " 1>&2
-+  else
-+            echo "configure: warning: 'UVM=' not found in /etc/mk.conf.  Checking /netbsd for uvm symbols..." 1>&2
-+    if test x`nm /netbsd | grep uvm_sysctl` != x ; then
-+      cat >> confdefs.h <<\EOF
-+#define UVM 1
-+EOF
-+
-+      echo "configure: warning: *Enabling* UVM -- 'uvm_sysctl' symbol found in /netbsd.
-+  If this is in error, remove the define of UVM=1 from CXXFLAGS
-+  in Makefile.config, and mail bgrayson@ece.utexas.edu that
-+  the autoconf script didn't work properly.
-+  " 1>&2
-+    else
-+      echo "configure: warning: 
-+
-+    *Disabling* UVM -- 'UVM=' not found in /etc/mk.conf.
-+    If this is in error, add -DUVM=1 to CXXFLAGS in
-+    Makefile.config, and please mail bgrayson@ece.utexas.edu that
-+    the autoconf script did not work properly.
-+    " 1>&2
-+    fi
-+  fi
-+  host_dir=bsd
-+  host_os=openbsd
++	host_dir=bsd
++	host_os=openbsd
 +;;
  bsdi*) 
  	EXTRALIBS="-lkvm $XPMLIB"