diff -urN man-db-2.3.20/include/Defines.in man-db-2.3.20-freebsd/include/Defines.in
--- man-db-2.3.20/include/Defines.in	Thu Sep  6 11:06:23 2001
+++ man-db-2.3.20-freebsd/include/Defines.in	Fri Apr 12 17:21:17 2002
@@ -32,7 +32,8 @@
 CPPFLAGS = @CPPFLAGS@
 CFLAGS = @CFLAGS@
 LDFLAGS = @LDFLAGS@
-LDLIBS = @LIBS@ #@LEXLIB@
+INTLLIBS = @INTLLIBS@
+LDLIBS = @LIBS@ @INTLLIBS@ #@LEXLIB@
 
 # Allow prog-specific MANDEFS and ensure MANCPPFLAGS comes before
 # user/configure defined CPPFLAGS
Binary files man-db-2.3.20/po/fr.gmo and man-db-2.3.20-freebsd/po/fr.gmo differ
diff -urN man-db-2.3.20/src/Makefile.in man-db-2.3.20-freebsd/src/Makefile.in
--- man-db-2.3.20/src/Makefile.in	Thu Sep  6 20:51:28 2001
+++ man-db-2.3.20-freebsd/src/Makefile.in	Fri Apr 12 17:01:38 2002
@@ -80,7 +80,7 @@
 mandb: security.o manp.o util.o ult_src.o check_mandirs.o hashtable.o \
        straycats.o compression.o lexgrog.o globbing.o mandb.o
 
-wrapper:	LDLIBS=-lc
+wrapper:	LDLIBS=-lc $(INTLLIBS)
 
 catman manpath whatis apropos: fake_security.o manp.o
 catman manpath whatis apropos accessdb: util.o 
diff -urN man-db-2.3.20/src/check_mandirs.c man-db-2.3.20-freebsd/src/check_mandirs.c
--- man-db-2.3.20/src/check_mandirs.c	Thu Sep  6 23:43:12 2001
+++ man-db-2.3.20-freebsd/src/check_mandirs.c	Fri Apr 12 17:01:38 2002
@@ -236,7 +236,11 @@
 char *filename_info (char *file, struct mandata *info)
 {
 	char *manpage = xstrdup (file);
+#ifdef __FreeBSD__
+	char *base_name = strrchr (manpage, '/') + 1;
+#else
 	char *base_name = basename (manpage);
+#endif
 #ifdef COMP_SRC
 	struct compression *comp;
 #endif
diff -urN man-db-2.3.20/src/compression.c man-db-2.3.20-freebsd/src/compression.c
--- man-db-2.3.20/src/compression.c	Fri Apr 12 17:26:56 2002
+++ man-db-2.3.20-freebsd/src/compression.c	Fri Apr 12 17:01:38 2002
@@ -64,7 +64,9 @@
 		error (FATAL, errno, _("can't create a temporary filename"));
 	regain_effective_privs ();
 	umask (oldmask);
+#ifndef __FreeBSD__
 	atexit (remove_ztemp);
+#endif
 }
 
 /* Take filename as arg, return structure containing decompressor 
diff -urN man-db-2.3.20/src/straycats.c man-db-2.3.20-freebsd/src/straycats.c
--- man-db-2.3.20/src/straycats.c	Thu Sep  6 23:15:24 2001
+++ man-db-2.3.20-freebsd/src/straycats.c	Fri Apr 12 17:01:38 2002
@@ -244,7 +244,7 @@
 			} else
 #else
 			if (realpath (catdir, fullpath) == NULL) {
-				if (quiet < 2)
+				if (quiet < 2) {
 					if (errno == ENOENT)
 						error (0, 0, _("warning: %s is a dangling symlink"), fullpath);
 					else