NetBSD port

cde/programs/dtdocbook/tcl/Imakefile

@@ -7,58 +7,61 @@ XCOMM $XConsortium: Imakefile /main/4 1996/08/08 14:42:19 cde-hp $
 #define LibHeaders	NO
 #define LibInstall	NO
 
-#if defined(FreeBSDArchitecture)
 VERSION = 8.5
-#else
-VERSION = 7.5
-#endif
 
-prefix =	/usr/local
+#if defined(LinuxArchitecture)
+prefix =	/usr/lib
+#elif defined(OpenBSDArchitecture)
+prefix =	/usr/local/lib/tcl
+#elif defined(NetBSDArchitecture)
+prefix =	/usr/pkg/lib
+#else
+prefix =	/usr/local/lib
+#endif
 
 XCOMM Directory from which applications will reference the library of Tcl
 XCOMM scripts (note: you can set the TCL_LIBRARY environment variable at
 XCOMM run-time to override this value):
-TCL_LIBRARY =	$(prefix)/lib/tcl$(VERSION)
-#ifdef OpenBSDArchitecture
+#ifdef TclLibrary
 TCL_LIBRARY =	TclLibrary
+#else
+TCL_LIBRARY =	$(prefix)/tcl$(VERSION)
 #endif
 
-#ifdef SunArchitecture
+#if defined(SunArchitecture)
 EXTRA_DEFINES = -DTCL_LIBRARY=\"${TCL_LIBRARY}\" \
 	-DNO_UNION_WAIT -DHAVE_UNISTD_H \
 	-DTCL_GOT_TIMEZONE
-#else
-# ifdef IBMArchitecture
+
+#elif defined(IBMArchitecture)
 EXTRA_DEFINES = -DTCL_LIBRARY=\"${TCL_LIBRARY}\" \
 	-DNO_UNION_WAIT -DHAVE_UNISTD_H -DNEED_MATHERR -Dvfork=fork \
 	-DTCL_GOT_TIMEZONE -DHAVE_SYS_SELECT_H
-# else
-#   ifdef AlphaArchitecture
+
+#elif defined(AlphaArchitecture)
 EXTRA_DEFINES = -DTCL_LIBRARY=\"${TCL_LIBRARY}\" \
 	-DNO_UNION_WAIT -DHAVE_UNISTD_H -DNEED_MATHERR \
 	-DTCL_GOT_TIMEZONE -DTIME_WITH_SYS_TIME
 
-#   else
-#     ifdef OpenBSDArchitecture
+#elif defined(OpenBSDArchitecture)
 EXTRA_DEFINES = -DTCL_LIBRARY=\"${TCL_LIBRARY}\" \
 	-DNO_UNION_WAIT -DHAVE_UNISTD_H \
 	-DTCL_GOT_TIMEZONE
 
-#     else
-#       ifdef FreeBSDArchitecture
+#elif defined(FreeBSDArchitecture)
 EXTRA_DEFINES = -DTCL_LIBRARY=\"${TCL_LIBRARY}\" \
 	-DNO_UNION_WAIT -DHAVE_UNISTD_H \
 	-DTCL_GOT_TIMEZONE
 
-#       else
+#elif defined(NetBSDArchitecture)
 EXTRA_DEFINES = -DTCL_LIBRARY=\"${TCL_LIBRARY}\" \
 	-DNO_UNION_WAIT -DHAVE_UNISTD_H -DNEED_MATHERR \
 	-DTCL_GOT_TIMEZONE
 
-#       endif
-#     endif
-#   endif
-# endif
+#else
+EXTRA_DEFINES = -DTCL_LIBRARY=\"${TCL_LIBRARY}\" \
+	-DNO_UNION_WAIT -DHAVE_UNISTD_H -DNEED_MATHERR \
+	-DTCL_GOT_TIMEZONE
 #endif
 
 INCLUDES = -I.

cde/programs/dtdocbook/tcl/tclExpr.c

@@ -392,7 +392,11 @@ ExprParseString(interp, string, valuePtr)
 	    }
 	} else {
 	    errno = 0;
+#ifdef __NetBSD__
+	    valuePtr->doubleValue = (double)strtof(string, &term);
+#else
 	    valuePtr->doubleValue = strtod(string, &term);
+#endif
 	    if ((term != string) && (*term == 0)) {
 		if (errno != 0) {
 		    Tcl_ResetResult(interp);
@@ -496,7 +500,11 @@ ExprLex(interp, infoPtr, valuePtr)
 	    return TCL_OK;
 	} else {
 	    errno = 0;
+#ifdef __NetBSD__
+	    valuePtr->doubleValue = (double)strtof(p, &term);
+#else
 	    valuePtr->doubleValue = strtod(p, &term);
+#endif
 	    if (term != p) {
 		if (errno != 0) {
 		    TclExprFloatError(interp, valuePtr->doubleValue);