2 files changed, 23 insertions, 21 deletions

diff --git a/gnu/usr.bin/gperf/Makefile b/gnu/usr.bin/gperf/Makefile
index 57fd0612bf77..86674c4bbf39 100644
--- a/gnu/usr.bin/gperf/Makefile
+++ b/gnu/usr.bin/gperf/Makefile
@@ -1,17 +1,18 @@
 # $FreeBSD$
 
-GPROFDIR=	${.CURDIR}/../../../contrib/gperf
+.include <bsd.own.mk>
+GPERFDIR=	${.CURDIR}/../../../contrib/gperf
 
-.PATH: ${GPROFDIR}/src ${GPROFDIR}/lib ${GPROFDIR}/doc
+.PATH: ${GPERFDIR}/src ${GPERFDIR}/lib ${GPERFDIR}/doc
 
 SUBDIR=	doc
 
 PROG_CXX=	gperf
-SRCS=	bool-array.cc gen-perf.cc hash-table.cc iterator.cc key-list.cc \
-	list-node.cc main.cc new.cc options.cc read-line.cc trace.cc \
-	vectors.cc version.cc
-SRCS+=  hash.cc
+SRCS=	bool-array.cc hash-table.cc input.cc keyword-list.cc keyword.cc \
+	main.cc options.cc output.cc positions.cc search.cc version.cc \
+	getline.cc hash.cc
+WARNS=	1
 
-CXXFLAGS+=	-I${GPROFDIR}/lib -I${.CURDIR}
+CXXFLAGS+=	-I${GPERFDIR}/lib -I${.CURDIR}
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/gperf/config.h b/gnu/usr.bin/gperf/config.h
index 464005e3fa58..91c1236ec1cb 100644
--- a/gnu/usr.bin/gperf/config.h
+++ b/gnu/usr.bin/gperf/config.h
@@ -1,21 +1,22 @@
+/* config.h.  Generated from config.h.in by configure.  */
+/* config.h.in.  Generated from configure.ac by autoheader.  */
 /* $FreeBSD$ */
-/* config.h.  Generated automatically by configure.  */
-/* config.h.in.  Generated automatically from configure.in by autoheader.  */
 
-/* Define if the C++ compiler supports "throw ()" declarations.  */
-#define HAVE_THROW_DECL 1
+/* Define if the C++ compiler supports stack-allocated variable-size arrays.
+   */
+#define HAVE_DYNAMIC_ARRAY 1
 
-/* Define if you have the getrlimit function.  */
-#define HAVE_GETRLIMIT 1
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT ""
 
-/* Define if you have the setrlimit function.  */
-#define HAVE_SETRLIMIT 1
+/* Define to the full name of this package. */
+#define PACKAGE_NAME ""
 
-/* Define if you have the <sys/resource.h> header file.  */
-#define HAVE_SYS_RESOURCE_H 1
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING ""
 
-/* Define if you have the <sys/time.h> header file.  */
-#define HAVE_SYS_TIME_H 1
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME ""
 
-/* Define if you have the <unistd.h> header file.  */
-#define HAVE_UNISTD_H 1
+/* Define to the version of this package. */
+#define PACKAGE_VERSION ""