CVS commit: pkgsrc/devel/bmake/files

["Brook Milligan" <brook%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   brook
Date:           Tue Aug 15 15:54:06 UTC 2017

Modified Files:
        pkgsrc/devel/bmake/files: FILES Makefile Makefile.config.in
            bsd.after-import.mk configure configure.in make-bootstrap.sh.in
Added Files:
        pkgsrc/devel/bmake/files: VERSION

Log Message:
Fix a problem with MAKE_VERSION being undefined on case-insentive filesystems.

On case-insensitive filesystems such as MacOS, two files (Makefile and makefile,
which is created by configure from makefile.in) collide.  Only the former
defines MAKE_VERSION, but it is replaced by the latter.  Consequently,
MAKE_VERSION is defined as an empty string on these systems.  This patch is
the result of a discussion on tech-pkg (see the thread following
http://mail-index.netbsd.org/tech-pkg/2017/08/13/msg018629.html) and is
based upon code incorporated into bmake v20170812.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/bmake/files/FILES
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/bmake/files/Makefile \
    pkgsrc/devel/bmake/files/bsd.after-import.mk
cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/devel/bmake/files/Makefile.config.in
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/bmake/files/VERSION
cvs rdiff -u -r1.15 -r1.16 pkgsrc/devel/bmake/files/configure
cvs rdiff -u -r1.13 -r1.14 pkgsrc/devel/bmake/files/configure.in
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/bmake/files/make-bootstrap.sh.in

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

Modified files:

Index: pkgsrc/devel/bmake/files/FILES
diff -u pkgsrc/devel/bmake/files/FILES:1.7 pkgsrc/devel/bmake/files/FILES:1.8
--- pkgsrc/devel/bmake/files/FILES:1.7  Tue May 19 22:01:19 2015
+++ pkgsrc/devel/bmake/files/FILES      Tue Aug 15 15:54:06 2017
@@ -5,6 +5,7 @@ Makefile.config.in
 PSD.doc/Makefile
 PSD.doc/tutorial.ms
 README
+VERSION
 aclocal.m4
 arch.c
 bmake.1

Index: pkgsrc/devel/bmake/files/Makefile
diff -u pkgsrc/devel/bmake/files/Makefile:1.2 pkgsrc/devel/bmake/files/Makefile:1.3
--- pkgsrc/devel/bmake/files/Makefile:1.2       Tue May 19 22:01:19 2015
+++ pkgsrc/devel/bmake/files/Makefile   Tue Aug 15 15:54:06 2017
@@ -1,7 +1,4 @@
-#      $Id: Makefile,v 1.2 2015/05/19 22:01:19 joerg Exp $
-
-# Base version on src date
-MAKE_VERSION= 20150505
+#      $Id: Makefile,v 1.3 2017/08/15 15:54:06 brook Exp $
 
 PROG=  bmake
 
@@ -57,6 +54,8 @@ SRCS+= \
        lstReplace.c \
        lstSucc.c
 
+.-include "VERSION"
+
 # this file gets generated by configure
 .-include "Makefile.config"
 
Index: pkgsrc/devel/bmake/files/bsd.after-import.mk
diff -u pkgsrc/devel/bmake/files/bsd.after-import.mk:1.2 pkgsrc/devel/bmake/files/bsd.after-import.mk:1.3
--- pkgsrc/devel/bmake/files/bsd.after-import.mk:1.2    Tue May 19 22:01:19 2015
+++ pkgsrc/devel/bmake/files/bsd.after-import.mk        Tue Aug 15 15:54:06 2017
@@ -1,4 +1,4 @@
-# $Id: bsd.after-import.mk,v 1.2 2015/05/19 22:01:19 joerg Exp $
+# $Id: bsd.after-import.mk,v 1.3 2017/08/15 15:54:06 brook Exp $
 
 # This makefile is for use when integrating bmake into a BSD build
 # system.  Use this makefile after importing bmake.
@@ -56,6 +56,7 @@ bootstrap:    ${BMAKE_SRC}/boot-strap ${MAK
 
 # 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: pkgsrc/devel/bmake/files/Makefile.config.in
diff -u pkgsrc/devel/bmake/files/Makefile.config.in:1.1.1.1 pkgsrc/devel/bmake/files/Makefile.config.in:1.2
--- pkgsrc/devel/bmake/files/Makefile.config.in:1.1.1.1 Tue May 19 21:36:43 2015
+++ pkgsrc/devel/bmake/files/Makefile.config.in Tue Aug 15 15:54:06 2017
@@ -1,5 +1,7 @@
 # things set by configure
 
+_MAKE_VERSION=@_MAKE_VERSION@
+
 prefix= @prefix@
 srcdir= @srcdir@
 CC?= @CC@

Index: pkgsrc/devel/bmake/files/configure
diff -u pkgsrc/devel/bmake/files/configure:1.15 pkgsrc/devel/bmake/files/configure:1.16
--- pkgsrc/devel/bmake/files/configure:1.15     Tue May 19 22:01:19 2015
+++ pkgsrc/devel/bmake/files/configure  Tue Aug 15 15:54:06 2017
@@ -591,6 +591,7 @@ ac_includes_default="\
 #endif"
 
 ac_subst_vars='LTLIBOBJS
+_MAKE_VERSION
 filemon_h
 use_meta
 diff_u
@@ -2263,6 +2264,8 @@ case "$srcdir" in
 *) srcdir=`cd $srcdir && pwd`;;
 esac
 
+. $srcdir/VERSION
+
 
 # Check whether --with-defshell was given.
 if test "${with_defshell+set}" = set; then :

Index: pkgsrc/devel/bmake/files/configure.in
diff -u pkgsrc/devel/bmake/files/configure.in:1.13 pkgsrc/devel/bmake/files/configure.in:1.14
--- pkgsrc/devel/bmake/files/configure.in:1.13  Tue May 19 22:01:19 2015
+++ pkgsrc/devel/bmake/files/configure.in       Tue Aug 15 15:54:06 2017
@@ -1,6 +1,6 @@
 dnl
 dnl RCSid:
-dnl    $Id: configure.in,v 1.13 2015/05/19 22:01:19 joerg Exp $
+dnl    $Id: configure.in,v 1.14 2017/08/15 15:54:06 brook Exp $
 dnl
 dnl Process this file with autoconf to produce a configure script
 dnl
@@ -14,6 +14,9 @@ case "$srcdir" in
 *) 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(GCC)
 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: pkgsrc/devel/bmake/files/make-bootstrap.sh.in
diff -u pkgsrc/devel/bmake/files/make-bootstrap.sh.in:1.5 pkgsrc/devel/bmake/files/make-bootstrap.sh.in:1.6
--- pkgsrc/devel/bmake/files/make-bootstrap.sh.in:1.5   Sun Jan 24 16:14:44 2016
+++ pkgsrc/devel/bmake/files/make-bootstrap.sh.in       Tue Aug 15 15:54:06 2017
@@ -13,7 +13,7 @@ esac
 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@\" \

Added files:

Index: pkgsrc/devel/bmake/files/VERSION
diff -u /dev/null pkgsrc/devel/bmake/files/VERSION:1.1
--- /dev/null   Tue Aug 15 15:54:06 2017
+++ pkgsrc/devel/bmake/files/VERSION    Tue Aug 15 15:54:06 2017
@@ -0,0 +1,2 @@
+# keep this compatible with sh and make
+_MAKE_VERSION=20150505