Index: head/gnu/lib/libstdc++/doc/Makefile
===================================================================
--- head/gnu/lib/libstdc++/doc/Makefile	(revision 276564)
+++ head/gnu/lib/libstdc++/doc/Makefile	(nonexistent)
@@ -1,13 +0,0 @@
-# $FreeBSD$
-
-SRCDIR= ${.CURDIR}/../../../../contrib/libstdc++
-
-.PATH: ${SRCDIR}/../libio
-
-INFO = iostream
-
-INFOENTRY_iostream= "* iostream: (iostream).	The GNU C++ I/O library."
-
-MAKEINFOFLAGS+= -I ${SRCDIR}/../libio 
-
-.include <bsd.info.mk>

Property changes on: head/gnu/lib/libstdc++/doc/Makefile
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/gnu/usr.bin/diff/doc/Makefile
===================================================================
--- head/gnu/usr.bin/diff/doc/Makefile	(revision 276564)
+++ head/gnu/usr.bin/diff/doc/Makefile	(nonexistent)
@@ -1,9 +0,0 @@
-# $FreeBSD$
-
-INFO = diff
-
-INFOENTRY_diff= "* DIFF: (diff).                 DIFF/PATCH Reference Manual."
-
-SRCDIR=${.CURDIR}/../../../../contrib/diff/doc
-
-.include <bsd.info.mk>

Property changes on: head/gnu/usr.bin/diff/doc/Makefile
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/gnu/usr.bin/diff/Makefile
===================================================================
--- head/gnu/usr.bin/diff/Makefile	(revision 276564)
+++ head/gnu/usr.bin/diff/Makefile	(revision 276565)
@@ -1,35 +1,33 @@
 # $FreeBSD$
 
 .include <src.opts.mk>
 
 DIFFSRC=${.CURDIR}/../../../contrib/diff/src
 .PATH: ${DIFFSRC} \
        ${.CURDIR}/../../../contrib/diff/lib \
        ${.CURDIR}/../../../contrib/diff/man
 
 PROG=	diff
 SRCS=   analyze.c context.c diff.c dir.c ed.c ifdef.c io.c \
 	normal.c side.c util.c \
 	xmalloc.c strtoumax.c cmpbuf.c exitfail.c error.c quotesys.c \
 	strftime.c c-stack.c basename.c exclude.c hard-locale.c \
 	file-type.c posixver.c prepargs.c version-etc.c
 
 # Important for ctype macros!
 CFLAGS+=-funsigned-char
 
 CFLAGS+=-DHAVE_CONFIG_H
 CFLAGS+=-DPR_PROGRAM=\"/usr/bin/pr\"
 CFLAGS+=-I${.CURDIR}/../../../contrib/diff
 CFLAGS+=-I${.CURDIR}/../../../contrib/diff/src
 CFLAGS+=-I${.CURDIR}/../../../contrib/diff/lib
 CFLAGS+=-I${DESTDIR}/usr/include/gnu
 
-SUBDIR+=doc
-
 LIBADD+=	gnuregex
 
 .if ${MK_TESTS} != "no"
 SUBDIR+=	tests
 .endif
 
 .include <bsd.prog.mk>
Index: head/gnu/usr.bin/gdb/Makefile.inc
===================================================================
--- head/gnu/usr.bin/gdb/Makefile.inc	(revision 276564)
+++ head/gnu/usr.bin/gdb/Makefile.inc	(revision 276565)
@@ -1,71 +1,63 @@
 # $FreeBSD$
 
 VERSION= "6.1.1 [FreeBSD]"
 VENDOR= marcel
 
 BMAKE_GDB= ${.CURDIR}/..
 BMAKE_ROOT= ${BMAKE_GDB}/..
 BMAKE_BU= ${BMAKE_ROOT}/binutils
 
 CNTRB_ROOT= ${BMAKE_ROOT}/../../contrib
 CNTRB_BU= ${CNTRB_ROOT}/binutils
 CNTRB_GDB= ${CNTRB_ROOT}/gdb
 CNTRB_RL= ${CNTRB_ROOT}/libreadline
 
 OBJ_ROOT= ${.OBJDIR}/../..
 OBJ_BU= ${OBJ_ROOT}/binutils
 OBJ_GDB= ${OBJ_ROOT}/gdb
 OBJ_RL= ${OBJ_ROOT}/../lib/libreadline/readline
 
 # These assignments duplicate much of the functionality of
 # MACHINE_CPUARCH, but there's no easy way to export make functions...
 
 .if defined(TARGET_ARCH)
 TARGET_CPUARCH=${TARGET_ARCH:C/mips(n32|64)?(el)?/mips/:C/arm(v6)?(eb|hf)?/arm/:C/powerpc64/powerpc/}
 .else
 TARGET_CPUARCH=${MACHINE_CPUARCH}
 .endif
 TARGET_ARCH?=	${MACHINE_ARCH}
 TARGET_SUBDIR= ${BMAKE_GDB}/arch/${TARGET_CPUARCH}
 
 .if ${TARGET_ARCH} != ${MACHINE_ARCH}
 GDB_CROSS_DEBUGGER=
 .endif
 
-.if !defined(INFO)
-
 .PATH:	${CNTRB_GDB}/gdb ${CNTRB_GDB}/gdb/cli ${CNTRB_GDB}/gdb/mi	\
 	${CNTRB_GDB}/gdb/signals ${CNTRB_GDB}/gdb/tui ${TARGET_SUBDIR}
 
 CFLAGS+= -DHAVE_CONFIG_H -DRL_NO_COMPAT -DMI_OUT=1 -DTUI=1
 CFLAGS+= -DDEBUGDIR=\"${DEBUGDIR}\"
 CFLAGS+= -I.
 CFLAGS+= -I${TARGET_SUBDIR}
 CFLAGS+= -I${BMAKE_BU}/libbfd -I${BMAKE_BU}/libbfd/${TARGET_CPUARCH}
 CFLAGS+= -I${CNTRB_GDB}/gdb
 CFLAGS+= -I${CNTRB_GDB}/gdb/config
 CFLAGS+= -I${CNTRB_BU}/include
 CFLAGS+= -I${CNTRB_GDB}/include
 CFLAGS+= -I${CNTRB_BU}/bfd
 CFLAGS+= -I${OBJ_RL}/..
 
 GENSRCS+= nm.h tm.h
 
 .if defined(GDB_CROSS_DEBUGGER)
 CFLAGS+= -DCROSS_DEBUGGER -I${BMAKE_ROOT}/../..
 GDB_SUFFIX= -${TARGET_ARCH}
 MAN=
 .endif
 
 .include "${TARGET_SUBDIR}/Makefile"
 
 SRCS+= ${GENSRCS}
 CLEANFILES+= ${GENSRCS}
-
-.else
-
-.PATH:	${CNTRB_GDB}/gdb ${CNTRB_GDB}/gdb/doc ${CNTRB_RL}/doc
-
-.endif
 
 .include "../Makefile.inc"
Index: head/gnu/usr.bin/gperf/Makefile
===================================================================
--- head/gnu/usr.bin/gperf/Makefile	(revision 276564)
+++ head/gnu/usr.bin/gperf/Makefile	(revision 276565)
@@ -1,18 +1,16 @@
 # $FreeBSD$
 
 .include <bsd.own.mk>
 GPERFDIR=	${.CURDIR}/../../../contrib/gperf
 
 .PATH: ${GPERFDIR}/src ${GPERFDIR}/lib ${GPERFDIR}/doc
 
-SUBDIR=	doc
-
 PROG_CXX=	gperf
 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${GPERFDIR}/lib -I${.CURDIR}
 
 .include <bsd.prog.mk>
Index: head/gnu/usr.bin/gperf/doc/Makefile
===================================================================
--- head/gnu/usr.bin/gperf/doc/Makefile	(revision 276564)
+++ head/gnu/usr.bin/gperf/doc/Makefile	(nonexistent)
@@ -1,9 +0,0 @@
-# $FreeBSD$
-
-INFO = gperf
-INFOSECTION= "Programming & development tools."
-INFOENTRY_gperf= "* Gperf: (gperf).		The GNU perfect hash function generator."
-
-SRCDIR= ${.CURDIR}/../../../../contrib/gperf/doc
-
-.include <bsd.info.mk>

Property changes on: head/gnu/usr.bin/gperf/doc/Makefile
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property