===================================================================
RCS file: /cvs/mandoc/mandocdb.c,v
retrieving revision 1.19
retrieving revision 1.24
diff -u -p -r1.19 -r1.24
--- mandoc/mandocdb.c	2011/12/01 23:46:26	1.19
+++ mandoc/mandocdb.c	2011/12/04 14:23:29	1.24
@@ -1,4 +1,4 @@
-/*	$Id: mandocdb.c,v 1.19 2011/12/01 23:46:26 kristaps Exp $ */
+/*	$Id: mandocdb.c,v 1.24 2011/12/04 14:23:29 schwarze Exp $ */
 /*
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>
@@ -33,10 +33,12 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <arpa/inet.h>
-
-#ifdef __linux__
+#if defined(__linux__)
+# include <endian.h>
 # include <db_185.h>
+#elif defined(__APPLE__)
+# include <libkern/OSByteOrder.h>
+# include <db.h>
 #else
 # include <db.h>
 #endif
@@ -628,11 +630,11 @@ index_merge(const struct of *of, struct mparse *mp,
 		 * into the database.
 		 */
 
-		vbuf.rec = htonl(rec);
+		vbuf.rec = htobe32(rec);
 		seq = R_FIRST;
 		while (0 == (ch = (*hash->seq)(hash, &key, &val, seq))) {
 			seq = R_NEXT;
-			vbuf.mask = *(uint64_t *)val.data;
+			vbuf.mask = htobe64(*(uint64_t *)val.data);
 			val.size = sizeof(struct db_val);
 			val.data = &vbuf;
 			dbt_put(db, dbf, &key, &val);
@@ -732,7 +734,7 @@ index_prune(const struct of *ofile, DB *db, const char
 				break;
 
 			vbuf = val.data;
-			if (*maxrec != ntohl(vbuf->rec))
+			if (*maxrec != betoh32(vbuf->rec))
 				continue;
 
 			if ((ch = (*db->del)(db, &key, R_CURSOR)) < 0)
@@ -1415,13 +1417,12 @@ ofile_argbuild(int argc, char *argv[], struct of **of)
 				*p = '\0';
 				continue;
 			}
-			if (strncmp("man", p + 1, 3)) {
+			if (0 == strncmp("man", p + 1, 3))
 				src_form |= MANDOC_SRC;
-				arch = p + 1;
-			} else if (strncmp("cat", p + 1, 3)) {
+			else if (0 == strncmp("cat", p + 1, 3))
 				src_form |= MANDOC_FORM;
+			else
 				arch = p + 1;
-			}
 			break;
 		}
 		if (NULL == title)