Update to 0.26.0.

3 files changed, 60 insertions, 28 deletions

diff --git a/devel/mk-configure/Makefile b/devel/mk-configure/Makefile
index e0461768144c..30283ec4a668 100644
--- a/devel/mk-configure/Makefile
+++ b/devel/mk-configure/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mk-configure
-PORTVERSION=	0.24.0
-PORTREVISION=	1
+PORTVERSION=	0.26.0
 CATEGORIES=	devel
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
@@ -17,19 +16,12 @@ RUN_DEPENDS:=	${BUILD_DEPENDS} \
 		bmkdep:${PORTSDIR}/devel/bmkdep
 
 BMAKE?=		${LOCALBASE}/bin/bmake
-INSTALL_TARGET=	installdirs install
+INSTALL_TARGET=	installdirs install install-doc
 
-PORTDOCS=	README NEWS TODO COPYRIGHT FAQ presentation.pdf
 PORTEXAMPLES=	*
 
-.if !defined(NOPORTDOCS)
-MAKE_ENV+=	EXTRAFILES="${PORTDOCS:C|.*\.pdf|doc/&|}"
-.else
-MAKE_ENV+=	EXTRAFILES=""
-.endif
-
 post-patch:
-	@${ECHO_CMD} "MKDEP ?= bmkdep" >> ${WRKSRC}/sys.mk
+	@${ECHO_CMD} "MKDEP ?= bmkdep" >> ${WRKSRC}/mk/sys.mk
 
 do-build:
 	@${SETENV} ${MAKE_ENV} ${BMAKE} -C ${BUILD_WRKSRC} ${MAKE_FLAGS} ${MAKEFILE} \
@@ -38,8 +30,6 @@ do-build:
 do-install:
 	@${SETENV} ${MAKE_ENV} ${BMAKE} -C ${INSTALL_WRKSRC} ${MAKE_FLAGS} ${MAKEFILE} \
 		${_MAKE_JOBS} ${MAKE_ARGS} ${INSTALL_TARGET}
-.if !defined(NOPORTEXAMPLES)
 	cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR}
-.endif
 
 .include <bsd.port.mk>
diff --git a/devel/mk-configure/distinfo b/devel/mk-configure/distinfo
index b28056747eb3..6a225b945425 100644
--- a/devel/mk-configure/distinfo
+++ b/devel/mk-configure/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mk-configure-0.24.0.tar.gz) = 1a4e524622f153bd543422aea3dfc39d26339af8540b0c966bb70a55ef648e9e
-SIZE (mk-configure-0.24.0.tar.gz) = 237471
+SHA256 (mk-configure-0.26.0.tar.gz) = 69057507843db47ff6ed2f4876471c7d3228a61b77fbae9236016ae046f8e2e0
+SIZE (mk-configure-0.26.0.tar.gz) = 274771
diff --git a/devel/mk-configure/pkg-plist b/devel/mk-configure/pkg-plist
index cfa968651b9b..6394b2637a68 100644
--- a/devel/mk-configure/pkg-plist
+++ b/devel/mk-configure/pkg-plist
@@ -11,11 +11,6 @@ bin/mkc_install
 bin/mkc_test_helper
 bin/mkc_which
 bin/mkcmake
-%%DATADIR%%/custom/endianess
-%%DATADIR%%/custom/prog_bison
-%%DATADIR%%/custom/prog_flex
-%%DATADIR%%/custom/prog_gawk
-%%DATADIR%%/custom/prog_gm4
 man/man1/mkc_check_custom.1.gz
 man/man1/mkc_check_decl.1.gz
 man/man1/mkc_check_funclib.1.gz
@@ -24,44 +19,91 @@ man/man1/mkc_check_prog.1.gz
 man/man1/mkc_check_sizeof.1.gz
 man/man1/mkcmake.1.gz
 man/man7/mk-configure.7.gz
-@dirrm %%DATADIR%%/custom
-@dirrm %%DATADIR%%
+%%PORTDOCS%%%%DOCSDIR%%/FAQ
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%DATADIR%%/custom/endianness
+%%DATADIR%%/custom/prog_bison
+%%DATADIR%%/custom/prog_flex
+%%DATADIR%%/custom/prog_gawk
+%%DATADIR%%/custom/prog_gm4
+%%DATADIR%%/features/getline/getline.c
+%%DATADIR%%/features/mkc_CIRCLEQ.h
+%%DATADIR%%/features/mkc_LIST.h
+%%DATADIR%%/features/mkc_RB.h
+%%DATADIR%%/features/mkc_SIMPLEQ.h
+%%DATADIR%%/features/mkc_SLIST.h
+%%DATADIR%%/features/mkc_SPLAY.h
+%%DATADIR%%/features/mkc_STAILQ.h
+%%DATADIR%%/features/mkc_TAILQ.h
+%%DATADIR%%/features/mkc_getline.h
+%%DATADIR%%/features/mkc_libdl.h
+%%DATADIR%%/features/mkc_libm.h
+%%DATADIR%%/features/mkc_strlcat.h
+%%DATADIR%%/features/mkc_strlcpy.h
+%%DATADIR%%/features/netbsd_sys_queue.h
+%%DATADIR%%/features/netbsd_sys_tree.h
+%%DATADIR%%/features/strlcat/strlcat.c
+%%DATADIR%%/features/strlcpy/strlcpy.c
 share/mkc-mk/configure.mk
 share/mkc-mk/mkc.configure.mk
 share/mkc-mk/mkc.files.mk
+share/mkc-mk/mkc.init.mk
 share/mkc-mk/mkc.intexts.mk
 share/mkc-mk/mkc.lib.mk
 share/mkc-mk/mkc.minitest.mk
 share/mkc-mk/mkc.mk
-share/mkc-mk/mkc.own.mk
 share/mkc-mk/mkc.pkg-config.mk
 share/mkc-mk/mkc.prog.mk
 share/mkc-mk/mkc.subdir.mk
 share/mkc-mk/mkc.subprj.mk
 share/mkc-mk/mkc.subprjs.mk
 share/mkc-mk/mkc_imp.arch.mk
+share/mkc-mk/mkc_imp.checkprogs.mk
+share/mkc-mk/mkc_imp.conf-final.mk
 share/mkc-mk/mkc_imp.dep.mk
+share/mkc-mk/mkc_imp.f_CIRCLEQ.mk
+share/mkc-mk/mkc_imp.f_LIST.mk
+share/mkc-mk/mkc_imp.f_RB.mk
+share/mkc-mk/mkc_imp.f_SIMPLEQ.mk
+share/mkc-mk/mkc_imp.f_SLIST.mk
+share/mkc-mk/mkc_imp.f_SPLAY.mk
+share/mkc-mk/mkc_imp.f_STAILQ.mk
+share/mkc-mk/mkc_imp.f_TAILQ.mk
+share/mkc-mk/mkc_imp.f_getline.mk
+share/mkc-mk/mkc_imp.f_libdl.mk
+share/mkc-mk/mkc_imp.f_libm.mk
+share/mkc-mk/mkc_imp.f_strlcat.mk
+share/mkc-mk/mkc_imp.f_strlcpy.mk
 share/mkc-mk/mkc_imp.files.mk
 share/mkc-mk/mkc_imp.final.mk
 share/mkc-mk/mkc_imp.inc.mk
 share/mkc-mk/mkc_imp.info.mk
-share/mkc-mk/mkc_imp.init.mk
 share/mkc-mk/mkc_imp.intexts.mk
 share/mkc-mk/mkc_imp.lib.mk
 share/mkc-mk/mkc_imp.links.mk
 share/mkc-mk/mkc_imp.lua.mk
 share/mkc-mk/mkc_imp.man.mk
+share/mkc-mk/mkc_imp.mk
+share/mkc-mk/mkc_imp.obj.mk
 share/mkc-mk/mkc_imp.objdir.mk
-share/mkc-mk/mkc_imp.own.mk
 share/mkc-mk/mkc_imp.pkg-config.mk
 share/mkc-mk/mkc_imp.platform.sys.mk
 share/mkc-mk/mkc_imp.pod.mk
 share/mkc-mk/mkc_imp.preinit.mk
 share/mkc-mk/mkc_imp.prog.mk
+share/mkc-mk/mkc_imp.rules.mk
 share/mkc-mk/mkc_imp.scripts.mk
-share/mkc-mk/mkc_imp.subdir.mk
 share/mkc-mk/mkc_imp.subprj.mk
-share/mkc-mk/mkc_imp.sys.mk
 share/mkc-mk/mkc_imp.vars.mk
 share/mkc-mk/sys.mk
-@dirrm share/mkc-mk
+@dirrmtry share/mkc-mk
+@dirrmtry %%DATADIR%%/features/strlcpy
+@dirrmtry %%DATADIR%%/features/strlcat
+@dirrmtry %%DATADIR%%/features/getline
+@dirrmtry %%DATADIR%%/features
+@dirrmtry %%DATADIR%%/custom
+@dirrmtry %%DATADIR%%
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%