devel/mirmake: import mirmake-20141220 as wip/mirmake.

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: devel/mirmake: import mirmake-20141220 as wip/mirmake.
From: Paolo Vincenzo Olivo <vms%retrobsd.ddns.net@localhost>
Date: Tue, 28 Feb 2023 18:51:48 +0000
Module Name:	pkgsrc-wip
Committed By:	Paolo Vincenzo Olivo <vms%retrobsd.ddns.net@localhost>
Pushed By:	vms
Date:		Tue Feb 28 19:51:48 2023 +0100
Changeset:	e6f0e51e52476e04078345310f23f3a98a6218a2

Added Files:
	mirmake/DESCR
	mirmake/Makefile
	mirmake/PLIST
	mirmake/distinfo
	mirmake/patches/patch-Build.sh
	mirmake/patches/patch-dist_scripts_Build.sh
	mirmake/patches/patch-dist_src_usr.bin_xinstall_xinstall.c

Log Message:
devel/mirmake: import mirmake-20141220 as wip/mirmake.

MirMake is a package of MirBSD's make(1) as well as its system makefile
includes, a few required tools, and a library containing hash functions,
strlcpy and strlcat functions, etc. for operating systems which do not
have these in libc. Tools included are: bmake (name is freely
choosable), UCB install (only on Interix/SFU), lorder, mkdep, tsort
(required by a few *.mk files), readlink (re- quired by bsd.obj.mk and
bsd.cfwrap.mk).

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

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

diffstat:
 mirmake/DESCR                                      |  7 +++
 mirmake/Makefile                                   | 59 ++++++++++++++++++++++
 mirmake/PLIST                                      | 40 +++++++++++++++
 mirmake/distinfo                                   |  8 +++
 mirmake/patches/patch-Build.sh                     | 15 ++++++
 mirmake/patches/patch-dist_scripts_Build.sh        | 32 ++++++++++++
 .../patch-dist_src_usr.bin_xinstall_xinstall.c     | 24 +++++++++
 7 files changed, 185 insertions(+)

diffs:
diff --git a/mirmake/DESCR b/mirmake/DESCR
new file mode 100644
index 0000000000..8dda27905b
--- /dev/null
+++ b/mirmake/DESCR
@@ -0,0 +1,7 @@
+MirMake is a package of MirBSD's make(1) as well as its system makefile
+includes, a few required tools, and a library containing hash functions,
+strlcpy and strlcat functions, etc. for operating systems which do not
+have these in libc. Tools included are: bmake (name is freely
+choosable), UCB install (only on Interix/SFU), lorder, mkdep, tsort
+(required by a few *.mk files), readlink (re- quired by bsd.obj.mk and
+bsd.cfwrap.mk).
diff --git a/mirmake/Makefile b/mirmake/Makefile
new file mode 100644
index 0000000000..3493cbe65c
--- /dev/null
+++ b/mirmake/Makefile
@@ -0,0 +1,59 @@
+# $NetBSD$
+
+DISTNAME=	mirmake_20141220.orig
+PKGNAME=	mirmake-20141220
+CATEGORIES=	devel
+MASTER_SITES=	http://www.mirbsd.org/MirOS/dist/mir/make/
+
+MAINTAINER=	vins%NetBSD.org@localhost
+HOMEPAGE=	http://www.mirbsd.org/man1/make.htm
+COMMENT=	Portable version of MirBSD make(1) and associated tools
+LICENSE=	modified-bsd AND isc AND miros
+
+.if exists(/bin/ksh)
+KSH=		/bin/ksh
+.else
+TOOL_DEPENDS+=	mksh-[0-9]*:../../shells/mksh
+KSH=		${PREFIX}/bin/mksh
+.endif
+
+UID=	`id -un`
+GID=	`id -gn`
+
+SUBST_CLASSES+=		paths
+SUBST_STAGE.paths=	pre-configure
+SUBST_FILES.paths=	Build.sh
+SUBST_VARS.paths=	PREFIX
+SUBST_MESSAGE.paths=	Include pkgsrc PREFIX in searched paths.
+
+.include "../../mk/bsd.prefs.mk"
+
+# build script accepts a number of arguments 
+BUILD_ARGS=	${OPSYS}
+BUILD_ARGS+=	${PREFIX}
+BUILD_ARGS+=	${PKGMANDIR}/man
+BUILD_ARGS+=	mbmake
+BUILD_ARGS+=	""
+BUILD_ARGS+=	""
+BUILD_ARGS+=	""
+BUILD_ARGS+=	${KSH}
+BUILD_ARGS+=	${UID}:${GID}
+
+WRKSRC=		${WRKDIR}/mirmake
+
+MAKE_ENV+=	LIBS=${LIBS:Q}
+MAKE_ENV+=	OVERRIDE_MKSH=${KSH}
+
+do-build:
+	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV}			\
+		${SH} ${WRKSRC}/Build.sh ${BUILD_ARGS}
+
+do-install:
+	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${INSTALL_ENV}	\
+		${SH} ${WRKSRC}/Install.sh
+
+.if ${OPSYS} == "Linux"
+.  include "../../devel/libbsd/buildlink3.mk"
+.endif
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/mirmake/PLIST b/mirmake/PLIST
new file mode 100644
index 0000000000..ca4a8a9f18
--- /dev/null
+++ b/mirmake/PLIST
@@ -0,0 +1,40 @@
+@comment $NetBSD$
+bin/binstall
+bin/lndir
+bin/lorder
+bin/mbmake
+bin/mkdep
+bin/tsort
+man/man1/binstall.1
+man/man1/lndir.1
+man/man1/lorder.1
+man/man1/mbmake.1
+man/man1/mkdep.1
+man/man1/tsort.1
+share/mbmake/PSD12.make.txt
+share/mbmake/adler32.h
+share/mbmake/bsd.cfwrap.mk
+share/mbmake/bsd.dep.mk
+share/mbmake/bsd.doc.mk
+share/mbmake/bsd.lib.mk
+share/mbmake/bsd.lt.mk
+share/mbmake/bsd.man.mk
+share/mbmake/bsd.obj.mk
+share/mbmake/bsd.own.mk
+share/mbmake/bsd.prog.mk
+share/mbmake/bsd.subdir.mk
+share/mbmake/bsd.sys.mk
+share/mbmake/getopt.h
+share/mbmake/libmirmake.a
+share/mbmake/md4.h
+share/mbmake/md5.h
+share/mbmake/mirmake.h
+share/mbmake/rmd160.h
+share/mbmake/sfv.h
+share/mbmake/sha1.h
+share/mbmake/sha2.h
+share/mbmake/suma.h
+share/mbmake/sys.mk
+share/mbmake/sysexits.h
+share/mbmake/tiger.h
+share/mbmake/whirlpool.h
diff --git a/mirmake/distinfo b/mirmake/distinfo
new file mode 100644
index 0000000000..9cfd9a8d59
--- /dev/null
+++ b/mirmake/distinfo
@@ -0,0 +1,8 @@
+$NetBSD$
+
+BLAKE2s (mirmake_20141220.orig.tar.gz) = 0b7c1d14d47c8a36be95d55c51af816c52b6d54c475ada766fb8be813703a7a1
+SHA512 (mirmake_20141220.orig.tar.gz) = c7a66b8bb4c196ff1e676e4dac2dd67ab7c653ef6b64a2424ce8a3481434a4afca5436b8cb77cb954a4efc7ae7deedb656060f10b2d6f54b4d9f14c759a6d604
+Size (mirmake_20141220.orig.tar.gz) = 390984 bytes
+SHA1 (patch-Build.sh) = f1b5326882a2c5ae77586043567097fbe4e4e735
+SHA1 (patch-dist_scripts_Build.sh) = b733aa915f28af2690fc61b12067c2e2a532879b
+SHA1 (patch-dist_src_usr.bin_xinstall_xinstall.c) = 4778683e066d85b03b26ef29d27bf7a50a75b53e
diff --git a/mirmake/patches/patch-Build.sh b/mirmake/patches/patch-Build.sh
new file mode 100644
index 0000000000..95dff3cd69
--- /dev/null
+++ b/mirmake/patches/patch-Build.sh
@@ -0,0 +1,15 @@
+$NetBSD$
+
+pkgsrc PREFIX support.
+
+--- Build.sh.orig	2014-12-20 22:14:21.000000000 +0000
++++ Build.sh
+@@ -141,7 +141,7 @@ fi
+ 
+ mktest=
+ for f in mksh mirbsdksh ksh; do
+-	for d in /usr/bin /usr/local/bin /bin /sw/bin; do
++	for d in @PREFIX@/bin /usr/bin /usr/local/bin /bin /sw/bin; do
+ 		mktest="${mktest}${d}/${f} "
+ 	done
+ done
diff --git a/mirmake/patches/patch-dist_scripts_Build.sh b/mirmake/patches/patch-dist_scripts_Build.sh
new file mode 100644
index 0000000000..239276244f
--- /dev/null
+++ b/mirmake/patches/patch-dist_scripts_Build.sh
@@ -0,0 +1,32 @@
+$NetBSD$
+
+Support pdksh.
+Do not require perl.
+
+--- dist/scripts/Build.sh.orig	2014-12-20 22:34:27.000000000 +0000
++++ dist/scripts/Build.sh
+@@ -66,6 +66,7 @@
+ export SHELL=$new_mirksh
+ unset MAKE
+ 
++[[ -n $KSH_VERSION ]] && set -o braceexpand
+ [[ -n $BASH_VERSION ]] && shopt -s extglob
+ 
+ # Directories
+@@ -262,9 +263,13 @@
+ 	}
+ EOF
+ $CC $CFLAGS -o _t.exe _t.c -Werror || rm -f _t.exe
+-[[ -x _t.exe ]] || perl -pi -e \
+-    's/__attribute__\s*\(\(\s*_*bounded_*\s*\([^)]*\)\s*\)\)//' \
+-    $(find . -name \*.[ch])
++[[ -x _t.exe ]] || find . -name \*.[ch] -exec sh -c '
++    T=/tmp/mirmake.$$.tmp
++    B='[[:blank:]]'
++    sed -e "s/__attribute__$B*(($B*_*bounded_*$B*([^)]*)$B*))//" {} > $T
++    test $? -eq 0 -a -s $T   || { rm -f $T; exit 1; }	  # error, bogus: delete
++    cmp -s {} $T || mv $T {} || { rm -f $T; exit 1; }	  # rename failed:  "
++    test -f $T && rm -f $T			     ' \; # unchanged file: "
+ rm -f _t.*
+ 
+ if [[ $binown = - ]]; then
diff --git a/mirmake/patches/patch-dist_src_usr.bin_xinstall_xinstall.c b/mirmake/patches/patch-dist_src_usr.bin_xinstall_xinstall.c
new file mode 100644
index 0000000000..804adf2ad6
--- /dev/null
+++ b/mirmake/patches/patch-dist_src_usr.bin_xinstall_xinstall.c
@@ -0,0 +1,24 @@
+$NetBSD$
+
+NetBSD doesn't define `strtofflags'.
+
+--- dist/src/usr.bin/xinstall/xinstall.c.orig	2014-12-20 22:27:39.000000000 +0000
++++ dist/src/usr.bin/xinstall/xinstall.c
+@@ -134,7 +134,7 @@
+ #endif
+ 	u_int iflags;
+ 	int ch, no_target;
+-#if defined(BSD) || defined(__APPLE__)
++#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__APPLE__)
+ 	char *flags;
+ #endif
+ 	char *to_name, *group = NULL, *owner = NULL;
+@@ -155,7 +155,7 @@
+ 			/* For backwards compatibility. */
+ 			break;
+ 		case 'f':
+-#if defined(BSD) || defined(__APPLE__)
++#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__APPLE__)
+ 			flags = optarg;
+ 			if (strtofflags(&flags, &fset, NULL))
+ 				errx(EX_USAGE, "%s: invalid flag", flags);
Prev by Date: py-rns: Fix AutoInterface on NetBSD
Next by Date: + mirmake
Previous by Thread: py-rns: Fix AutoInterface on NetBSD
Next by Thread: + mirmake
Indexes:
Home | Main Index | Thread Index | Old Index