Re: PR/41021 CVS commit: pkgsrc/devel/mk-files

[Aleksey Cheusov <cheusov%tut.by@localhost>]

>  Log Message:
>  Update to 20081111, provided by Aleksey Cheusov in PR 41021.
>  Update to the latest version.
>  Fix for destdir support.
>  Fix in CONFLICTS (there is no conflicts with bootstrap-mk-files).
>  Minor clean-ups.

This package is still not usable. First, bootstrap-mk-files conflicts
with it. Please apply the following patch.

? 1.patch
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/pkgtools/bootstrap-mk-files/Makefile,v
retrieving revision 1.23
diff -u -r1.23 Makefile
--- Makefile    7 Aug 2009 07:48:59 -0000       1.23
+++ Makefile    15 Oct 2009 20:45:47 -0000
@@ -5,8 +5,6 @@
 MASTER_SITES=  # empty
 DISTFILES=     # empty
 
-CONFLICTS+=    mk-files-[0-9]*
-
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.pkgsrc.org/
 COMMENT=       *.mk files for the bootstrap bmake utility

Second, it doesn't work under !BSD (e.g. Linux) due to problems with
bsd.*.mk files.  mk-files tries to install them to /usr/pkg/share/mk and
therefore conflicts with bootstrap-mk-files again. To solve this problem
I propose not to install mk files to /usr/pkg/share/mk at all,
and instead to install them to its own directory.

The following patch does this and makes the package much easier.

? 2.patch
? sjg-mk.patch
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/devel/mk-files/Makefile,v
retrieving revision 1.23
diff -u -r1.23 Makefile
--- Makefile    6 Apr 2009 10:25:51 -0000       1.23
+++ Makefile    15 Oct 2009 20:57:06 -0000
@@ -2,6 +2,7 @@
 #
 
 DISTNAME=      mk-20081111
+PKGREVISION=   1
 PKGNAME=       ${DISTNAME:S/mk/mk-files/1}
 CATEGORIES=    devel
 MASTER_SITES=  ftp://ftp.NetBSD.org/pub/NetBSD/misc/sjg/
@@ -23,22 +24,9 @@
 PKG_FAIL_REASON=       "Recurses against itself"
 .endif
 
-
-PLIST_SRC=${WRKDIR}/.PLIST_SRC
+sysmkdir=${PREFIX}/share/sjg-mk
 
 do-install:
-       ${SH} ${WRKSRC}/install-mk ${DESTDIR}${PREFIX}/share/mk
+       env SYS_MK_DIR=${sysmkdir} ${SH} ${WRKSRC}/install-mk  
${DESTDIR}${sysmkdir}
 
 .include "../../mk/bsd.pkg.mk"
-
-# The logic below mimics what install-mk does.
-# Ie. it won't install a sys.mk if a standard BSD one exists
-# same goes for the bsd.*.mk files (it makes the symlinks to *.mk)
-${WRKSRC}/FILES:       extract
-${WRKDIR}/.PLIST_SRC:  ${WRKSRC}/FILES
-       ( ${GREP} '^[A-Za-z].*\.mk' ${.ALLSRC} ; \
-       [ -f /usr/share/mk/sys.mk ] || ${ECHO} sys.mk; \
-       [ -f /usr/share/mk/bsd.prog.mk ] || \
-       for f in dep doc init lib man nls obj own prog subdir; do \
-               ${ECHO} bsd.$$f.mk; \
-       done ) | ${SED} 's,^,share/mk/,' > ${.TARGET}
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/devel/mk-files/PLIST,v
retrieving revision 1.2
diff -u -r1.2 PLIST
--- PLIST       20 Sep 2002 07:00:56 -0000      1.2
+++ PLIST       15 Oct 2009 20:57:06 -0000
@@ -1,2 +1,47 @@
 @comment $NetBSD: PLIST,v 1.2 2002/09/20 07:00:56 sjg Exp $
-@comment rest is autogenerated
+share/sjg-mk/AIX.sys.mk
+share/sjg-mk/Darwin.sys.mk
+share/sjg-mk/Generic.sys.mk
+share/sjg-mk/HP-UX.sys.mk
+share/sjg-mk/IRIX.sys.mk
+share/sjg-mk/Linux.sys.mk
+share/sjg-mk/NetBSD.sys.mk
+share/sjg-mk/OSF1.sys.mk
+share/sjg-mk/OpenBSD.sys.mk
+share/sjg-mk/SunOS.4.sys.mk
+share/sjg-mk/SunOS.5.sys.mk
+share/sjg-mk/UnixWare.sys.mk
+share/sjg-mk/autodep.mk
+share/sjg-mk/bsd.dep.mk
+share/sjg-mk/bsd.doc.mk
+share/sjg-mk/bsd.init.mk
+share/sjg-mk/bsd.lib.mk
+share/sjg-mk/bsd.man.mk
+share/sjg-mk/bsd.nls.mk
+share/sjg-mk/bsd.obj.mk
+share/sjg-mk/bsd.own.mk
+share/sjg-mk/bsd.prog.mk
+share/sjg-mk/bsd.subdir.mk
+share/sjg-mk/dep.mk
+share/sjg-mk/doc.mk
+share/sjg-mk/dpadd.mk
+share/sjg-mk/final.mk
+share/sjg-mk/host-target.mk
+share/sjg-mk/init.mk
+share/sjg-mk/java.mk
+share/sjg-mk/lib.mk
+share/sjg-mk/libs.mk
+share/sjg-mk/links.mk
+share/sjg-mk/man.mk
+share/sjg-mk/nls.mk
+share/sjg-mk/obj.mk
+share/sjg-mk/own.mk
+share/sjg-mk/prlist.mk
+share/sjg-mk/prog.mk
+share/sjg-mk/progs.mk
+share/sjg-mk/scripts.mk
+share/sjg-mk/subdir.mk
+share/sjg-mk/sys.mk
+share/sjg-mk/target-flags.mk
+share/sjg-mk/warnings.mk
+share/sjg-mk/yacc.mk

It looks like I'm the only user of this package.
And I hope moving share/mk to share/sjg-mk is not a problem.

-- 
Best regards, Aleksey Cheusov.