3 files changed, 44 insertions, 22 deletions

diff --git a/devel/mk-configure/Makefile b/devel/mk-configure/Makefile
index e56ac9e1cf7e..3f731cff10d3 100644
--- a/devel/mk-configure/Makefile
+++ b/devel/mk-configure/Makefile
@@ -6,15 +6,14 @@
 #
 
 PORTNAME=	mk-configure
-PORTVERSION=	0.11.1
+PORTVERSION=	0.13.0
 CATEGORIES=	devel
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	to.my.trociny@gmail.com
 COMMENT=	Lightweight, easy to use replacement for GNU autotools
 
-BUILD_DEPENDS=	${LOCALBASE}/share/mk/bsd.sys.mk:${PORTSDIR}/devel/netbsd-pkgsrc-mk-files
-RUN_DEPENDS=	${LOCALBASE}/share/mk/bsd.sys.mk:${PORTSDIR}/devel/netbsd-pkgsrc-mk-files
+BUILD_DEPENDS=	bmake:${PORTSDIR}/devel/bmake
 
 .if !defined(NOPORTDOCS)
 DOCFILES=	README NEWS TODO COPYRIGHT FAQ
@@ -23,13 +22,13 @@ DOCFILES=
 .endif
 
 MAN1=		mkc_check_funclib.1 mkc_check_header.1 mkc_check_sizeof.1 \
-		mkc_check_decl.1 mkc_check_prog.1
+		mkc_check_decl.1 mkc_check_prog.1 mkc_check_custom.1
 MAN7=		mk-configure.7
 
 do-build:
-	bmake -C ${WRKSRC} all MKFILESDIR=${LOCALBASE}/share/mk
+	bmake -C ${WRKSRC} all
 
 do-install:
-	bmake -C ${WRKSRC} install-dirs install EXTRAFILES="${DOCFILES}"
+	bmake -C ${WRKSRC} installdirs install EXTRAFILES="${DOCFILES}"
 
 .include <bsd.port.mk>
diff --git a/devel/mk-configure/distinfo b/devel/mk-configure/distinfo
index b3d5843e0241..c90f9b57aad5 100644
--- a/devel/mk-configure/distinfo
+++ b/devel/mk-configure/distinfo
@@ -1,3 +1,3 @@
-MD5 (mk-configure-0.11.1.tar.gz) = 09eb7ce6ab81f66987dfc9416f4259ce
-SHA256 (mk-configure-0.11.1.tar.gz) = c10030a4e69cb3d4351ffcc0d1f1d92396458fa2a6bdd7658a5e5abdc654a054
-SIZE (mk-configure-0.11.1.tar.gz) = 55822
+MD5 (mk-configure-0.13.0.tar.gz) = fbdbeac964b63ba91b3c5748a22b6c31
+SHA256 (mk-configure-0.13.0.tar.gz) = 4087a015f3e0c285872ecbe7988c052de7f09c233037b3bb5818e168cb5345e1
+SIZE (mk-configure-0.13.0.tar.gz) = 89968
diff --git a/devel/mk-configure/pkg-plist b/devel/mk-configure/pkg-plist
index 0f46fe9013a2..505a3305c44c 100644
--- a/devel/mk-configure/pkg-plist
+++ b/devel/mk-configure/pkg-plist
@@ -1,3 +1,4 @@
+bin/mkcmake
 bin/mkc_check_funclib
 bin/mkc_check_header
 bin/mkc_check_sizeof
@@ -7,20 +8,42 @@ bin/mkc_check_custom
 bin/mkc_which
 bin/mkc_check_version
 bin/mkc_test_helper
+bin/mkc_check_compiler
+bin/mkc_install
 bin/mkc_check_common.sh
-share/mk/configure.mk
-share/mk/mkc.configure.mk
-share/mk/mkc.files.mk
-share/mk/mkc.lib.mk
-share/mk/mkc.prog.mk
-share/mk/mkc.subdir.mk
-share/mk/mkc.own.mk
-share/mk/mkc.intexts.mk
-share/mk/mkc.common.mk
-share/mk/mkc.minitest.mk
-share/mk/mkc.pkg-config.mk
-share/mk/_mkc.ver.mk
-share/mk/_mkc.missedfiles.mk
+share/mk-configure/custom/endianess
+share/mk-configure/custom/prog_bison
+share/mk-configure/custom/prog_flex
+share/mk-configure/custom/prog_gawk
+share/mk-configure/custom/prog_gm4
+@dirrm share/mk-configure/custom
+@dirrm share/mk-configure
+share/mkc-mk/configure.mk
+share/mkc-mk/mkc.configure.mk
+share/mkc-mk/mkc.files.mk
+share/mkc-mk/mkc.lib.mk
+share/mkc-mk/mkc.prog.mk
+share/mkc-mk/mkc.subdir.mk
+share/mkc-mk/mkc.own.mk
+share/mkc-mk/mkc.intexts.mk
+share/mkc-mk/mkc.minitest.mk
+share/mkc-mk/mkc.pkg-config.mk
+share/mkc-mk/mkc.ver.mk
+share/mkc-mk/mkc_imp.files.mk
+share/mkc-mk/mkc_imp.inc.mk
+share/mkc-mk/mkc_imp.info.mk
+share/mkc-mk/mkc_imp.lib.mk
+share/mkc-mk/mkc_imp.links.mk
+share/mkc-mk/mkc_imp.man.mk
+share/mkc-mk/mkc_imp.own.mk
+share/mkc-mk/mkc_imp.prog.mk
+share/mkc-mk/mkc_imp.subdir.mk
+share/mkc-mk/mkc_imp.sys.mk
+share/mkc-mk/mkc_imp.init.mk
+share/mkc-mk/mkc_imp.final.mk
+share/mkc-mk/mkc_imp.platform.sys.mk
+share/mkc-mk/sys.mk
+@dirrm share/mkc-mk
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/TODO