Index: sbin/rcorder/rcorder.c
===================================================================
--- sbin/rcorder/rcorder.c
+++ sbin/rcorder/rcorder.c
@@ -990,7 +990,7 @@
 }
 
 static void
-generate_graphviz_header()
+generate_graphviz_header(void)
 {
 
 	if (do_graphviz != true)
@@ -1003,7 +1003,7 @@
 }
 
 static void
-generate_graphviz_footer()
+generate_graphviz_footer(void)
 {
 
 	if (do_graphviz == true)
@@ -1011,7 +1011,7 @@
 }
 
 static void
-generate_graphviz_providers()
+generate_graphviz_providers(void)
 {
 	Hash_Entry *entry;
 	Hash_Search psearch;
Index: usr.sbin/Makefile
===================================================================
--- usr.sbin/Makefile
+++ usr.sbin/Makefile
@@ -186,9 +186,9 @@
 SUBDIR.${MK_OPENSSL}+=	keyserv
 SUBDIR.${MK_PF}+=	ftp-proxy
 SUBDIR.${MK_PKGBOOTSTRAP}+=	pkg
-.if ${COMPILER_FEATURES:Mc++11}
-SUBDIR.${MK_PMC}+=	pmc
-.endif
+#.if ${COMPILER_FEATURES:Mc++11}
+#SUBDIR.${MK_PMC}+=	pmc
+#.endif
 SUBDIR.${MK_PMC}+=	pmcannotate pmccontrol pmcstat pmcstudy
 SUBDIR.${MK_PORTSNAP}+=	portsnap
 SUBDIR.${MK_PPP}+=	ppp
Index: usr.sbin/crunch/crunchgen/crunched_main.c
===================================================================
--- usr.sbin/crunch/crunchgen/crunched_main.c
+++ usr.sbin/crunch/crunchgen/crunched_main.c
@@ -183,7 +183,7 @@
 }
 
 static void
-crunched_usage()
+crunched_usage(void)
 {
 	int columns, len;
 	struct stub *ep;
Index: usr.sbin/pmccontrol/Makefile
===================================================================
--- usr.sbin/pmccontrol/Makefile
+++ usr.sbin/pmccontrol/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 #
 
-PROG_CXX=	pmccontrol
+PROG=	pmccontrol
 MAN=	pmccontrol.8
 
 LIBADD+=	pmc
Index: usr.sbin/pmcstat/Makefile
===================================================================
--- usr.sbin/pmcstat/Makefile
+++ usr.sbin/pmcstat/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 #
 
-PROG_CXX=	pmcstat
+PROG=	pmcstat
 MAN=	pmcstat.8
 
 CFLAGS+= -I${SRCTOP}/lib/libpmcstat