diff -Nrpu devel/bmake.orig/Makefile devel/bmake/Makefile
--- devel/bmake.orig/Makefile	2011-04-09 21:21:59.000000000 +0300
+++ devel/bmake/Makefile	2011-04-09 21:26:19.000000000 +0300
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	bmake
-PORTVERSION=	20101210
+PORTVERSION=	20110330
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.netbsd.org/pub/NetBSD/misc/sjg/ \
 		http://www.gtlib.cc.gatech.edu/pub/NetBSD/misc/sjg/ \
@@ -32,5 +32,20 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKDIR}/obj/bmake ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKDIR}/bmake/bmake.1 ${MAN1PREFIX}/man/man1
 	${SH} ${WRKDIR}/mk/install-mk ${PREFIX}/share/mk
+	cd ${PREFIX} ;						\
+	    ${FIND} share/mk -type f -o -type l			\
+	    	| ${SORT}					\
+	    	>${WRKDIR}/PLIST.share-mk
+	cd ${PREFIX} ;						\
+	    ${FIND} share/mk/${_DATADIR} -type d		\
+	    	| ${SORT} -r | ${SED} -e 's/^/@dirrm /g'	\
+		>>${WRKDIR}/PLIST.share-mk
+	${ECHO_CMD} "r ${TMPPLIST}"			> ${WRKDIR}/ex.script
+	${ECHO_CMD} "/Insert PLIST.share-mk"		>> ${WRKDIR}/ex.script
+	${ECHO_CMD} "d"					>> ${WRKDIR}/ex.script
+	${ECHO_CMD} "r ${WRKDIR}/PLIST.share-mk"	>> ${WRKDIR}/ex.script
+	${ECHO_CMD} "x!"				>> ${WRKDIR}/ex.script
+	${CP} -p ${TMPPLIST} ${TMPPLIST}.pre-share-mk
+	cd ${WRKDIR} ; ex < ex.script
 
 .include <bsd.port.mk>
diff -Nrpu devel/bmake.orig/distinfo devel/bmake/distinfo
--- devel/bmake.orig/distinfo	2011-04-09 21:21:59.000000000 +0300
+++ devel/bmake/distinfo	2011-04-09 21:26:58.000000000 +0300
@@ -1,4 +1,4 @@
-SHA256 (bmake-20101210.tar.gz) = 513f61147ee7bd556067a37eb89e8673d4a3a922f9a6af5220b1b7f22f487389
-SIZE (bmake-20101210.tar.gz) = 405481
+SHA256 (bmake-20110330.tar.gz) = 7b9862c2f318f242b8c31f74ff22150d5f1c02e6302accab6910c0b40c2379b5
+SIZE (bmake-20110330.tar.gz) = 426130
 SHA256 (mk-20100612.tar.gz) = 37abd0c420f9caec56af27909b8cdda7e81fd4c4eac6a15e4583511693050e7b
 SIZE (mk-20100612.tar.gz) = 46000
diff -Nrpu devel/bmake.orig/pkg-plist devel/bmake/pkg-plist
--- devel/bmake.orig/pkg-plist	2011-04-09 21:22:00.000000000 +0300
+++ devel/bmake/pkg-plist	2011-04-09 21:23:47.000000000 +0300
@@ -1,56 +1,4 @@
 bin/bmake
-share/mk/auto.dep.mk
-share/mk/auto.obj.mk
-share/mk/autoconf.mk
-share/mk/autodep.mk
-share/mk/bsd.dep.mk
-share/mk/bsd.doc.mk
-share/mk/bsd.init.mk
-share/mk/bsd.lib.mk
-share/mk/bsd.links.mk
-share/mk/bsd.man.mk
-share/mk/bsd.nls.mk
-share/mk/bsd.obj.mk
-share/mk/bsd.own.mk
-share/mk/bsd.prog.mk
-share/mk/bsd.subdir.mk
-share/mk/dep.mk
-share/mk/doc.mk
-share/mk/dpadd.mk
-share/mk/final.mk
-share/mk/host-target.mk
-share/mk/host.libnames.mk
-share/mk/inc.mk
-share/mk/init.mk
-share/mk/java.mk
-share/mk/lib.mk
-share/mk/libnames.mk
-share/mk/libs.mk
-share/mk/links.mk
-share/mk/man.mk
-share/mk/nls.mk
-share/mk/obj.mk
-share/mk/own.mk
-share/mk/prlist.mk
-share/mk/prog.mk
-share/mk/progs.mk
-share/mk/rst2htm.mk
-share/mk/scripts.mk
-share/mk/subdir.mk
-share/mk/sys.mk
-share/mk/sys/AIX.mk
-share/mk/sys/Darwin.mk
-share/mk/sys/Generic.mk
-share/mk/sys/HP-UX.mk
-share/mk/sys/IRIX.mk
-share/mk/sys/Linux.mk
-share/mk/sys/NetBSD.mk
-share/mk/sys/OSF1.mk
-share/mk/sys/OpenBSD.mk
-share/mk/sys/SunOS.mk
-share/mk/sys/UnixWare.mk
-share/mk/target-flags.mk
-share/mk/warnings.mk
-share/mk/yacc.mk
-@dirrm share/mk/sys
-@dirrmtry share/mk
+@comment Insert PLIST.share-mk here
+@comment -=[ begin PLIST.share-mk ]=-
+@comment -=[ end PLIST.share-mk ]=-