Re: building devel/bmake on case-insensitive filesystems

[Brook Milligan <brook%nmsu.edu@localhost>]

> On Aug 13, 2017, at 12:31 PM, <coypu%sdf.org@localhost> <coypu%sdf.org@localhost> wrote:
> 
> On Sun, Aug 13, 2017 at 12:19:07PM -0600, Brook Milligan wrote:
>> I expected as much.  What I really wanted to see was what exactly you did to introduce the new version file.  I was expecting that I could back port that (small change?) to the old version to verify that all was good.  Perhaps I am missing something, but this one difference seems like it would be quite small and easy to back port.  That pathway seems less invasive than attempting an import of the whole thing.
> 
> I also want another bmake change for SCOOS5 committed to netbsd (use
> safer include guards), and to patch in: http://gnats.netbsd.org/29386
> 
> so an update is overdue

Thanks for the patch (offline).  I pulled out everything that I think was relevant to adding the VERSION file; I ignored all the changes that just updated the version number itself, for example.  The result is the patch below.

This compiles on my Mac just fine and now 'bmake show-var VARNAME=MAKE_VERSION' responds with something useful.  Thus, I feel this solves the problem I identified and will commit this after a bit unless I hear otherwise.  Note that building this in pkgsrc really only checks the interaction between configure and make-bootstrap.sh.in, as the other files in the patch are not actually used.

It is clear that a full import is in order, but I will leave that to others who know the process better than I do.

Thanks a lot for working on this so quickly.

Cheers,
Brook


? VERSION
Index: FILES
===================================================================
RCS file: /cvsroot/pkgsrc/devel/bmake/files/FILES,v
retrieving revision 1.7
diff -u -r1.7 FILES
--- FILES	19 May 2015 22:01:19 -0000	1.7
+++ FILES	13 Aug 2017 19:06:10 -0000
@@ -5,6 +5,7 @@
 PSD.doc/Makefile
 PSD.doc/tutorial.ms
 README
+VERSION
 aclocal.m4
 arch.c
 bmake.1
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/devel/bmake/files/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- Makefile	19 May 2015 22:01:19 -0000	1.2
+++ Makefile	13 Aug 2017 19:06:10 -0000
@@ -1,8 +1,5 @@
 #	$Id: Makefile,v 1.2 2015/05/19 22:01:19 joerg Exp $
 
-# Base version on src date
-MAKE_VERSION= 20150505
-
 PROG=	bmake
 
 SRCS= \
@@ -57,6 +54,8 @@
 	lstReplace.c \
 	lstSucc.c
 
+.-include "VERSION"
+
 # this file gets generated by configure
 .-include "Makefile.config"
 
Index: Makefile.config.in
===================================================================
RCS file: /cvsroot/pkgsrc/devel/bmake/files/Makefile.config.in,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile.config.in
--- Makefile.config.in	19 May 2015 21:36:43 -0000	1.1.1.1
+++ Makefile.config.in	13 Aug 2017 19:06:10 -0000
@@ -1,5 +1,7 @@
 # things set by configure
 
+_MAKE_VERSION=@_MAKE_VERSION@
+
 prefix= @prefix@
 srcdir= @srcdir@
 CC?= @CC@
Index: bsd.after-import.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/bmake/files/bsd.after-import.mk,v
retrieving revision 1.2
diff -u -r1.2 bsd.after-import.mk
--- bsd.after-import.mk	19 May 2015 22:01:19 -0000	1.2
+++ bsd.after-import.mk	13 Aug 2017 19:06:10 -0000
@@ -56,6 +56,7 @@
 
 # Makefiles need a little more tweaking than say config.h
 MAKEFILE_SED = 	sed -e '/^MACHINE/d' \
+	-e '/include.*VERSION/d' \
 	-e '/^PROG/ { s,=,?=,;s,bmake,$${.CURDIR:T},; }' \
 	-e 's,^.-include,.sinclude,' \
 	-e '/^\..*include  *</ { s,<,<bsd.,;/autoconf/d; }' \
Index: configure
===================================================================
RCS file: /cvsroot/pkgsrc/devel/bmake/files/configure,v
retrieving revision 1.15
diff -u -r1.15 configure
--- configure	19 May 2015 22:01:19 -0000	1.15
+++ configure	13 Aug 2017 19:06:13 -0000
@@ -591,6 +591,7 @@
 #endif"
 
 ac_subst_vars='LTLIBOBJS
+_MAKE_VERSION
 filemon_h
 use_meta
 diff_u
@@ -2263,6 +2264,8 @@
 *) srcdir=`cd $srcdir && pwd`;;
 esac
 
+. $srcdir/VERSION
+
 
 # Check whether --with-defshell was given.
 if test "${with_defshell+set}" = set; then :
Index: configure.in
===================================================================
RCS file: /cvsroot/pkgsrc/devel/bmake/files/configure.in,v
retrieving revision 1.13
diff -u -r1.13 configure.in
--- configure.in	19 May 2015 22:01:19 -0000	1.13
+++ configure.in	13 Aug 2017 19:06:13 -0000
@@ -14,6 +14,9 @@
 *) srcdir=`cd $srcdir && pwd`;;
 esac
 
+dnl get _MAKE_VERSION
+. $srcdir/VERSION
+
 dnl
 AC_ARG_WITH(defshell,
 [  --with-defshell=SHELL  use SHELL by default - must be sh compatible, use sh or ksh to pick the internal definitions],
@@ -375,6 +378,7 @@
 AC_SUBST(diff_u)
 AC_SUBST(use_meta)
 AC_SUBST(filemon_h)
+AC_SUBST(_MAKE_VERSION)
 AC_OUTPUT(makefile Makefile.config make-bootstrap.sh unit-tests/Makefile)
 
 cat <<EOF
Index: make-bootstrap.sh.in
===================================================================
RCS file: /cvsroot/pkgsrc/devel/bmake/files/make-bootstrap.sh.in,v
retrieving revision 1.5
diff -u -r1.5 make-bootstrap.sh.in
--- make-bootstrap.sh.in	24 Jan 2016 16:14:44 -0000	1.5
+++ make-bootstrap.sh.in	13 Aug 2017 19:06:13 -0000
@@ -13,7 +13,7 @@
 CC="@CC@"
 CFLAGS="@CFLAGS@ -I. -I${srcdir} @DEFS@ @CPPFLAGS@ -DMAKE_NATIVE ${XDEFS} -DBMAKE_PATH_MAX=@bmake_path_max@"
 
-MAKE_VERSION=`sed -n '/^MAKE_VERSION=/s,.*=[^0-9]*,,p' $srcdir/Makefile`
+MAKE_VERSION=@_MAKE_VERSION@
 
 MDEFS="-DMAKE_VERSION=\"$MAKE_VERSION\" \
 -D@force_machine@MACHINE=\"@machine@\" -DPKGSRC_MACHINE_ARCH=\"@machine_arch@\" \