Removed now unused INTERNALSTATICLIB.

INTERNALLIB now implies NOPIC and NOPROFILE.
Removed gratuitous NOMAN.

10 files changed, 4 insertions, 19 deletions

diff --git a/gnu/usr.bin/binutils/libbfd/Makefile b/gnu/usr.bin/binutils/libbfd/Makefile
index fee486c..2aea1f4 100644
--- a/gnu/usr.bin/binutils/libbfd/Makefile
+++ b/gnu/usr.bin/binutils/libbfd/Makefile
@@ -16,10 +16,7 @@ WARNS=	2
 CFLAGS+= -I${SRCDIR}/bfd
 CFLAGS+= -DBFD_VERSION=\"${VERSION_DATE}\" -DBFD_VERSION_DATE=${VERSION_DATE}
 CFLAGS+= -DBFD_VERSION_STRING=\"${VERSION}\"
-NOPROFILE=	true
-NOPIC=		true
 INTERNALLIB=	true
-INTERNALSTATICLIB=true
 CLEANFILES+=	config.h targmatch.h
 
 # If set, BINUTILSDISTDIR is the path to a directory containing the full GNU
diff --git a/gnu/usr.bin/binutils/libbinutils/Makefile b/gnu/usr.bin/binutils/libbinutils/Makefile
index ef58e82..d9cd774 100644
--- a/gnu/usr.bin/binutils/libbinutils/Makefile
+++ b/gnu/usr.bin/binutils/libbinutils/Makefile
@@ -13,9 +13,6 @@ CFLAGS+= -DTARGET=\"${TARGET_ARCH}-unknown-freebsd\"
 CFLAGS+= -DBFD_VERSION_STRING=\"${VERSION}\"
 CFLAGS+= -I${SRCDIR}/binutils
 CFLAGS+= -I${SRCDIR}/bfd
-NOPROFILE=	true
-NOPIC=		true
 INTERNALLIB=	true
-INTERNALSTATICLIB=true
 
 .include <bsd.lib.mk>
diff --git a/gnu/usr.bin/binutils/libiberty/Makefile b/gnu/usr.bin/binutils/libiberty/Makefile
index 3d86ef4..f34be9e 100644
--- a/gnu/usr.bin/binutils/libiberty/Makefile
+++ b/gnu/usr.bin/binutils/libiberty/Makefile
@@ -15,9 +15,6 @@ SRCS+=	basename.c
 .endif
 WARNS=	1
 CFLAGS+=	-DHAVE_CONFIG_H
-NOPROFILE=	true
-NOPIC=		true
 INTERNALLIB=	true
-INTERNALSTATICLIB=true
 
 .include <bsd.lib.mk>
diff --git a/gnu/usr.bin/binutils/libopcodes/Makefile b/gnu/usr.bin/binutils/libopcodes/Makefile
index 356ecb7..053245f 100644
--- a/gnu/usr.bin/binutils/libopcodes/Makefile
+++ b/gnu/usr.bin/binutils/libopcodes/Makefile
@@ -7,10 +7,7 @@
 LIB=	opcodes
 SRCS+=	dis-buf.c disassemble.c
 CFLAGS+= -I${SRCDIR}/opcodes -I${SRCDIR}/bfd
-NOPROFILE=	true
-NOPIC=		true
 INTERNALLIB=	true
-INTERNALSTATICLIB=true
 
 # If set, BINUTILSDISTDIR is the path to a directory containing the full GNU
 # binutils release. FreeBSD only distributes the bits that are required to
diff --git a/gnu/usr.bin/groff/src/libs/libbib/Makefile b/gnu/usr.bin/groff/src/libs/libbib/Makefile
index af1f605..a4d3f23 100644
--- a/gnu/usr.bin/groff/src/libs/libbib/Makefile
+++ b/gnu/usr.bin/groff/src/libs/libbib/Makefile
@@ -2,7 +2,6 @@
 
 LIB=		bib
 INTERNALLIB=	YES
-INTERNALSTATICLIB=YES
 SRCS=		common.cc index.cc linear.cc search.cc map.c
 
 .include <bsd.lib.mk>
diff --git a/gnu/usr.bin/groff/src/libs/libdriver/Makefile b/gnu/usr.bin/groff/src/libs/libdriver/Makefile
index e082c79..6eab241 100644
--- a/gnu/usr.bin/groff/src/libs/libdriver/Makefile
+++ b/gnu/usr.bin/groff/src/libs/libdriver/Makefile
@@ -2,7 +2,6 @@
 
 LIB=		driver
 INTERNALLIB=	YES
-INTERNALSTATICLIB=YES
 SRCS=		input.cc printer.cc
 
 .include <bsd.lib.mk>
diff --git a/gnu/usr.bin/groff/src/libs/libgroff/Makefile b/gnu/usr.bin/groff/src/libs/libgroff/Makefile
index d768cf9..d309f19 100644
--- a/gnu/usr.bin/groff/src/libs/libgroff/Makefile
+++ b/gnu/usr.bin/groff/src/libs/libgroff/Makefile
@@ -2,7 +2,6 @@
 
 LIB=		groff
 INTERNALLIB=	YES
-INTERNALSTATICLIB=YES
 SRCS=		assert.cc change_lf.cc cmap.cc cset.cc device.cc errarg.cc\
 		error.cc fatal.cc filename.cc font.cc fontfile.cc\
 		htmlindicate.cc lf.cc lineno.cc macropath.cc\
diff --git a/gnu/usr.bin/man/lib/Makefile b/gnu/usr.bin/man/lib/Makefile
index c29bf7c..243d141 100644
--- a/gnu/usr.bin/man/lib/Makefile
+++ b/gnu/usr.bin/man/lib/Makefile
@@ -1,6 +1,7 @@
+# $FreeBSD$
+
 LIB=	man
 INTERNALLIB= true
-INTERNALSTATICLIB= true
 
 CFLAGS+= -DSTDC_HEADERS
 CLEANFILES+= config.h
diff --git a/gnu/usr.bin/rcs/lib/Makefile b/gnu/usr.bin/rcs/lib/Makefile
index d379232..ce08651 100644
--- a/gnu/usr.bin/rcs/lib/Makefile
+++ b/gnu/usr.bin/rcs/lib/Makefile
@@ -1,3 +1,5 @@
+# $FreeBSD$
+
 # Define FSYNC_ALL to get slower but safer writes in case of crashes in
 # the middle of CVS/RCS changes
 #CFLAGS += -DFSYNC_ALL
@@ -7,8 +9,6 @@ SRCS    = maketime.c partime.c rcsedit.c rcsfcmp.c rcsfnms.c rcsgen.c \
 	  rcskeep.c rcskeys.c rcslex.c rcsmap.c rcsrev.c rcssyn.c rcstime.c \
 	  rcsutil.c merger.c version.c
 
-NOPROFILE=		noprofile
 INTERNALLIB=		true
-INTERNALSTATICLIB=	true
 
 .include <bsd.lib.mk>
diff --git a/gnu/usr.bin/texinfo/libtxi/Makefile b/gnu/usr.bin/texinfo/libtxi/Makefile
index b7427aa..96df19a 100644
--- a/gnu/usr.bin/texinfo/libtxi/Makefile
+++ b/gnu/usr.bin/texinfo/libtxi/Makefile
@@ -2,7 +2,6 @@
 
 LIB=	txi
 INTERNALLIB= true
-INTERNALSTATICLIB= true
 
 SRCS=	getopt.c getopt1.c substring.c xexit.c xmalloc.c xstrdup.c