 @@ -1,36 +1,35 @@
-# $NetBSD: Makefile,v 1.3 2012/10/06 15:33:59 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2013/01/14 18:01:59 christos Exp $
 .include <bsd.own.mk>
 MDIST=	${NETBSDSRCDIR}/external/bsd/mdocml/dist
 MDOCDIR=${NETBSDSRCDIR}/external/bsd/mdocml
 MANCONFDIR=${NETBSDSRCDIR}/usr.bin/man
 PROGS=			makemandb apropos whatis
 SRCS.makemandb=		makemandb.c apropos-utils.c manconf.c
 SRCS.apropos=	apropos.c apropos-utils.c manconf.c
 SRCS.whatis=	whatis.c apropos-utils.c manconf.c
 MAN.makemandb=	makemandb.8
 MAN.apropos=	apropos.1
 MAN.whatis=	whatis.1
 BINDIR.apropos=		/usr/bin
 BINDIR.makemandb=	/usr/sbin
 BINDIR.whatis=		/usr/bin
 .PATH: ${MANCONFDIR}
-CPPFLAGS+=-I${MDIST} -I${MANCONFDIR} -I${.OBJDIR}
+CPPFLAGS+= -I${MDOCDIR} -I${MANCONFDIR} -I${.OBJDIR}
 MDOCMLOBJDIR!=	cd ${MDOCDIR}/lib/libmandoc && ${PRINTOBJDIR}
 MDOCMLLIB=	${MDOCMLOBJDIR}/libmandoc.a
 DPADD.makemandb+= 	${MDOCMLLIB} ${LIBARCHIVE} ${LIBBZ2} ${LIBLZMA}
 LDADD.makemandb+= 	-L${MDOCMLOBJDIR} -lmandoc -larchive -lbz2 -llzma
 DPADD+=		${LIBSQLITE3} ${LIBM} ${LIBZ} ${LIBUTIL}
 LDADD+=		-lsqlite3 -lm -lz -lutil
 stopwords.c: stopwords.txt
 	( set -e; ${TOOL_NBPERF} -n stopwords_hash -s -p ${.ALLSRC};	\
 	echo 'static const char *stopwords[] = {';			\
 	${TOOL_SED} -e 's|^\(.*\)$$|	"\1",|' ${.ALLSRC};		\

 @@ -1,14 +1,14 @@
-/*	$NetBSD: apropos-utils.c,v 1.7 2012/10/06 15:33:59 wiz Exp $	*/
+/*	$NetBSD: apropos-utils.c,v 1.8 2013/01/14 18:01:59 christos Exp $	*/
 /*-
  * Copyright (c) 2011 Abhinav Upadhyay <er.abhinav.upadhyay@gmail.com>
  * All rights reserved.
+ *
  * This code was developed as part of Google's Summer of Code 2011 program.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
+ *
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -21,44 +21,44 @@
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
  * FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE
  * COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY OR CONSEQUENTIAL DAMAGES (INCLUDING,
  * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
  * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: apropos-utils.c,v 1.7 2012/10/06 15:33:59 wiz Exp $");
+__RCSID("$NetBSD: apropos-utils.c,v 1.8 2013/01/14 18:01:59 christos Exp $");
 #include <sys/queue.h>
 #include <sys/stat.h>
 #include <assert.h>
 #include <ctype.h>
 #include <err.h>
 #include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <util.h>
 #include <zlib.h>
 #include "apropos-utils.h"
 #include "manconf.h"
-#include "mandoc.h"
+#include "dist/mandoc.h"
 #include "sqlite3.h"
 typedef struct orig_callback_data {
 	void *data;
 	int (*callback) (void *, const char *, const char *, const char *,
 		const char *, size_t);
 } orig_callback_data;
 typedef struct inverse_document_frequency {
 	double value;
 	int status;
 } inverse_document_frequency;

 @@ -1,54 +1,54 @@
-/*	$NetBSD: makemandb.c,v 1.16 2012/11/08 19:17:54 christos Exp $	*/
+/*	$NetBSD: makemandb.c,v 1.17 2013/01/14 18:01:59 christos Exp $	*/
 /*
  * Copyright (c) 2011 Abhinav Upadhyay <er.abhinav.upadhyay@gmail.com>
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
+ *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: makemandb.c,v 1.16 2012/11/08 19:17:54 christos Exp $");
+__RCSID("$NetBSD: makemandb.c,v 1.17 2013/01/14 18:01:59 christos Exp $");
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <assert.h>
 #include <ctype.h>
 #include <dirent.h>
 #include <err.h>
 #include <archive.h>
 #include <libgen.h>
 #include <md5.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <util.h>
 #include "apropos-utils.h"
-#include "man.h"
+#include "dist/man.h"
-#include "mandoc.h"
+#include "dist/mandoc.h"
-#include "mdoc.h"
+#include "dist/mdoc.h"
 #include "sqlite3.h"
 #define BUFLEN 1024
 #define MDOC 0	//If the page is of mdoc(7) type
 #define MAN 1	//If the page  is of man(7) type
 /*
  * A data structure for holding section specific data.
  */
 typedef struct secbuff {
 	char *data;
 	size_t buflen;	//Total length of buffer allocated initially
 	size_t offset;	// Current offset in the buffer.