dmake: Add patches

[Michael Baeuerle <micha%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Michael Baeuerle <micha%NetBSD.org@localhost>
Pushed By:	micha
Date:		Fri Jun 25 14:00:02 2021 +0200
Changeset:	88745fe064a85ab74325453e6b3d3b6d3627b256

Added Files:
	dmake/patches/patch-sunpro_Make_bin_make_common_Makefile.def
	dmake/patches/patch-sunpro_Make_bin_make_common_read.cc

Log Message:
dmake: Add patches

Search file with default rules in "share/lib/dmake/make.rules".

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

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

diffstat:
 .../patch-sunpro_Make_bin_make_common_Makefile.def | 16 +++++++++++++++
 .../patch-sunpro_Make_bin_make_common_read.cc      | 24 ++++++++++++++++++++++
 2 files changed, 40 insertions(+)

diffs:
diff --git a/dmake/patches/patch-sunpro_Make_bin_make_common_Makefile.def b/dmake/patches/patch-sunpro_Make_bin_make_common_Makefile.def
new file mode 100644
index 0000000000..3bf42d61ef
--- /dev/null
+++ b/dmake/patches/patch-sunpro_Make_bin_make_common_Makefile.def
@@ -0,0 +1,16 @@
+$NetBSD$
+
+Install default rules to "share/lib/dmake".
+(to make it clear that they are not associated with BSD make)
+
+--- sunpro/Make/bin/make/common/Makefile.def.orig	2017-04-18 22:58:00.000000000 +0000
++++ sunpro/Make/bin/make/common/Makefile.def
+@@ -6,7 +6,7 @@ include		$(SRCROOT)/$(RULESDIR)/rules.to
+ ###########################################################################
+ 
+ INSMODE=	0644
+-INSDIR=		share/lib/make
++INSDIR=		share/lib/dmake
+ TARGET=		make.rules
+ AUXSRCEXT=	.file
+ 
diff --git a/dmake/patches/patch-sunpro_Make_bin_make_common_read.cc b/dmake/patches/patch-sunpro_Make_bin_make_common_read.cc
new file mode 100644
index 0000000000..30ec0a9c27
--- /dev/null
+++ b/dmake/patches/patch-sunpro_Make_bin_make_common_read.cc
@@ -0,0 +1,24 @@
+$NetBSD$
+
+Search default rules in "share/lib/dmake" and "usr/include/dmake".
+(to make it clear that they are not associated with BSD make)
+
+--- sunpro/Make/bin/make/common/read.cc.orig	2021-05-10 17:15:50.000000000 +0000
++++ sunpro/Make/bin/make/common/read.cc
+@@ -226,14 +226,14 @@ read_simple_file(register Name makefile_
+ 						NOCATGETS("%s/../../share/lib/make"), run_dir);
+ 					} else {
+ 	                        		(void) sprintf(makerules_dir,
+-						NOCATGETS("%s/../share/lib/make"), run_dir);
++						NOCATGETS("%s/../share/lib/dmake"), run_dir);
+ 					}
+ 					add_dir_to_path(makerules_dir,
+ 							&makefile_path,
+ 							-1);
+ 				}
+ #ifdef INS_BASE
+-				add_dir_to_path(NOCATGETS(INS_BASE "/share/lib/make"),
++				add_dir_to_path(NOCATGETS(INS_BASE "/share/lib/dmake"),
+ 						&makefile_path,
+ 						-1);
+ #endif