pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

mk-configure-current: update PLIST and fixes for pkglint warnings



Module Name:	pkgsrc-wip
Committed By:	Aleksey Cheusov <vle%gmx.net@localhost>
Pushed By:	cheusov
Date:		Fri May 24 16:03:36 2024 +0400
Changeset:	9921dfd756cd4215aecfd1b3ab42c844bfeb1044

Modified Files:
	distbb-git/Makefile
	mk-configure-current/Makefile
	mk-configure-current/PLIST

Log Message:
mk-configure-current: update PLIST and fixes for pkglint warnings

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=9921dfd756cd4215aecfd1b3ab42c844bfeb1044

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 distbb-git/Makefile           |  4 ++--
 mk-configure-current/Makefile | 14 ++++++++------
 mk-configure-current/PLIST    |  2 +-
 3 files changed, 11 insertions(+), 9 deletions(-)

diffs:
diff --git a/distbb-git/Makefile b/distbb-git/Makefile
index e65f4753e7..85937ba7a2 100644
--- a/distbb-git/Makefile
+++ b/distbb-git/Makefile
@@ -21,7 +21,7 @@ DEPENDS+=	digest-[0-9]*:../../pkgtools/digest
 
 TOOL_DEPENDS+=	mk-configure>=0.21:../../devel/mk-configure
 
-WRKSRC=			${WRKDIR}/distbb
+WRKSRC=		${WRKDIR}/distbb
 
 USE_LANGUAGES=		# none
 
@@ -34,7 +34,7 @@ REPLACE_FILES.runawk=	gen_weights.in gen_queue.in pkg_summary2build_deps.in \
 			distbb_grep.in
 
 EGDIR=			${PREFIX}/share/examples/distbb
-DOCDIR=			${PREFIX}/share/doc/distbb
+DOCDIR=		${PREFIX}/share/doc/distbb
 
 CONF_FILES=		${EGDIR}/distbb.conf     ${PKG_SYSCONFDIR}/distbb.conf
 CONF_FILES+=		${EGDIR}/distbb.local.mk ${PKG_SYSCONFDIR}/distbb.local.mk
diff --git a/mk-configure-current/Makefile b/mk-configure-current/Makefile
index 25d1e5b9b2..1229dce893 100644
--- a/mk-configure-current/Makefile
+++ b/mk-configure-current/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD$
 #
 
-DISTNAME=	mk-configure-0.38.2
+DISTNAME=	mk-configure-0.39.1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mk-configure/}
 
@@ -18,7 +18,7 @@ WRKSRC=		${WRKDIR}/mk-configure
 DEPENDS+=	bmake-[0-9]*:../../devel/bmake
 
 USE_LANGUAGES=		c c++
-USE_TOOLS=		makeinfo
+USE_TOOLS=		makeinfo pax
 
 BUILD_TARGET=		all all-doc
 INSTALL_TARGET=		install install-doc
@@ -42,11 +42,13 @@ TEST_TARGET=		test
 
 #	${INSTALL_DATA} ${WRKSRC}/presentation/*.pdf \
 #		${DESTDIR}${PREFIX}/share/doc/mk-configure
+post-build:
+	set -e; cd ${WRKSRC}/mk; \
+	${FIND} . -name 'mkc_imp.cc_*' -o -name 'mkc_imp.cxx_*' | \
+		${SED} "s;^\([.]/\)*;share/mk-configure/mk/;g" > ${WRKDIR}/PLIST-addon
+
 post-install:
-	${CP} -Rp ${WRKSRC}/examples/* ${DESTDIR}${PREFIX}/${EGDIR}
-	${FIND} ${DESTDIR}${PREFIX}/share/mk-configure/mk | \
-		grep -E 'mkc_imp.(cc|cxx)' | \
-		${SED} 's;${DESTDIR}${PREFIX}/;;g' > ${WRKDIR}/PLIST-addon
+	cd ${WRKSRC}/examples && ${PAX} -wr * ${DESTDIR}${PREFIX}/${EGDIR}
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/mk-configure-current/PLIST b/mk-configure-current/PLIST
index 0404ef0db1..3ac1c873f9 100644
--- a/mk-configure-current/PLIST
+++ b/mk-configure-current/PLIST
@@ -33,6 +33,7 @@ share/doc/mk-configure/NEWS
 share/doc/mk-configure/NOTES
 share/doc/mk-configure/README.md
 share/doc/mk-configure/TODO
+share/examples/mk-configure/MKCmakefile
 share/examples/mk-configure/Makefile.inc
 share/examples/mk-configure/RBTREE/Makefile
 share/examples/mk-configure/RBTREE/expect.out
@@ -311,7 +312,6 @@ share/examples/mk-configure/libdeps/progs/foobaz/foobaz.c
 share/examples/mk-configure/libdeps/progs/fooquxfoobar/Makefile
 share/examples/mk-configure/libdeps/progs/fooquxfoobar/fooquxfoobar.c
 share/examples/mk-configure/libdeps/test.mk
-share/examples/mk-configure/makefile
 share/examples/mk-configure/multilibs/Makefile
 share/examples/mk-configure/multilibs/app/Makefile
 share/examples/mk-configure/multilibs/app/app.c


Home | Main Index | Thread Index | Old Index