pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc
Module Name: pkgsrc
Committed By: wiz
Date: Sun Mar 30 15:07:06 UTC 2025
Modified Files:
pkgsrc/bootstrap: README bootstrap
pkgsrc/mk: bsd.prefs.mk pthread.builtin.mk
pkgsrc/mk/configure: gnu-configure.mk
pkgsrc/mk/pkgtasks: bsd.pkgtasks.mk
Log Message:
mk: remove support for MirBSD
Upstream project has stopped.
Ok bsiegert@
As proposed on tech-pkg.
To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 pkgsrc/bootstrap/README
cvs rdiff -u -r1.331 -r1.332 pkgsrc/bootstrap/bootstrap
cvs rdiff -u -r1.456 -r1.457 pkgsrc/mk/bsd.prefs.mk
cvs rdiff -u -r1.17 -r1.18 pkgsrc/mk/pthread.builtin.mk
cvs rdiff -u -r1.33 -r1.34 pkgsrc/mk/configure/gnu-configure.mk
cvs rdiff -u -r1.9 -r1.10 pkgsrc/mk/pkgtasks/bsd.pkgtasks.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/bootstrap/README
diff -u pkgsrc/bootstrap/README:1.42 pkgsrc/bootstrap/README:1.43
--- pkgsrc/bootstrap/README:1.42 Sun Mar 30 14:50:39 2025
+++ pkgsrc/bootstrap/README Sun Mar 30 15:07:06 2025
@@ -1,4 +1,4 @@
-$NetBSD: README,v 1.42 2025/03/30 14:50:39 wiz Exp $
+$NetBSD: README,v 1.43 2025/03/30 15:07:06 wiz Exp $
To try to get pkgsrc working on your system, please try the following
as root:
@@ -145,7 +145,6 @@ Platforms believed to have no users
* AIX (no cwrappers)
BSDOS (no README)
Haiku
- IRIX
Interix
- MirBSD (patched libtool support removed August 2022)
+ IRIX
* OSF1
Index: pkgsrc/bootstrap/bootstrap
diff -u pkgsrc/bootstrap/bootstrap:1.331 pkgsrc/bootstrap/bootstrap:1.332
--- pkgsrc/bootstrap/bootstrap:1.331 Sun Mar 30 14:50:39 2025
+++ pkgsrc/bootstrap/bootstrap Sun Mar 30 15:07:06 2025
@@ -1,6 +1,6 @@
#! /bin/sh
-# $NetBSD: bootstrap,v 1.331 2025/03/30 14:50:39 wiz Exp $
+# $NetBSD: bootstrap,v 1.332 2025/03/30 15:07:06 wiz Exp $
#
# Copyright (c) 2001-2011 Alistair Crooks <agc%NetBSD.org@localhost>
# All rights reserved.
@@ -767,28 +767,6 @@ Minix)
machine_arch=`uname -p`
check_compiler=yes
;;
-MirBSD)
- root_group=wheel
- need_pax=yes
- machine_arch=`arch -s`
- # there is no /usr/bin/cc, so use mgcc if unset
- test -n "$CC" || { CC=mgcc; export CC; }
- # get some variables from the native make if unset
- for var in CFLAGS CPPFLAGS LDFLAGS; do
- # check if variable is already set
- eval _tmp=\"\$$var\"
- [ "x$_tmp" != x ] && continue
- # ask the native make (EXPERIMENTAL = don't add -Werror)
- # the -I${.CURDIR} dance is to prevent junk in CPPFLAGS
- _tmp=`printf '%s\nall:\n\t@%s %%s %s=${%s:M*:Q:Q}\n%s\n%s\n' \
- $var'+=-I${.CURDIR}' printf $var $var':S/-I${.CURDIR}//' \
- EXPERIMENTAL=yes '.include <bsd.prog.mk>' | \
- (unset MAKECONF; /usr/bin/make -f - all 2>/dev/null) | \
- sed 's/^x//'`
- eval $_tmp
- eval export $var
- done
- ;;
NetBSD)
root_group=wheel
machine_arch=`uname -p`
Index: pkgsrc/mk/bsd.prefs.mk
diff -u pkgsrc/mk/bsd.prefs.mk:1.456 pkgsrc/mk/bsd.prefs.mk:1.457
--- pkgsrc/mk/bsd.prefs.mk:1.456 Sat Feb 22 21:27:07 2025
+++ pkgsrc/mk/bsd.prefs.mk Sun Mar 30 15:07:06 2025
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.456 2025/02/22 21:27:07 nia Exp $
+# $NetBSD: bsd.prefs.mk,v 1.457 2025/03/30 15:07:06 wiz Exp $
#
# This file includes the mk.conf file, which contains the user settings.
#
@@ -233,11 +233,6 @@ NATIVE_OS_VERSION= 3.0
. endif
. endif
-.elif ${NATIVE_OPSYS} == "MirBSD"
-NATIVE_LOWER_OPSYS?= mirbsd
-NATIVE_LOWER_OPSYS_VERSUFFIX= ${NATIVE_OS_VERSION}
-NATIVE_LOWER_VENDOR?= unknown
-
.elif !empty(NATIVE_OPSYS:MIRIX*)
NATIVE_LOWER_OPSYS?= irix
NATIVE_LOWER_OPSYS_VERSUFFIX?= ${NATIVE_OS_VERSION}
@@ -522,9 +517,6 @@ OBJECT_FMT?= ELF
OBJECT_FMT= ELF
.elif ${OPSYS} == "Minix"
OBJECT_FMT= ELF
-.elif ${OPSYS} == "MirBSD"
-OBJECT_FMT= ELF
-MKPROFILE= no
.elif ${OPSYS} == "Linux"
OBJECT_FMT= ELF
.elif ${OPSYS} == "AIX"
Index: pkgsrc/mk/pthread.builtin.mk
diff -u pkgsrc/mk/pthread.builtin.mk:1.17 pkgsrc/mk/pthread.builtin.mk:1.18
--- pkgsrc/mk/pthread.builtin.mk:1.17 Sat Jan 13 20:26:47 2024
+++ pkgsrc/mk/pthread.builtin.mk Sun Mar 30 15:07:06 2025
@@ -1,4 +1,4 @@
-# $NetBSD: pthread.builtin.mk,v 1.17 2024/01/13 20:26:47 riastradh Exp $
+# $NetBSD: pthread.builtin.mk,v 1.18 2025/03/30 15:07:06 wiz Exp $
BUILTIN_PKG:= pthread
@@ -62,7 +62,7 @@ BUILDLINK_LDFLAGS.pthread= # empty
# XXX This should really be a check for GCC!
# XXX
BUILDLINK_OPSYS_SUPPORT_PTHREAD= \
- DragonFly FreeBSD Linux MirBSD NetBSD OpenBSD SunOS
+ DragonFly FreeBSD Linux NetBSD OpenBSD SunOS
. if !empty(BUILDLINK_OPSYS_SUPPORT_PTHREAD:M${OPSYS})
BUILDLINK_CFLAGS.pthread+= -pthread
BUILDLINK_LDFLAGS.pthread+= -pthread
Index: pkgsrc/mk/configure/gnu-configure.mk
diff -u pkgsrc/mk/configure/gnu-configure.mk:1.33 pkgsrc/mk/configure/gnu-configure.mk:1.34
--- pkgsrc/mk/configure/gnu-configure.mk:1.33 Fri Oct 4 19:27:15 2024
+++ pkgsrc/mk/configure/gnu-configure.mk Sun Mar 30 15:07:06 2025
@@ -1,4 +1,4 @@
-# $NetBSD: gnu-configure.mk,v 1.33 2024/10/04 19:27:15 rillig Exp $
+# $NetBSD: gnu-configure.mk,v 1.34 2025/03/30 15:07:06 wiz Exp $
#
# Package-settable variables:
#
@@ -63,10 +63,6 @@ CONFIGURE_ENV+= ac_given_INSTALL=${INSTA
CONFIGURE_ENV+= lt_cv_sys_max_cmd_len=${_OPSYS_MAX_CMDLEN_CMD:sh}
.endif
-.if ${OPSYS} == "MirBSD"
-CONFIGURE_ENV+= lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$$'
-.endif
-
.if ${MACHINE_PLATFORM:MDarwin-[0-8].*-powerpc}
# ld does not have -rpath
CONFIGURE_ARGS+= --disable-rpath
@@ -192,23 +188,6 @@ configure-scripts-override:
###
do-configure-pre-hook: configure-scripts-osdep
-.if ${OPSYS} == "MirBSD"
-# awk script by Benny Siegert <bsiegert%mirbsd.de@localhost>
-_SCRIPT.configure-scripts-osdep= \
- ${AWK} 'BEGIN { found = 0 } \
- /dynamic linker characteristics.../ { found = 1 } \
- /^netbsd/ { \
- if (found) { \
- sub("netbsd","mirbsd*|netbsd"); \
- found = 0; \
- } \
- } \
- { print $$0 }' $$file >$$file.override; \
- ${CHMOD} +x $$file.override; \
- ${TOUCH} -r $$file $$file.override; \
- ${MV} -f $$file.override $$file
-.endif
-
.PHONY: configure-scripts-osdep
configure-scripts-osdep:
.if defined(_SCRIPT.configure-scripts-osdep) && !empty(_SCRIPT.configure-scripts-osdep)
Index: pkgsrc/mk/pkgtasks/bsd.pkgtasks.mk
diff -u pkgsrc/mk/pkgtasks/bsd.pkgtasks.mk:1.9 pkgsrc/mk/pkgtasks/bsd.pkgtasks.mk:1.10
--- pkgsrc/mk/pkgtasks/bsd.pkgtasks.mk:1.9 Fri Nov 30 18:38:20 2018
+++ pkgsrc/mk/pkgtasks/bsd.pkgtasks.mk Sun Mar 30 15:07:06 2025
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkgtasks.mk,v 1.9 2018/11/30 18:38:20 rillig Exp $
+# $NetBSD: bsd.pkgtasks.mk,v 1.10 2025/03/30 15:07:06 wiz Exp $
#
# Copyright (c) 2017 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -201,5 +201,5 @@ FILES_SUBST+= UNAME=${UNAME:Q}
# Variables for addgroup/adduser programs used by pkgtasks.
FILES_SUBST+= GROUPADD=${GROUPADD:Q}
FILES_SUBST+= PW=${PW:Q} # DragonFly, FreeBSD
-FILES_SUBST+= PWD_MKDB=${PWD_MKDB:Q} # MirBSD
+FILES_SUBST+= PWD_MKDB=${PWD_MKDB:Q}
FILES_SUBST+= USERADD=${USERADD:Q}
Home |
Main Index |
Thread Index |
Old Index