1--- src/manpath.c.orig	2005-08-20 16:26:06.000000000 -0700
2+++ src/manpath.c	2012-10-17 13:05:56.000000000 -0700
3@@ -26,6 +26,10 @@
4 #include <unistd.h>
5 #include <sys/types.h>
6 #include <sys/stat.h>
7+#ifdef __APPLE__
8+#include <stdbool.h>
9+#include <xcselect.h>
10+#endif /* __APPLE__ */
11 
12 /* not always in <string.h> */
13 extern char *index(const char *, int);
14@@ -372,6 +376,25 @@
15      for (dlp = cfdirlist.nxt; dlp; dlp = dlp->nxt)
16 	  if (dlp->mandatory)
17 	       add_to_mandirlist (dlp->mandir, perrs);
18+
19+#ifdef __APPLE__
20+	xcselect_manpaths *xcp;
21+	const char *path;
22+	unsigned i, count;
23+
24+	// TODO: pass something for sdkname
25+	xcp = xcselect_get_manpaths(NULL);
26+	if (xcp != NULL) {
27+		count = xcselect_manpaths_get_num_paths(xcp);
28+		for (i = 0; i < count; i++) {
29+			path = xcselect_manpaths_get_path(xcp, i);
30+			if (path != NULL) {
31+				add_to_mandirlist((char *)path, perrs);
32+			}
33+		}
34+		xcselect_manpaths_free(xcp);
35+	}
36+#endif /* __APPLE__ */
37 }
38 
39 static void
40