Fixup NetBSD and OpenBSD builds

CMake is now fixed, and a NetBSD extra wait for key on exit with
the system curses is also fixed.

src/conio/CMakeLists.txt

@@ -176,8 +176,19 @@ if(USE_CURSES_ANYWAY)
 		endif()
 		target_link_libraries(ciolib ${NCURSES_LIBRARIES})
 	else()
-		target_link_libraries(ciolib ${CURSES_NCURSES_LIBRARY})
-		target_link_libraries(ciolib ${CURSES_TINFO_LIBRARY_NAME})
+		if(NOT CURSES_NCURSES_LIBRARY)
+			target_link_libraries(ciolib ${CURSES_CURSES_LIBRARY})
+		else()
+			target_link_libraries(ciolib ${CURSES_NCURSES_LIBRARY})
+		endif()
+		if(CURSES_TINFO_LIBRARY_NAME)
+			if(NOT CURSES_NCURSES_HAS_CBREAK OR NOT CURSES_NCURSES_HAS_NODELAY)
+				find_library(CURSES_EXTRA_LIBRARY "${CURSES_TINFO_LIBRARY_NAME}")
+				if(CURSES_EXTRA_LIBRARY)
+					target_link_libraries(ciolib ${CURSES_TINFO_LIBRARY_NAME})
+				endif()
+			endif()
+		endif()
 	endif()
 endif()
 

src/conio/curs_cio.c

@@ -810,11 +810,12 @@ void curs_suspend(void)
 
 void curs_resume(void)
 {
+	wint_t ch;
 	if (suspended) {
 		raw();
 		timeout(10);
 		refresh();
-		getch();
+		get_wch(&ch);
 	}
 	suspended = 0;
 }

src/xpdev/CMakeLists.txt

@@ -159,12 +159,12 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "Haiku")
 elseif(CMAKE_SYSTEM_NAME STREQUAL "NetBSD")
 	target_link_libraries(xpdev m)
 	if(NOT WITHOUT_OSS)
-		target_link_libraries(ossaudio)
+		target_link_libraries(xpdev ossaudio)
 	endif()
 elseif(CMAKE_SYSTEM_NAME STREQUAL "OpenBSD")
 	target_link_libraries(xpdev m)
 	if(NOT WITHOUT_OSS)
-		target_link_libraries(ossaudio)
+		target_link_libraries(xpdev ossaudio)
 	endif()
 elseif(CMAKE_SYSTEM_NAME STREQUAL "SunOS")
 	target_link_libraries(xpdev socket m)