summaryrefslogtreecommitdiff
path: root/devel/mk-configure
diff options
context:
space:
mode:
Diffstat (limited to 'devel/mk-configure')
-rw-r--r--devel/mk-configure/Makefile22
-rw-r--r--devel/mk-configure/PLIST59
-rw-r--r--devel/mk-configure/distinfo9
-rw-r--r--devel/mk-configure/patches/patch-mkc__imp.own.mk13
4 files changed, 66 insertions, 37 deletions
diff --git a/devel/mk-configure/Makefile b/devel/mk-configure/Makefile
index 2b5bf307400..14ca6956ca1 100644
--- a/devel/mk-configure/Makefile
+++ b/devel/mk-configure/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2013/04/06 08:39:31 cheusov Exp $
+# $NetBSD: Makefile,v 1.15 2014/01/01 23:59:27 cheusov Exp $
#
-DISTNAME= mk-configure-0.24.0
-PKGREVISION= 1
+DISTNAME= mk-configure-0.25.0
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mk-configure/} \
http://mova.org/~cheusov/pub/mk-configure/
@@ -14,9 +13,12 @@ LICENSE= modified-bsd
DEPENDS+= bmake-[0-9]*:../../devel/bmake
-USE_LANGUAGES= # no languages
+USE_LANGUAGES= c
-DOC_FILES= doc/presentation.pdf
+BUILD_TARGET= all all-doc
+INSTALL_TARGET= install install-doc
+
+MAKE_PROGRAM= ${PREFIX}/bin/bmake
MAKE_ENV+= MANDIR=${PREFIX}/${PKGMANDIR} \
SYSCONFDIR=${PKG_SYSCONFDIR} \
@@ -24,15 +26,11 @@ MAKE_ENV+= MANDIR=${PREFIX}/${PKGMANDIR} \
AUTO_MKDIRS= yes
-PKGDOCDIR= share/doc/mk-configure
EGDIR= share/examples/mk-configure
-#TEST_TARGET= test
+TEST_TARGET= test
post-install:
-.for i in ${DOC_FILES}
- ${INSTALL_DATA} ${WRKSRC}/"${i}" ${DESTDIR}${PREFIX}/${PKGDOCDIR}
-.endfor
cp -Rp ${WRKSRC}/examples/* ${DESTDIR}${PREFIX}/${EGDIR}
.include "../../mk/bsd.prefs.mk"
@@ -44,4 +42,8 @@ REPLACE.awk.new= /usr/xpg4/bin/awk
REPLACE_FILES.awk= mkc_check_version
.endif
+.if ${OPSYS} != NetBSD && ${OPSYS} != FreeBSD && ${OPSYS} != OpenBSD && ${OPSYS} != DragonFly && ${OPSYS} != MirBSD
+DEPENDS+= bmkdep-[0-9]*:../../devel/bmkdep
+.endif
+
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/mk-configure/PLIST b/devel/mk-configure/PLIST
index 65be89f4e9d..4e8a8a3abe9 100644
--- a/devel/mk-configure/PLIST
+++ b/devel/mk-configure/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2013/03/08 11:35:14 cheusov Exp $
+@comment $NetBSD: PLIST,v 1.6 2014/01/01 23:59:27 cheusov Exp $
bin/mkc_check_common.sh
bin/mkc_check_compiler
bin/mkc_check_custom
@@ -20,14 +20,23 @@ man/man1/mkc_check_prog.1
man/man1/mkc_check_sizeof.1
man/man1/mkcmake.1
man/man7/mk-configure.7
-share/doc/mk-configure/COPYRIGHT
share/doc/mk-configure/FAQ
+share/doc/mk-configure/LICENSE
share/doc/mk-configure/NEWS
share/doc/mk-configure/README
share/doc/mk-configure/TODO
-share/doc/mk-configure/presentation.pdf
share/examples/mk-configure/Makefile
share/examples/mk-configure/Makefile.inc
+share/examples/mk-configure/hello_TARGETS/Makefile
+share/examples/mk-configure/hello_TARGETS/Makefile.inc
+share/examples/mk-configure/hello_TARGETS/expect.out
+share/examples/mk-configure/hello_TARGETS/hello1/Makefile
+share/examples/mk-configure/hello_TARGETS/hello1/hello1.c
+share/examples/mk-configure/hello_TARGETS/hello1/hello1.pod
+share/examples/mk-configure/hello_TARGETS/hello2/Makefile
+share/examples/mk-configure/hello_TARGETS/hello2/hello2.c
+share/examples/mk-configure/hello_TARGETS/hello2/hello2.pod
+share/examples/mk-configure/hello_TARGETS/test.mk
share/examples/mk-configure/hello_calc2/Makefile
share/examples/mk-configure/hello_calc2/expect.out
share/examples/mk-configure/hello_calc2/expressions.txt
@@ -125,7 +134,7 @@ share/examples/mk-configure/hello_lua/bar.lua
share/examples/mk-configure/hello_lua/baz.c
share/examples/mk-configure/hello_lua/expect.out
share/examples/mk-configure/hello_lua/foo.lua
-share/examples/mk-configure/hello_lua/foobar
+share/examples/mk-configure/hello_lua/foobar.in
share/examples/mk-configure/hello_lua/test.mk
share/examples/mk-configure/hello_lua2/Makefile
share/examples/mk-configure/hello_lua2/bar.lua
@@ -195,6 +204,7 @@ share/examples/mk-configure/hello_sizeof/sizeof_test.c
share/examples/mk-configure/hello_sizeof/test.mk
share/examples/mk-configure/hello_strlcpy/Makefile
share/examples/mk-configure/hello_strlcpy/expect.out
+share/examples/mk-configure/hello_strlcpy/getline.c
share/examples/mk-configure/hello_strlcpy/hello.c
share/examples/mk-configure/hello_strlcpy/input.in
share/examples/mk-configure/hello_strlcpy/strlcpy.c
@@ -270,6 +280,10 @@ share/examples/mk-configure/tools/libs/foo/Makefile
share/examples/mk-configure/tools/libs/foo/foo.c
share/examples/mk-configure/tools/libs/foo/foo.h
share/examples/mk-configure/tools/libs/foo/linkme.mk
+share/examples/mk-configure/tools/libs/qux/Makefile
+share/examples/mk-configure/tools/libs/qux/linkme.mk
+share/examples/mk-configure/tools/libs/qux/qux.c
+share/examples/mk-configure/tools/libs/qux/qux.h.in
share/examples/mk-configure/tools/test.mk
share/examples/mk-configure/tools/tools/prog1/Makefile
share/examples/mk-configure/tools/tools/prog1/prog1.c
@@ -277,6 +291,35 @@ share/examples/mk-configure/tools/tools/prog2/Makefile
share/examples/mk-configure/tools/tools/prog2/prog2.c
share/examples/mk-configure/tools/tools/prog3/Makefile
share/examples/mk-configure/tools/tools/prog3/prog3.c
+share/examples/mk-configure/tools/tools/prog4/Makefile
+share/examples/mk-configure/tools/tools/prog4/prog4.c
+share/examples/mk-configure/tools2/Makefile
+share/examples/mk-configure/tools2/expect.out
+share/examples/mk-configure/tools2/libs/bar/Makefile
+share/examples/mk-configure/tools2/libs/bar/bar.c
+share/examples/mk-configure/tools2/libs/bar/bar.h
+share/examples/mk-configure/tools2/libs/bar/linkme.mk
+share/examples/mk-configure/tools2/libs/foo/Makefile
+share/examples/mk-configure/tools2/libs/foo/foo.c
+share/examples/mk-configure/tools2/libs/foo/foo.h
+share/examples/mk-configure/tools2/libs/foo/linkme.mk
+share/examples/mk-configure/tools2/libs/qux/Makefile
+share/examples/mk-configure/tools2/libs/qux/linkme.mk
+share/examples/mk-configure/tools2/libs/qux/qux.c
+share/examples/mk-configure/tools2/libs/qux/qux.h.in
+share/examples/mk-configure/tools2/test.mk
+share/examples/mk-configure/tools2/tests/prog1/Makefile
+share/examples/mk-configure/tools2/tests/prog2/Makefile
+share/examples/mk-configure/tools2/tests/prog3/Makefile
+share/examples/mk-configure/tools2/tests/prog4/Makefile
+share/examples/mk-configure/tools2/tools/prog1/Makefile
+share/examples/mk-configure/tools2/tools/prog1/prog1.c
+share/examples/mk-configure/tools2/tools/prog2/Makefile
+share/examples/mk-configure/tools2/tools/prog2/prog2.c
+share/examples/mk-configure/tools2/tools/prog3/Makefile
+share/examples/mk-configure/tools2/tools/prog3/prog3.c
+share/examples/mk-configure/tools2/tools/prog4/Makefile
+share/examples/mk-configure/tools2/tools/prog4/prog4.c
share/mk-configure/custom/endianess
share/mk-configure/custom/prog_bison
share/mk-configure/custom/prog_flex
@@ -285,11 +328,11 @@ share/mk-configure/custom/prog_gm4
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
@@ -301,22 +344,20 @@ 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.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
diff --git a/devel/mk-configure/distinfo b/devel/mk-configure/distinfo
index 9a151159ab7..11c18681b7b 100644
--- a/devel/mk-configure/distinfo
+++ b/devel/mk-configure/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.9 2013/04/06 08:39:31 cheusov Exp $
+$NetBSD: distinfo,v 1.10 2014/01/01 23:59:27 cheusov Exp $
-SHA1 (mk-configure-0.24.0.tar.gz) = 4f429eca4c6cbbd19a3176bed902c703503dd352
-RMD160 (mk-configure-0.24.0.tar.gz) = 445ea46d9a79fc305270d561efca6bceccce8c55
-Size (mk-configure-0.24.0.tar.gz) = 237471 bytes
-SHA1 (patch-mkc__imp.own.mk) = 1c47784bc620f9576c53163e4ce65b50306c07a6
+SHA1 (mk-configure-0.25.0.tar.gz) = 06736b3fb45e1810ba494a1e8f9b048a89354794
+RMD160 (mk-configure-0.25.0.tar.gz) = ad727b762285166fccde5809c453bee937768104
+Size (mk-configure-0.25.0.tar.gz) = 252755 bytes
diff --git a/devel/mk-configure/patches/patch-mkc__imp.own.mk b/devel/mk-configure/patches/patch-mkc__imp.own.mk
deleted file mode 100644
index 1f37978cca8..00000000000
--- a/devel/mk-configure/patches/patch-mkc__imp.own.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-mkc__imp.own.mk,v 1.1 2013/04/06 08:39:31 cheusov Exp $
-
---- mkc_imp.own.mk.orig 2013-03-08 10:39:34.000000000 +0000
-+++ mkc_imp.own.mk
-@@ -71,7 +71,7 @@ ROOT_GROUP.MirBSD = wheel
- ROOT_GROUP.HP-UX = bin
- ROOT_GROUP.OSF1 = bin
- ROOT_GROUP.Interix = +Administrators
--ROOR_GROUP.Haiku = root
-+ROOT_GROUP.Minix = operator
-
- ROOT_USER.HP-UX = bin
- ROOT_USER.OSF1 = bin