3 files changed, 30 insertions, 24 deletions

diff --git a/devel/bmake/Makefile b/devel/bmake/Makefile
index e2ef4e341e14..77f4d150ef67 100644
--- a/devel/bmake/Makefile
+++ b/devel/bmake/Makefile
@@ -6,25 +6,29 @@
 #
 
 PORTNAME=	bmake
-PORTVERSION=	20100222
+PORTVERSION=	20100618
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.netbsd.org/pub/NetBSD/misc/sjg/ \
 		http://www.gtlib.cc.gatech.edu/pub/NetBSD/misc/sjg/ \
 		ftp://ftp.uk.netbsd.org/pub/NetBSD/misc/sjg/ \
 		ftp://ftp.de.netbsd.org/pub/NetBSD/misc/sjg/
-DISTFILES=	bmake-${PORTVERSION}.tar.gz mk-20100102.tar.gz
+DISTFILES=	bmake-${PORTVERSION}.tar.gz mk-20100612.tar.gz
 
 MAINTAINER=	to.my.trociny@gmail.com
 COMMENT=	Portable version of NetBSD 'make' utility
 
 MAN1=		bmake.1
 
+post-patch:	.SILENT
+	${REINPLACE_CMD} 's/^\.Nx/NetBSD/' ${WRKDIR}/bmake/bmake.1
+
 do-build:
-	${WRKDIR}/bmake/boot-strap -m ${WRKDIR}/mk objdir=${WRKDIR}/obj
+	${SETENV} ${MAKE_ENV} ${SH} ${WRKDIR}/bmake/boot-strap \
+		-m ${WRKDIR}/mk objdir=${WRKDIR}/obj prefix=${PREFIX}
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKDIR}/obj/bmake ${PREFIX}/bin/
-	${INSTALL_MAN} ${WRKDIR}/bmake/bmake.cat1 ${PREFIX}/man/man1/bmake.1
+	${INSTALL_PROGRAM} ${WRKDIR}/obj/bmake ${PREFIX}/bin
+	${INSTALL_MAN} ${WRKDIR}/bmake/bmake.1 ${MAN1PREFIX}/man/man1
 	${SH} ${WRKDIR}/mk/install-mk ${PREFIX}/share/mk
 
 .include <bsd.port.mk>
diff --git a/devel/bmake/distinfo b/devel/bmake/distinfo
index 28a9c07de1a0..6e2995105739 100644
--- a/devel/bmake/distinfo
+++ b/devel/bmake/distinfo
@@ -1,6 +1,6 @@
-MD5 (bmake-20100222.tar.gz) = 704f3ccd36a66378d321f59d1ea9dac1
-SHA256 (bmake-20100222.tar.gz) = 06c013e09c4b72e4c0dd2bad9208de09c69c2e7b1fe3650a3e09c12479a8a585
-SIZE (bmake-20100222.tar.gz) = 382891
-MD5 (mk-20100102.tar.gz) = 08d3490c9128fd2fa38a584889ea9267
-SHA256 (mk-20100102.tar.gz) = 2216bf8f48d738b1387285a5a4e9ada9465559ad84527767c109c85d6b35cd95
-SIZE (mk-20100102.tar.gz) = 42331
+MD5 (bmake-20100618.tar.gz) = a6ecc6bfc341033f2d84a62282833073
+SHA256 (bmake-20100618.tar.gz) = 0654127eb0ca8a6fe25146776635dd0e0f648c6cb228c45bb0f5190c33bd8166
+SIZE (bmake-20100618.tar.gz) = 390124
+MD5 (mk-20100612.tar.gz) = 333b2cb2eb7087fc874584b58522efe4
+SHA256 (mk-20100612.tar.gz) = 37abd0c420f9caec56af27909b8cdda7e81fd4c4eac6a15e4583511693050e7b
+SIZE (mk-20100612.tar.gz) = 46000
diff --git a/devel/bmake/pkg-plist b/devel/bmake/pkg-plist
index 79df0ffd9d63..9ae5ce09cf07 100644
--- a/devel/bmake/pkg-plist
+++ b/devel/bmake/pkg-plist
@@ -1,7 +1,19 @@
 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
@@ -26,19 +38,6 @@ share/mk/rst2htm.mk
 share/mk/scripts.mk
 share/mk/subdir.mk
 share/mk/sys.mk
-share/mk/target-flags.mk
-share/mk/warnings.mk
-share/mk/yacc.mk
-share/mk/bsd.dep.mk
-share/mk/bsd.doc.mk
-share/mk/bsd.init.mk
-share/mk/bsd.lib.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/sys/AIX.mk
 share/mk/sys/Darwin.mk
 share/mk/sys/Generic.mk
@@ -50,5 +49,8 @@ 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