more patches...

This commit is contained in:
c0dev0id 2023-01-11 10:10:34 +01:00
parent 94240da182
commit 53c64b33ae
150 changed files with 33268 additions and 0 deletions

View File

@ -0,0 +1,145 @@
Support for Wacom One S (CTL-472) [OpenBSD/uwacom]
Even though more product ids are maintained in usbdevs.h, OpenBSD
currently only supports the Wacom Intuos Draw (CTL-490) tablet.
I extended the support to another tablet, which identifies itself
as CTL-472 and is a more recent (and still available) model.
Index: sys/dev/usb/usbdevs.h
===================================================================
RCS file: /cvs/src/sys/dev/usb/usbdevs.h,v
retrieving revision 1.752
diff -u -p -u -p -r1.752 usbdevs.h
--- sys/dev/usb/usbdevs.h 18 May 2021 14:23:53 -0000 1.752
+++ sys/dev/usb/usbdevs.h 6 Jun 2021 17:27:24 -0000
@@ -4582,6 +4582,7 @@
#define USB_PRODUCT_WACOM_GRAPHIRE4_4X5 0x0015 /* Graphire4 Classic A6 */
#define USB_PRODUCT_WACOM_INTUOSA5 0x0021 /* Intuos A5 */
#define USB_PRODUCT_WACOM_INTUOS_DRAW 0x033b /* Intuos Draw (CTL-490) */
+#define USB_PRODUCT_WACOM_ONE_S 0x037a /* One (CTL-472) */
#define USB_PRODUCT_WACOM_INTUOS_PRO_S 0x0392 /* Intuos Pro S */
/* WAGO Kontakttechnik products */
Index: sys/dev/usb/uwacom.c
===================================================================
RCS file: /cvs/src/sys/dev/usb/uwacom.c,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 uwacom.c
--- sys/dev/usb/uwacom.c 23 Aug 2020 11:08:02 -0000 1.2
+++ sys/dev/usb/uwacom.c 6 Jun 2021 17:27:24 -0000
@@ -39,6 +39,8 @@ struct uwacom_softc {
struct uhidev sc_hdev;
struct hidms sc_ms;
struct hid_location sc_loc_tip_press;
+ int sc_big_endian;
+ int sc_use_pressure;
};
struct cfdriver uwacom_cd = {
@@ -47,7 +49,8 @@ struct cfdriver uwacom_cd = {
const struct usb_devno uwacom_devs[] = {
- { USB_VENDOR_WACOM, USB_PRODUCT_WACOM_INTUOS_DRAW }
+ { USB_VENDOR_WACOM, USB_PRODUCT_WACOM_INTUOS_DRAW },
+ { USB_VENDOR_WACOM, USB_PRODUCT_WACOM_ONE_S }
};
int uwacom_match(struct device *, void *, void *);
@@ -102,6 +105,8 @@ uwacom_attach(struct device *parent, str
sc->sc_hdev.sc_parent = uha->parent;
sc->sc_hdev.sc_udev = uaa->device;
sc->sc_hdev.sc_report_id = uha->reportid;
+ sc->sc_big_endian = 0;
+ sc->sc_use_pressure = 0;
usbd_set_idle(uha->parent->sc_udev, uha->parent->sc_ifaceno, 0, 0);
@@ -121,9 +126,25 @@ uwacom_attach(struct device *parent, str
ms->sc_loc_y.size = 16;
ms->sc_tsscale.minx = 0;
- ms->sc_tsscale.maxx = 7600;
ms->sc_tsscale.miny = 0;
- ms->sc_tsscale.maxy = 4750;
+ if (uha->uaa->product == USB_PRODUCT_WACOM_ONE_S) {
+ static uByte reportbuf[2];
+ reportbuf[0] = 0x02;
+ reportbuf[1] = 0x02;
+ uhidev_set_report(uha->parent, UHID_FEATURE_REPORT, 2,
+ &reportbuf, 2);
+ ms->sc_tsscale.maxx = 15200;
+ ms->sc_tsscale.maxy = 9500;
+ }
+
+ if (uha->uaa->product == USB_PRODUCT_WACOM_INTUOS_DRAW) {
+ sc->sc_big_endian = 1;
+ sc->sc_use_pressure = 1;
+ sc->sc_loc_tip_press.pos = 43;
+ sc->sc_loc_tip_press.size = 8;
+ ms->sc_tsscale.maxx = 7600;
+ ms->sc_tsscale.maxy = 4750;
+ }
ms->sc_loc_btn[0].pos = 0;
ms->sc_loc_btn[0].size = 1;
@@ -132,9 +153,6 @@ uwacom_attach(struct device *parent, str
ms->sc_loc_btn[2].pos = 2;
ms->sc_loc_btn[2].size = 1;
- sc->sc_loc_tip_press.pos = 43;
- sc->sc_loc_tip_press.size = 8;
-
hidms_attach(ms, &uwacom_accessops);
}
@@ -163,19 +181,26 @@ uwacom_intr(struct uhidev *addr, void *b
if ((data[0] & 0xf0) == 0xc0)
return;
- x = be16toh(hid_get_data(data, len, &ms->sc_loc_x));
- y = be16toh(hid_get_data(data, len, &ms->sc_loc_y));
- pressure = hid_get_data(data, len, &sc->sc_loc_tip_press);
+ if (sc->sc_big_endian == 1) {
+ x = be16toh(hid_get_data(data, len, &ms->sc_loc_x));
+ y = be16toh(hid_get_data(data, len, &ms->sc_loc_y));
+ } else {
+ x = le16toh(hid_get_data(data, len, &ms->sc_loc_x));
+ y = le16toh(hid_get_data(data, len, &ms->sc_loc_y));
+ }
for (i = 0; i < ms->sc_num_buttons; i++)
if (hid_get_data(data, len, &ms->sc_loc_btn[i]))
buttons |= (1 << i);
/* button 0 reporting is flaky, use tip pressure for it */
- if (pressure > 10)
- buttons |= 1;
- else
- buttons &= ~1;
+ if (sc->sc_use_pressure == 1) {
+ pressure = hid_get_data(data, len, &sc->sc_loc_tip_press);
+ if (pressure > 10)
+ buttons |= 1;
+ else
+ buttons &= ~1;
+ }
if (x != 0 || y != 0 || buttons != ms->sc_buttons) {
wsmouse_position(ms->sc_wsmousedev, x, y);
Index: share/man/man4/uwacom.4
===================================================================
RCS file: /cvs/src/share/man/man4/uwacom.4,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 uwacom.4
--- share/man/man4/uwacom.4 12 Sep 2016 10:39:06 -0000 1.2
+++ share/man/man4/uwacom.4 6 Jun 2021 17:27:24 -0000
@@ -42,6 +42,7 @@ driver supports the following Wacom tabl
.Bl -column "Intuos Draw" "Model Number" -offset 6n
.It Em Name Ta Em Model Number
.It Li Intuos Draw Ta CTL-490
+.It Li One Ta CTL-472
.El
.Sh SEE ALSO
.Xr uhidev 4 ,

101
acpi.diff Normal file
View File

@ -0,0 +1,101 @@
Index: sys/dev/acpi/acpitz.c
===================================================================
RCS file: /home/cvs/src/sys/dev/acpi/acpitz.c,v
retrieving revision 1.58
diff -u -p -r1.58 acpitz.c
--- sys/dev/acpi/acpitz.c 6 Apr 2022 18:59:27 -0000 1.58
+++ sys/dev/acpi/acpitz.c 30 Jun 2022 10:52:09 -0000
@@ -39,6 +39,8 @@
#define ACPITZ_TMP_RETRY (3)
#define ACPITZ_UNKNOWN (-1)
+#define PERFPOL_AUTO 1
+
struct acpitz_softc {
struct device sc_dev;
@@ -89,7 +91,9 @@ void acpitz_init(struct acpitz_softc *,
void (*acpitz_cpu_setperf)(int);
int acpitz_perflevel = -1;
extern void (*cpu_setperf)(int);
+extern int hw_power;
extern int perflevel;
+extern int perfpolicy;
#define PERFSTEP 10
#define ACPITZ_TRIPS (1L << 0)
@@ -224,6 +228,13 @@ acpitz_attach(struct device *parent, str
else
printf(": critical temperature is %d degC\n", KTOC(sc->sc_crt));
+ if ((sc->sc_psv = acpitz_gettempreading(sc, "_PSV")) == -1) {
+ printf("%s: no passive cooling temperature defined\n",
+ DEVNAME(sc));
+ } else
+ printf("%s: passive cooling temperature is %d degC\n",
+ DEVNAME(sc), KTOC(sc->sc_psv));
+
sc->sc_hot = acpitz_gettempreading(sc, "_HOT");
sc->sc_tc1 = acpitz_getreading(sc, "_TC1");
sc->sc_tc2 = acpitz_getreading(sc, "_TC2");
@@ -231,7 +242,7 @@ acpitz_attach(struct device *parent, str
/* get _PSL, _ALx */
acpitz_init(sc, ACPITZ_INIT);
- dnprintf(10, "%s: _HOT: %d _TC1: %d _TC2: %d _PSV: %d _TMP: %d "
+ printf("%s: _HOT: %d _TC1: %d _TC2: %d _PSV: %d _TMP: %d "
"_CRT: %d\n", DEVNAME(sc), sc->sc_hot, sc->sc_tc1, sc->sc_tc2,
sc->sc_psv, sc->sc_tmp, sc->sc_crt);
@@ -376,15 +387,13 @@ acpitz_refresh(void *arg)
/* passive cooling */
if (sc->sc_lasttmp != -1 && sc->sc_tc1 != -1 && sc->sc_tc2 != -1 &&
sc->sc_psv != -1) {
- dnprintf(30, "%s: passive cooling: lasttmp: %d tc1: %d "
- "tc2: %d psv: %d\n", DEVNAME(sc), sc->sc_lasttmp,
- sc->sc_tc1, sc->sc_tc2, sc->sc_psv);
-
nperf = acpitz_perflevel;
- if (sc->sc_psv <= sc->sc_tmp) {
+ if (sc->sc_psv <= sc->sc_tmp && perfpolicy == PERFPOL_AUTO && !hw_power) {
/* Passive cooling enabled */
- dnprintf(1, "%s: enabling passive %d %d\n",
- DEVNAME(sc), sc->sc_tmp, sc->sc_psv);
+ printf("%s: passive cooling: tmp: %d tc1: %d "
+ "tc2: %d psv: %d perfpol: %d pwr: %d (active)\n",
+ DEVNAME(sc), KTOC(sc->sc_tmp), sc->sc_tc1, sc->sc_tc2,
+ KTOC(sc->sc_psv), perfpolicy, hw_power);
if (!sc->sc_pse)
sc->sc_acpi->sc_pse++;
sc->sc_pse = 1;
@@ -392,6 +401,9 @@ acpitz_refresh(void *arg)
trend = sc->sc_tc1 * (sc->sc_tmp - sc->sc_lasttmp) +
sc->sc_tc2 * (sc->sc_tmp - sc->sc_psv);
+ printf("%s: trend: %d(tc1) * %d(tmp) - %d(lasttmp)) + %d(tc2) * %d(tmp) - %d(psv) = %d\n",
+ DEVNAME(sc), sc->sc_tc1, sc->sc_tmp, sc->sc_lasttmp, sc->sc_tc2, sc->sc_tmp, sc->sc_psv, trend);
+
/* Depending on trend, slow down/speed up */
if (trend > 0)
nperf -= PERFSTEP;
@@ -400,8 +412,10 @@ acpitz_refresh(void *arg)
}
else {
/* Passive cooling disabled, increase % */
- dnprintf(1, "%s: disabling passive %d %d\n",
- DEVNAME(sc), sc->sc_tmp, sc->sc_psv);
+ printf("%s: passive cooling: tmp: %d tc1: %d "
+ "tc2: %d psv: %d perfpol: %d pwr: %d (inactive)\n",
+ DEVNAME(sc), KTOC(sc->sc_tmp), sc->sc_tc1, sc->sc_tc2,
+ KTOC(sc->sc_psv), perfpolicy, hw_power);
if (sc->sc_pse)
sc->sc_acpi->sc_pse--;
sc->sc_pse = 0;
@@ -420,6 +434,7 @@ acpitz_refresh(void *arg)
if (acpitz_cpu_setperf && nperf != acpitz_perflevel) {
acpitz_perflevel = nperf;
acpitz_cpu_setperf(nperf);
+ printf("%s: set perflevel: %d\n", DEVNAME(sc), nperf);
}
}
sc->sc_lasttmp = sc->sc_tmp;

32
acpitz_force.diff Normal file
View File

@ -0,0 +1,32 @@
Index: sys/dev/acpi/acpitz.c
===================================================================
RCS file: /home/cvs/src/sys/dev/acpi/acpitz.c,v
retrieving revision 1.58
diff -u -p -r1.58 acpitz.c
--- sys/dev/acpi/acpitz.c 6 Apr 2022 18:59:27 -0000 1.58
+++ sys/dev/acpi/acpitz.c 27 Jun 2022 14:09:22 -0000
@@ -90,6 +90,7 @@ void (*acpitz_cpu_setperf)(int);
int acpitz_perflevel = -1;
extern void (*cpu_setperf)(int);
extern int perflevel;
+extern int perfpolicy;
#define PERFSTEP 10
#define ACPITZ_TRIPS (1L << 0)
@@ -381,7 +382,7 @@ acpitz_refresh(void *arg)
sc->sc_tc1, sc->sc_tc2, sc->sc_psv);
nperf = acpitz_perflevel;
- if (sc->sc_psv <= sc->sc_tmp) {
+ if (sc->sc_psv <= sc->sc_tmp && perfpolicy == 1) {
/* Passive cooling enabled */
dnprintf(1, "%s: enabling passive %d %d\n",
DEVNAME(sc), sc->sc_tmp, sc->sc_psv);
@@ -423,6 +424,7 @@ acpitz_refresh(void *arg)
}
}
sc->sc_lasttmp = sc->sc_tmp;
+ printf("DEBUG: perfpolicy=%d, perflevel=%d, acpitz_perflevel=%d\n", perfpolicy, perflevel, acpitz_perflevel);
/* active cooling */
for (i = 0; i < ACPITZ_MAX_AC; i++) {

893
alacritty-0.10.0.diff Normal file
View File

@ -0,0 +1,893 @@
Index: x11/alacritty/Makefile
===================================================================
RCS file: /home/cvs/ports/x11/alacritty/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- x11/alacritty/Makefile 15 Nov 2021 20:00:49 -0000 1.4
+++ x11/alacritty/Makefile 28 Jan 2022 20:55:20 -0000
@@ -11,8 +11,7 @@ MAINTAINER = Eric Auge <eau+obsd@unix4fu
GH_ACCOUNT = alacritty
GH_PROJECT = alacritty
-GH_TAGNAME = v0.9.0
-REVISION = 2
+GH_TAGNAME = v0.10.0
# Apache 2.0
PERMIT_PACKAGE = Yes
@@ -38,6 +37,9 @@ SEPARATE_BUILD = Yes
RELEASE_DIR = ${MODCARGO_TARGET_DIR}/release
EXTRA_DIR= ${WRKSRC}/extra
+
+# test result: FAILED. 60 passed; 1 failed;
+# failed test: config::tests::config_read_eof
do-install:
${INSTALL_PROGRAM} ${RELEASE_DIR}/alacritty ${PREFIX}/bin/
Index: x11/alacritty/crates.inc
===================================================================
RCS file: /home/cvs/ports/x11/alacritty/crates.inc,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 crates.inc
--- x11/alacritty/crates.inc 22 Oct 2021 17:24:59 -0000 1.1.1.1
+++ x11/alacritty/crates.inc 28 Jan 2022 19:46:10 -0000
@@ -1,53 +1,48 @@
-# $OpenBSD: crates.inc,v 1.1.1.1 2021/10/22 17:24:59 fcambus Exp $
-
-MODCARGO_CRATES += ab_glyph_rasterizer 0.1.4 # Apache-2.0
+# $OpenBSD$
MODCARGO_CRATES += adler32 1.2.0 # Zlib
-MODCARGO_CRATES += andrew 0.3.1 # MIT
MODCARGO_CRATES += android_glue 0.2.3 # MIT
-MODCARGO_CRATES += ansi_term 0.11.0 # MIT
+MODCARGO_CRATES += ansi_term 0.12.1 # MIT
MODCARGO_CRATES += atty 0.2.14 # MIT
MODCARGO_CRATES += autocfg 1.0.1 # Apache-2.0 OR MIT
MODCARGO_CRATES += base64 0.13.0 # MIT/Apache-2.0
MODCARGO_CRATES += bitflags 1.2.1 # MIT/Apache-2.0
MODCARGO_CRATES += block 0.1.6 # MIT
-MODCARGO_CRATES += calloop 0.6.5 # MIT
-MODCARGO_CRATES += cc 1.0.69 # MIT/Apache-2.0
+MODCARGO_CRATES += bumpalo 3.9.1 # MIT/Apache-2.0
+MODCARGO_CRATES += calloop 0.9.3 # MIT
+MODCARGO_CRATES += cc 1.0.72 # MIT/Apache-2.0
MODCARGO_CRATES += cfg-if 0.1.10 # MIT/Apache-2.0
MODCARGO_CRATES += cfg-if 1.0.0 # MIT/Apache-2.0
MODCARGO_CRATES += cgl 0.3.2 # MIT / Apache-2.0
-MODCARGO_CRATES += clap 2.33.3 # MIT
+MODCARGO_CRATES += clap 2.34.0 # MIT
MODCARGO_CRATES += clipboard-win 3.1.1 # MIT
-MODCARGO_CRATES += cmake 0.1.45 # MIT/Apache-2.0
-MODCARGO_CRATES += cocoa 0.23.0 # MIT / Apache-2.0
+MODCARGO_CRATES += cmake 0.1.48 # MIT/Apache-2.0
MODCARGO_CRATES += cocoa 0.24.0 # MIT / Apache-2.0
MODCARGO_CRATES += cocoa-foundation 0.1.0 # MIT / Apache-2.0
MODCARGO_CRATES += copypasta 0.7.1 # MIT / Apache-2.0
MODCARGO_CRATES += core-foundation 0.7.0 # MIT / Apache-2.0
-MODCARGO_CRATES += core-foundation 0.9.1 # MIT / Apache-2.0
+MODCARGO_CRATES += core-foundation 0.9.2 # MIT / Apache-2.0
MODCARGO_CRATES += core-foundation-sys 0.7.0 # MIT / Apache-2.0
-MODCARGO_CRATES += core-foundation-sys 0.8.2 # MIT / Apache-2.0
+MODCARGO_CRATES += core-foundation-sys 0.8.3 # MIT / Apache-2.0
MODCARGO_CRATES += core-graphics 0.19.2 # MIT / Apache-2.0
-MODCARGO_CRATES += core-graphics 0.22.2 # MIT / Apache-2.0
+MODCARGO_CRATES += core-graphics 0.22.3 # MIT / Apache-2.0
MODCARGO_CRATES += core-graphics-types 0.1.1 # MIT / Apache-2.0
MODCARGO_CRATES += core-text 19.2.0 # MIT/Apache-2.0
MODCARGO_CRATES += core-video-sys 0.1.4 # MIT
-MODCARGO_CRATES += crc32fast 1.2.1 # MIT OR Apache-2.0
-MODCARGO_CRATES += crossfont 0.3.1 # Apache-2.0
-MODCARGO_CRATES += darling 0.10.2 # MIT
-MODCARGO_CRATES += darling_core 0.10.2 # MIT
-MODCARGO_CRATES += darling_macro 0.10.2 # MIT
-MODCARGO_CRATES += derivative 2.2.0 # MIT/Apache-2.0
+MODCARGO_CRATES += crc32fast 1.3.0 # MIT OR Apache-2.0
+MODCARGO_CRATES += crossfont 0.3.2 # Apache-2.0
+MODCARGO_CRATES += cty 0.2.2 # MIT OR Apache-2.0
+MODCARGO_CRATES += darling 0.13.1 # MIT
+MODCARGO_CRATES += darling_core 0.13.1 # MIT
+MODCARGO_CRATES += darling_macro 0.13.1 # MIT
MODCARGO_CRATES += dirs 3.0.2 # MIT OR Apache-2.0
MODCARGO_CRATES += dirs-sys 0.3.6 # MIT OR Apache-2.0
MODCARGO_CRATES += dispatch 0.2.0 # MIT
-MODCARGO_CRATES += dlib 0.4.2 # MIT
MODCARGO_CRATES += dlib 0.5.0 # MIT
MODCARGO_CRATES += downcast-rs 1.2.0 # MIT/Apache-2.0
-MODCARGO_CRATES += dtoa 0.4.8 # MIT OR Apache-2.0
MODCARGO_CRATES += dwrote 0.11.0 # MPL-2.0
-MODCARGO_CRATES += embed-resource 1.6.3 # MIT
+MODCARGO_CRATES += embed-resource 1.6.5 # MIT
MODCARGO_CRATES += expat-sys 2.1.6 # MIT
-MODCARGO_CRATES += filetime 0.2.14 # MIT/Apache-2.0
+MODCARGO_CRATES += filetime 0.2.15 # MIT/Apache-2.0
MODCARGO_CRATES += fnv 1.0.7 # Apache-2.0 / MIT
MODCARGO_CRATES += foreign-types 0.3.2 # MIT/Apache-2.0
MODCARGO_CRATES += foreign-types 0.5.0 # MIT/Apache-2.0
@@ -62,135 +57,146 @@ MODCARGO_CRATES += fuchsia-zircon 0.3.3
MODCARGO_CRATES += fuchsia-zircon-sys 0.3.3 # BSD-3-Clause
MODCARGO_CRATES += getrandom 0.2.3 # MIT OR Apache-2.0
MODCARGO_CRATES += gl_generator 0.14.0 # Apache-2.0
-MODCARGO_CRATES += glutin 0.26.0 # Apache-2.0
+MODCARGO_CRATES += glutin 0.28.0 # Apache-2.0
MODCARGO_CRATES += glutin_egl_sys 0.1.5 # Apache-2.0
MODCARGO_CRATES += glutin_emscripten_sys 0.1.1 # Apache-2.0
MODCARGO_CRATES += glutin_gles2_sys 0.1.5 # Apache-2.0
MODCARGO_CRATES += glutin_glx_sys 0.1.7 # Apache-2.0
MODCARGO_CRATES += glutin_wgl_sys 0.1.5 # Apache-2.0
+MODCARGO_CRATES += hashbrown 0.11.2 # Apache-2.0/MIT
+MODCARGO_CRATES += heck 0.3.3 # MIT OR Apache-2.0
MODCARGO_CRATES += hermit-abi 0.1.19 # MIT/Apache-2.0
MODCARGO_CRATES += ident_case 1.0.1 # MIT/Apache-2.0
+MODCARGO_CRATES += indexmap 1.8.0 # Apache-2.0/MIT
MODCARGO_CRATES += inotify 0.7.1 # ISC
MODCARGO_CRATES += inotify-sys 0.1.5 # ISC
-MODCARGO_CRATES += instant 0.1.10 # BSD-3-Clause
+MODCARGO_CRATES += instant 0.1.12 # BSD-3-Clause
MODCARGO_CRATES += iovec 0.1.4 # MIT/Apache-2.0
-MODCARGO_CRATES += itoa 0.4.7 # MIT OR Apache-2.0
+MODCARGO_CRATES += itoa 1.0.1 # MIT OR Apache-2.0
MODCARGO_CRATES += jni-sys 0.3.0 # MIT/Apache-2.0
+MODCARGO_CRATES += js-sys 0.3.55 # MIT/Apache-2.0
MODCARGO_CRATES += kernel32-sys 0.2.2 # MIT
MODCARGO_CRATES += khronos_api 3.1.0 # Apache-2.0
MODCARGO_CRATES += lazy-bytes-cast 5.0.1 # BSL-1.0
MODCARGO_CRATES += lazy_static 1.4.0 # MIT/Apache-2.0
MODCARGO_CRATES += lazycell 1.3.0 # MIT/Apache-2.0
-MODCARGO_CRATES += libc 0.2.98 # MIT OR Apache-2.0
-MODCARGO_CRATES += libloading 0.6.7 # ISC
-MODCARGO_CRATES += libloading 0.7.0 # ISC
+MODCARGO_CRATES += libc 0.2.112 # MIT OR Apache-2.0
+MODCARGO_CRATES += libloading 0.7.2 # ISC
MODCARGO_CRATES += linked-hash-map 0.5.4 # MIT/Apache-2.0
-MODCARGO_CRATES += lock_api 0.4.4 # Apache-2.0/MIT
+MODCARGO_CRATES += lock_api 0.4.5 # Apache-2.0/MIT
MODCARGO_CRATES += log 0.4.14 # MIT OR Apache-2.0
MODCARGO_CRATES += malloc_buf 0.0.6 # MIT
-MODCARGO_CRATES += maybe-uninit 2.0.0 # Apache-2.0 OR MIT
-MODCARGO_CRATES += memchr 2.3.4 # Unlicense/MIT
-MODCARGO_CRATES += memmap2 0.1.0 # MIT/Apache-2.0
-MODCARGO_CRATES += memmap2 0.2.3 # MIT/Apache-2.0
-MODCARGO_CRATES += memoffset 0.6.4 # MIT
+MODCARGO_CRATES += memchr 2.4.1 # Unlicense/MIT
+MODCARGO_CRATES += memmap2 0.3.1 # MIT/Apache-2.0
+MODCARGO_CRATES += memoffset 0.6.5 # MIT
+MODCARGO_CRATES += minimal-lexical 0.2.1 # MIT/Apache-2.0
MODCARGO_CRATES += miniz_oxide 0.3.7 # MIT
MODCARGO_CRATES += mio 0.6.23 # MIT
+MODCARGO_CRATES += mio 0.8.0 # MIT
MODCARGO_CRATES += mio-anonymous-pipes 0.2.0 # MIT
MODCARGO_CRATES += mio-extras 2.0.6 # MIT OR Apache-2.0
+MODCARGO_CRATES += mio-uds 0.6.8 # MIT/Apache-2.0
MODCARGO_CRATES += miow 0.2.2 # MIT/Apache-2.0
MODCARGO_CRATES += miow 0.3.7 # MIT/Apache-2.0
-MODCARGO_CRATES += ndk 0.2.1 # MIT OR Apache-2.0
-MODCARGO_CRATES += ndk-glue 0.2.1 # MIT OR Apache-2.0
-MODCARGO_CRATES += ndk-macro 0.2.0 # MIT OR Apache-2.0
-MODCARGO_CRATES += ndk-sys 0.2.1 # MIT OR Apache-2.0
+MODCARGO_CRATES += ndk 0.5.0 # MIT OR Apache-2.0
+MODCARGO_CRATES += ndk-glue 0.5.0 # MIT OR Apache-2.0
+MODCARGO_CRATES += ndk-macro 0.3.0 # MIT OR Apache-2.0
+MODCARGO_CRATES += ndk-sys 0.2.2 # MIT OR Apache-2.0
MODCARGO_CRATES += net2 0.2.37 # MIT/Apache-2.0
-MODCARGO_CRATES += nix 0.18.0 # MIT
-MODCARGO_CRATES += nix 0.20.0 # MIT
-MODCARGO_CRATES += nix 0.22.0 # MIT
-MODCARGO_CRATES += nom 6.2.1 # MIT
+MODCARGO_CRATES += nix 0.22.2 # MIT
+MODCARGO_CRATES += nom 7.1.0 # MIT
MODCARGO_CRATES += notify 4.0.17 # CC0-1.0
-MODCARGO_CRATES += num_enum 0.4.3 # BSD-3-Clause
-MODCARGO_CRATES += num_enum_derive 0.4.3 # BSD-3-Clause
+MODCARGO_CRATES += ntapi 0.3.6 # Apache-2.0 OR MIT
+MODCARGO_CRATES += num_enum 0.5.6 # BSD-3-Clause OR MIT OR Apache-2.0
+MODCARGO_CRATES += num_enum_derive 0.5.6 # BSD-3-Clause OR MIT OR Apache-2.0
MODCARGO_CRATES += objc 0.2.7 # MIT
MODCARGO_CRATES += objc-foundation 0.1.1 # MIT
MODCARGO_CRATES += objc_id 0.1.1 # MIT
-MODCARGO_CRATES += once_cell 1.8.0 # MIT OR Apache-2.0
+MODCARGO_CRATES += once_cell 1.9.0 # MIT OR Apache-2.0
MODCARGO_CRATES += osmesa-sys 0.1.2 # CC0-1.0
-MODCARGO_CRATES += owned_ttf_parser 0.6.0 # Apache-2.0
-MODCARGO_CRATES += parking_lot 0.11.1 # Apache-2.0/MIT
-MODCARGO_CRATES += parking_lot_core 0.8.3 # Apache-2.0/MIT
+MODCARGO_CRATES += parking_lot 0.11.2 # Apache-2.0/MIT
+MODCARGO_CRATES += parking_lot_core 0.8.5 # Apache-2.0/MIT
MODCARGO_CRATES += percent-encoding 2.1.0 # MIT/Apache-2.0
-MODCARGO_CRATES += pkg-config 0.3.19 # MIT/Apache-2.0
+MODCARGO_CRATES += pkg-config 0.3.24 # MIT/Apache-2.0
MODCARGO_CRATES += png 0.16.8 # MIT OR Apache-2.0
-MODCARGO_CRATES += proc-macro-crate 0.1.5 # Apache-2.0/MIT
-MODCARGO_CRATES += proc-macro2 1.0.28 # MIT OR Apache-2.0
-MODCARGO_CRATES += quote 1.0.9 # MIT OR Apache-2.0
-MODCARGO_CRATES += raw-window-handle 0.3.3 # MIT
-MODCARGO_CRATES += redox_syscall 0.2.9 # MIT
+MODCARGO_CRATES += proc-macro-crate 1.1.0 # Apache-2.0/MIT
+MODCARGO_CRATES += proc-macro-error 1.0.4 # MIT OR Apache-2.0
+MODCARGO_CRATES += proc-macro-error-attr 1.0.4 # MIT OR Apache-2.0
+MODCARGO_CRATES += proc-macro2 1.0.36 # MIT OR Apache-2.0
+MODCARGO_CRATES += quick-xml 0.22.0 # MIT
+MODCARGO_CRATES += quote 1.0.14 # MIT OR Apache-2.0
+MODCARGO_CRATES += raw-window-handle 0.4.2 # MIT OR Apache-2.0 OR Zlib
+MODCARGO_CRATES += redox_syscall 0.2.10 # MIT
MODCARGO_CRATES += redox_users 0.4.0 # MIT
MODCARGO_CRATES += regex-automata 0.1.10 # Unlicense/MIT
MODCARGO_CRATES += regex-syntax 0.6.25 # MIT/Apache-2.0
-MODCARGO_CRATES += rusttype 0.9.2 # MIT / Apache-2.0
-MODCARGO_CRATES += ryu 1.0.5 # Apache-2.0 OR BSL-1.0
+MODCARGO_CRATES += ryu 1.0.9 # Apache-2.0 OR BSL-1.0
MODCARGO_CRATES += same-file 1.0.6 # Unlicense/MIT
MODCARGO_CRATES += scoped-tls 1.0.0 # MIT/Apache-2.0
MODCARGO_CRATES += scopeguard 1.1.0 # MIT/Apache-2.0
-MODCARGO_CRATES += serde 1.0.127 # MIT OR Apache-2.0
-MODCARGO_CRATES += serde_derive 1.0.127 # MIT OR Apache-2.0
-MODCARGO_CRATES += serde_json 1.0.66 # MIT OR Apache-2.0
-MODCARGO_CRATES += serde_yaml 0.8.17 # MIT OR Apache-2.0
+MODCARGO_CRATES += serde 1.0.133 # MIT OR Apache-2.0
+MODCARGO_CRATES += serde_derive 1.0.133 # MIT OR Apache-2.0
+MODCARGO_CRATES += serde_json 1.0.74 # MIT OR Apache-2.0
+MODCARGO_CRATES += serde_yaml 0.8.23 # MIT OR Apache-2.0
MODCARGO_CRATES += servo-fontconfig 0.5.1 # MIT / Apache-2.0
MODCARGO_CRATES += servo-fontconfig-sys 5.1.0 # MIT
MODCARGO_CRATES += shared_library 0.1.9 # Apache-2.0/MIT
-MODCARGO_CRATES += signal-hook 0.1.17 # Apache-2.0/MIT
+MODCARGO_CRATES += signal-hook 0.3.13 # Apache-2.0/MIT
+MODCARGO_CRATES += signal-hook-mio 0.2.1 # Apache-2.0/MIT
MODCARGO_CRATES += signal-hook-registry 1.4.0 # Apache-2.0/MIT
-MODCARGO_CRATES += slab 0.4.3 # MIT
-MODCARGO_CRATES += smallvec 1.6.1 # MIT/Apache-2.0
-MODCARGO_CRATES += smithay-client-toolkit 0.12.3 # MIT
-MODCARGO_CRATES += smithay-client-toolkit 0.14.0 # MIT
-MODCARGO_CRATES += smithay-clipboard 0.6.4 # MIT
+MODCARGO_CRATES += slab 0.4.5 # MIT
+MODCARGO_CRATES += smallvec 1.7.0 # MIT/Apache-2.0
+MODCARGO_CRATES += smithay-client-toolkit 0.15.3 # MIT
+MODCARGO_CRATES += smithay-clipboard 0.6.5 # MIT
MODCARGO_CRATES += spsc-buffer 0.1.1 # MIT
MODCARGO_CRATES += strsim 0.8.0 # MIT
-MODCARGO_CRATES += strsim 0.9.3 # MIT
-MODCARGO_CRATES += syn 1.0.74 # MIT OR Apache-2.0
+MODCARGO_CRATES += strsim 0.10.0 # MIT
+MODCARGO_CRATES += structopt 0.3.25 # Apache-2.0 OR MIT
+MODCARGO_CRATES += structopt-derive 0.4.18 # Apache-2.0/MIT
+MODCARGO_CRATES += syn 1.0.85 # MIT OR Apache-2.0
MODCARGO_CRATES += textwrap 0.11.0 # MIT
-MODCARGO_CRATES += thiserror 1.0.26 # MIT OR Apache-2.0
-MODCARGO_CRATES += thiserror-impl 1.0.26 # MIT OR Apache-2.0
-MODCARGO_CRATES += time 0.1.43 # MIT/Apache-2.0
+MODCARGO_CRATES += thiserror 1.0.30 # MIT OR Apache-2.0
+MODCARGO_CRATES += thiserror-impl 1.0.30 # MIT OR Apache-2.0
MODCARGO_CRATES += toml 0.5.8 # MIT/Apache-2.0
-MODCARGO_CRATES += ttf-parser 0.6.2 # MIT OR Apache-2.0
-MODCARGO_CRATES += unicode-width 0.1.8 # MIT/Apache-2.0
+MODCARGO_CRATES += unicode-segmentation 1.8.0 # MIT/Apache-2.0
+MODCARGO_CRATES += unicode-width 0.1.9 # MIT/Apache-2.0
MODCARGO_CRATES += unicode-xid 0.2.2 # MIT OR Apache-2.0
MODCARGO_CRATES += utf8parse 0.2.0 # Apache-2.0 OR MIT
MODCARGO_CRATES += vec_map 0.8.2 # MIT/Apache-2.0
-MODCARGO_CRATES += version_check 0.9.3 # MIT/Apache-2.0
+MODCARGO_CRATES += version_check 0.9.4 # MIT/Apache-2.0
MODCARGO_CRATES += vswhom 0.1.0 # MIT
MODCARGO_CRATES += vswhom-sys 0.1.0 # MIT
MODCARGO_CRATES += vte 0.10.1 # Apache-2.0 OR MIT
MODCARGO_CRATES += vte_generate_state_changes 0.1.1 # Apache-2.0 OR MIT
MODCARGO_CRATES += walkdir 2.3.2 # Unlicense/MIT
MODCARGO_CRATES += wasi 0.10.2+wasi-snapshot-preview1 # Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT
-MODCARGO_CRATES += wayland-client 0.28.6 # MIT
-MODCARGO_CRATES += wayland-commons 0.28.6 # MIT
-MODCARGO_CRATES += wayland-cursor 0.28.6 # MIT
-MODCARGO_CRATES += wayland-egl 0.28.6 # MIT
-MODCARGO_CRATES += wayland-protocols 0.28.6 # MIT
-MODCARGO_CRATES += wayland-scanner 0.28.6 # MIT
-MODCARGO_CRATES += wayland-sys 0.28.6 # MIT
+MODCARGO_CRATES += wasm-bindgen 0.2.78 # MIT/Apache-2.0
+MODCARGO_CRATES += wasm-bindgen-backend 0.2.78 # MIT/Apache-2.0
+MODCARGO_CRATES += wasm-bindgen-macro 0.2.78 # MIT/Apache-2.0
+MODCARGO_CRATES += wasm-bindgen-macro-support 0.2.78 # MIT/Apache-2.0
+MODCARGO_CRATES += wasm-bindgen-shared 0.2.78 # MIT/Apache-2.0
+MODCARGO_CRATES += wayland-client 0.29.4 # MIT
+MODCARGO_CRATES += wayland-commons 0.29.4 # MIT
+MODCARGO_CRATES += wayland-cursor 0.29.4 # MIT
+MODCARGO_CRATES += wayland-egl 0.29.4 # MIT
+MODCARGO_CRATES += wayland-protocols 0.29.4 # MIT
+MODCARGO_CRATES += wayland-scanner 0.29.4 # MIT
+MODCARGO_CRATES += wayland-sys 0.29.4 # MIT
+MODCARGO_CRATES += web-sys 0.3.55 # MIT/Apache-2.0
MODCARGO_CRATES += winapi 0.2.8 # MIT
MODCARGO_CRATES += winapi 0.3.9 # MIT/Apache-2.0
MODCARGO_CRATES += winapi-build 0.1.1 # MIT
MODCARGO_CRATES += winapi-i686-pc-windows-gnu 0.4.0 # MIT/Apache-2.0
MODCARGO_CRATES += winapi-util 0.1.5 # Unlicense/MIT
MODCARGO_CRATES += winapi-x86_64-pc-windows-gnu 0.4.0 # MIT/Apache-2.0
-MODCARGO_CRATES += winit 0.24.0 # Apache-2.0
-MODCARGO_CRATES += winreg 0.9.0 # MIT
+MODCARGO_CRATES += winit 0.26.1 # Apache-2.0
+MODCARGO_CRATES += winreg 0.10.1 # MIT
MODCARGO_CRATES += wio 0.2.2 # MIT/Apache-2.0
MODCARGO_CRATES += ws2_32-sys 0.2.1 # MIT
-MODCARGO_CRATES += x11-clipboard 0.5.2 # MIT
-MODCARGO_CRATES += x11-dl 2.18.5 # MIT
-MODCARGO_CRATES += xcb 0.9.0 # MIT
-MODCARGO_CRATES += xcursor 0.3.3 # MIT
-MODCARGO_CRATES += xdg 2.2.0 # Apache-2.0/MIT
+MODCARGO_CRATES += x11-clipboard 0.5.3 # MIT
+MODCARGO_CRATES += x11-dl 2.19.1 # MIT
+MODCARGO_CRATES += xcb 0.10.1 # MIT
+MODCARGO_CRATES += xcursor 0.3.4 # MIT
+MODCARGO_CRATES += xdg 2.4.0 # Apache-2.0/MIT
MODCARGO_CRATES += xml-rs 0.8.4 # MIT
MODCARGO_CRATES += yaml-rust 0.4.5 # MIT/Apache-2.0
Index: x11/alacritty/distinfo
===================================================================
RCS file: /home/cvs/ports/x11/alacritty/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- x11/alacritty/distinfo 22 Oct 2021 17:24:59 -0000 1.1.1.1
+++ x11/alacritty/distinfo 28 Jan 2022 19:46:10 -0000
@@ -1,52 +1,48 @@
-SHA256 (alacritty-0.9.0.tar.gz) = bTqqyeBHf5A1Y7b7JuCJEYQHzb/pUqHi/79OlxtwYrM=
-SHA256 (cargo/ab_glyph_rasterizer-0.1.4.tar.gz) = 2f5eMt4Bcw6x9rf1tRwX4D4jJb9Ap091TwTxMAQ6//8=
+SHA256 (alacritty-0.10.0.tar.gz) = Xe6clPlEt0KwGJ3YfEPIcXX/rd6ASau0Zoylo+aP1lo=
SHA256 (cargo/adler32-1.2.0.tar.gz) = quEnfTmu7BXLOIJm7MJLEcgEad6uYGfhehp6qeXB8jQ=
-SHA256 (cargo/andrew-0.3.1.tar.gz) = jEr7Cd1kL+7IQI4z+S8//EBSlG9rIPMvuZwfWM1Pp88=
SHA256 (cargo/android_glue-0.2.3.tar.gz) = AAREIm/P8kjyvEx2Jb4yxjysz+zCcjorn3inSHpJxAc=
-SHA256 (cargo/ansi_term-0.11.0.tar.gz) = 7km69sthe4U6qNk79CDbI4P6tG0xRILKKAO0DV/el5s=
+SHA256 (cargo/ansi_term-0.12.1.tar.gz) = 1Sqbt+wM9ITFUYMKfOJ70g1n6sZH4b77VrC+TuOaVdI=
SHA256 (cargo/atty-0.2.14.tar.gz) = 2bOb4Ydw0RQhzbG5lHpF3T836TCSy/N3YUgooxnV/ug=
SHA256 (cargo/autocfg-1.0.1.tar.gz) = zbAx3XjihzHYfVbMj/70qPNsomw4/i3nAFQ+Yn+KRko=
SHA256 (cargo/base64-0.13.0.tar.gz) = kE3+rFDzzauij8b1f9zdt19J7WE0ZnanjE/+VYd4Av0=
SHA256 (cargo/bitflags-1.2.1.tar.gz) = zx3i/ox1vBRaL1d63ZUfgTSIm0eV1HRmpUpchG1pFpM=
SHA256 (cargo/block-0.1.6.tar.gz) = DYwf72kJQdPneI0yhRdZH+zGhMCECEcC1v8WQemTaZo=
-SHA256 (cargo/calloop-0.6.5.tar.gz) = CwNhZ+dgQWlFeZcsKM9Id7T5LaIiVg3bSQCJN7amcnw=
-SHA256 (cargo/cc-1.0.69.tar.gz) = 5wzC9ixs4YaJY4J71nd2TGLQfD2aPh+xF37hqasZnrI=
+SHA256 (cargo/bumpalo-3.9.1.tar.gz) = pKRaRqsfJBLlPToK3nb/rSAlgEKUVpquOHIxoM1uCJk=
+SHA256 (cargo/calloop-0.9.3.tar.gz) = vy7sYe/laqHoE/USaVkpaTPPBwADDkMUeGxId5pmq4I=
+SHA256 (cargo/cc-1.0.72.tar.gz) = IqkTe5XqBoZOAYN1tyrft9tub2jPyN9aBNACiAUEhe4=
SHA256 (cargo/cfg-if-0.1.10.tar.gz) = R4W90clrKoRrK9fMAuhraz2/FOflNEbE9UySo2EECCI=
SHA256 (cargo/cfg-if-1.0.0.tar.gz) = uvHeQzl2FYi8Bhnjy8ASDuWC67dLU7Tvv3kRe9LaQP0=
SHA256 (cargo/cgl-0.3.2.tar.gz) = DO0FUSNOh6/uEkEdU1ZI3YnS5/NMeLdTOVVnr/PUR/8=
-SHA256 (cargo/clap-2.33.3.tar.gz) = N+WKx4VzxAcI1FUi8NgPovAcxPm04r90mAclVFQxIAI=
+SHA256 (cargo/clap-2.34.0.tar.gz) = oGEFRBgMOLiBAf7PLdY0sXSmLu9pRvhN/GpxJ1ErOBw=
SHA256 (cargo/clipboard-win-3.1.1.tar.gz) = n99eAQhra+dQQoukpAYZ+EfrLpV1bu6EsY4G5fC1A0I=
-SHA256 (cargo/cmake-0.1.45.tar.gz) = 62IQtjcXHfukzaEuV5rG3HP1FlrVYTPl1y7zEx8yCFU=
-SHA256 (cargo/cocoa-0.23.0.tar.gz) = xUIBwH3POlyjP+zsuAQq7XZ+5L/VoCNajOq82pVgRLI=
+SHA256 (cargo/cmake-0.1.48.tar.gz) = 6K2M7xBKxXtouJ3zIIFk0ihQOrvc5w9ogP+j2XDnRDo=
SHA256 (cargo/cocoa-0.24.0.tar.gz) = b2OQLpIjUw77TibM0M9V7DDVktO0LiGije/EKpWG6DI=
SHA256 (cargo/cocoa-foundation-0.1.0.tar.gz) = et5Jtl1WDKWMQDpHm7OWWSsVXAGF6tp0LuMj0daNYxg=
SHA256 (cargo/copypasta-0.7.1.tar.gz) = RCPXn+2D69mrgewh+pcUQwCpYXghWCh9yb9+3aw3/ws=
SHA256 (cargo/core-foundation-0.7.0.tar.gz) = V9JMehPEPocON8FVa3RVVDeHCgRRT3aF9bNU4JBWcXE=
-SHA256 (cargo/core-foundation-0.9.1.tar.gz) = ConirkJuqDFV3M8QwPprFGPvbV/LRM7gsiSkCPpkCmI=
+SHA256 (cargo/core-foundation-0.9.2.tar.gz) = aIjhBVG7k+Qk2N8dB/GotPzrAAGjpLBIv8R1VJRvR7M=
SHA256 (cargo/core-foundation-sys-0.7.0.tar.gz) = s6catJTAtbhgvchAeuCJeAUkFwcMLO04VzqRV611uKw=
-SHA256 (cargo/core-foundation-sys-0.8.2.tar.gz) = 6iIbUoSkfkADO/m2bzX5hOwOopMesDUFJGzSepY/mBs=
+SHA256 (cargo/core-foundation-sys-0.8.3.tar.gz) = WCfOv0ZwRouHct0ZGFZ2iu3LGwJ4oE+Yn3dmNRkXudw=
SHA256 (cargo/core-graphics-0.19.2.tar.gz) = s4iTdObqarJdupC7XZYgL2EQgFg2H23HLosD5vi76SM=
-SHA256 (cargo/core-graphics-0.22.2.tar.gz) = Jp819ptUK4DnNqIKiaBSFcDOgMLAPFFKuy4xi3g3nYY=
+SHA256 (cargo/core-graphics-0.22.3.tar.gz) = JYG7qzuP/G/L1VC/RsNVE10W6f8qbqAyrWub8dfv5Ps=
SHA256 (cargo/core-graphics-types-0.1.1.tar.gz) = Omi2izRGCCZEyRrHeL9QzUEEv7ACtaanxEzKWixweIs=
SHA256 (cargo/core-text-19.2.0.tar.gz) = mddK2mbgfBzvoY+Kv7p2W0hvJQ3i5KmZ5XJ/wN1LSiU=
SHA256 (cargo/core-video-sys-0.1.4.tar.gz) = NOytI2EK2XV2ZNZE42kkbt3hgD/LQ+1yh2VlCYpdOCg=
-SHA256 (cargo/crc32fast-1.2.1.tar.gz) = gRVv7OhKtqnyr9sQnOOuV35CsSKEQe3tmb139ieVOxo=
-SHA256 (cargo/crossfont-0.3.1.tar.gz) = tsCWfpOgRAhlvx2GfDpQ1pk/UFSyoQGG/CgwOXkYJB0=
-SHA256 (cargo/darling-0.10.2.tar.gz) = DXBuddh+NVadt4GpteJBbP8SNqR+04CDH5WTgszV+Fg=
-SHA256 (cargo/darling_core-0.10.2.tar.gz) = 8Mlgri2k3oipGy2SDCpyM7QAvDPLKEU6KYeCLYOSUZs=
-SHA256 (cargo/darling_macro-0.10.2.tar.gz) = 2bWi9KxJaYIsYiJIFdBplSZWytxwhP3Kl1Hm2VkYm3I=
-SHA256 (cargo/derivative-2.2.0.tar.gz) = /MPdXp6cCyldbh5NgR+28VfV/9eEuNIC/GLqyANadws=
+SHA256 (cargo/crc32fast-1.3.0.tar.gz) = c4wpDfrqhPwcoVrZwWjQg7BacU4e/d2O2qtnjcKNKDY=
+SHA256 (cargo/crossfont-0.3.2.tar.gz) = EplpWkxkF7fkppV72WNHhAbhSLewNR4vLOMSlrBRglE=
+SHA256 (cargo/cty-0.2.2.tar.gz) = s2X6vHlQRmcgU+KclUcz7DsF5L5lSrEw/o8flNcFHzU=
+SHA256 (cargo/darling-0.13.1.tar.gz) = 0NcguGg/jdg8ZRVfBTBWDLpozSvzlfZROkg8ruV/9/Q=
+SHA256 (cargo/darling_core-0.13.1.tar.gz) = ejQPJB0s7tHetHrjbEFEsnB+x90LZJ+JTLObtZWYYyQ=
+SHA256 (cargo/darling_macro-0.13.1.tar.gz) = csQbO3NS/rMhGg10PcVwCk47YPUb0rNoiS0eD5qV9Es=
SHA256 (cargo/dirs-3.0.2.tar.gz) = MLqgQxA8nQwqV89TfMLzViOIncDUBebDzM+tvIHHEwk=
SHA256 (cargo/dirs-sys-0.3.6.tar.gz) = A9hlNO02emdUjcaBE6D121VDL9+7bm+dd3BDl9ldV4A=
SHA256 (cargo/dispatch-0.2.0.tar.gz) = vQyTu0sMbZt39ENbCumMJNF/HEWy/4RMYVGgclbKkjs=
-SHA256 (cargo/dlib-0.4.2.tar.gz) = sR8V0eMmjxQPaNOQY31edthJeC2XGucGPg2mn+lwmnY=
SHA256 (cargo/dlib-0.5.0.tar.gz) = rBt1FzKMBMKqaEIvxgpBuSIIGCFC7QSiWHnCbI+Hh5Q=
SHA256 (cargo/downcast-rs-1.2.0.tar.gz) = nqg10pA2pAh3k4NvqTGwiDetXpV9qeI4hrKVhvubZlA=
-SHA256 (cargo/dtoa-0.4.8.tar.gz) = VomYmM52qvSg8k2RTJfqbtl21C/satM/y7ChED4HsrA=
SHA256 (cargo/dwrote-0.11.0.tar.gz) = Q5ocK6VhGtPtcxKAVB020unErF5/uBiie2BL3Fpqpls=
-SHA256 (cargo/embed-resource-1.6.3.tar.gz) = Rd4w6zF7TNOILuFmI8swBOX7maj0zUAJfK32HvvFStw=
+SHA256 (cargo/embed-resource-1.6.5.tar.gz) = hVBesjn8lSswDynwVW0tiECCqDVmdo2YAnjY+vOMeA0=
SHA256 (cargo/expat-sys-2.1.6.tar.gz) = ZY8ZcokgE4NC9oQIt892RNkNR4Q1PY68MufoZj2+Rfo=
-SHA256 (cargo/filetime-0.2.14.tar.gz) = HTTPoTpjrgWL+mAf6eMTu9s3RkJ8FFkYVGTOD89i4eg=
+SHA256 (cargo/filetime-0.2.15.tar.gz) = l1zPg9jZ0NhGgoUKOMgWkCe+gzaIBZccxPI4wrJFvJg=
SHA256 (cargo/fnv-1.0.7.tar.gz) = P57skY0/JAad7LmvFVTK18iA4tokqa/YisoABTGrgsE=
SHA256 (cargo/foreign-types-0.3.2.tar.gz) = 9vM564rcBSzSyniRD9qGmu+jjSLVy2SOZIXk0/wG87E=
SHA256 (cargo/foreign-types-0.5.0.tar.gz) = 1zfZqlGft7dJy8O5Yu3PMQqN0fS2fJHE+Dl1290X2WU=
@@ -61,187 +57,194 @@ SHA256 (cargo/fuchsia-zircon-0.3.3.tar.g
SHA256 (cargo/fuchsia-zircon-sys-0.3.3.tar.gz) = Pcqprncl0SzbhbOtmaQ023C0aMCd7RfgEthrXBAQ96c=
SHA256 (cargo/getrandom-0.2.3.tar.gz) = f82ZlGNSTFJllRf+LOqYSTz+SF0QVl57D7B9u6etJ1M=
SHA256 (cargo/gl_generator-0.14.0.tar.gz) = GpXfwjorSpovWrQdGU+L/aPKvsQq9OOfCMM56yoMEk0=
-SHA256 (cargo/glutin-0.26.0.tar.gz) = GuHLuRdrkVHEzgPwEuPNHGwYxL557errPZn12AhcX6M=
+SHA256 (cargo/glutin-0.28.0.tar.gz) = AOqdvlRLyKZXxMSnmMLRbNAbVJgg5HZXKXVJ0oNx9tI=
SHA256 (cargo/glutin_egl_sys-0.1.5.tar.gz) = KrtqpVUjSAxK3FpWu6okmZLi3dsvxj3JbgSjNVNkwhE=
SHA256 (cargo/glutin_emscripten_sys-0.1.1.tar.gz) = gN5BRt926KbDKwMAe8dk/zJJ3K609nXWigbK8brDY/E=
SHA256 (cargo/glutin_gles2_sys-0.1.5.tar.gz) = 6AlOcItzCnyKGVT0+KMYgK8A64ocW1v4XSigo8bWkQM=
SHA256 (cargo/glutin_glx_sys-0.1.7.tar.gz) = fjk8j8ArgHRZQQQpFQ6cT6/9sxLVm4wDhWYXPIGZE1E=
SHA256 (cargo/glutin_wgl_sys-0.1.5.tar.gz) = PaWVGhVp26uGXG8qhj76//GTqTyvBVONGT6eOBbSFpY=
+SHA256 (cargo/hashbrown-0.11.2.tar.gz) = q17w1JCe83JMyMzmzMhXLFyBdZLpKF9UZPjob4vTcm4=
+SHA256 (cargo/heck-0.3.3.tar.gz) = bWIe+yaGPw6ZJMasV36CdeXmt3RV22T/psZckE6eEyw=
SHA256 (cargo/hermit-abi-0.1.19.tar.gz) = YrRnNDuUukdtyyUA0kLa27OVV9+IkxCsd8XZkQCqrDM=
SHA256 (cargo/ident_case-1.0.1.tar.gz) = ueA4S2GVhWbpJtxQZgMh0SFZAl52fBjgQ9rya3AQTDk=
+SHA256 (cargo/indexmap-1.8.0.tar.gz) = KCpiR3Isq6QEwGUBa7+lIoBuUXFMNPXfw+SjpG/LQiM=
SHA256 (cargo/inotify-0.7.1.tar.gz) = SBbGbSyK5nPfgzZsGDQVOPI0om1lqezqXDSLRTrB0C8=
SHA256 (cargo/inotify-sys-0.1.5.tar.gz) = 4FwCteib/zuUbO3sonirxij+gR5gTwJ8RaiqPPeT0Os=
-SHA256 (cargo/instant-0.1.10.tar.gz) = vuAyixIJ0VfvAByU3YW0+PZBOa2w6sJln0sIOCsvR00=
+SHA256 (cargo/instant-0.1.12.tar.gz) = elu+gkxQfF2llWNV6Gp0bYLg4UZPZdhizF5x2nDpSyw=
SHA256 (cargo/iovec-0.1.4.tar.gz) = srPqb/leF1Rz+P/mp+t8ANBUJAMhuExXBRF1/jweB14=
-SHA256 (cargo/itoa-0.4.7.tar.gz) = 3SUDYCGw3oigr/a4UAUVY8ZRbQv1P4Y4k47bud5zJzY=
+SHA256 (cargo/itoa-1.0.1.tar.gz) = GquPw2dYi4nc7oOrD9ZrcrULcvoZBNcJUEWs4rDIHDU=
SHA256 (cargo/jni-sys-0.3.0.tar.gz) = jq9LwC0Xy91/9MdDjK/N9/uaRhMxOtEbT4/v59P6ATA=
+SHA256 (cargo/js-sys-0.3.55.tar.gz) = fMn/zNOMRRqGvxNlffJE6cPzdJPM6OXiHpQJY3d6zIQ=
SHA256 (cargo/kernel32-sys-0.2.2.tar.gz) = dQdiSylINDHAui2Crs6Mps26k4K/9N3Q90kFYMBWCY0=
SHA256 (cargo/khronos_api-3.1.0.tar.gz) = 4ttYXh1zj8dxvwihUUINPtGT2diVo2339vipRWuRHdw=
SHA256 (cargo/lazy-bytes-cast-5.0.1.tar.gz) = ECV0mfCJzRVq2C0KnNV9lQH6LJiQaJkql+s8J4NvIGs=
SHA256 (cargo/lazy_static-1.4.0.tar.gz) = 4qutI/vEKzcA8vJ5hE3IMq2ysusGmy35GPRVxOGMxkY=
SHA256 (cargo/lazycell-1.3.0.tar.gz) = gw0Izh0dlB5rMGRfGg61ZDAT2DXON3ml/CCCYdvhD1U=
-SHA256 (cargo/libc-0.2.98.tar.gz) = Mgz+dxddo6SD7+1LwK3BloygULCYzk8vHBOlZiYSh5A=
-SHA256 (cargo/libloading-0.6.7.tar.gz) = NRoyQXoS1ffoLDaKZngeMHg02uBMbODNRFbVKYkimIM=
-SHA256 (cargo/libloading-0.7.0.tar.gz) = b4TZZDjBX81sPyRMj84B0eK5xrViPpxxHckobY/JLWo=
+SHA256 (cargo/libc-0.2.112.tar.gz) = GwPRfzZKOgQtXl1GsFO7v4LJLJQwxZLdTAZNxu6ZcSU=
+SHA256 (cargo/libloading-0.7.2.tar.gz) = r+ID1mnsl5txKGGbrlpjt7QukgPBspFGB57gXi9gS1I=
SHA256 (cargo/linked-hash-map-0.5.4.tar.gz) = f7mzivkmCBQLhraTYEuf/MWCQkCkhNHs1HlbrLL+iPM=
-SHA256 (cargo/lock_api-0.4.4.tar.gz) = A4KIBgbf9tFclHbEFtGGkLcnQqp7YFu23W7JAw+/B+s=
+SHA256 (cargo/lock_api-0.4.5.tar.gz) = cSpNCTyZduJOfbykHbiV2ry6w4619ARTk9F6lb37EQk=
SHA256 (cargo/log-0.4.14.tar.gz) = Ubm75sR9Ufw+GpuUWWWUa0xEFCq4eSxQg1qYDTYsJxA=
SHA256 (cargo/malloc_buf-0.0.6.tar.gz) = YruQf+iNVNjZzjKjzOq0IY7S9rfTVhfK/prfhOQ5Gcs=
-SHA256 (cargo/maybe-uninit-2.0.0.tar.gz) = YDAuTbOmHacMDLeZGXYkg2LzAxnoiFDEh7m5W78FngA=
-SHA256 (cargo/memchr-2.3.4.tar.gz) = DuHEeqolbsq8rqNR6uSpsB7zntgQAE4pjSUR7ShLFSU=
-SHA256 (cargo/memmap2-0.1.0.tar.gz) = 2bcMoqYQOsi2ZdwVCxQu8OTonfZAyebPKV0YnDyuvlo=
-SHA256 (cargo/memmap2-0.2.3.tar.gz) = cj4+vc3FwCPbHfMVNkVzeJ+IV8EbYxov3618APXARrQ=
-SHA256 (cargo/memoffset-0.6.4.tar.gz) = WazMUH8TOANqBHfvYa/a4zzeYIQPTf5IExnOOtEW3fk=
+SHA256 (cargo/memchr-2.4.1.tar.gz) = MIzDm+Abc9DRj4Kg57Kj34UkX4Svlv3dxdIC0n5HuGo=
+SHA256 (cargo/memmap2-0.3.1.tar.gz) = ALbC6/9hgBmHiPXbCNfOO8HQthcXZniDGnUQgllz41c=
+SHA256 (cargo/memoffset-0.6.5.tar.gz) = WqNh1Prqk2AwZKAnQV8HvY4dXIjJ+/aL9WooVCj9ec4=
+SHA256 (cargo/minimal-lexical-0.2.1.tar.gz) = aDVMXGvTbXP/P+zrBe+lm2rLdiZhf0livjIqgl5h95o=
SHA256 (cargo/miniz_oxide-0.3.7.tar.gz) = eR2qrh7WiJVg+MQ1kZT1Zkg1VUBXMkSlRIqDuh7MdDU=
SHA256 (cargo/mio-0.6.23.tar.gz) = Sv1m9bkb8qO8E/rQ4hyu2sFoykxwdQTnVYVkiugOTMQ=
+SHA256 (cargo/mio-0.8.0.tar.gz) = uicvhfoLQfyRhyvlebO74PVreSqjYaOA62aUafaNr7I=
SHA256 (cargo/mio-anonymous-pipes-0.2.0.tar.gz) = a8UTAl/lAFo6pWG1D9ss2loVC4SACuAqzYqp7WLKGms=
SHA256 (cargo/mio-extras-2.0.6.tar.gz) = UkA/4pABLOd3xGJnkMiVEySiueMxazFDd5xysCl0Lxk=
+SHA256 (cargo/mio-uds-0.6.8.tar.gz) = r8tpnrJtQzJkfMhISSu8Fer7JvCNAwRVDVqh9hLgZvA=
SHA256 (cargo/miow-0.2.2.tar.gz) = 69gIQkFmMi1KONqHCDv93TrEwTEzTtVYVhEusG1GlE0=
SHA256 (cargo/miow-0.3.7.tar.gz) = ufHFsCXNqHb2bvQ6ET+R68n0zO80hDAA4K3267q4TiE=
-SHA256 (cargo/ndk-0.2.1.tar.gz) = XrFnwf6+0KSWY5A00MdrO3QmNjYEXbVInu5SFDwkbnM=
-SHA256 (cargo/ndk-glue-0.2.1.tar.gz) = vfOZuLejnG+xU8TsMscv1f54nfJKZH8inCOap62xUkE=
-SHA256 (cargo/ndk-macro-0.2.0.tar.gz) = BdHGMH3EJND2W5sG6U+IJI5jBXJrFHKf1npeR7LcSB0=
-SHA256 (cargo/ndk-sys-0.2.1.tar.gz) = xEkiyz27HHC15fRD1jtkNjqJhWTXObpRmOOpE4RCho0=
+SHA256 (cargo/ndk-0.5.0.tar.gz) = ltho9lTHLnX4aHVyaZzavnVfA+/7tiVCdo6ZXVuNaZ0=
+SHA256 (cargo/ndk-glue-0.5.0.tar.gz) = /CkbjeIJXLqNq3zzgb9YL/TBegms+FTDLkZUWwgIXSg=
+SHA256 (cargo/ndk-macro-0.3.0.tar.gz) = DfesAMRnL51a7OVO4zR1ILfiDxWGVsfbLm3gGQLremw=
+SHA256 (cargo/ndk-sys-0.2.2.tar.gz) = 4bzddMIK1dlarNYO+bpA/fd/dnBRBAVB31V7epsqISE=
SHA256 (cargo/net2-0.2.37.tar.gz) = ORYw0StoACrh4l6Pl0MGR0lmVQrYLaxohvuJEMGVaK4=
-SHA256 (cargo/nix-0.18.0.tar.gz) = g0UP5qYULd2V+wZLdGCD/E7xcF/oH2SmTh1LOfVKEFU=
-SHA256 (cargo/nix-0.20.0.tar.gz) = +ptIGdobxhwOpItjt7yGBAZN1DAT58wyXfCY1JzXwYo=
-SHA256 (cargo/nix-0.22.0.tar.gz) = zx4l7mtBLCoeP8tqRJmlwb/n9D4BS9zpprZmblqi0Yc=
-SHA256 (cargo/nom-6.2.1.tar.gz) = nFxRuQg6PGIPpnoqY10c59lbiX6VfWso/5pdqWChA6Y=
+SHA256 (cargo/nix-0.22.2.tar.gz) = 07uaE/oyvFrrZBUM0/MtbPTHSPj4pBfM5dLrl2qDcLo=
+SHA256 (cargo/nom-7.1.0.tar.gz) = Gx0R4e84nHb+W4G8ry6jLPiLYrxJThn0k9CzDnqTAQk=
SHA256 (cargo/notify-4.0.17.tar.gz) = rgPIyFPbp7/SPlcf8M/3vJ3OtApM1oTNFoGCQYP0Ulc=
-SHA256 (cargo/num_enum-0.4.3.tar.gz) = ylZaffBvPUtIVJTyW6BdoUNZUPTcJjRA7aem+puONuQ=
-SHA256 (cargo/num_enum_derive-0.4.3.tar.gz) = /6WjPd3f7gTAKDp2U5h9Y06IA0fpa1su1k3gfvtZ250=
+SHA256 (cargo/ntapi-0.3.6.tar.gz) = P2u5AuQ3tthuA8zhCn4q9mIpLF3+8jtliZ6jrJNUrUQ=
+SHA256 (cargo/num_enum-0.5.6.tar.gz) = cg0+oQVeTkV0wMCw+MP9TyTEza9GWUggbeoJC1e1Jq0=
+SHA256 (cargo/num_enum_derive-0.5.6.tar.gz) = DZkrdoSQ1/4NhYbZtXRfbEn1V9ptgdyYKx0WetTtuyE=
SHA256 (cargo/objc-0.2.7.tar.gz) = kVsbRyvCHFNGTWyEYcnTr4Bboe+DfhysJUQo9Kdxd7E=
SHA256 (cargo/objc-foundation-0.1.1.tar.gz) = Gt0bZZ42yWB8equGSnbHpMJ2DNDNLhIPP7i5UsfiK/k=
SHA256 (cargo/objc_id-0.1.1.tar.gz) = yS1N20vXtQ1zDCFf+HF1TQ2msheISfiioqtpcS0MBzs=
-SHA256 (cargo/once_cell-1.8.0.tar.gz) = aS/LY7ZLF1gCngqW7mPgSc6MWUhYfy9yCN8EYl5fa1Y=
+SHA256 (cargo/once_cell-1.9.0.tar.gz) = 2jJRXZ9ubkide8nYTHGwYNtyR9wDW75E6siM+HSG2NU=
SHA256 (cargo/osmesa-sys-0.1.2.tar.gz) = iM/s5uldLnF+CHKn9TqGhHEq0Tgip5ebx2C5x37AATs=
-SHA256 (cargo/owned_ttf_parser-0.6.0.tar.gz) = n5I/uAbEYmbAKrSlsjlzXBRL3tpySlDtBY5SJvWUzeM=
-SHA256 (cargo/parking_lot-0.11.1.tar.gz) = bXdErAKd8i3KYoTv5OiYmR0o4whccGyXK819pKJ6Fes=
-SHA256 (cargo/parking_lot_core-0.8.3.tar.gz) = +np4KTjnRXY/5pB/xrqGlG1y9J/n4h3gdOCBKKmfsBg=
+SHA256 (cargo/parking_lot-0.11.2.tar.gz) = fRe3gDamBmO3l63q7kb1yd/ruGlI0SVQB6HWvgJx/5k=
+SHA256 (cargo/parking_lot_core-0.8.5.tar.gz) = 126OFJO8rA0nZsQnN/NEWPHIxQwNI7yyTqlTr/snMhY=
SHA256 (cargo/percent-encoding-2.1.0.tar.gz) = 1P1WQdAcjxiiPae2/ikpj/S1WvzM33iXOyTPMXX+4y4=
-SHA256 (cargo/pkg-config-0.3.19.tar.gz) = ODFFOzRJzrSLbZx618ltXqZz6bRwodxXjCzmUhIwiEw=
+SHA256 (cargo/pkg-config-0.3.24.tar.gz) = WIk/dRybBBKHGgmr1i7NKgApjGyDvvoiPvmMUq70DL4=
SHA256 (cargo/png-0.16.8.tar.gz) = PDKHkgy4R97j3jPTAcRj+6FN2pnbJCFN35P4PTAh9MY=
-SHA256 (cargo/proc-macro-crate-0.1.5.tar.gz) = HW6jxFlbljY8E5Q0l9s0r0Rg+0dKlcQ/REatNBuMl4U=
-SHA256 (cargo/proc-macro2-1.0.28.tar.gz) = XH7YuMe4huo+193kBSEhhfQjq0RoJmfIxt0Uqh2fZhI=
-SHA256 (cargo/quote-1.0.9.tar.gz) = w9C5dF3C3r9QfIQi3gXXImzB8GRCFt/f6tmI+bGrMqc=
-SHA256 (cargo/raw-window-handle-0.3.3.tar.gz) = CkQaemyArWRzvUt07ByaTJUXlChb+UHCEm9gfHLkghE=
-SHA256 (cargo/redox_syscall-0.2.9.tar.gz) = WrSaut8/nhxLxJnohF4VKth9KtLTA3GEEXEWnp11/u4=
+SHA256 (cargo/proc-macro-crate-1.1.0.tar.gz) = HrrOaInK+Im00/dr7O4S6QNT8rjH2HVTSnHldC+Pb4M=
+SHA256 (cargo/proc-macro-error-1.0.4.tar.gz) = 2iVJD/mJKqs/z3w28Iz7kC3T5xyg+flRe+oCpzpc44w=
+SHA256 (cargo/proc-macro-error-attr-1.0.4.tar.gz) = ob5AGA5S7MmK2AsYSTS689DSn5eVdOQ5r1pVJ0s1+Gk=
+SHA256 (cargo/proc-macro2-1.0.36.tar.gz) = xzQtWIP7zK4cw3ojU7Cch8mw86/XP1+5u6aHofczsCk=
+SHA256 (cargo/quick-xml-0.22.0.tar.gz) = hTPxTIOCqq0NWSyBKsO4JhYhKLZWYjMeESe0XD0YU2s=
+SHA256 (cargo/quote-1.0.14.tar.gz) = R6qARHzk2vFxdQADcFKvF2r104zD5XHZ7BxzU/wQyH0=
+SHA256 (cargo/raw-window-handle-0.4.2.tar.gz) = +6de7pSp1Sc6aMnh4QXZz/4e9wBTIyV4g4nlqD4lIrc=
+SHA256 (cargo/redox_syscall-0.2.10.tar.gz) = g4PzljkmnN6X0lWjK9towEczcpVBSUDGi90wwuEyA/8=
SHA256 (cargo/redox_users-0.4.0.tar.gz) = UoUy89gByHrsne8q3ZyoAv5WnkSlRK/mM3ZSZ4QKvmQ=
SHA256 (cargo/regex-automata-0.1.10.tar.gz) = bCMNc/uNjBucCzE1xRQqis7joFWPuNtc8ctl+NeGITI=
SHA256 (cargo/regex-syntax-0.6.25.tar.gz) = 9JcoWITz/P9CT/yTPlbXy8pRHe8MmDGn+bX2FT48yJs=
-SHA256 (cargo/rusttype-0.9.2.tar.gz) = 3Hxyet7QvhjFuAwWQOrgrI45ar9vqEd9lss30Y7l7Fk=
-SHA256 (cargo/ryu-1.0.5.tar.gz) = cdMB1Bk9Axq915/3491yEWipVy7z/lGhUXq6I1vY+G4=
+SHA256 (cargo/ryu-1.0.9.tar.gz) = c7S3UMeCllwhG0LwIvWa8fvOq90CZiNxTxBBUvHsFJ8=
SHA256 (cargo/same-file-1.0.6.tar.gz) = k/wdw6qpv+2V4C5urau0uvfjB4sL0bTXtrC2g3iQBQI=
SHA256 (cargo/scoped-tls-1.0.0.tar.gz) = 6mqSkOPJzw8YFF73/6YtaO4L9fzWUQF+WG3H/V2kSMI=
SHA256 (cargo/scopeguard-1.1.0.tar.gz) = 0pqwxtP8Dukv5m4tmfcA6rF6jVfRwdO3SDgPsguqeM0=
-SHA256 (cargo/serde-1.0.127.tar.gz) = 8DuYeKv20U5nedPyTweyz6kDUs/sSsxaq48ax/FG+ug=
-SHA256 (cargo/serde_derive-1.0.127.tar.gz) = oCSSbTQyUWYGMoWX4PIkpRNVpJO0n91n6SCRh8vlXsw=
-SHA256 (cargo/serde_json-1.0.66.tar.gz) = M2sQ2hmhKtCUtZ2HDr3iakVALltHCt1LX9A8UEijISc=
-SHA256 (cargo/serde_yaml-0.8.17.tar.gz) = FWVO1Kthcmv5GKOcuNmKLimVsAI4eAf6a6WP339ZuyM=
+SHA256 (cargo/serde-1.0.133.tar.gz) = l1ZQZ1F7YOLR6osmjlnOA23pB6xSOtg6BHXaBOgYmJo=
+SHA256 (cargo/serde_derive-1.0.133.tar.gz) = 7SAWmTKFaNjQggj90IDj/1lObEIuQ4tnBZBdoBAF1Tc=
+SHA256 (cargo/serde_json-1.0.74.tar.gz) = 7iu5zQYcWGXTRbsCykn87xORdBtnK1Sgv3tnm63sMUI=
+SHA256 (cargo/serde_yaml-0.8.23.tar.gz) = pKUh8pQDhcFlok7ihqqFmWM9FiB3pUvcripv1ae/p6A=
SHA256 (cargo/servo-fontconfig-0.5.1.tar.gz) = x+PiL+X9c9BOvw2qBJ0+/j6uVTac44qxbQfd2axcIXw=
SHA256 (cargo/servo-fontconfig-sys-5.1.0.tar.gz) = 42uHnbmJLfpA+V2hw4qDXUFjS4JfvYxMQYCT1Twks4g=
SHA256 (cargo/shared_library-0.1.9.tar.gz) = Wp5+Dyv64k2KW1pmxbJXqDx0EjBDEVEqDAVM1eYZ2hE=
-SHA256 (cargo/signal-hook-0.1.17.tar.gz) = fjHUQsFvBHpnG1px4hYdbmiBQBK39TedJp69kV+sJyk=
+SHA256 (cargo/signal-hook-0.3.13.tar.gz) = ZHyX3ycQB9zqSFu3T/21fy5oPxMGyFT0aKDCRLravy0=
+SHA256 (cargo/signal-hook-mio-0.2.1.tar.gz) = Kf1YZ/HE8sW+B5rueirfEVLrsEpLxNNB9QS33s5gftQ=
SHA256 (cargo/signal-hook-registry-1.4.0.tar.gz) = 5R5zMo3ErAx8y9o6SU36A98d4vRgGBJ/YMaT8mSEVbA=
-SHA256 (cargo/slab-0.4.3.tar.gz) = 8XOsPRp+OygAP0DeC1zn/icQ+bncP8OGZM6+5Gs7ZSc=
-SHA256 (cargo/smallvec-1.6.1.tar.gz) = /g83yejzxaSmatZVqTx02qxK0AxEFTO/XG55kLtCYE4=
-SHA256 (cargo/smithay-client-toolkit-0.12.3.tar.gz) = R1DHb9XTrJX6PtgP5mfWo9hZCpYOW1dbmO6pMzmoC4A=
-SHA256 (cargo/smithay-client-toolkit-0.14.0.tar.gz) = 7Hg2g0maLPyFtt89BPg7GQe1y9mKGu1EZn298erE5kw=
-SHA256 (cargo/smithay-clipboard-0.6.4.tar.gz) = mGxbSnvU9Q1MUfgfhEdFU1y0iDYPnPYyk3gLEJuSlfM=
+SHA256 (cargo/slab-0.4.5.tar.gz) = ne+R/R4Bj+AHAieR+GXQzMmzoNUAHgGqu4tA5GAAr7U=
+SHA256 (cargo/smallvec-1.7.0.tar.gz) = Hsq2xzWmu0E5wMqv0Mw2NXSLuzrPRVDoE4EiCZJR8wk=
+SHA256 (cargo/smithay-client-toolkit-0.15.3.tar.gz) = EyXykiCc7njVA1UwkyQiowqkyP2hoWWTrAg8HeIR5oo=
+SHA256 (cargo/smithay-clipboard-0.6.5.tar.gz) = YQtVG9JTeL/SuOeg/L2D1Cfo8vakDEeuD3BojplJ3VU=
SHA256 (cargo/spsc-buffer-0.1.1.tar.gz) = vmw/OcN6QoPuS0PRMRyCjy4fsFQeduoMsaKr2e8vWzs=
+SHA256 (cargo/strsim-0.10.0.tar.gz) = c0c8Dlnm1YEsXf4qBkpkRJSfCJ4g7smi5VBllklORiM=
SHA256 (cargo/strsim-0.8.0.tar.gz) = jqURnNtMVbVdQyq7UToEKThIeMFd3mDMd7HJneGpWmo=
-SHA256 (cargo/strsim-0.9.3.tar.gz) = ZEbO2A1sSGQ221wHjd4Rqfc9QrV/snMSHhYLhPY9iUw=
-SHA256 (cargo/syn-1.0.74.tar.gz) = GHPYMlUNRYjD28IPATYasAv+dBBI9x4/7PFFp8wYspw=
+SHA256 (cargo/structopt-0.3.25.tar.gz) = QLl4j0ICqnXCQOzJwVxlGF5qOczesP1dAIuYglRkyHw=
+SHA256 (cargo/structopt-derive-0.4.18.tar.gz) = 3LWuMn+cwTtodjtXSXcMueBIqZvZ39+ljQzwXV9kr+A=
+SHA256 (cargo/syn-1.0.85.tar.gz) = poSsPc2JE4J+GM0JpoOE7mbB3iQVfjxVbJqxbYVpX7c=
SHA256 (cargo/textwrap-0.11.0.tar.gz) = 0yZhD0CMek629Rw3wzDklrCFBslFfJ00KH7MOICfsGA=
-SHA256 (cargo/thiserror-1.0.26.tar.gz) = kxGeT+rBy+bHmMNNOlPqACawsd5qEg3u+JUTfAUpv+I=
-SHA256 (cargo/thiserror-impl-1.0.26.tar.gz) = Bg1poK/neWv0Lp4v+R9e5pH7FcU9OLS2KppT6yMWR0U=
-SHA256 (cargo/time-0.1.43.tar.gz) = yopQ7yNg+9HusOzUZ5WoehkCTrS1PF3JFsof2V/mJDg=
+SHA256 (cargo/thiserror-1.0.30.tar.gz) = hUur5S5N8WU3BrmPz8BYQwEAObQGh1kwpw5NlkTlxBc=
+SHA256 (cargo/thiserror-impl-1.0.30.tar.gz) = qjL9P2J/Nn/hb4k+JZeuPAUCD4u6Jmak5upz03flcUs=
SHA256 (cargo/toml-0.5.8.tar.gz) = oxFClwgmcz34JB7zXcBA75jGeasU18PlTYJwmbOs7Ko=
-SHA256 (cargo/ttf-parser-0.6.2.tar.gz) = Pl1816s+R92m5WVC9LvzgkwVI0lYxuG9aqo0fpNJn9w=
-SHA256 (cargo/unicode-width-0.1.8.tar.gz) = kzdZGJOhm4jY2H8s7B5z+tXN/RDlpvNJ9JitbqL/seM=
+SHA256 (cargo/unicode-segmentation-1.8.0.tar.gz) = iJWEmpSeeEXga9bcGqUXMaEDxCcHAQpbWRwAOPtzOFs=
+SHA256 (cargo/unicode-width-0.1.9.tar.gz) = PtdC1Oor0RduI2FyyEKar1RIbnrAmNsp/+ZSngzlCXM=
SHA256 (cargo/unicode-xid-0.2.2.tar.gz) = jMuC1h+ApmPv4feHpRsWtaUeMxTWrDZbCGOfUjh7M/M=
SHA256 (cargo/utf8parse-0.2.0.tar.gz) = k25LSSrP0TVCHY3KSxqoCnv8JucC7zr3EOB1JoTfU3I=
SHA256 (cargo/vec_map-0.8.2.tar.gz) = 8b3fEYe+aS55xf/quJETLfsPI27TakPH7TnxFl7iAZE=
-SHA256 (cargo/version_check-0.9.3.tar.gz) = X+zcqaUpHMK43PfcAkU/7nkaKA83Q8sJBfiCKuRjs/4=
+SHA256 (cargo/version_check-0.9.4.tar.gz) = SYdLUWe2XXGTuKuhVn9cfZPQAcr8NGAM7gA+2nh+SD8=
SHA256 (cargo/vswhom-0.1.0.tar.gz) = vpebfwdQcQV5noVCA7Rw/3x4oWOeMwpY8YO1/qV0YIs=
SHA256 (cargo/vswhom-sys-0.1.0.tar.gz) = /C9UAtPQ55oGlxT3tI4+zGC+d3WiwEnLg5RXRXojlTI=
SHA256 (cargo/vte-0.10.1.tar.gz) = bLzmkqtMovHzBH/PcyQwJJwOlxv90rI0zyxHrZOvWYM=
SHA256 (cargo/vte_generate_state_changes-0.1.1.tar.gz) = 0leBcIHH3/zbqyS55i0t72Li/30AscIAYlUebMzBRf8=
SHA256 (cargo/walkdir-2.3.2.tar.gz) = gIzyc1zUtoZhE/ZIt5HGrcVxRTe8Ii2TR7sgM4b/2lY=
SHA256 (cargo/wasi-0.10.2+wasi-snapshot-preview1.tar.gz) = /W+9mnmCndGtDMIGJ78e1gZ1an937f97ZrcGT5yzJ8Y=
-SHA256 (cargo/wayland-client-0.28.6.tar.gz) = 46szI1DlAvFZOCIBOUp448wS0PBNuGNCkmAWTqQOA1U=
-SHA256 (cargo/wayland-commons-0.28.6.tar.gz) = ohgXlHxwEbvQon4RsXsze/0CLoVEsHGiZBIyBHlm+9o=
-SHA256 (cargo/wayland-cursor-0.28.6.tar.gz) = vmEAhO3RWG1F573Sdf40XHwYc1mMqkZMT7g13ucPplo=
-SHA256 (cargo/wayland-egl-0.28.6.tar.gz) = mboaseGHVrI5gtNvCIVtUh199FAV9ASi18TwstL2aVY=
-SHA256 (cargo/wayland-protocols-0.28.6.tar.gz) = KGYg6k2AO6z2H6CHpCQu4xZpMJnuWhQHlqq6ArKfhh8=
-SHA256 (cargo/wayland-scanner-0.28.6.tar.gz) = zpI+st62HeMy0fNW7Htr83CU3FVzlS4ciTbbA7VMA/E=
-SHA256 (cargo/wayland-sys-0.28.6.tar.gz) = 2EH8qa7X/r+b7S6XlsSb9Y1BUs7aislJ6+AIaNjw/rg=
+SHA256 (cargo/wasm-bindgen-0.2.78.tar.gz) = Yy9z4jayGRUOonkZblTmEPXbr6XWF4YwPU2lT4Tkf84=
+SHA256 (cargo/wasm-bindgen-backend-0.2.78.tar.gz) = oxe/j5+6JHa0sshe9MSvj/OcPH8M3+7U+Cw0qICqg3s=
+SHA256 (cargo/wasm-bindgen-macro-0.2.78.tar.gz) = 1WFG58SVUov2WHZjvqE6jrWI05s2tnnYOXLhotu9rPk=
+SHA256 (cargo/wasm-bindgen-macro-support-0.2.78.tar.gz) = eAPg7qJYNfir3Fhc0wIbPesRVDxv4ibc0wsiiFfFxas=
+SHA256 (cargo/wasm-bindgen-shared-0.2.78.tar.gz) = AjcjJ4nPA31UgHc/5Wiqx0W/4q+8Eahj6XkBeAprR8w=
+SHA256 (cargo/wayland-client-0.29.4.tar.gz) = kSI0YOcyV/aX2eI9QBJ5Ej02A5o/ekSemD8SMpLURY8=
+SHA256 (cargo/wayland-commons-0.29.4.tar.gz) = lPbl40DXwTSQ7KhniYxM7Fr1bCel/+XIDG/EcI4i0z4=
+SHA256 (cargo/wayland-cursor-0.29.4.tar.gz) = xSdY8T1eeGH8g9lC09mb8nDIMmlXXlKsKeW3PLlWpr0=
+SHA256 (cargo/wayland-egl-0.29.4.tar.gz) = gygdae4WK1kDHGZjhek73kA57FU7kMQZHNsSjO6imjo=
+SHA256 (cargo/wayland-protocols-0.29.4.tar.gz) = YBR64jMDQC5B/gNPdPssNa0HgO6IocQKwJo74edGV0E=
+SHA256 (cargo/wayland-scanner-0.29.4.tar.gz) = OaHtMUP3oUMYcVaiq1J0LonawzJFulBcFyJN9Ik5+eA=
+SHA256 (cargo/wayland-sys-0.29.4.tar.gz) = 2TQd95qJdWeRiON9qziJv6V8RKwsttoWb1GagcvkUtQ=
+SHA256 (cargo/web-sys-0.3.55.tar.gz) = OOsQXxxZ2eqmtc3JK4Wdhbkm6Cyy4JRc0Mkln6pv6fs=
SHA256 (cargo/winapi-0.2.8.tar.gz) = Fn3J1pSam4V/NFEnXpEcP0QlWELB96dvM8VRA6kJCHo=
SHA256 (cargo/winapi-0.3.9.tar.gz) = XIOaZ0/NepiVLlkyQupACr6TmSdGdh44ZBQF0osA9Bk=
SHA256 (cargo/winapi-build-0.1.1.tar.gz) = LTFe7js0rKR5ey2msT7Ygmbm1hJWKgxGOQr4KZ/Gmbw=
SHA256 (cargo/winapi-i686-pc-windows-gnu-0.4.0.tar.gz) = rDuHxjYgQm3ZuZHlzgMp7/VFvMu7NPO+Cf9vtqtRt7Y=
SHA256 (cargo/winapi-util-0.1.5.tar.gz) = cOxs6FuxWBUcrl5ch/lajpfSwMSwASI/M6M0485d4Xg=
SHA256 (cargo/winapi-x86_64-pc-windows-gnu-0.4.0.tar.gz) = cS4ieEHQV8HuHNL7Ivp+WlRhro5I+iynnsQs/BkxGD8=
-SHA256 (cargo/winit-0.24.0.tar.gz) = 2k7ab84OuEvQoz48h5TrkC4QM9Ch1aMbxPGbG0u/9Zc=
-SHA256 (cargo/winreg-0.9.0.tar.gz) = Fs2ziYOXz39iTClJSGab6vruvFV31exT0K+3ZjNZNZc=
+SHA256 (cargo/winit-0.26.1.tar.gz) = m0PMkx1YuZRhGIYH79essqCT5l/GIfVMrXhRemBj5zo=
+SHA256 (cargo/winreg-0.10.1.tar.gz) = gND04nLIXe8TlHY4CxL5rGCSZondLgHUkjIi9AWAhp0=
SHA256 (cargo/wio-0.2.2.tar.gz) = XRKZMvRkSsI5bLRWOFy/nmO1swxujcSCC9yk6wggN6U=
SHA256 (cargo/ws2_32-sys-0.2.1.tar.gz) = 1Zzv69DIkvot1t5YHpNzAdhVLLREic3/A1xhh8tj+l4=
-SHA256 (cargo/x11-clipboard-0.5.2.tar.gz) = s5es5umAUQ3lmk/j1MdY3/qyMdbXR86foaumtgNdXzI=
-SHA256 (cargo/x11-dl-2.18.5.tar.gz) = K/mB46WzMBIJdUIY+WIFLU2e6X5Hj00m1Kbs7TTB/vg=
-SHA256 (cargo/xcb-0.9.0.tar.gz) = YgVvYxOLORFvgqVAyYPMEfHJDNcLPUkqcMJeqlC9IqY=
-SHA256 (cargo/xcursor-0.3.3.tar.gz) = OpojFXSueIAWRmF879E7/pS+kHwOT6l5z9i3cKo8XQg=
-SHA256 (cargo/xdg-2.2.0.tar.gz) = 0IloGqEGqG+t4bASj7Xa8H1YZ6UJqwNtmZiN7IBCmlc=
+SHA256 (cargo/x11-clipboard-0.5.3.tar.gz) = RzBot7gKyGoYMogk8QVOXgB4mMR7W7woG9er4yvDZTw=
+SHA256 (cargo/x11-dl-2.19.1.tar.gz) = 6iaSa0zoGm9dnQ86C8QB5aN8auFKG/qo/2CZyoADjFk=
+SHA256 (cargo/xcb-0.10.1.tar.gz) = dx4rmW33IM0cbdn/kPYtkWmP02EMwHg4jQVkvdZiKpw=
+SHA256 (cargo/xcursor-0.3.4.tar.gz) = RjcFpjMTzUMBGEOBxegELwp+m0u2NlPyFjEdSudGkLc=
+SHA256 (cargo/xdg-2.4.0.tar.gz) = OiP+lYxwQSaHA5yG9XiTi0oLtQ7HiOlrzk1qsA3dWAM=
SHA256 (cargo/xml-rs-0.8.4.tar.gz) = 0tfTlIYT91yY/ZMoz9zEWsxNNgZVKJ0KfU7JMTkiAKM=
SHA256 (cargo/yaml-rust-0.4.5.tar.gz) = VsGTbEzHocmrIaHrtgLrlCuoaMvUSpnLfNxYkjNeHIU=
-SIZE (alacritty-0.9.0.tar.gz) = 1422571
-SIZE (cargo/ab_glyph_rasterizer-0.1.4.tar.gz) = 6641
+SIZE (alacritty-0.10.0.tar.gz) = 1437372
SIZE (cargo/adler32-1.2.0.tar.gz) = 6411
-SIZE (cargo/andrew-0.3.1.tar.gz) = 14030
SIZE (cargo/android_glue-0.2.3.tar.gz) = 1572
-SIZE (cargo/ansi_term-0.11.0.tar.gz) = 17087
+SIZE (cargo/ansi_term-0.12.1.tar.gz) = 24838
SIZE (cargo/atty-0.2.14.tar.gz) = 5470
SIZE (cargo/autocfg-1.0.1.tar.gz) = 12908
SIZE (cargo/base64-0.13.0.tar.gz) = 62070
SIZE (cargo/bitflags-1.2.1.tar.gz) = 16745
SIZE (cargo/block-0.1.6.tar.gz) = 4077
-SIZE (cargo/calloop-0.6.5.tar.gz) = 25180
-SIZE (cargo/cc-1.0.69.tar.gz) = 56044
+SIZE (cargo/bumpalo-3.9.1.tar.gz) = 77507
+SIZE (cargo/calloop-0.9.3.tar.gz) = 55389
+SIZE (cargo/cc-1.0.72.tar.gz) = 57495
SIZE (cargo/cfg-if-0.1.10.tar.gz) = 7933
SIZE (cargo/cfg-if-1.0.0.tar.gz) = 7934
SIZE (cargo/cgl-0.3.2.tar.gz) = 7557
-SIZE (cargo/clap-2.33.3.tar.gz) = 201925
+SIZE (cargo/clap-2.34.0.tar.gz) = 202210
SIZE (cargo/clipboard-win-3.1.1.tar.gz) = 11964
-SIZE (cargo/cmake-0.1.45.tar.gz) = 14375
-SIZE (cargo/cocoa-0.23.0.tar.gz) = 39052
+SIZE (cargo/cmake-0.1.48.tar.gz) = 15142
SIZE (cargo/cocoa-0.24.0.tar.gz) = 39235
SIZE (cargo/cocoa-foundation-0.1.0.tar.gz) = 10645
SIZE (cargo/copypasta-0.7.1.tar.gz) = 12882
SIZE (cargo/core-foundation-0.7.0.tar.gz) = 25384
-SIZE (cargo/core-foundation-0.9.1.tar.gz) = 25985
+SIZE (cargo/core-foundation-0.9.2.tar.gz) = 26857
SIZE (cargo/core-foundation-sys-0.7.0.tar.gz) = 17033
-SIZE (cargo/core-foundation-sys-0.8.2.tar.gz) = 17461
+SIZE (cargo/core-foundation-sys-0.8.3.tar.gz) = 17519
SIZE (cargo/core-graphics-0.19.2.tar.gz) = 28995
-SIZE (cargo/core-graphics-0.22.2.tar.gz) = 28263
+SIZE (cargo/core-graphics-0.22.3.tar.gz) = 29514
SIZE (cargo/core-graphics-types-0.1.1.tar.gz) = 2530
SIZE (cargo/core-text-19.2.0.tar.gz) = 18446
SIZE (cargo/core-video-sys-0.1.4.tar.gz) = 10568
-SIZE (cargo/crc32fast-1.2.1.tar.gz) = 38172
-SIZE (cargo/crossfont-0.3.1.tar.gz) = 31085
-SIZE (cargo/darling-0.10.2.tar.gz) = 17620
-SIZE (cargo/darling_core-0.10.2.tar.gz) = 44339
-SIZE (cargo/darling_macro-0.10.2.tar.gz) = 1919
-SIZE (cargo/derivative-2.2.0.tar.gz) = 48076
+SIZE (cargo/crc32fast-1.3.0.tar.gz) = 38565
+SIZE (cargo/crossfont-0.3.2.tar.gz) = 31052
+SIZE (cargo/cty-0.2.2.tar.gz) = 7230
+SIZE (cargo/darling-0.13.1.tar.gz) = 20097
+SIZE (cargo/darling_core-0.13.1.tar.gz) = 50847
+SIZE (cargo/darling_macro-0.13.1.tar.gz) = 1910
SIZE (cargo/dirs-3.0.2.tar.gz) = 12184
SIZE (cargo/dirs-sys-0.3.6.tar.gz) = 10626
SIZE (cargo/dispatch-0.2.0.tar.gz) = 10229
-SIZE (cargo/dlib-0.4.2.tar.gz) = 3853
SIZE (cargo/dlib-0.5.0.tar.gz) = 5788
SIZE (cargo/downcast-rs-1.2.0.tar.gz) = 11670
-SIZE (cargo/dtoa-0.4.8.tar.gz) = 16175
SIZE (cargo/dwrote-0.11.0.tar.gz) = 21715
-SIZE (cargo/embed-resource-1.6.3.tar.gz) = 12401
+SIZE (cargo/embed-resource-1.6.5.tar.gz) = 12509
SIZE (cargo/expat-sys-2.1.6.tar.gz) = 518887
-SIZE (cargo/filetime-0.2.14.tar.gz) = 14358
+SIZE (cargo/filetime-0.2.15.tar.gz) = 14511
SIZE (cargo/fnv-1.0.7.tar.gz) = 11266
SIZE (cargo/foreign-types-0.3.2.tar.gz) = 7504
SIZE (cargo/foreign-types-0.5.0.tar.gz) = 7824
@@ -256,135 +259,146 @@ SIZE (cargo/fuchsia-zircon-0.3.3.tar.gz)
SIZE (cargo/fuchsia-zircon-sys-0.3.3.tar.gz) = 7191
SIZE (cargo/getrandom-0.2.3.tar.gz) = 26261
SIZE (cargo/gl_generator-0.14.0.tar.gz) = 22330
-SIZE (cargo/glutin-0.26.0.tar.gz) = 57841
+SIZE (cargo/glutin-0.28.0.tar.gz) = 57949
SIZE (cargo/glutin_egl_sys-0.1.5.tar.gz) = 5890
SIZE (cargo/glutin_emscripten_sys-0.1.1.tar.gz) = 1892
SIZE (cargo/glutin_gles2_sys-0.1.5.tar.gz) = 6023
SIZE (cargo/glutin_glx_sys-0.1.7.tar.gz) = 5644
SIZE (cargo/glutin_wgl_sys-0.1.5.tar.gz) = 5487
+SIZE (cargo/hashbrown-0.11.2.tar.gz) = 85713
+SIZE (cargo/heck-0.3.3.tar.gz) = 10260
SIZE (cargo/hermit-abi-0.1.19.tar.gz) = 9979
SIZE (cargo/ident_case-1.0.1.tar.gz) = 3492
+SIZE (cargo/indexmap-1.8.0.tar.gz) = 52583
SIZE (cargo/inotify-0.7.1.tar.gz) = 24637
SIZE (cargo/inotify-sys-0.1.5.tar.gz) = 6965
-SIZE (cargo/instant-0.1.10.tar.gz) = 5218
+SIZE (cargo/instant-0.1.12.tar.gz) = 6128
SIZE (cargo/iovec-0.1.4.tar.gz) = 8720
-SIZE (cargo/itoa-0.4.7.tar.gz) = 12099
+SIZE (cargo/itoa-1.0.1.tar.gz) = 11059
SIZE (cargo/jni-sys-0.3.0.tar.gz) = 10232
+SIZE (cargo/js-sys-0.3.55.tar.gz) = 70499
SIZE (cargo/kernel32-sys-0.2.2.tar.gz) = 24537
SIZE (cargo/khronos_api-3.1.0.tar.gz) = 599718
SIZE (cargo/lazy-bytes-cast-5.0.1.tar.gz) = 4354
SIZE (cargo/lazy_static-1.4.0.tar.gz) = 10443
SIZE (cargo/lazycell-1.3.0.tar.gz) = 12502
-SIZE (cargo/libc-0.2.98.tar.gz) = 522087
-SIZE (cargo/libloading-0.6.7.tar.gz) = 25037
-SIZE (cargo/libloading-0.7.0.tar.gz) = 26216
+SIZE (cargo/libc-0.2.112.tar.gz) = 571445
+SIZE (cargo/libloading-0.7.2.tar.gz) = 27229
SIZE (cargo/linked-hash-map-0.5.4.tar.gz) = 16166
-SIZE (cargo/lock_api-0.4.4.tar.gz) = 20356
+SIZE (cargo/lock_api-0.4.5.tar.gz) = 25199
SIZE (cargo/log-0.4.14.tar.gz) = 34582
SIZE (cargo/malloc_buf-0.0.6.tar.gz) = 1239
-SIZE (cargo/maybe-uninit-2.0.0.tar.gz) = 11809
-SIZE (cargo/memchr-2.3.4.tar.gz) = 23077
-SIZE (cargo/memmap2-0.1.0.tar.gz) = 17685
-SIZE (cargo/memmap2-0.2.3.tar.gz) = 17669
-SIZE (cargo/memoffset-0.6.4.tar.gz) = 7664
+SIZE (cargo/memchr-2.4.1.tar.gz) = 64977
+SIZE (cargo/memmap2-0.3.1.tar.gz) = 18393
+SIZE (cargo/memoffset-0.6.5.tar.gz) = 7686
+SIZE (cargo/minimal-lexical-0.2.1.tar.gz) = 94841
SIZE (cargo/miniz_oxide-0.3.7.tar.gz) = 44996
SIZE (cargo/mio-0.6.23.tar.gz) = 103554
+SIZE (cargo/mio-0.8.0.tar.gz) = 82954
SIZE (cargo/mio-anonymous-pipes-0.2.0.tar.gz) = 3763
SIZE (cargo/mio-extras-2.0.6.tar.gz) = 16292
+SIZE (cargo/mio-uds-0.6.8.tar.gz) = 11496
SIZE (cargo/miow-0.2.2.tar.gz) = 22044
SIZE (cargo/miow-0.3.7.tar.gz) = 24563
-SIZE (cargo/ndk-0.2.1.tar.gz) = 38584
-SIZE (cargo/ndk-glue-0.2.1.tar.gz) = 3684
-SIZE (cargo/ndk-macro-0.2.0.tar.gz) = 4949
-SIZE (cargo/ndk-sys-0.2.1.tar.gz) = 273674
+SIZE (cargo/ndk-0.5.0.tar.gz) = 39766
+SIZE (cargo/ndk-glue-0.5.0.tar.gz) = 4986
+SIZE (cargo/ndk-macro-0.3.0.tar.gz) = 4884
+SIZE (cargo/ndk-sys-0.2.2.tar.gz) = 279365
SIZE (cargo/net2-0.2.37.tar.gz) = 21311
-SIZE (cargo/nix-0.18.0.tar.gz) = 209962
-SIZE (cargo/nix-0.20.0.tar.gz) = 216983
-SIZE (cargo/nix-0.22.0.tar.gz) = 227091
-SIZE (cargo/nom-6.2.1.tar.gz) = 148362
+SIZE (cargo/nix-0.22.2.tar.gz) = 227371
+SIZE (cargo/nom-7.1.0.tar.gz) = 115647
SIZE (cargo/notify-4.0.17.tar.gz) = 54419
-SIZE (cargo/num_enum-0.4.3.tar.gz) = 4840
-SIZE (cargo/num_enum_derive-0.4.3.tar.gz) = 4552
+SIZE (cargo/ntapi-0.3.6.tar.gz) = 127221
+SIZE (cargo/num_enum-0.5.6.tar.gz) = 13721
+SIZE (cargo/num_enum_derive-0.5.6.tar.gz) = 11672
SIZE (cargo/objc-0.2.7.tar.gz) = 22036
SIZE (cargo/objc-foundation-0.1.1.tar.gz) = 9063
SIZE (cargo/objc_id-0.1.1.tar.gz) = 3258
-SIZE (cargo/once_cell-1.8.0.tar.gz) = 28925
+SIZE (cargo/once_cell-1.9.0.tar.gz) = 30702
SIZE (cargo/osmesa-sys-0.1.2.tar.gz) = 1322
-SIZE (cargo/owned_ttf_parser-0.6.0.tar.gz) = 20574
-SIZE (cargo/parking_lot-0.11.1.tar.gz) = 39854
-SIZE (cargo/parking_lot_core-0.8.3.tar.gz) = 32147
+SIZE (cargo/parking_lot-0.11.2.tar.gz) = 39869
+SIZE (cargo/parking_lot_core-0.8.5.tar.gz) = 32466
SIZE (cargo/percent-encoding-2.1.0.tar.gz) = 9748
-SIZE (cargo/pkg-config-0.3.19.tar.gz) = 15451
+SIZE (cargo/pkg-config-0.3.24.tar.gz) = 16489
SIZE (cargo/png-0.16.8.tar.gz) = 52598
-SIZE (cargo/proc-macro-crate-0.1.5.tar.gz) = 8096
-SIZE (cargo/proc-macro2-1.0.28.tar.gz) = 38732
-SIZE (cargo/quote-1.0.9.tar.gz) = 25042
-SIZE (cargo/raw-window-handle-0.3.3.tar.gz) = 5798
-SIZE (cargo/redox_syscall-0.2.9.tar.gz) = 23533
+SIZE (cargo/proc-macro-crate-1.1.0.tar.gz) = 8535
+SIZE (cargo/proc-macro-error-1.0.4.tar.gz) = 25293
+SIZE (cargo/proc-macro-error-attr-1.0.4.tar.gz) = 7971
+SIZE (cargo/proc-macro2-1.0.36.tar.gz) = 41411
+SIZE (cargo/quick-xml-0.22.0.tar.gz) = 132066
+SIZE (cargo/quote-1.0.14.tar.gz) = 27252
+SIZE (cargo/raw-window-handle-0.4.2.tar.gz) = 10139
+SIZE (cargo/redox_syscall-0.2.10.tar.gz) = 23582
SIZE (cargo/redox_users-0.4.0.tar.gz) = 13023
SIZE (cargo/regex-automata-0.1.10.tar.gz) = 114533
SIZE (cargo/regex-syntax-0.6.25.tar.gz) = 293293
-SIZE (cargo/rusttype-0.9.2.tar.gz) = 31314
-SIZE (cargo/ryu-1.0.5.tar.gz) = 49570
+SIZE (cargo/ryu-1.0.9.tar.gz) = 48391
SIZE (cargo/same-file-1.0.6.tar.gz) = 10183
SIZE (cargo/scoped-tls-1.0.0.tar.gz) = 9146
SIZE (cargo/scopeguard-1.1.0.tar.gz) = 11470
-SIZE (cargo/serde-1.0.127.tar.gz) = 75162
-SIZE (cargo/serde_derive-1.0.127.tar.gz) = 54201
-SIZE (cargo/serde_json-1.0.66.tar.gz) = 115121
-SIZE (cargo/serde_yaml-0.8.17.tar.gz) = 40805
+SIZE (cargo/serde-1.0.133.tar.gz) = 75566
+SIZE (cargo/serde_derive-1.0.133.tar.gz) = 54726
+SIZE (cargo/serde_json-1.0.74.tar.gz) = 115919
+SIZE (cargo/serde_yaml-0.8.23.tar.gz) = 42140
SIZE (cargo/servo-fontconfig-0.5.1.tar.gz) = 9738
SIZE (cargo/servo-fontconfig-sys-5.1.0.tar.gz) = 1790708
SIZE (cargo/shared_library-0.1.9.tar.gz) = 10566
-SIZE (cargo/signal-hook-0.1.17.tar.gz) = 27085
+SIZE (cargo/signal-hook-0.3.13.tar.gz) = 49252
+SIZE (cargo/signal-hook-mio-0.2.1.tar.gz) = 8893
SIZE (cargo/signal-hook-registry-1.4.0.tar.gz) = 17912
-SIZE (cargo/slab-0.4.3.tar.gz) = 15681
-SIZE (cargo/smallvec-1.6.1.tar.gz) = 26444
-SIZE (cargo/smithay-client-toolkit-0.12.3.tar.gz) = 128701
-SIZE (cargo/smithay-client-toolkit-0.14.0.tar.gz) = 127701
-SIZE (cargo/smithay-clipboard-0.6.4.tar.gz) = 16234
+SIZE (cargo/slab-0.4.5.tar.gz) = 15888
+SIZE (cargo/smallvec-1.7.0.tar.gz) = 27459
+SIZE (cargo/smithay-client-toolkit-0.15.3.tar.gz) = 129366
+SIZE (cargo/smithay-clipboard-0.6.5.tar.gz) = 16331
SIZE (cargo/spsc-buffer-0.1.1.tar.gz) = 3176
+SIZE (cargo/strsim-0.10.0.tar.gz) = 11355
SIZE (cargo/strsim-0.8.0.tar.gz) = 9309
-SIZE (cargo/strsim-0.9.3.tar.gz) = 10266
-SIZE (cargo/syn-1.0.74.tar.gz) = 232974
+SIZE (cargo/structopt-0.3.25.tar.gz) = 52296
+SIZE (cargo/structopt-derive-0.4.18.tar.gz) = 20996
+SIZE (cargo/syn-1.0.85.tar.gz) = 235056
SIZE (cargo/textwrap-0.11.0.tar.gz) = 17322
-SIZE (cargo/thiserror-1.0.26.tar.gz) = 16711
-SIZE (cargo/thiserror-impl-1.0.26.tar.gz) = 13431
-SIZE (cargo/time-0.1.43.tar.gz) = 28653
+SIZE (cargo/thiserror-1.0.30.tar.gz) = 17748
+SIZE (cargo/thiserror-impl-1.0.30.tar.gz) = 15230
SIZE (cargo/toml-0.5.8.tar.gz) = 54219
-SIZE (cargo/ttf-parser-0.6.2.tar.gz) = 106052
-SIZE (cargo/unicode-width-0.1.8.tar.gz) = 16732
+SIZE (cargo/unicode-segmentation-1.8.0.tar.gz) = 94011
+SIZE (cargo/unicode-width-0.1.9.tar.gz) = 16745
SIZE (cargo/unicode-xid-0.2.2.tar.gz) = 14955
SIZE (cargo/utf8parse-0.2.0.tar.gz) = 13392
SIZE (cargo/vec_map-0.8.2.tar.gz) = 14466
-SIZE (cargo/version_check-0.9.3.tar.gz) = 12547
+SIZE (cargo/version_check-0.9.4.tar.gz) = 14895
SIZE (cargo/vswhom-0.1.0.tar.gz) = 9420
SIZE (cargo/vswhom-sys-0.1.0.tar.gz) = 15589
SIZE (cargo/vte-0.10.1.tar.gz) = 24947
SIZE (cargo/vte_generate_state_changes-0.1.1.tar.gz) = 2422
SIZE (cargo/walkdir-2.3.2.tar.gz) = 23516
SIZE (cargo/wasi-0.10.2+wasi-snapshot-preview1.tar.gz) = 27505
-SIZE (cargo/wayland-client-0.28.6.tar.gz) = 69347
-SIZE (cargo/wayland-commons-0.28.6.tar.gz) = 20581
-SIZE (cargo/wayland-cursor-0.28.6.tar.gz) = 6176
-SIZE (cargo/wayland-egl-0.28.6.tar.gz) = 3066
-SIZE (cargo/wayland-protocols-0.28.6.tar.gz) = 125975
-SIZE (cargo/wayland-scanner-0.28.6.tar.gz) = 17226
-SIZE (cargo/wayland-sys-0.28.6.tar.gz) = 7937
+SIZE (cargo/wasm-bindgen-0.2.78.tar.gz) = 162111
+SIZE (cargo/wasm-bindgen-backend-0.2.78.tar.gz) = 25576
+SIZE (cargo/wasm-bindgen-macro-0.2.78.tar.gz) = 11700
+SIZE (cargo/wasm-bindgen-macro-support-0.2.78.tar.gz) = 17858
+SIZE (cargo/wasm-bindgen-shared-0.2.78.tar.gz) = 7206
+SIZE (cargo/wayland-client-0.29.4.tar.gz) = 71383
+SIZE (cargo/wayland-commons-0.29.4.tar.gz) = 20757
+SIZE (cargo/wayland-cursor-0.29.4.tar.gz) = 6136
+SIZE (cargo/wayland-egl-0.29.4.tar.gz) = 3088
+SIZE (cargo/wayland-protocols-0.29.4.tar.gz) = 140842
+SIZE (cargo/wayland-scanner-0.29.4.tar.gz) = 17231
+SIZE (cargo/wayland-sys-0.29.4.tar.gz) = 7919
+SIZE (cargo/web-sys-0.3.55.tar.gz) = 664827
SIZE (cargo/winapi-0.2.8.tar.gz) = 455145
SIZE (cargo/winapi-0.3.9.tar.gz) = 1200382
SIZE (cargo/winapi-build-0.1.1.tar.gz) = 669
SIZE (cargo/winapi-i686-pc-windows-gnu-0.4.0.tar.gz) = 2918815
SIZE (cargo/winapi-util-0.1.5.tar.gz) = 10164
SIZE (cargo/winapi-x86_64-pc-windows-gnu-0.4.0.tar.gz) = 2947998
-SIZE (cargo/winit-0.24.0.tar.gz) = 330256
-SIZE (cargo/winreg-0.9.0.tar.gz) = 23127
+SIZE (cargo/winit-0.26.1.tar.gz) = 333842
+SIZE (cargo/winreg-0.10.1.tar.gz) = 25725
SIZE (cargo/wio-0.2.2.tar.gz) = 11214
SIZE (cargo/ws2_32-sys-0.2.1.tar.gz) = 4697
-SIZE (cargo/x11-clipboard-0.5.2.tar.gz) = 7634
-SIZE (cargo/x11-dl-2.18.5.tar.gz) = 62951
-SIZE (cargo/xcb-0.9.0.tar.gz) = 129744
-SIZE (cargo/xcursor-0.3.3.tar.gz) = 6130
-SIZE (cargo/xdg-2.2.0.tar.gz) = 13387
+SIZE (cargo/x11-clipboard-0.5.3.tar.gz) = 7789
+SIZE (cargo/x11-dl-2.19.1.tar.gz) = 64664
+SIZE (cargo/xcb-0.10.1.tar.gz) = 141048
+SIZE (cargo/xcursor-0.3.4.tar.gz) = 6069
+SIZE (cargo/xdg-2.4.0.tar.gz) = 14035
SIZE (cargo/xml-rs-0.8.4.tar.gz) = 52690
SIZE (cargo/yaml-rust-0.4.5.tar.gz) = 47783

872
alacritty.diff Normal file
View File

@ -0,0 +1,872 @@
diff -ru alacritty.old/Makefile alacritty/Makefile
--- alacritty.old/Makefile Mon Nov 15 21:00:49 2021
+++ alacritty/Makefile Mon Jan 24 15:52:06 2022
@@ -11,8 +11,8 @@
GH_ACCOUNT = alacritty
GH_PROJECT = alacritty
-GH_TAGNAME = v0.9.0
-REVISION = 2
+GH_TAGNAME = v0.10.0
+REVISION = 0
# Apache 2.0
PERMIT_PACKAGE = Yes
diff -ru alacritty.old/crates.inc alacritty/crates.inc
--- alacritty.old/crates.inc Fri Oct 22 19:24:59 2021
+++ alacritty/crates.inc Mon Jan 24 16:41:46 2022
@@ -1,53 +1,48 @@
-# $OpenBSD: crates.inc,v 1.1.1.1 2021/10/22 17:24:59 fcambus Exp $
-
-MODCARGO_CRATES += ab_glyph_rasterizer 0.1.4 # Apache-2.0
+# $OpenBSD$
MODCARGO_CRATES += adler32 1.2.0 # Zlib
-MODCARGO_CRATES += andrew 0.3.1 # MIT
MODCARGO_CRATES += android_glue 0.2.3 # MIT
-MODCARGO_CRATES += ansi_term 0.11.0 # MIT
+MODCARGO_CRATES += ansi_term 0.12.1 # MIT
MODCARGO_CRATES += atty 0.2.14 # MIT
MODCARGO_CRATES += autocfg 1.0.1 # Apache-2.0 OR MIT
MODCARGO_CRATES += base64 0.13.0 # MIT/Apache-2.0
MODCARGO_CRATES += bitflags 1.2.1 # MIT/Apache-2.0
MODCARGO_CRATES += block 0.1.6 # MIT
-MODCARGO_CRATES += calloop 0.6.5 # MIT
-MODCARGO_CRATES += cc 1.0.69 # MIT/Apache-2.0
+MODCARGO_CRATES += bumpalo 3.9.1 # MIT/Apache-2.0
+MODCARGO_CRATES += calloop 0.9.3 # MIT
+MODCARGO_CRATES += cc 1.0.72 # MIT/Apache-2.0
MODCARGO_CRATES += cfg-if 0.1.10 # MIT/Apache-2.0
MODCARGO_CRATES += cfg-if 1.0.0 # MIT/Apache-2.0
MODCARGO_CRATES += cgl 0.3.2 # MIT / Apache-2.0
-MODCARGO_CRATES += clap 2.33.3 # MIT
+MODCARGO_CRATES += clap 2.34.0 # MIT
MODCARGO_CRATES += clipboard-win 3.1.1 # MIT
-MODCARGO_CRATES += cmake 0.1.45 # MIT/Apache-2.0
-MODCARGO_CRATES += cocoa 0.23.0 # MIT / Apache-2.0
+MODCARGO_CRATES += cmake 0.1.48 # MIT/Apache-2.0
MODCARGO_CRATES += cocoa 0.24.0 # MIT / Apache-2.0
MODCARGO_CRATES += cocoa-foundation 0.1.0 # MIT / Apache-2.0
MODCARGO_CRATES += copypasta 0.7.1 # MIT / Apache-2.0
MODCARGO_CRATES += core-foundation 0.7.0 # MIT / Apache-2.0
-MODCARGO_CRATES += core-foundation 0.9.1 # MIT / Apache-2.0
+MODCARGO_CRATES += core-foundation 0.9.2 # MIT / Apache-2.0
MODCARGO_CRATES += core-foundation-sys 0.7.0 # MIT / Apache-2.0
-MODCARGO_CRATES += core-foundation-sys 0.8.2 # MIT / Apache-2.0
+MODCARGO_CRATES += core-foundation-sys 0.8.3 # MIT / Apache-2.0
MODCARGO_CRATES += core-graphics 0.19.2 # MIT / Apache-2.0
-MODCARGO_CRATES += core-graphics 0.22.2 # MIT / Apache-2.0
+MODCARGO_CRATES += core-graphics 0.22.3 # MIT / Apache-2.0
MODCARGO_CRATES += core-graphics-types 0.1.1 # MIT / Apache-2.0
MODCARGO_CRATES += core-text 19.2.0 # MIT/Apache-2.0
MODCARGO_CRATES += core-video-sys 0.1.4 # MIT
-MODCARGO_CRATES += crc32fast 1.2.1 # MIT OR Apache-2.0
-MODCARGO_CRATES += crossfont 0.3.1 # Apache-2.0
-MODCARGO_CRATES += darling 0.10.2 # MIT
-MODCARGO_CRATES += darling_core 0.10.2 # MIT
-MODCARGO_CRATES += darling_macro 0.10.2 # MIT
-MODCARGO_CRATES += derivative 2.2.0 # MIT/Apache-2.0
+MODCARGO_CRATES += crc32fast 1.3.0 # MIT OR Apache-2.0
+MODCARGO_CRATES += crossfont 0.3.2 # Apache-2.0
+MODCARGO_CRATES += cty 0.2.2 # MIT OR Apache-2.0
+MODCARGO_CRATES += darling 0.13.1 # MIT
+MODCARGO_CRATES += darling_core 0.13.1 # MIT
+MODCARGO_CRATES += darling_macro 0.13.1 # MIT
MODCARGO_CRATES += dirs 3.0.2 # MIT OR Apache-2.0
MODCARGO_CRATES += dirs-sys 0.3.6 # MIT OR Apache-2.0
MODCARGO_CRATES += dispatch 0.2.0 # MIT
-MODCARGO_CRATES += dlib 0.4.2 # MIT
MODCARGO_CRATES += dlib 0.5.0 # MIT
MODCARGO_CRATES += downcast-rs 1.2.0 # MIT/Apache-2.0
-MODCARGO_CRATES += dtoa 0.4.8 # MIT OR Apache-2.0
MODCARGO_CRATES += dwrote 0.11.0 # MPL-2.0
-MODCARGO_CRATES += embed-resource 1.6.3 # MIT
+MODCARGO_CRATES += embed-resource 1.6.5 # MIT
MODCARGO_CRATES += expat-sys 2.1.6 # MIT
-MODCARGO_CRATES += filetime 0.2.14 # MIT/Apache-2.0
+MODCARGO_CRATES += filetime 0.2.15 # MIT/Apache-2.0
MODCARGO_CRATES += fnv 1.0.7 # Apache-2.0 / MIT
MODCARGO_CRATES += foreign-types 0.3.2 # MIT/Apache-2.0
MODCARGO_CRATES += foreign-types 0.5.0 # MIT/Apache-2.0
@@ -62,135 +57,146 @@
MODCARGO_CRATES += fuchsia-zircon-sys 0.3.3 # BSD-3-Clause
MODCARGO_CRATES += getrandom 0.2.3 # MIT OR Apache-2.0
MODCARGO_CRATES += gl_generator 0.14.0 # Apache-2.0
-MODCARGO_CRATES += glutin 0.26.0 # Apache-2.0
+MODCARGO_CRATES += glutin 0.28.0 # Apache-2.0
MODCARGO_CRATES += glutin_egl_sys 0.1.5 # Apache-2.0
MODCARGO_CRATES += glutin_emscripten_sys 0.1.1 # Apache-2.0
MODCARGO_CRATES += glutin_gles2_sys 0.1.5 # Apache-2.0
MODCARGO_CRATES += glutin_glx_sys 0.1.7 # Apache-2.0
MODCARGO_CRATES += glutin_wgl_sys 0.1.5 # Apache-2.0
+MODCARGO_CRATES += hashbrown 0.11.2 # Apache-2.0/MIT
+MODCARGO_CRATES += heck 0.3.3 # MIT OR Apache-2.0
MODCARGO_CRATES += hermit-abi 0.1.19 # MIT/Apache-2.0
MODCARGO_CRATES += ident_case 1.0.1 # MIT/Apache-2.0
+MODCARGO_CRATES += indexmap 1.8.0 # Apache-2.0/MIT
MODCARGO_CRATES += inotify 0.7.1 # ISC
MODCARGO_CRATES += inotify-sys 0.1.5 # ISC
-MODCARGO_CRATES += instant 0.1.10 # BSD-3-Clause
+MODCARGO_CRATES += instant 0.1.12 # BSD-3-Clause
MODCARGO_CRATES += iovec 0.1.4 # MIT/Apache-2.0
-MODCARGO_CRATES += itoa 0.4.7 # MIT OR Apache-2.0
+MODCARGO_CRATES += itoa 1.0.1 # MIT OR Apache-2.0
MODCARGO_CRATES += jni-sys 0.3.0 # MIT/Apache-2.0
+MODCARGO_CRATES += js-sys 0.3.55 # MIT/Apache-2.0
MODCARGO_CRATES += kernel32-sys 0.2.2 # MIT
MODCARGO_CRATES += khronos_api 3.1.0 # Apache-2.0
MODCARGO_CRATES += lazy-bytes-cast 5.0.1 # BSL-1.0
MODCARGO_CRATES += lazy_static 1.4.0 # MIT/Apache-2.0
MODCARGO_CRATES += lazycell 1.3.0 # MIT/Apache-2.0
-MODCARGO_CRATES += libc 0.2.98 # MIT OR Apache-2.0
-MODCARGO_CRATES += libloading 0.6.7 # ISC
-MODCARGO_CRATES += libloading 0.7.0 # ISC
+MODCARGO_CRATES += libc 0.2.112 # MIT OR Apache-2.0
+MODCARGO_CRATES += libloading 0.7.2 # ISC
MODCARGO_CRATES += linked-hash-map 0.5.4 # MIT/Apache-2.0
-MODCARGO_CRATES += lock_api 0.4.4 # Apache-2.0/MIT
+MODCARGO_CRATES += lock_api 0.4.5 # Apache-2.0/MIT
MODCARGO_CRATES += log 0.4.14 # MIT OR Apache-2.0
MODCARGO_CRATES += malloc_buf 0.0.6 # MIT
-MODCARGO_CRATES += maybe-uninit 2.0.0 # Apache-2.0 OR MIT
-MODCARGO_CRATES += memchr 2.3.4 # Unlicense/MIT
-MODCARGO_CRATES += memmap2 0.1.0 # MIT/Apache-2.0
-MODCARGO_CRATES += memmap2 0.2.3 # MIT/Apache-2.0
-MODCARGO_CRATES += memoffset 0.6.4 # MIT
+MODCARGO_CRATES += memchr 2.4.1 # Unlicense/MIT
+MODCARGO_CRATES += memmap2 0.3.1 # MIT/Apache-2.0
+MODCARGO_CRATES += memoffset 0.6.5 # MIT
+MODCARGO_CRATES += minimal-lexical 0.2.1 # MIT/Apache-2.0
MODCARGO_CRATES += miniz_oxide 0.3.7 # MIT
MODCARGO_CRATES += mio 0.6.23 # MIT
+MODCARGO_CRATES += mio 0.8.0 # MIT
MODCARGO_CRATES += mio-anonymous-pipes 0.2.0 # MIT
MODCARGO_CRATES += mio-extras 2.0.6 # MIT OR Apache-2.0
+MODCARGO_CRATES += mio-uds 0.6.8 # MIT/Apache-2.0
MODCARGO_CRATES += miow 0.2.2 # MIT/Apache-2.0
MODCARGO_CRATES += miow 0.3.7 # MIT/Apache-2.0
-MODCARGO_CRATES += ndk 0.2.1 # MIT OR Apache-2.0
-MODCARGO_CRATES += ndk-glue 0.2.1 # MIT OR Apache-2.0
-MODCARGO_CRATES += ndk-macro 0.2.0 # MIT OR Apache-2.0
-MODCARGO_CRATES += ndk-sys 0.2.1 # MIT OR Apache-2.0
+MODCARGO_CRATES += ndk 0.5.0 # MIT OR Apache-2.0
+MODCARGO_CRATES += ndk-glue 0.5.0 # MIT OR Apache-2.0
+MODCARGO_CRATES += ndk-macro 0.3.0 # MIT OR Apache-2.0
+MODCARGO_CRATES += ndk-sys 0.2.2 # MIT OR Apache-2.0
MODCARGO_CRATES += net2 0.2.37 # MIT/Apache-2.0
-MODCARGO_CRATES += nix 0.18.0 # MIT
-MODCARGO_CRATES += nix 0.20.0 # MIT
-MODCARGO_CRATES += nix 0.22.0 # MIT
-MODCARGO_CRATES += nom 6.2.1 # MIT
+MODCARGO_CRATES += nix 0.22.2 # MIT
+MODCARGO_CRATES += nom 7.1.0 # MIT
MODCARGO_CRATES += notify 4.0.17 # CC0-1.0
-MODCARGO_CRATES += num_enum 0.4.3 # BSD-3-Clause
-MODCARGO_CRATES += num_enum_derive 0.4.3 # BSD-3-Clause
+MODCARGO_CRATES += ntapi 0.3.6 # Apache-2.0 OR MIT
+MODCARGO_CRATES += num_enum 0.5.6 # BSD-3-Clause OR MIT OR Apache-2.0
+MODCARGO_CRATES += num_enum_derive 0.5.6 # BSD-3-Clause OR MIT OR Apache-2.0
MODCARGO_CRATES += objc 0.2.7 # MIT
MODCARGO_CRATES += objc-foundation 0.1.1 # MIT
MODCARGO_CRATES += objc_id 0.1.1 # MIT
-MODCARGO_CRATES += once_cell 1.8.0 # MIT OR Apache-2.0
+MODCARGO_CRATES += once_cell 1.9.0 # MIT OR Apache-2.0
MODCARGO_CRATES += osmesa-sys 0.1.2 # CC0-1.0
-MODCARGO_CRATES += owned_ttf_parser 0.6.0 # Apache-2.0
-MODCARGO_CRATES += parking_lot 0.11.1 # Apache-2.0/MIT
-MODCARGO_CRATES += parking_lot_core 0.8.3 # Apache-2.0/MIT
+MODCARGO_CRATES += parking_lot 0.11.2 # Apache-2.0/MIT
+MODCARGO_CRATES += parking_lot_core 0.8.5 # Apache-2.0/MIT
MODCARGO_CRATES += percent-encoding 2.1.0 # MIT/Apache-2.0
-MODCARGO_CRATES += pkg-config 0.3.19 # MIT/Apache-2.0
+MODCARGO_CRATES += pkg-config 0.3.24 # MIT/Apache-2.0
MODCARGO_CRATES += png 0.16.8 # MIT OR Apache-2.0
-MODCARGO_CRATES += proc-macro-crate 0.1.5 # Apache-2.0/MIT
-MODCARGO_CRATES += proc-macro2 1.0.28 # MIT OR Apache-2.0
-MODCARGO_CRATES += quote 1.0.9 # MIT OR Apache-2.0
-MODCARGO_CRATES += raw-window-handle 0.3.3 # MIT
-MODCARGO_CRATES += redox_syscall 0.2.9 # MIT
+MODCARGO_CRATES += proc-macro-crate 1.1.0 # Apache-2.0/MIT
+MODCARGO_CRATES += proc-macro-error 1.0.4 # MIT OR Apache-2.0
+MODCARGO_CRATES += proc-macro-error-attr 1.0.4 # MIT OR Apache-2.0
+MODCARGO_CRATES += proc-macro2 1.0.36 # MIT OR Apache-2.0
+MODCARGO_CRATES += quick-xml 0.22.0 # MIT
+MODCARGO_CRATES += quote 1.0.14 # MIT OR Apache-2.0
+MODCARGO_CRATES += raw-window-handle 0.4.2 # MIT OR Apache-2.0 OR Zlib
+MODCARGO_CRATES += redox_syscall 0.2.10 # MIT
MODCARGO_CRATES += redox_users 0.4.0 # MIT
MODCARGO_CRATES += regex-automata 0.1.10 # Unlicense/MIT
MODCARGO_CRATES += regex-syntax 0.6.25 # MIT/Apache-2.0
-MODCARGO_CRATES += rusttype 0.9.2 # MIT / Apache-2.0
-MODCARGO_CRATES += ryu 1.0.5 # Apache-2.0 OR BSL-1.0
+MODCARGO_CRATES += ryu 1.0.9 # Apache-2.0 OR BSL-1.0
MODCARGO_CRATES += same-file 1.0.6 # Unlicense/MIT
MODCARGO_CRATES += scoped-tls 1.0.0 # MIT/Apache-2.0
MODCARGO_CRATES += scopeguard 1.1.0 # MIT/Apache-2.0
-MODCARGO_CRATES += serde 1.0.127 # MIT OR Apache-2.0
-MODCARGO_CRATES += serde_derive 1.0.127 # MIT OR Apache-2.0
-MODCARGO_CRATES += serde_json 1.0.66 # MIT OR Apache-2.0
-MODCARGO_CRATES += serde_yaml 0.8.17 # MIT OR Apache-2.0
+MODCARGO_CRATES += serde 1.0.133 # MIT OR Apache-2.0
+MODCARGO_CRATES += serde_derive 1.0.133 # MIT OR Apache-2.0
+MODCARGO_CRATES += serde_json 1.0.74 # MIT OR Apache-2.0
+MODCARGO_CRATES += serde_yaml 0.8.23 # MIT OR Apache-2.0
MODCARGO_CRATES += servo-fontconfig 0.5.1 # MIT / Apache-2.0
MODCARGO_CRATES += servo-fontconfig-sys 5.1.0 # MIT
MODCARGO_CRATES += shared_library 0.1.9 # Apache-2.0/MIT
-MODCARGO_CRATES += signal-hook 0.1.17 # Apache-2.0/MIT
+MODCARGO_CRATES += signal-hook 0.3.13 # Apache-2.0/MIT
+MODCARGO_CRATES += signal-hook-mio 0.2.1 # Apache-2.0/MIT
MODCARGO_CRATES += signal-hook-registry 1.4.0 # Apache-2.0/MIT
-MODCARGO_CRATES += slab 0.4.3 # MIT
-MODCARGO_CRATES += smallvec 1.6.1 # MIT/Apache-2.0
-MODCARGO_CRATES += smithay-client-toolkit 0.12.3 # MIT
-MODCARGO_CRATES += smithay-client-toolkit 0.14.0 # MIT
-MODCARGO_CRATES += smithay-clipboard 0.6.4 # MIT
+MODCARGO_CRATES += slab 0.4.5 # MIT
+MODCARGO_CRATES += smallvec 1.7.0 # MIT/Apache-2.0
+MODCARGO_CRATES += smithay-client-toolkit 0.15.3 # MIT
+MODCARGO_CRATES += smithay-clipboard 0.6.5 # MIT
MODCARGO_CRATES += spsc-buffer 0.1.1 # MIT
MODCARGO_CRATES += strsim 0.8.0 # MIT
-MODCARGO_CRATES += strsim 0.9.3 # MIT
-MODCARGO_CRATES += syn 1.0.74 # MIT OR Apache-2.0
+MODCARGO_CRATES += strsim 0.10.0 # MIT
+MODCARGO_CRATES += structopt 0.3.25 # Apache-2.0 OR MIT
+MODCARGO_CRATES += structopt-derive 0.4.18 # Apache-2.0/MIT
+MODCARGO_CRATES += syn 1.0.85 # MIT OR Apache-2.0
MODCARGO_CRATES += textwrap 0.11.0 # MIT
-MODCARGO_CRATES += thiserror 1.0.26 # MIT OR Apache-2.0
-MODCARGO_CRATES += thiserror-impl 1.0.26 # MIT OR Apache-2.0
-MODCARGO_CRATES += time 0.1.43 # MIT/Apache-2.0
+MODCARGO_CRATES += thiserror 1.0.30 # MIT OR Apache-2.0
+MODCARGO_CRATES += thiserror-impl 1.0.30 # MIT OR Apache-2.0
MODCARGO_CRATES += toml 0.5.8 # MIT/Apache-2.0
-MODCARGO_CRATES += ttf-parser 0.6.2 # MIT OR Apache-2.0
-MODCARGO_CRATES += unicode-width 0.1.8 # MIT/Apache-2.0
+MODCARGO_CRATES += unicode-segmentation 1.8.0 # MIT/Apache-2.0
+MODCARGO_CRATES += unicode-width 0.1.9 # MIT/Apache-2.0
MODCARGO_CRATES += unicode-xid 0.2.2 # MIT OR Apache-2.0
MODCARGO_CRATES += utf8parse 0.2.0 # Apache-2.0 OR MIT
MODCARGO_CRATES += vec_map 0.8.2 # MIT/Apache-2.0
-MODCARGO_CRATES += version_check 0.9.3 # MIT/Apache-2.0
+MODCARGO_CRATES += version_check 0.9.4 # MIT/Apache-2.0
MODCARGO_CRATES += vswhom 0.1.0 # MIT
MODCARGO_CRATES += vswhom-sys 0.1.0 # MIT
MODCARGO_CRATES += vte 0.10.1 # Apache-2.0 OR MIT
MODCARGO_CRATES += vte_generate_state_changes 0.1.1 # Apache-2.0 OR MIT
MODCARGO_CRATES += walkdir 2.3.2 # Unlicense/MIT
MODCARGO_CRATES += wasi 0.10.2+wasi-snapshot-preview1 # Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT
-MODCARGO_CRATES += wayland-client 0.28.6 # MIT
-MODCARGO_CRATES += wayland-commons 0.28.6 # MIT
-MODCARGO_CRATES += wayland-cursor 0.28.6 # MIT
-MODCARGO_CRATES += wayland-egl 0.28.6 # MIT
-MODCARGO_CRATES += wayland-protocols 0.28.6 # MIT
-MODCARGO_CRATES += wayland-scanner 0.28.6 # MIT
-MODCARGO_CRATES += wayland-sys 0.28.6 # MIT
+MODCARGO_CRATES += wasm-bindgen 0.2.78 # MIT/Apache-2.0
+MODCARGO_CRATES += wasm-bindgen-backend 0.2.78 # MIT/Apache-2.0
+MODCARGO_CRATES += wasm-bindgen-macro 0.2.78 # MIT/Apache-2.0
+MODCARGO_CRATES += wasm-bindgen-macro-support 0.2.78 # MIT/Apache-2.0
+MODCARGO_CRATES += wasm-bindgen-shared 0.2.78 # MIT/Apache-2.0
+MODCARGO_CRATES += wayland-client 0.29.4 # MIT
+MODCARGO_CRATES += wayland-commons 0.29.4 # MIT
+MODCARGO_CRATES += wayland-cursor 0.29.4 # MIT
+MODCARGO_CRATES += wayland-egl 0.29.4 # MIT
+MODCARGO_CRATES += wayland-protocols 0.29.4 # MIT
+MODCARGO_CRATES += wayland-scanner 0.29.4 # MIT
+MODCARGO_CRATES += wayland-sys 0.29.4 # MIT
+MODCARGO_CRATES += web-sys 0.3.55 # MIT/Apache-2.0
MODCARGO_CRATES += winapi 0.2.8 # MIT
MODCARGO_CRATES += winapi 0.3.9 # MIT/Apache-2.0
MODCARGO_CRATES += winapi-build 0.1.1 # MIT
MODCARGO_CRATES += winapi-i686-pc-windows-gnu 0.4.0 # MIT/Apache-2.0
MODCARGO_CRATES += winapi-util 0.1.5 # Unlicense/MIT
MODCARGO_CRATES += winapi-x86_64-pc-windows-gnu 0.4.0 # MIT/Apache-2.0
-MODCARGO_CRATES += winit 0.24.0 # Apache-2.0
-MODCARGO_CRATES += winreg 0.9.0 # MIT
+MODCARGO_CRATES += winit 0.26.1 # Apache-2.0
+MODCARGO_CRATES += winreg 0.10.1 # MIT
MODCARGO_CRATES += wio 0.2.2 # MIT/Apache-2.0
MODCARGO_CRATES += ws2_32-sys 0.2.1 # MIT
-MODCARGO_CRATES += x11-clipboard 0.5.2 # MIT
-MODCARGO_CRATES += x11-dl 2.18.5 # MIT
-MODCARGO_CRATES += xcb 0.9.0 # MIT
-MODCARGO_CRATES += xcursor 0.3.3 # MIT
-MODCARGO_CRATES += xdg 2.2.0 # Apache-2.0/MIT
+MODCARGO_CRATES += x11-clipboard 0.5.3 # MIT
+MODCARGO_CRATES += x11-dl 2.19.1 # MIT
+MODCARGO_CRATES += xcb 0.10.1 # MIT
+MODCARGO_CRATES += xcursor 0.3.4 # MIT
+MODCARGO_CRATES += xdg 2.4.0 # Apache-2.0/MIT
MODCARGO_CRATES += xml-rs 0.8.4 # MIT
MODCARGO_CRATES += yaml-rust 0.4.5 # MIT/Apache-2.0
diff -ru alacritty.old/distinfo alacritty/distinfo
--- alacritty.old/distinfo Fri Oct 22 19:24:59 2021
+++ alacritty/distinfo Mon Jan 24 16:39:17 2022
@@ -1,52 +1,48 @@
-SHA256 (alacritty-0.9.0.tar.gz) = bTqqyeBHf5A1Y7b7JuCJEYQHzb/pUqHi/79OlxtwYrM=
-SHA256 (cargo/ab_glyph_rasterizer-0.1.4.tar.gz) = 2f5eMt4Bcw6x9rf1tRwX4D4jJb9Ap091TwTxMAQ6//8=
+SHA256 (alacritty-0.10.0.tar.gz) = Xe6clPlEt0KwGJ3YfEPIcXX/rd6ASau0Zoylo+aP1lo=
SHA256 (cargo/adler32-1.2.0.tar.gz) = quEnfTmu7BXLOIJm7MJLEcgEad6uYGfhehp6qeXB8jQ=
-SHA256 (cargo/andrew-0.3.1.tar.gz) = jEr7Cd1kL+7IQI4z+S8//EBSlG9rIPMvuZwfWM1Pp88=
SHA256 (cargo/android_glue-0.2.3.tar.gz) = AAREIm/P8kjyvEx2Jb4yxjysz+zCcjorn3inSHpJxAc=
-SHA256 (cargo/ansi_term-0.11.0.tar.gz) = 7km69sthe4U6qNk79CDbI4P6tG0xRILKKAO0DV/el5s=
+SHA256 (cargo/ansi_term-0.12.1.tar.gz) = 1Sqbt+wM9ITFUYMKfOJ70g1n6sZH4b77VrC+TuOaVdI=
SHA256 (cargo/atty-0.2.14.tar.gz) = 2bOb4Ydw0RQhzbG5lHpF3T836TCSy/N3YUgooxnV/ug=
SHA256 (cargo/autocfg-1.0.1.tar.gz) = zbAx3XjihzHYfVbMj/70qPNsomw4/i3nAFQ+Yn+KRko=
SHA256 (cargo/base64-0.13.0.tar.gz) = kE3+rFDzzauij8b1f9zdt19J7WE0ZnanjE/+VYd4Av0=
SHA256 (cargo/bitflags-1.2.1.tar.gz) = zx3i/ox1vBRaL1d63ZUfgTSIm0eV1HRmpUpchG1pFpM=
SHA256 (cargo/block-0.1.6.tar.gz) = DYwf72kJQdPneI0yhRdZH+zGhMCECEcC1v8WQemTaZo=
-SHA256 (cargo/calloop-0.6.5.tar.gz) = CwNhZ+dgQWlFeZcsKM9Id7T5LaIiVg3bSQCJN7amcnw=
-SHA256 (cargo/cc-1.0.69.tar.gz) = 5wzC9ixs4YaJY4J71nd2TGLQfD2aPh+xF37hqasZnrI=
+SHA256 (cargo/bumpalo-3.9.1.tar.gz) = pKRaRqsfJBLlPToK3nb/rSAlgEKUVpquOHIxoM1uCJk=
+SHA256 (cargo/calloop-0.9.3.tar.gz) = vy7sYe/laqHoE/USaVkpaTPPBwADDkMUeGxId5pmq4I=
+SHA256 (cargo/cc-1.0.72.tar.gz) = IqkTe5XqBoZOAYN1tyrft9tub2jPyN9aBNACiAUEhe4=
SHA256 (cargo/cfg-if-0.1.10.tar.gz) = R4W90clrKoRrK9fMAuhraz2/FOflNEbE9UySo2EECCI=
SHA256 (cargo/cfg-if-1.0.0.tar.gz) = uvHeQzl2FYi8Bhnjy8ASDuWC67dLU7Tvv3kRe9LaQP0=
SHA256 (cargo/cgl-0.3.2.tar.gz) = DO0FUSNOh6/uEkEdU1ZI3YnS5/NMeLdTOVVnr/PUR/8=
-SHA256 (cargo/clap-2.33.3.tar.gz) = N+WKx4VzxAcI1FUi8NgPovAcxPm04r90mAclVFQxIAI=
+SHA256 (cargo/clap-2.34.0.tar.gz) = oGEFRBgMOLiBAf7PLdY0sXSmLu9pRvhN/GpxJ1ErOBw=
SHA256 (cargo/clipboard-win-3.1.1.tar.gz) = n99eAQhra+dQQoukpAYZ+EfrLpV1bu6EsY4G5fC1A0I=
-SHA256 (cargo/cmake-0.1.45.tar.gz) = 62IQtjcXHfukzaEuV5rG3HP1FlrVYTPl1y7zEx8yCFU=
-SHA256 (cargo/cocoa-0.23.0.tar.gz) = xUIBwH3POlyjP+zsuAQq7XZ+5L/VoCNajOq82pVgRLI=
+SHA256 (cargo/cmake-0.1.48.tar.gz) = 6K2M7xBKxXtouJ3zIIFk0ihQOrvc5w9ogP+j2XDnRDo=
SHA256 (cargo/cocoa-0.24.0.tar.gz) = b2OQLpIjUw77TibM0M9V7DDVktO0LiGije/EKpWG6DI=
SHA256 (cargo/cocoa-foundation-0.1.0.tar.gz) = et5Jtl1WDKWMQDpHm7OWWSsVXAGF6tp0LuMj0daNYxg=
SHA256 (cargo/copypasta-0.7.1.tar.gz) = RCPXn+2D69mrgewh+pcUQwCpYXghWCh9yb9+3aw3/ws=
SHA256 (cargo/core-foundation-0.7.0.tar.gz) = V9JMehPEPocON8FVa3RVVDeHCgRRT3aF9bNU4JBWcXE=
-SHA256 (cargo/core-foundation-0.9.1.tar.gz) = ConirkJuqDFV3M8QwPprFGPvbV/LRM7gsiSkCPpkCmI=
+SHA256 (cargo/core-foundation-0.9.2.tar.gz) = aIjhBVG7k+Qk2N8dB/GotPzrAAGjpLBIv8R1VJRvR7M=
SHA256 (cargo/core-foundation-sys-0.7.0.tar.gz) = s6catJTAtbhgvchAeuCJeAUkFwcMLO04VzqRV611uKw=
-SHA256 (cargo/core-foundation-sys-0.8.2.tar.gz) = 6iIbUoSkfkADO/m2bzX5hOwOopMesDUFJGzSepY/mBs=
+SHA256 (cargo/core-foundation-sys-0.8.3.tar.gz) = WCfOv0ZwRouHct0ZGFZ2iu3LGwJ4oE+Yn3dmNRkXudw=
SHA256 (cargo/core-graphics-0.19.2.tar.gz) = s4iTdObqarJdupC7XZYgL2EQgFg2H23HLosD5vi76SM=
-SHA256 (cargo/core-graphics-0.22.2.tar.gz) = Jp819ptUK4DnNqIKiaBSFcDOgMLAPFFKuy4xi3g3nYY=
+SHA256 (cargo/core-graphics-0.22.3.tar.gz) = JYG7qzuP/G/L1VC/RsNVE10W6f8qbqAyrWub8dfv5Ps=
SHA256 (cargo/core-graphics-types-0.1.1.tar.gz) = Omi2izRGCCZEyRrHeL9QzUEEv7ACtaanxEzKWixweIs=
SHA256 (cargo/core-text-19.2.0.tar.gz) = mddK2mbgfBzvoY+Kv7p2W0hvJQ3i5KmZ5XJ/wN1LSiU=
SHA256 (cargo/core-video-sys-0.1.4.tar.gz) = NOytI2EK2XV2ZNZE42kkbt3hgD/LQ+1yh2VlCYpdOCg=
-SHA256 (cargo/crc32fast-1.2.1.tar.gz) = gRVv7OhKtqnyr9sQnOOuV35CsSKEQe3tmb139ieVOxo=
-SHA256 (cargo/crossfont-0.3.1.tar.gz) = tsCWfpOgRAhlvx2GfDpQ1pk/UFSyoQGG/CgwOXkYJB0=
-SHA256 (cargo/darling-0.10.2.tar.gz) = DXBuddh+NVadt4GpteJBbP8SNqR+04CDH5WTgszV+Fg=
-SHA256 (cargo/darling_core-0.10.2.tar.gz) = 8Mlgri2k3oipGy2SDCpyM7QAvDPLKEU6KYeCLYOSUZs=
-SHA256 (cargo/darling_macro-0.10.2.tar.gz) = 2bWi9KxJaYIsYiJIFdBplSZWytxwhP3Kl1Hm2VkYm3I=
-SHA256 (cargo/derivative-2.2.0.tar.gz) = /MPdXp6cCyldbh5NgR+28VfV/9eEuNIC/GLqyANadws=
+SHA256 (cargo/crc32fast-1.3.0.tar.gz) = c4wpDfrqhPwcoVrZwWjQg7BacU4e/d2O2qtnjcKNKDY=
+SHA256 (cargo/crossfont-0.3.2.tar.gz) = EplpWkxkF7fkppV72WNHhAbhSLewNR4vLOMSlrBRglE=
+SHA256 (cargo/cty-0.2.2.tar.gz) = s2X6vHlQRmcgU+KclUcz7DsF5L5lSrEw/o8flNcFHzU=
+SHA256 (cargo/darling-0.13.1.tar.gz) = 0NcguGg/jdg8ZRVfBTBWDLpozSvzlfZROkg8ruV/9/Q=
+SHA256 (cargo/darling_core-0.13.1.tar.gz) = ejQPJB0s7tHetHrjbEFEsnB+x90LZJ+JTLObtZWYYyQ=
+SHA256 (cargo/darling_macro-0.13.1.tar.gz) = csQbO3NS/rMhGg10PcVwCk47YPUb0rNoiS0eD5qV9Es=
SHA256 (cargo/dirs-3.0.2.tar.gz) = MLqgQxA8nQwqV89TfMLzViOIncDUBebDzM+tvIHHEwk=
SHA256 (cargo/dirs-sys-0.3.6.tar.gz) = A9hlNO02emdUjcaBE6D121VDL9+7bm+dd3BDl9ldV4A=
SHA256 (cargo/dispatch-0.2.0.tar.gz) = vQyTu0sMbZt39ENbCumMJNF/HEWy/4RMYVGgclbKkjs=
-SHA256 (cargo/dlib-0.4.2.tar.gz) = sR8V0eMmjxQPaNOQY31edthJeC2XGucGPg2mn+lwmnY=
SHA256 (cargo/dlib-0.5.0.tar.gz) = rBt1FzKMBMKqaEIvxgpBuSIIGCFC7QSiWHnCbI+Hh5Q=
SHA256 (cargo/downcast-rs-1.2.0.tar.gz) = nqg10pA2pAh3k4NvqTGwiDetXpV9qeI4hrKVhvubZlA=
-SHA256 (cargo/dtoa-0.4.8.tar.gz) = VomYmM52qvSg8k2RTJfqbtl21C/satM/y7ChED4HsrA=
SHA256 (cargo/dwrote-0.11.0.tar.gz) = Q5ocK6VhGtPtcxKAVB020unErF5/uBiie2BL3Fpqpls=
-SHA256 (cargo/embed-resource-1.6.3.tar.gz) = Rd4w6zF7TNOILuFmI8swBOX7maj0zUAJfK32HvvFStw=
+SHA256 (cargo/embed-resource-1.6.5.tar.gz) = hVBesjn8lSswDynwVW0tiECCqDVmdo2YAnjY+vOMeA0=
SHA256 (cargo/expat-sys-2.1.6.tar.gz) = ZY8ZcokgE4NC9oQIt892RNkNR4Q1PY68MufoZj2+Rfo=
-SHA256 (cargo/filetime-0.2.14.tar.gz) = HTTPoTpjrgWL+mAf6eMTu9s3RkJ8FFkYVGTOD89i4eg=
+SHA256 (cargo/filetime-0.2.15.tar.gz) = l1zPg9jZ0NhGgoUKOMgWkCe+gzaIBZccxPI4wrJFvJg=
SHA256 (cargo/fnv-1.0.7.tar.gz) = P57skY0/JAad7LmvFVTK18iA4tokqa/YisoABTGrgsE=
SHA256 (cargo/foreign-types-0.3.2.tar.gz) = 9vM564rcBSzSyniRD9qGmu+jjSLVy2SOZIXk0/wG87E=
SHA256 (cargo/foreign-types-0.5.0.tar.gz) = 1zfZqlGft7dJy8O5Yu3PMQqN0fS2fJHE+Dl1290X2WU=
@@ -61,187 +57,194 @@
SHA256 (cargo/fuchsia-zircon-sys-0.3.3.tar.gz) = Pcqprncl0SzbhbOtmaQ023C0aMCd7RfgEthrXBAQ96c=
SHA256 (cargo/getrandom-0.2.3.tar.gz) = f82ZlGNSTFJllRf+LOqYSTz+SF0QVl57D7B9u6etJ1M=
SHA256 (cargo/gl_generator-0.14.0.tar.gz) = GpXfwjorSpovWrQdGU+L/aPKvsQq9OOfCMM56yoMEk0=
-SHA256 (cargo/glutin-0.26.0.tar.gz) = GuHLuRdrkVHEzgPwEuPNHGwYxL557errPZn12AhcX6M=
+SHA256 (cargo/glutin-0.28.0.tar.gz) = AOqdvlRLyKZXxMSnmMLRbNAbVJgg5HZXKXVJ0oNx9tI=
SHA256 (cargo/glutin_egl_sys-0.1.5.tar.gz) = KrtqpVUjSAxK3FpWu6okmZLi3dsvxj3JbgSjNVNkwhE=
SHA256 (cargo/glutin_emscripten_sys-0.1.1.tar.gz) = gN5BRt926KbDKwMAe8dk/zJJ3K609nXWigbK8brDY/E=
SHA256 (cargo/glutin_gles2_sys-0.1.5.tar.gz) = 6AlOcItzCnyKGVT0+KMYgK8A64ocW1v4XSigo8bWkQM=
SHA256 (cargo/glutin_glx_sys-0.1.7.tar.gz) = fjk8j8ArgHRZQQQpFQ6cT6/9sxLVm4wDhWYXPIGZE1E=
SHA256 (cargo/glutin_wgl_sys-0.1.5.tar.gz) = PaWVGhVp26uGXG8qhj76//GTqTyvBVONGT6eOBbSFpY=
+SHA256 (cargo/hashbrown-0.11.2.tar.gz) = q17w1JCe83JMyMzmzMhXLFyBdZLpKF9UZPjob4vTcm4=
+SHA256 (cargo/heck-0.3.3.tar.gz) = bWIe+yaGPw6ZJMasV36CdeXmt3RV22T/psZckE6eEyw=
SHA256 (cargo/hermit-abi-0.1.19.tar.gz) = YrRnNDuUukdtyyUA0kLa27OVV9+IkxCsd8XZkQCqrDM=
SHA256 (cargo/ident_case-1.0.1.tar.gz) = ueA4S2GVhWbpJtxQZgMh0SFZAl52fBjgQ9rya3AQTDk=
+SHA256 (cargo/indexmap-1.8.0.tar.gz) = KCpiR3Isq6QEwGUBa7+lIoBuUXFMNPXfw+SjpG/LQiM=
SHA256 (cargo/inotify-0.7.1.tar.gz) = SBbGbSyK5nPfgzZsGDQVOPI0om1lqezqXDSLRTrB0C8=
SHA256 (cargo/inotify-sys-0.1.5.tar.gz) = 4FwCteib/zuUbO3sonirxij+gR5gTwJ8RaiqPPeT0Os=
-SHA256 (cargo/instant-0.1.10.tar.gz) = vuAyixIJ0VfvAByU3YW0+PZBOa2w6sJln0sIOCsvR00=
+SHA256 (cargo/instant-0.1.12.tar.gz) = elu+gkxQfF2llWNV6Gp0bYLg4UZPZdhizF5x2nDpSyw=
SHA256 (cargo/iovec-0.1.4.tar.gz) = srPqb/leF1Rz+P/mp+t8ANBUJAMhuExXBRF1/jweB14=
-SHA256 (cargo/itoa-0.4.7.tar.gz) = 3SUDYCGw3oigr/a4UAUVY8ZRbQv1P4Y4k47bud5zJzY=
+SHA256 (cargo/itoa-1.0.1.tar.gz) = GquPw2dYi4nc7oOrD9ZrcrULcvoZBNcJUEWs4rDIHDU=
SHA256 (cargo/jni-sys-0.3.0.tar.gz) = jq9LwC0Xy91/9MdDjK/N9/uaRhMxOtEbT4/v59P6ATA=
+SHA256 (cargo/js-sys-0.3.55.tar.gz) = fMn/zNOMRRqGvxNlffJE6cPzdJPM6OXiHpQJY3d6zIQ=
SHA256 (cargo/kernel32-sys-0.2.2.tar.gz) = dQdiSylINDHAui2Crs6Mps26k4K/9N3Q90kFYMBWCY0=
SHA256 (cargo/khronos_api-3.1.0.tar.gz) = 4ttYXh1zj8dxvwihUUINPtGT2diVo2339vipRWuRHdw=
SHA256 (cargo/lazy-bytes-cast-5.0.1.tar.gz) = ECV0mfCJzRVq2C0KnNV9lQH6LJiQaJkql+s8J4NvIGs=
SHA256 (cargo/lazy_static-1.4.0.tar.gz) = 4qutI/vEKzcA8vJ5hE3IMq2ysusGmy35GPRVxOGMxkY=
SHA256 (cargo/lazycell-1.3.0.tar.gz) = gw0Izh0dlB5rMGRfGg61ZDAT2DXON3ml/CCCYdvhD1U=
-SHA256 (cargo/libc-0.2.98.tar.gz) = Mgz+dxddo6SD7+1LwK3BloygULCYzk8vHBOlZiYSh5A=
-SHA256 (cargo/libloading-0.6.7.tar.gz) = NRoyQXoS1ffoLDaKZngeMHg02uBMbODNRFbVKYkimIM=
-SHA256 (cargo/libloading-0.7.0.tar.gz) = b4TZZDjBX81sPyRMj84B0eK5xrViPpxxHckobY/JLWo=
+SHA256 (cargo/libc-0.2.112.tar.gz) = GwPRfzZKOgQtXl1GsFO7v4LJLJQwxZLdTAZNxu6ZcSU=
+SHA256 (cargo/libloading-0.7.2.tar.gz) = r+ID1mnsl5txKGGbrlpjt7QukgPBspFGB57gXi9gS1I=
SHA256 (cargo/linked-hash-map-0.5.4.tar.gz) = f7mzivkmCBQLhraTYEuf/MWCQkCkhNHs1HlbrLL+iPM=
-SHA256 (cargo/lock_api-0.4.4.tar.gz) = A4KIBgbf9tFclHbEFtGGkLcnQqp7YFu23W7JAw+/B+s=
+SHA256 (cargo/lock_api-0.4.5.tar.gz) = cSpNCTyZduJOfbykHbiV2ry6w4619ARTk9F6lb37EQk=
SHA256 (cargo/log-0.4.14.tar.gz) = Ubm75sR9Ufw+GpuUWWWUa0xEFCq4eSxQg1qYDTYsJxA=
SHA256 (cargo/malloc_buf-0.0.6.tar.gz) = YruQf+iNVNjZzjKjzOq0IY7S9rfTVhfK/prfhOQ5Gcs=
-SHA256 (cargo/maybe-uninit-2.0.0.tar.gz) = YDAuTbOmHacMDLeZGXYkg2LzAxnoiFDEh7m5W78FngA=
-SHA256 (cargo/memchr-2.3.4.tar.gz) = DuHEeqolbsq8rqNR6uSpsB7zntgQAE4pjSUR7ShLFSU=
-SHA256 (cargo/memmap2-0.1.0.tar.gz) = 2bcMoqYQOsi2ZdwVCxQu8OTonfZAyebPKV0YnDyuvlo=
-SHA256 (cargo/memmap2-0.2.3.tar.gz) = cj4+vc3FwCPbHfMVNkVzeJ+IV8EbYxov3618APXARrQ=
-SHA256 (cargo/memoffset-0.6.4.tar.gz) = WazMUH8TOANqBHfvYa/a4zzeYIQPTf5IExnOOtEW3fk=
+SHA256 (cargo/memchr-2.4.1.tar.gz) = MIzDm+Abc9DRj4Kg57Kj34UkX4Svlv3dxdIC0n5HuGo=
+SHA256 (cargo/memmap2-0.3.1.tar.gz) = ALbC6/9hgBmHiPXbCNfOO8HQthcXZniDGnUQgllz41c=
+SHA256 (cargo/memoffset-0.6.5.tar.gz) = WqNh1Prqk2AwZKAnQV8HvY4dXIjJ+/aL9WooVCj9ec4=
+SHA256 (cargo/minimal-lexical-0.2.1.tar.gz) = aDVMXGvTbXP/P+zrBe+lm2rLdiZhf0livjIqgl5h95o=
SHA256 (cargo/miniz_oxide-0.3.7.tar.gz) = eR2qrh7WiJVg+MQ1kZT1Zkg1VUBXMkSlRIqDuh7MdDU=
SHA256 (cargo/mio-0.6.23.tar.gz) = Sv1m9bkb8qO8E/rQ4hyu2sFoykxwdQTnVYVkiugOTMQ=
+SHA256 (cargo/mio-0.8.0.tar.gz) = uicvhfoLQfyRhyvlebO74PVreSqjYaOA62aUafaNr7I=
SHA256 (cargo/mio-anonymous-pipes-0.2.0.tar.gz) = a8UTAl/lAFo6pWG1D9ss2loVC4SACuAqzYqp7WLKGms=
SHA256 (cargo/mio-extras-2.0.6.tar.gz) = UkA/4pABLOd3xGJnkMiVEySiueMxazFDd5xysCl0Lxk=
+SHA256 (cargo/mio-uds-0.6.8.tar.gz) = r8tpnrJtQzJkfMhISSu8Fer7JvCNAwRVDVqh9hLgZvA=
SHA256 (cargo/miow-0.2.2.tar.gz) = 69gIQkFmMi1KONqHCDv93TrEwTEzTtVYVhEusG1GlE0=
SHA256 (cargo/miow-0.3.7.tar.gz) = ufHFsCXNqHb2bvQ6ET+R68n0zO80hDAA4K3267q4TiE=
-SHA256 (cargo/ndk-0.2.1.tar.gz) = XrFnwf6+0KSWY5A00MdrO3QmNjYEXbVInu5SFDwkbnM=
-SHA256 (cargo/ndk-glue-0.2.1.tar.gz) = vfOZuLejnG+xU8TsMscv1f54nfJKZH8inCOap62xUkE=
-SHA256 (cargo/ndk-macro-0.2.0.tar.gz) = BdHGMH3EJND2W5sG6U+IJI5jBXJrFHKf1npeR7LcSB0=
-SHA256 (cargo/ndk-sys-0.2.1.tar.gz) = xEkiyz27HHC15fRD1jtkNjqJhWTXObpRmOOpE4RCho0=
+SHA256 (cargo/ndk-0.5.0.tar.gz) = ltho9lTHLnX4aHVyaZzavnVfA+/7tiVCdo6ZXVuNaZ0=
+SHA256 (cargo/ndk-glue-0.5.0.tar.gz) = /CkbjeIJXLqNq3zzgb9YL/TBegms+FTDLkZUWwgIXSg=
+SHA256 (cargo/ndk-macro-0.3.0.tar.gz) = DfesAMRnL51a7OVO4zR1ILfiDxWGVsfbLm3gGQLremw=
+SHA256 (cargo/ndk-sys-0.2.2.tar.gz) = 4bzddMIK1dlarNYO+bpA/fd/dnBRBAVB31V7epsqISE=
SHA256 (cargo/net2-0.2.37.tar.gz) = ORYw0StoACrh4l6Pl0MGR0lmVQrYLaxohvuJEMGVaK4=
-SHA256 (cargo/nix-0.18.0.tar.gz) = g0UP5qYULd2V+wZLdGCD/E7xcF/oH2SmTh1LOfVKEFU=
-SHA256 (cargo/nix-0.20.0.tar.gz) = +ptIGdobxhwOpItjt7yGBAZN1DAT58wyXfCY1JzXwYo=
-SHA256 (cargo/nix-0.22.0.tar.gz) = zx4l7mtBLCoeP8tqRJmlwb/n9D4BS9zpprZmblqi0Yc=
-SHA256 (cargo/nom-6.2.1.tar.gz) = nFxRuQg6PGIPpnoqY10c59lbiX6VfWso/5pdqWChA6Y=
+SHA256 (cargo/nix-0.22.2.tar.gz) = 07uaE/oyvFrrZBUM0/MtbPTHSPj4pBfM5dLrl2qDcLo=
+SHA256 (cargo/nom-7.1.0.tar.gz) = Gx0R4e84nHb+W4G8ry6jLPiLYrxJThn0k9CzDnqTAQk=
SHA256 (cargo/notify-4.0.17.tar.gz) = rgPIyFPbp7/SPlcf8M/3vJ3OtApM1oTNFoGCQYP0Ulc=
-SHA256 (cargo/num_enum-0.4.3.tar.gz) = ylZaffBvPUtIVJTyW6BdoUNZUPTcJjRA7aem+puONuQ=
-SHA256 (cargo/num_enum_derive-0.4.3.tar.gz) = /6WjPd3f7gTAKDp2U5h9Y06IA0fpa1su1k3gfvtZ250=
+SHA256 (cargo/ntapi-0.3.6.tar.gz) = P2u5AuQ3tthuA8zhCn4q9mIpLF3+8jtliZ6jrJNUrUQ=
+SHA256 (cargo/num_enum-0.5.6.tar.gz) = cg0+oQVeTkV0wMCw+MP9TyTEza9GWUggbeoJC1e1Jq0=
+SHA256 (cargo/num_enum_derive-0.5.6.tar.gz) = DZkrdoSQ1/4NhYbZtXRfbEn1V9ptgdyYKx0WetTtuyE=
SHA256 (cargo/objc-0.2.7.tar.gz) = kVsbRyvCHFNGTWyEYcnTr4Bboe+DfhysJUQo9Kdxd7E=
SHA256 (cargo/objc-foundation-0.1.1.tar.gz) = Gt0bZZ42yWB8equGSnbHpMJ2DNDNLhIPP7i5UsfiK/k=
SHA256 (cargo/objc_id-0.1.1.tar.gz) = yS1N20vXtQ1zDCFf+HF1TQ2msheISfiioqtpcS0MBzs=
-SHA256 (cargo/once_cell-1.8.0.tar.gz) = aS/LY7ZLF1gCngqW7mPgSc6MWUhYfy9yCN8EYl5fa1Y=
+SHA256 (cargo/once_cell-1.9.0.tar.gz) = 2jJRXZ9ubkide8nYTHGwYNtyR9wDW75E6siM+HSG2NU=
SHA256 (cargo/osmesa-sys-0.1.2.tar.gz) = iM/s5uldLnF+CHKn9TqGhHEq0Tgip5ebx2C5x37AATs=
-SHA256 (cargo/owned_ttf_parser-0.6.0.tar.gz) = n5I/uAbEYmbAKrSlsjlzXBRL3tpySlDtBY5SJvWUzeM=
-SHA256 (cargo/parking_lot-0.11.1.tar.gz) = bXdErAKd8i3KYoTv5OiYmR0o4whccGyXK819pKJ6Fes=
-SHA256 (cargo/parking_lot_core-0.8.3.tar.gz) = +np4KTjnRXY/5pB/xrqGlG1y9J/n4h3gdOCBKKmfsBg=
+SHA256 (cargo/parking_lot-0.11.2.tar.gz) = fRe3gDamBmO3l63q7kb1yd/ruGlI0SVQB6HWvgJx/5k=
+SHA256 (cargo/parking_lot_core-0.8.5.tar.gz) = 126OFJO8rA0nZsQnN/NEWPHIxQwNI7yyTqlTr/snMhY=
SHA256 (cargo/percent-encoding-2.1.0.tar.gz) = 1P1WQdAcjxiiPae2/ikpj/S1WvzM33iXOyTPMXX+4y4=
-SHA256 (cargo/pkg-config-0.3.19.tar.gz) = ODFFOzRJzrSLbZx618ltXqZz6bRwodxXjCzmUhIwiEw=
+SHA256 (cargo/pkg-config-0.3.24.tar.gz) = WIk/dRybBBKHGgmr1i7NKgApjGyDvvoiPvmMUq70DL4=
SHA256 (cargo/png-0.16.8.tar.gz) = PDKHkgy4R97j3jPTAcRj+6FN2pnbJCFN35P4PTAh9MY=
-SHA256 (cargo/proc-macro-crate-0.1.5.tar.gz) = HW6jxFlbljY8E5Q0l9s0r0Rg+0dKlcQ/REatNBuMl4U=
-SHA256 (cargo/proc-macro2-1.0.28.tar.gz) = XH7YuMe4huo+193kBSEhhfQjq0RoJmfIxt0Uqh2fZhI=
-SHA256 (cargo/quote-1.0.9.tar.gz) = w9C5dF3C3r9QfIQi3gXXImzB8GRCFt/f6tmI+bGrMqc=
-SHA256 (cargo/raw-window-handle-0.3.3.tar.gz) = CkQaemyArWRzvUt07ByaTJUXlChb+UHCEm9gfHLkghE=
-SHA256 (cargo/redox_syscall-0.2.9.tar.gz) = WrSaut8/nhxLxJnohF4VKth9KtLTA3GEEXEWnp11/u4=
+SHA256 (cargo/proc-macro-crate-1.1.0.tar.gz) = HrrOaInK+Im00/dr7O4S6QNT8rjH2HVTSnHldC+Pb4M=
+SHA256 (cargo/proc-macro-error-1.0.4.tar.gz) = 2iVJD/mJKqs/z3w28Iz7kC3T5xyg+flRe+oCpzpc44w=
+SHA256 (cargo/proc-macro-error-attr-1.0.4.tar.gz) = ob5AGA5S7MmK2AsYSTS689DSn5eVdOQ5r1pVJ0s1+Gk=
+SHA256 (cargo/proc-macro2-1.0.36.tar.gz) = xzQtWIP7zK4cw3ojU7Cch8mw86/XP1+5u6aHofczsCk=
+SHA256 (cargo/quick-xml-0.22.0.tar.gz) = hTPxTIOCqq0NWSyBKsO4JhYhKLZWYjMeESe0XD0YU2s=
+SHA256 (cargo/quote-1.0.14.tar.gz) = R6qARHzk2vFxdQADcFKvF2r104zD5XHZ7BxzU/wQyH0=
+SHA256 (cargo/raw-window-handle-0.4.2.tar.gz) = +6de7pSp1Sc6aMnh4QXZz/4e9wBTIyV4g4nlqD4lIrc=
+SHA256 (cargo/redox_syscall-0.2.10.tar.gz) = g4PzljkmnN6X0lWjK9towEczcpVBSUDGi90wwuEyA/8=
SHA256 (cargo/redox_users-0.4.0.tar.gz) = UoUy89gByHrsne8q3ZyoAv5WnkSlRK/mM3ZSZ4QKvmQ=
SHA256 (cargo/regex-automata-0.1.10.tar.gz) = bCMNc/uNjBucCzE1xRQqis7joFWPuNtc8ctl+NeGITI=
SHA256 (cargo/regex-syntax-0.6.25.tar.gz) = 9JcoWITz/P9CT/yTPlbXy8pRHe8MmDGn+bX2FT48yJs=
-SHA256 (cargo/rusttype-0.9.2.tar.gz) = 3Hxyet7QvhjFuAwWQOrgrI45ar9vqEd9lss30Y7l7Fk=
-SHA256 (cargo/ryu-1.0.5.tar.gz) = cdMB1Bk9Axq915/3491yEWipVy7z/lGhUXq6I1vY+G4=
+SHA256 (cargo/ryu-1.0.9.tar.gz) = c7S3UMeCllwhG0LwIvWa8fvOq90CZiNxTxBBUvHsFJ8=
SHA256 (cargo/same-file-1.0.6.tar.gz) = k/wdw6qpv+2V4C5urau0uvfjB4sL0bTXtrC2g3iQBQI=
SHA256 (cargo/scoped-tls-1.0.0.tar.gz) = 6mqSkOPJzw8YFF73/6YtaO4L9fzWUQF+WG3H/V2kSMI=
SHA256 (cargo/scopeguard-1.1.0.tar.gz) = 0pqwxtP8Dukv5m4tmfcA6rF6jVfRwdO3SDgPsguqeM0=
-SHA256 (cargo/serde-1.0.127.tar.gz) = 8DuYeKv20U5nedPyTweyz6kDUs/sSsxaq48ax/FG+ug=
-SHA256 (cargo/serde_derive-1.0.127.tar.gz) = oCSSbTQyUWYGMoWX4PIkpRNVpJO0n91n6SCRh8vlXsw=
-SHA256 (cargo/serde_json-1.0.66.tar.gz) = M2sQ2hmhKtCUtZ2HDr3iakVALltHCt1LX9A8UEijISc=
-SHA256 (cargo/serde_yaml-0.8.17.tar.gz) = FWVO1Kthcmv5GKOcuNmKLimVsAI4eAf6a6WP339ZuyM=
+SHA256 (cargo/serde-1.0.133.tar.gz) = l1ZQZ1F7YOLR6osmjlnOA23pB6xSOtg6BHXaBOgYmJo=
+SHA256 (cargo/serde_derive-1.0.133.tar.gz) = 7SAWmTKFaNjQggj90IDj/1lObEIuQ4tnBZBdoBAF1Tc=
+SHA256 (cargo/serde_json-1.0.74.tar.gz) = 7iu5zQYcWGXTRbsCykn87xORdBtnK1Sgv3tnm63sMUI=
+SHA256 (cargo/serde_yaml-0.8.23.tar.gz) = pKUh8pQDhcFlok7ihqqFmWM9FiB3pUvcripv1ae/p6A=
SHA256 (cargo/servo-fontconfig-0.5.1.tar.gz) = x+PiL+X9c9BOvw2qBJ0+/j6uVTac44qxbQfd2axcIXw=
SHA256 (cargo/servo-fontconfig-sys-5.1.0.tar.gz) = 42uHnbmJLfpA+V2hw4qDXUFjS4JfvYxMQYCT1Twks4g=
SHA256 (cargo/shared_library-0.1.9.tar.gz) = Wp5+Dyv64k2KW1pmxbJXqDx0EjBDEVEqDAVM1eYZ2hE=
-SHA256 (cargo/signal-hook-0.1.17.tar.gz) = fjHUQsFvBHpnG1px4hYdbmiBQBK39TedJp69kV+sJyk=
+SHA256 (cargo/signal-hook-0.3.13.tar.gz) = ZHyX3ycQB9zqSFu3T/21fy5oPxMGyFT0aKDCRLravy0=
+SHA256 (cargo/signal-hook-mio-0.2.1.tar.gz) = Kf1YZ/HE8sW+B5rueirfEVLrsEpLxNNB9QS33s5gftQ=
SHA256 (cargo/signal-hook-registry-1.4.0.tar.gz) = 5R5zMo3ErAx8y9o6SU36A98d4vRgGBJ/YMaT8mSEVbA=
-SHA256 (cargo/slab-0.4.3.tar.gz) = 8XOsPRp+OygAP0DeC1zn/icQ+bncP8OGZM6+5Gs7ZSc=
-SHA256 (cargo/smallvec-1.6.1.tar.gz) = /g83yejzxaSmatZVqTx02qxK0AxEFTO/XG55kLtCYE4=
-SHA256 (cargo/smithay-client-toolkit-0.12.3.tar.gz) = R1DHb9XTrJX6PtgP5mfWo9hZCpYOW1dbmO6pMzmoC4A=
-SHA256 (cargo/smithay-client-toolkit-0.14.0.tar.gz) = 7Hg2g0maLPyFtt89BPg7GQe1y9mKGu1EZn298erE5kw=
-SHA256 (cargo/smithay-clipboard-0.6.4.tar.gz) = mGxbSnvU9Q1MUfgfhEdFU1y0iDYPnPYyk3gLEJuSlfM=
+SHA256 (cargo/slab-0.4.5.tar.gz) = ne+R/R4Bj+AHAieR+GXQzMmzoNUAHgGqu4tA5GAAr7U=
+SHA256 (cargo/smallvec-1.7.0.tar.gz) = Hsq2xzWmu0E5wMqv0Mw2NXSLuzrPRVDoE4EiCZJR8wk=
+SHA256 (cargo/smithay-client-toolkit-0.15.3.tar.gz) = EyXykiCc7njVA1UwkyQiowqkyP2hoWWTrAg8HeIR5oo=
+SHA256 (cargo/smithay-clipboard-0.6.5.tar.gz) = YQtVG9JTeL/SuOeg/L2D1Cfo8vakDEeuD3BojplJ3VU=
SHA256 (cargo/spsc-buffer-0.1.1.tar.gz) = vmw/OcN6QoPuS0PRMRyCjy4fsFQeduoMsaKr2e8vWzs=
+SHA256 (cargo/strsim-0.10.0.tar.gz) = c0c8Dlnm1YEsXf4qBkpkRJSfCJ4g7smi5VBllklORiM=
SHA256 (cargo/strsim-0.8.0.tar.gz) = jqURnNtMVbVdQyq7UToEKThIeMFd3mDMd7HJneGpWmo=
-SHA256 (cargo/strsim-0.9.3.tar.gz) = ZEbO2A1sSGQ221wHjd4Rqfc9QrV/snMSHhYLhPY9iUw=
-SHA256 (cargo/syn-1.0.74.tar.gz) = GHPYMlUNRYjD28IPATYasAv+dBBI9x4/7PFFp8wYspw=
+SHA256 (cargo/structopt-0.3.25.tar.gz) = QLl4j0ICqnXCQOzJwVxlGF5qOczesP1dAIuYglRkyHw=
+SHA256 (cargo/structopt-derive-0.4.18.tar.gz) = 3LWuMn+cwTtodjtXSXcMueBIqZvZ39+ljQzwXV9kr+A=
+SHA256 (cargo/syn-1.0.85.tar.gz) = poSsPc2JE4J+GM0JpoOE7mbB3iQVfjxVbJqxbYVpX7c=
SHA256 (cargo/textwrap-0.11.0.tar.gz) = 0yZhD0CMek629Rw3wzDklrCFBslFfJ00KH7MOICfsGA=
-SHA256 (cargo/thiserror-1.0.26.tar.gz) = kxGeT+rBy+bHmMNNOlPqACawsd5qEg3u+JUTfAUpv+I=
-SHA256 (cargo/thiserror-impl-1.0.26.tar.gz) = Bg1poK/neWv0Lp4v+R9e5pH7FcU9OLS2KppT6yMWR0U=
-SHA256 (cargo/time-0.1.43.tar.gz) = yopQ7yNg+9HusOzUZ5WoehkCTrS1PF3JFsof2V/mJDg=
+SHA256 (cargo/thiserror-1.0.30.tar.gz) = hUur5S5N8WU3BrmPz8BYQwEAObQGh1kwpw5NlkTlxBc=
+SHA256 (cargo/thiserror-impl-1.0.30.tar.gz) = qjL9P2J/Nn/hb4k+JZeuPAUCD4u6Jmak5upz03flcUs=
SHA256 (cargo/toml-0.5.8.tar.gz) = oxFClwgmcz34JB7zXcBA75jGeasU18PlTYJwmbOs7Ko=
-SHA256 (cargo/ttf-parser-0.6.2.tar.gz) = Pl1816s+R92m5WVC9LvzgkwVI0lYxuG9aqo0fpNJn9w=
-SHA256 (cargo/unicode-width-0.1.8.tar.gz) = kzdZGJOhm4jY2H8s7B5z+tXN/RDlpvNJ9JitbqL/seM=
+SHA256 (cargo/unicode-segmentation-1.8.0.tar.gz) = iJWEmpSeeEXga9bcGqUXMaEDxCcHAQpbWRwAOPtzOFs=
+SHA256 (cargo/unicode-width-0.1.9.tar.gz) = PtdC1Oor0RduI2FyyEKar1RIbnrAmNsp/+ZSngzlCXM=
SHA256 (cargo/unicode-xid-0.2.2.tar.gz) = jMuC1h+ApmPv4feHpRsWtaUeMxTWrDZbCGOfUjh7M/M=
SHA256 (cargo/utf8parse-0.2.0.tar.gz) = k25LSSrP0TVCHY3KSxqoCnv8JucC7zr3EOB1JoTfU3I=
SHA256 (cargo/vec_map-0.8.2.tar.gz) = 8b3fEYe+aS55xf/quJETLfsPI27TakPH7TnxFl7iAZE=
-SHA256 (cargo/version_check-0.9.3.tar.gz) = X+zcqaUpHMK43PfcAkU/7nkaKA83Q8sJBfiCKuRjs/4=
+SHA256 (cargo/version_check-0.9.4.tar.gz) = SYdLUWe2XXGTuKuhVn9cfZPQAcr8NGAM7gA+2nh+SD8=
SHA256 (cargo/vswhom-0.1.0.tar.gz) = vpebfwdQcQV5noVCA7Rw/3x4oWOeMwpY8YO1/qV0YIs=
SHA256 (cargo/vswhom-sys-0.1.0.tar.gz) = /C9UAtPQ55oGlxT3tI4+zGC+d3WiwEnLg5RXRXojlTI=
SHA256 (cargo/vte-0.10.1.tar.gz) = bLzmkqtMovHzBH/PcyQwJJwOlxv90rI0zyxHrZOvWYM=
SHA256 (cargo/vte_generate_state_changes-0.1.1.tar.gz) = 0leBcIHH3/zbqyS55i0t72Li/30AscIAYlUebMzBRf8=
SHA256 (cargo/walkdir-2.3.2.tar.gz) = gIzyc1zUtoZhE/ZIt5HGrcVxRTe8Ii2TR7sgM4b/2lY=
SHA256 (cargo/wasi-0.10.2+wasi-snapshot-preview1.tar.gz) = /W+9mnmCndGtDMIGJ78e1gZ1an937f97ZrcGT5yzJ8Y=
-SHA256 (cargo/wayland-client-0.28.6.tar.gz) = 46szI1DlAvFZOCIBOUp448wS0PBNuGNCkmAWTqQOA1U=
-SHA256 (cargo/wayland-commons-0.28.6.tar.gz) = ohgXlHxwEbvQon4RsXsze/0CLoVEsHGiZBIyBHlm+9o=
-SHA256 (cargo/wayland-cursor-0.28.6.tar.gz) = vmEAhO3RWG1F573Sdf40XHwYc1mMqkZMT7g13ucPplo=
-SHA256 (cargo/wayland-egl-0.28.6.tar.gz) = mboaseGHVrI5gtNvCIVtUh199FAV9ASi18TwstL2aVY=
-SHA256 (cargo/wayland-protocols-0.28.6.tar.gz) = KGYg6k2AO6z2H6CHpCQu4xZpMJnuWhQHlqq6ArKfhh8=
-SHA256 (cargo/wayland-scanner-0.28.6.tar.gz) = zpI+st62HeMy0fNW7Htr83CU3FVzlS4ciTbbA7VMA/E=
-SHA256 (cargo/wayland-sys-0.28.6.tar.gz) = 2EH8qa7X/r+b7S6XlsSb9Y1BUs7aislJ6+AIaNjw/rg=
+SHA256 (cargo/wasm-bindgen-0.2.78.tar.gz) = Yy9z4jayGRUOonkZblTmEPXbr6XWF4YwPU2lT4Tkf84=
+SHA256 (cargo/wasm-bindgen-backend-0.2.78.tar.gz) = oxe/j5+6JHa0sshe9MSvj/OcPH8M3+7U+Cw0qICqg3s=
+SHA256 (cargo/wasm-bindgen-macro-0.2.78.tar.gz) = 1WFG58SVUov2WHZjvqE6jrWI05s2tnnYOXLhotu9rPk=
+SHA256 (cargo/wasm-bindgen-macro-support-0.2.78.tar.gz) = eAPg7qJYNfir3Fhc0wIbPesRVDxv4ibc0wsiiFfFxas=
+SHA256 (cargo/wasm-bindgen-shared-0.2.78.tar.gz) = AjcjJ4nPA31UgHc/5Wiqx0W/4q+8Eahj6XkBeAprR8w=
+SHA256 (cargo/wayland-client-0.29.4.tar.gz) = kSI0YOcyV/aX2eI9QBJ5Ej02A5o/ekSemD8SMpLURY8=
+SHA256 (cargo/wayland-commons-0.29.4.tar.gz) = lPbl40DXwTSQ7KhniYxM7Fr1bCel/+XIDG/EcI4i0z4=
+SHA256 (cargo/wayland-cursor-0.29.4.tar.gz) = xSdY8T1eeGH8g9lC09mb8nDIMmlXXlKsKeW3PLlWpr0=
+SHA256 (cargo/wayland-egl-0.29.4.tar.gz) = gygdae4WK1kDHGZjhek73kA57FU7kMQZHNsSjO6imjo=
+SHA256 (cargo/wayland-protocols-0.29.4.tar.gz) = YBR64jMDQC5B/gNPdPssNa0HgO6IocQKwJo74edGV0E=
+SHA256 (cargo/wayland-scanner-0.29.4.tar.gz) = OaHtMUP3oUMYcVaiq1J0LonawzJFulBcFyJN9Ik5+eA=
+SHA256 (cargo/wayland-sys-0.29.4.tar.gz) = 2TQd95qJdWeRiON9qziJv6V8RKwsttoWb1GagcvkUtQ=
+SHA256 (cargo/web-sys-0.3.55.tar.gz) = OOsQXxxZ2eqmtc3JK4Wdhbkm6Cyy4JRc0Mkln6pv6fs=
SHA256 (cargo/winapi-0.2.8.tar.gz) = Fn3J1pSam4V/NFEnXpEcP0QlWELB96dvM8VRA6kJCHo=
SHA256 (cargo/winapi-0.3.9.tar.gz) = XIOaZ0/NepiVLlkyQupACr6TmSdGdh44ZBQF0osA9Bk=
SHA256 (cargo/winapi-build-0.1.1.tar.gz) = LTFe7js0rKR5ey2msT7Ygmbm1hJWKgxGOQr4KZ/Gmbw=
SHA256 (cargo/winapi-i686-pc-windows-gnu-0.4.0.tar.gz) = rDuHxjYgQm3ZuZHlzgMp7/VFvMu7NPO+Cf9vtqtRt7Y=
SHA256 (cargo/winapi-util-0.1.5.tar.gz) = cOxs6FuxWBUcrl5ch/lajpfSwMSwASI/M6M0485d4Xg=
SHA256 (cargo/winapi-x86_64-pc-windows-gnu-0.4.0.tar.gz) = cS4ieEHQV8HuHNL7Ivp+WlRhro5I+iynnsQs/BkxGD8=
-SHA256 (cargo/winit-0.24.0.tar.gz) = 2k7ab84OuEvQoz48h5TrkC4QM9Ch1aMbxPGbG0u/9Zc=
-SHA256 (cargo/winreg-0.9.0.tar.gz) = Fs2ziYOXz39iTClJSGab6vruvFV31exT0K+3ZjNZNZc=
+SHA256 (cargo/winit-0.26.1.tar.gz) = m0PMkx1YuZRhGIYH79essqCT5l/GIfVMrXhRemBj5zo=
+SHA256 (cargo/winreg-0.10.1.tar.gz) = gND04nLIXe8TlHY4CxL5rGCSZondLgHUkjIi9AWAhp0=
SHA256 (cargo/wio-0.2.2.tar.gz) = XRKZMvRkSsI5bLRWOFy/nmO1swxujcSCC9yk6wggN6U=
SHA256 (cargo/ws2_32-sys-0.2.1.tar.gz) = 1Zzv69DIkvot1t5YHpNzAdhVLLREic3/A1xhh8tj+l4=
-SHA256 (cargo/x11-clipboard-0.5.2.tar.gz) = s5es5umAUQ3lmk/j1MdY3/qyMdbXR86foaumtgNdXzI=
-SHA256 (cargo/x11-dl-2.18.5.tar.gz) = K/mB46WzMBIJdUIY+WIFLU2e6X5Hj00m1Kbs7TTB/vg=
-SHA256 (cargo/xcb-0.9.0.tar.gz) = YgVvYxOLORFvgqVAyYPMEfHJDNcLPUkqcMJeqlC9IqY=
-SHA256 (cargo/xcursor-0.3.3.tar.gz) = OpojFXSueIAWRmF879E7/pS+kHwOT6l5z9i3cKo8XQg=
-SHA256 (cargo/xdg-2.2.0.tar.gz) = 0IloGqEGqG+t4bASj7Xa8H1YZ6UJqwNtmZiN7IBCmlc=
+SHA256 (cargo/x11-clipboard-0.5.3.tar.gz) = RzBot7gKyGoYMogk8QVOXgB4mMR7W7woG9er4yvDZTw=
+SHA256 (cargo/x11-dl-2.19.1.tar.gz) = 6iaSa0zoGm9dnQ86C8QB5aN8auFKG/qo/2CZyoADjFk=
+SHA256 (cargo/xcb-0.10.1.tar.gz) = dx4rmW33IM0cbdn/kPYtkWmP02EMwHg4jQVkvdZiKpw=
+SHA256 (cargo/xcursor-0.3.4.tar.gz) = RjcFpjMTzUMBGEOBxegELwp+m0u2NlPyFjEdSudGkLc=
+SHA256 (cargo/xdg-2.4.0.tar.gz) = OiP+lYxwQSaHA5yG9XiTi0oLtQ7HiOlrzk1qsA3dWAM=
SHA256 (cargo/xml-rs-0.8.4.tar.gz) = 0tfTlIYT91yY/ZMoz9zEWsxNNgZVKJ0KfU7JMTkiAKM=
SHA256 (cargo/yaml-rust-0.4.5.tar.gz) = VsGTbEzHocmrIaHrtgLrlCuoaMvUSpnLfNxYkjNeHIU=
-SIZE (alacritty-0.9.0.tar.gz) = 1422571
-SIZE (cargo/ab_glyph_rasterizer-0.1.4.tar.gz) = 6641
+SIZE (alacritty-0.10.0.tar.gz) = 1437372
SIZE (cargo/adler32-1.2.0.tar.gz) = 6411
-SIZE (cargo/andrew-0.3.1.tar.gz) = 14030
SIZE (cargo/android_glue-0.2.3.tar.gz) = 1572
-SIZE (cargo/ansi_term-0.11.0.tar.gz) = 17087
+SIZE (cargo/ansi_term-0.12.1.tar.gz) = 24838
SIZE (cargo/atty-0.2.14.tar.gz) = 5470
SIZE (cargo/autocfg-1.0.1.tar.gz) = 12908
SIZE (cargo/base64-0.13.0.tar.gz) = 62070
SIZE (cargo/bitflags-1.2.1.tar.gz) = 16745
SIZE (cargo/block-0.1.6.tar.gz) = 4077
-SIZE (cargo/calloop-0.6.5.tar.gz) = 25180
-SIZE (cargo/cc-1.0.69.tar.gz) = 56044
+SIZE (cargo/bumpalo-3.9.1.tar.gz) = 77507
+SIZE (cargo/calloop-0.9.3.tar.gz) = 55389
+SIZE (cargo/cc-1.0.72.tar.gz) = 57495
SIZE (cargo/cfg-if-0.1.10.tar.gz) = 7933
SIZE (cargo/cfg-if-1.0.0.tar.gz) = 7934
SIZE (cargo/cgl-0.3.2.tar.gz) = 7557
-SIZE (cargo/clap-2.33.3.tar.gz) = 201925
+SIZE (cargo/clap-2.34.0.tar.gz) = 202210
SIZE (cargo/clipboard-win-3.1.1.tar.gz) = 11964
-SIZE (cargo/cmake-0.1.45.tar.gz) = 14375
-SIZE (cargo/cocoa-0.23.0.tar.gz) = 39052
+SIZE (cargo/cmake-0.1.48.tar.gz) = 15142
SIZE (cargo/cocoa-0.24.0.tar.gz) = 39235
SIZE (cargo/cocoa-foundation-0.1.0.tar.gz) = 10645
SIZE (cargo/copypasta-0.7.1.tar.gz) = 12882
SIZE (cargo/core-foundation-0.7.0.tar.gz) = 25384
-SIZE (cargo/core-foundation-0.9.1.tar.gz) = 25985
+SIZE (cargo/core-foundation-0.9.2.tar.gz) = 26857
SIZE (cargo/core-foundation-sys-0.7.0.tar.gz) = 17033
-SIZE (cargo/core-foundation-sys-0.8.2.tar.gz) = 17461
+SIZE (cargo/core-foundation-sys-0.8.3.tar.gz) = 17519
SIZE (cargo/core-graphics-0.19.2.tar.gz) = 28995
-SIZE (cargo/core-graphics-0.22.2.tar.gz) = 28263
+SIZE (cargo/core-graphics-0.22.3.tar.gz) = 29514
SIZE (cargo/core-graphics-types-0.1.1.tar.gz) = 2530
SIZE (cargo/core-text-19.2.0.tar.gz) = 18446
SIZE (cargo/core-video-sys-0.1.4.tar.gz) = 10568
-SIZE (cargo/crc32fast-1.2.1.tar.gz) = 38172
-SIZE (cargo/crossfont-0.3.1.tar.gz) = 31085
-SIZE (cargo/darling-0.10.2.tar.gz) = 17620
-SIZE (cargo/darling_core-0.10.2.tar.gz) = 44339
-SIZE (cargo/darling_macro-0.10.2.tar.gz) = 1919
-SIZE (cargo/derivative-2.2.0.tar.gz) = 48076
+SIZE (cargo/crc32fast-1.3.0.tar.gz) = 38565
+SIZE (cargo/crossfont-0.3.2.tar.gz) = 31052
+SIZE (cargo/cty-0.2.2.tar.gz) = 7230
+SIZE (cargo/darling-0.13.1.tar.gz) = 20097
+SIZE (cargo/darling_core-0.13.1.tar.gz) = 50847
+SIZE (cargo/darling_macro-0.13.1.tar.gz) = 1910
SIZE (cargo/dirs-3.0.2.tar.gz) = 12184
SIZE (cargo/dirs-sys-0.3.6.tar.gz) = 10626
SIZE (cargo/dispatch-0.2.0.tar.gz) = 10229
-SIZE (cargo/dlib-0.4.2.tar.gz) = 3853
SIZE (cargo/dlib-0.5.0.tar.gz) = 5788
SIZE (cargo/downcast-rs-1.2.0.tar.gz) = 11670
-SIZE (cargo/dtoa-0.4.8.tar.gz) = 16175
SIZE (cargo/dwrote-0.11.0.tar.gz) = 21715
-SIZE (cargo/embed-resource-1.6.3.tar.gz) = 12401
+SIZE (cargo/embed-resource-1.6.5.tar.gz) = 12509
SIZE (cargo/expat-sys-2.1.6.tar.gz) = 518887
-SIZE (cargo/filetime-0.2.14.tar.gz) = 14358
+SIZE (cargo/filetime-0.2.15.tar.gz) = 14511
SIZE (cargo/fnv-1.0.7.tar.gz) = 11266
SIZE (cargo/foreign-types-0.3.2.tar.gz) = 7504
SIZE (cargo/foreign-types-0.5.0.tar.gz) = 7824
@@ -256,135 +259,146 @@
SIZE (cargo/fuchsia-zircon-sys-0.3.3.tar.gz) = 7191
SIZE (cargo/getrandom-0.2.3.tar.gz) = 26261
SIZE (cargo/gl_generator-0.14.0.tar.gz) = 22330
-SIZE (cargo/glutin-0.26.0.tar.gz) = 57841
+SIZE (cargo/glutin-0.28.0.tar.gz) = 57949
SIZE (cargo/glutin_egl_sys-0.1.5.tar.gz) = 5890
SIZE (cargo/glutin_emscripten_sys-0.1.1.tar.gz) = 1892
SIZE (cargo/glutin_gles2_sys-0.1.5.tar.gz) = 6023
SIZE (cargo/glutin_glx_sys-0.1.7.tar.gz) = 5644
SIZE (cargo/glutin_wgl_sys-0.1.5.tar.gz) = 5487
+SIZE (cargo/hashbrown-0.11.2.tar.gz) = 85713
+SIZE (cargo/heck-0.3.3.tar.gz) = 10260
SIZE (cargo/hermit-abi-0.1.19.tar.gz) = 9979
SIZE (cargo/ident_case-1.0.1.tar.gz) = 3492
+SIZE (cargo/indexmap-1.8.0.tar.gz) = 52583
SIZE (cargo/inotify-0.7.1.tar.gz) = 24637
SIZE (cargo/inotify-sys-0.1.5.tar.gz) = 6965
-SIZE (cargo/instant-0.1.10.tar.gz) = 5218
+SIZE (cargo/instant-0.1.12.tar.gz) = 6128
SIZE (cargo/iovec-0.1.4.tar.gz) = 8720
-SIZE (cargo/itoa-0.4.7.tar.gz) = 12099
+SIZE (cargo/itoa-1.0.1.tar.gz) = 11059
SIZE (cargo/jni-sys-0.3.0.tar.gz) = 10232
+SIZE (cargo/js-sys-0.3.55.tar.gz) = 70499
SIZE (cargo/kernel32-sys-0.2.2.tar.gz) = 24537
SIZE (cargo/khronos_api-3.1.0.tar.gz) = 599718
SIZE (cargo/lazy-bytes-cast-5.0.1.tar.gz) = 4354
SIZE (cargo/lazy_static-1.4.0.tar.gz) = 10443
SIZE (cargo/lazycell-1.3.0.tar.gz) = 12502
-SIZE (cargo/libc-0.2.98.tar.gz) = 522087
-SIZE (cargo/libloading-0.6.7.tar.gz) = 25037
-SIZE (cargo/libloading-0.7.0.tar.gz) = 26216
+SIZE (cargo/libc-0.2.112.tar.gz) = 571445
+SIZE (cargo/libloading-0.7.2.tar.gz) = 27229
SIZE (cargo/linked-hash-map-0.5.4.tar.gz) = 16166
-SIZE (cargo/lock_api-0.4.4.tar.gz) = 20356
+SIZE (cargo/lock_api-0.4.5.tar.gz) = 25199
SIZE (cargo/log-0.4.14.tar.gz) = 34582
SIZE (cargo/malloc_buf-0.0.6.tar.gz) = 1239
-SIZE (cargo/maybe-uninit-2.0.0.tar.gz) = 11809
-SIZE (cargo/memchr-2.3.4.tar.gz) = 23077
-SIZE (cargo/memmap2-0.1.0.tar.gz) = 17685
-SIZE (cargo/memmap2-0.2.3.tar.gz) = 17669
-SIZE (cargo/memoffset-0.6.4.tar.gz) = 7664
+SIZE (cargo/memchr-2.4.1.tar.gz) = 64977
+SIZE (cargo/memmap2-0.3.1.tar.gz) = 18393
+SIZE (cargo/memoffset-0.6.5.tar.gz) = 7686
+SIZE (cargo/minimal-lexical-0.2.1.tar.gz) = 94841
SIZE (cargo/miniz_oxide-0.3.7.tar.gz) = 44996
SIZE (cargo/mio-0.6.23.tar.gz) = 103554
+SIZE (cargo/mio-0.8.0.tar.gz) = 82954
SIZE (cargo/mio-anonymous-pipes-0.2.0.tar.gz) = 3763
SIZE (cargo/mio-extras-2.0.6.tar.gz) = 16292
+SIZE (cargo/mio-uds-0.6.8.tar.gz) = 11496
SIZE (cargo/miow-0.2.2.tar.gz) = 22044
SIZE (cargo/miow-0.3.7.tar.gz) = 24563
-SIZE (cargo/ndk-0.2.1.tar.gz) = 38584
-SIZE (cargo/ndk-glue-0.2.1.tar.gz) = 3684
-SIZE (cargo/ndk-macro-0.2.0.tar.gz) = 4949
-SIZE (cargo/ndk-sys-0.2.1.tar.gz) = 273674
+SIZE (cargo/ndk-0.5.0.tar.gz) = 39766
+SIZE (cargo/ndk-glue-0.5.0.tar.gz) = 4986
+SIZE (cargo/ndk-macro-0.3.0.tar.gz) = 4884
+SIZE (cargo/ndk-sys-0.2.2.tar.gz) = 279365
SIZE (cargo/net2-0.2.37.tar.gz) = 21311
-SIZE (cargo/nix-0.18.0.tar.gz) = 209962
-SIZE (cargo/nix-0.20.0.tar.gz) = 216983
-SIZE (cargo/nix-0.22.0.tar.gz) = 227091
-SIZE (cargo/nom-6.2.1.tar.gz) = 148362
+SIZE (cargo/nix-0.22.2.tar.gz) = 227371
+SIZE (cargo/nom-7.1.0.tar.gz) = 115647
SIZE (cargo/notify-4.0.17.tar.gz) = 54419
-SIZE (cargo/num_enum-0.4.3.tar.gz) = 4840
-SIZE (cargo/num_enum_derive-0.4.3.tar.gz) = 4552
+SIZE (cargo/ntapi-0.3.6.tar.gz) = 127221
+SIZE (cargo/num_enum-0.5.6.tar.gz) = 13721
+SIZE (cargo/num_enum_derive-0.5.6.tar.gz) = 11672
SIZE (cargo/objc-0.2.7.tar.gz) = 22036
SIZE (cargo/objc-foundation-0.1.1.tar.gz) = 9063
SIZE (cargo/objc_id-0.1.1.tar.gz) = 3258
-SIZE (cargo/once_cell-1.8.0.tar.gz) = 28925
+SIZE (cargo/once_cell-1.9.0.tar.gz) = 30702
SIZE (cargo/osmesa-sys-0.1.2.tar.gz) = 1322
-SIZE (cargo/owned_ttf_parser-0.6.0.tar.gz) = 20574
-SIZE (cargo/parking_lot-0.11.1.tar.gz) = 39854
-SIZE (cargo/parking_lot_core-0.8.3.tar.gz) = 32147
+SIZE (cargo/parking_lot-0.11.2.tar.gz) = 39869
+SIZE (cargo/parking_lot_core-0.8.5.tar.gz) = 32466
SIZE (cargo/percent-encoding-2.1.0.tar.gz) = 9748
-SIZE (cargo/pkg-config-0.3.19.tar.gz) = 15451
+SIZE (cargo/pkg-config-0.3.24.tar.gz) = 16489
SIZE (cargo/png-0.16.8.tar.gz) = 52598
-SIZE (cargo/proc-macro-crate-0.1.5.tar.gz) = 8096
-SIZE (cargo/proc-macro2-1.0.28.tar.gz) = 38732
-SIZE (cargo/quote-1.0.9.tar.gz) = 25042
-SIZE (cargo/raw-window-handle-0.3.3.tar.gz) = 5798
-SIZE (cargo/redox_syscall-0.2.9.tar.gz) = 23533
+SIZE (cargo/proc-macro-crate-1.1.0.tar.gz) = 8535
+SIZE (cargo/proc-macro-error-1.0.4.tar.gz) = 25293
+SIZE (cargo/proc-macro-error-attr-1.0.4.tar.gz) = 7971
+SIZE (cargo/proc-macro2-1.0.36.tar.gz) = 41411
+SIZE (cargo/quick-xml-0.22.0.tar.gz) = 132066
+SIZE (cargo/quote-1.0.14.tar.gz) = 27252
+SIZE (cargo/raw-window-handle-0.4.2.tar.gz) = 10139
+SIZE (cargo/redox_syscall-0.2.10.tar.gz) = 23582
SIZE (cargo/redox_users-0.4.0.tar.gz) = 13023
SIZE (cargo/regex-automata-0.1.10.tar.gz) = 114533
SIZE (cargo/regex-syntax-0.6.25.tar.gz) = 293293
-SIZE (cargo/rusttype-0.9.2.tar.gz) = 31314
-SIZE (cargo/ryu-1.0.5.tar.gz) = 49570
+SIZE (cargo/ryu-1.0.9.tar.gz) = 48391
SIZE (cargo/same-file-1.0.6.tar.gz) = 10183
SIZE (cargo/scoped-tls-1.0.0.tar.gz) = 9146
SIZE (cargo/scopeguard-1.1.0.tar.gz) = 11470
-SIZE (cargo/serde-1.0.127.tar.gz) = 75162
-SIZE (cargo/serde_derive-1.0.127.tar.gz) = 54201
-SIZE (cargo/serde_json-1.0.66.tar.gz) = 115121
-SIZE (cargo/serde_yaml-0.8.17.tar.gz) = 40805
+SIZE (cargo/serde-1.0.133.tar.gz) = 75566
+SIZE (cargo/serde_derive-1.0.133.tar.gz) = 54726
+SIZE (cargo/serde_json-1.0.74.tar.gz) = 115919
+SIZE (cargo/serde_yaml-0.8.23.tar.gz) = 42140
SIZE (cargo/servo-fontconfig-0.5.1.tar.gz) = 9738
SIZE (cargo/servo-fontconfig-sys-5.1.0.tar.gz) = 1790708
SIZE (cargo/shared_library-0.1.9.tar.gz) = 10566
-SIZE (cargo/signal-hook-0.1.17.tar.gz) = 27085
+SIZE (cargo/signal-hook-0.3.13.tar.gz) = 49252
+SIZE (cargo/signal-hook-mio-0.2.1.tar.gz) = 8893
SIZE (cargo/signal-hook-registry-1.4.0.tar.gz) = 17912
-SIZE (cargo/slab-0.4.3.tar.gz) = 15681
-SIZE (cargo/smallvec-1.6.1.tar.gz) = 26444
-SIZE (cargo/smithay-client-toolkit-0.12.3.tar.gz) = 128701
-SIZE (cargo/smithay-client-toolkit-0.14.0.tar.gz) = 127701
-SIZE (cargo/smithay-clipboard-0.6.4.tar.gz) = 16234
+SIZE (cargo/slab-0.4.5.tar.gz) = 15888
+SIZE (cargo/smallvec-1.7.0.tar.gz) = 27459
+SIZE (cargo/smithay-client-toolkit-0.15.3.tar.gz) = 129366
+SIZE (cargo/smithay-clipboard-0.6.5.tar.gz) = 16331
SIZE (cargo/spsc-buffer-0.1.1.tar.gz) = 3176
+SIZE (cargo/strsim-0.10.0.tar.gz) = 11355
SIZE (cargo/strsim-0.8.0.tar.gz) = 9309
-SIZE (cargo/strsim-0.9.3.tar.gz) = 10266
-SIZE (cargo/syn-1.0.74.tar.gz) = 232974
+SIZE (cargo/structopt-0.3.25.tar.gz) = 52296
+SIZE (cargo/structopt-derive-0.4.18.tar.gz) = 20996
+SIZE (cargo/syn-1.0.85.tar.gz) = 235056
SIZE (cargo/textwrap-0.11.0.tar.gz) = 17322
-SIZE (cargo/thiserror-1.0.26.tar.gz) = 16711
-SIZE (cargo/thiserror-impl-1.0.26.tar.gz) = 13431
-SIZE (cargo/time-0.1.43.tar.gz) = 28653
+SIZE (cargo/thiserror-1.0.30.tar.gz) = 17748
+SIZE (cargo/thiserror-impl-1.0.30.tar.gz) = 15230
SIZE (cargo/toml-0.5.8.tar.gz) = 54219
-SIZE (cargo/ttf-parser-0.6.2.tar.gz) = 106052
-SIZE (cargo/unicode-width-0.1.8.tar.gz) = 16732
+SIZE (cargo/unicode-segmentation-1.8.0.tar.gz) = 94011
+SIZE (cargo/unicode-width-0.1.9.tar.gz) = 16745
SIZE (cargo/unicode-xid-0.2.2.tar.gz) = 14955
SIZE (cargo/utf8parse-0.2.0.tar.gz) = 13392
SIZE (cargo/vec_map-0.8.2.tar.gz) = 14466
-SIZE (cargo/version_check-0.9.3.tar.gz) = 12547
+SIZE (cargo/version_check-0.9.4.tar.gz) = 14895
SIZE (cargo/vswhom-0.1.0.tar.gz) = 9420
SIZE (cargo/vswhom-sys-0.1.0.tar.gz) = 15589
SIZE (cargo/vte-0.10.1.tar.gz) = 24947
SIZE (cargo/vte_generate_state_changes-0.1.1.tar.gz) = 2422
SIZE (cargo/walkdir-2.3.2.tar.gz) = 23516
SIZE (cargo/wasi-0.10.2+wasi-snapshot-preview1.tar.gz) = 27505
-SIZE (cargo/wayland-client-0.28.6.tar.gz) = 69347
-SIZE (cargo/wayland-commons-0.28.6.tar.gz) = 20581
-SIZE (cargo/wayland-cursor-0.28.6.tar.gz) = 6176
-SIZE (cargo/wayland-egl-0.28.6.tar.gz) = 3066
-SIZE (cargo/wayland-protocols-0.28.6.tar.gz) = 125975
-SIZE (cargo/wayland-scanner-0.28.6.tar.gz) = 17226
-SIZE (cargo/wayland-sys-0.28.6.tar.gz) = 7937
+SIZE (cargo/wasm-bindgen-0.2.78.tar.gz) = 162111
+SIZE (cargo/wasm-bindgen-backend-0.2.78.tar.gz) = 25576
+SIZE (cargo/wasm-bindgen-macro-0.2.78.tar.gz) = 11700
+SIZE (cargo/wasm-bindgen-macro-support-0.2.78.tar.gz) = 17858
+SIZE (cargo/wasm-bindgen-shared-0.2.78.tar.gz) = 7206
+SIZE (cargo/wayland-client-0.29.4.tar.gz) = 71383
+SIZE (cargo/wayland-commons-0.29.4.tar.gz) = 20757
+SIZE (cargo/wayland-cursor-0.29.4.tar.gz) = 6136
+SIZE (cargo/wayland-egl-0.29.4.tar.gz) = 3088
+SIZE (cargo/wayland-protocols-0.29.4.tar.gz) = 140842
+SIZE (cargo/wayland-scanner-0.29.4.tar.gz) = 17231
+SIZE (cargo/wayland-sys-0.29.4.tar.gz) = 7919
+SIZE (cargo/web-sys-0.3.55.tar.gz) = 664827
SIZE (cargo/winapi-0.2.8.tar.gz) = 455145
SIZE (cargo/winapi-0.3.9.tar.gz) = 1200382
SIZE (cargo/winapi-build-0.1.1.tar.gz) = 669
SIZE (cargo/winapi-i686-pc-windows-gnu-0.4.0.tar.gz) = 2918815
SIZE (cargo/winapi-util-0.1.5.tar.gz) = 10164
SIZE (cargo/winapi-x86_64-pc-windows-gnu-0.4.0.tar.gz) = 2947998
-SIZE (cargo/winit-0.24.0.tar.gz) = 330256
-SIZE (cargo/winreg-0.9.0.tar.gz) = 23127
+SIZE (cargo/winit-0.26.1.tar.gz) = 333842
+SIZE (cargo/winreg-0.10.1.tar.gz) = 25725
SIZE (cargo/wio-0.2.2.tar.gz) = 11214
SIZE (cargo/ws2_32-sys-0.2.1.tar.gz) = 4697
-SIZE (cargo/x11-clipboard-0.5.2.tar.gz) = 7634
-SIZE (cargo/x11-dl-2.18.5.tar.gz) = 62951
-SIZE (cargo/xcb-0.9.0.tar.gz) = 129744
-SIZE (cargo/xcursor-0.3.3.tar.gz) = 6130
-SIZE (cargo/xdg-2.2.0.tar.gz) = 13387
+SIZE (cargo/x11-clipboard-0.5.3.tar.gz) = 7789
+SIZE (cargo/x11-dl-2.19.1.tar.gz) = 64664
+SIZE (cargo/xcb-0.10.1.tar.gz) = 141048
+SIZE (cargo/xcursor-0.3.4.tar.gz) = 6069
+SIZE (cargo/xdg-2.4.0.tar.gz) = 14035
SIZE (cargo/xml-rs-0.8.4.tar.gz) = 52690
SIZE (cargo/yaml-rust-0.4.5.tar.gz) = 47783

View File

@ -0,0 +1,642 @@
Index: sys/arch/amd64/amd64/identcpu.c
===================================================================
RCS file: /cvs/src/sys/arch/amd64/amd64/identcpu.c,v
retrieving revision 1.129
diff -u -p -u -p -r1.129 identcpu.c
--- sys/arch/amd64/amd64/identcpu.c 22 Sep 2022 04:36:38 -0000 1.129
+++ sys/arch/amd64/amd64/identcpu.c 7 Nov 2022 17:58:50 -0000
@@ -221,7 +221,11 @@ const struct {
{ SEFF0EDX_SSBD, "SSBD" },
}, cpu_tpm_eaxfeatures[] = {
{ TPM_SENSOR, "SENSOR" },
+ { TPM_TURBO, "TURBO" },
{ TPM_ARAT, "ARAT" },
+ { TPM_HWP, "HWP" },
+}, cpu_tpm_ecxfeatures[] = {
+ { TPM_EPB, "EPB" },
}, cpu_cpuid_perf_eax[] = {
{ CPUIDEAX_VERID, "PERF" },
}, cpu_cpuid_apmi_edx[] = {
@@ -511,7 +515,7 @@ void
identifycpu(struct cpu_info *ci)
{
uint64_t freq = 0;
- u_int32_t dummy, val, cpu_tpm_ecxflags = 0;
+ u_int32_t dummy, val;
char mycpu_model[48];
int i;
char *brandstr_from, *brandstr_to;
@@ -598,6 +602,8 @@ identifycpu(struct cpu_info *ci)
if (cpu_apmi_edx & CPUIDEDX_ITSC)
atomic_setbits_int(&ci->ci_flags, CPUF_INVAR_TSC);
+ tsc_timecounter_init(ci, freq);
+
tsc_identify(ci);
}
@@ -657,17 +663,21 @@ identifycpu(struct cpu_info *ci)
}
if (!strcmp(cpu_vendor, "GenuineIntel") && cpuid_level >= 0x06) {
- CPUID(0x06, ci->ci_feature_tpmflags, dummy, cpu_tpm_ecxflags,
- dummy);
+ CPUID(0x06, ci->ci_feature_tpmflags_eax, dummy,
+ ci->ci_feature_tpmflags_ecx, dummy);
for (i = 0; i < nitems(cpu_tpm_eaxfeatures); i++)
- if (ci->ci_feature_tpmflags &
+ if (ci->ci_feature_tpmflags_eax &
cpu_tpm_eaxfeatures[i].bit)
printf(",%s", cpu_tpm_eaxfeatures[i].str);
+ for (i = 0; i < nitems(cpu_tpm_eaxfeatures); i++)
+ if (ci->ci_feature_tpmflags_ecx &
+ cpu_tpm_ecxfeatures[i].bit)
+ printf(",%s", cpu_tpm_ecxfeatures[i].str);
} else if (!strcmp(cpu_vendor, "AuthenticAMD")) {
- CPUID(0x06, ci->ci_feature_tpmflags, dummy, cpu_tpm_ecxflags,
+ CPUID(0x06, ci->ci_feature_tpmflags_eax, dummy, ci->ci_feature_tpmflags_ecx,
dummy);
if (ci->ci_family >= 0x12)
- ci->ci_feature_tpmflags |= TPM_ARAT;
+ ci->ci_feature_tpmflags_eax |= TPM_ARAT;
}
/* AMD speculation control features */
@@ -713,7 +723,9 @@ identifycpu(struct cpu_info *ci)
setperf_setup = k1x_init;
}
- if (cpu_ecxfeature & CPUIDECX_EST)
+ if (ci->ci_feature_tpmflags_eax & TPM_HWP)
+ setperf_setup = pstate_init;
+ else if (cpu_ecxfeature & CPUIDECX_EST)
setperf_setup = est_init;
#endif
@@ -736,7 +748,7 @@ identifycpu(struct cpu_info *ci)
}
#ifndef SMALL_KERNEL
- if (CPU_IS_PRIMARY(ci) && (ci->ci_feature_tpmflags & TPM_SENSOR)) {
+ if (CPU_IS_PRIMARY(ci) && (ci->ci_feature_tpmflags_eax & TPM_SENSOR)) {
ci->ci_sensor.type = SENSOR_TEMP;
sensor_task_register(ci, intelcore_update_sensor, 5);
sensor_attach(&ci->ci_sensordev, &ci->ci_sensor);
@@ -762,15 +774,13 @@ identifycpu(struct cpu_info *ci)
#endif
}
- tsc_timecounter_init(ci, freq);
-
cpu_topology(ci);
#if NVMM > 0
cpu_check_vmm_cap(ci);
#endif /* NVMM > 0 */
/* Check for effective frequency via MPERF, APERF */
- if ((cpu_tpm_ecxflags & TPM_EFFFREQ) && ci->ci_smt_id == 0) {
+ if ((ci->ci_feature_tpmflags_ecx & TPM_EFFFREQ) && ci->ci_smt_id == 0) {
#ifndef SMALL_KERNEL
ci->ci_hz_sensor.type = SENSOR_FREQ;
sensor_task_register(ci, cpu_hz_update_sensor, 1);
Index: sys/arch/amd64/amd64/machdep.c
===================================================================
RCS file: /cvs/src/sys/arch/amd64/amd64/machdep.c,v
retrieving revision 1.282
diff -u -p -u -p -r1.282 machdep.c
--- sys/arch/amd64/amd64/machdep.c 30 Oct 2022 17:43:39 -0000 1.282
+++ sys/arch/amd64/amd64/machdep.c 7 Nov 2022 17:58:51 -0000
@@ -553,6 +553,9 @@ cpu_sysctl(int *name, u_int namelen, voi
#endif
case CPU_TSCFREQ:
return (sysctl_rdquad(oldp, oldlenp, newp, tsc_frequency));
+ case CPU_HWP:
+ return (pstate_hwp_sysctl(name + 1, namelen - 1, oldp, oldlenp,
+ newp, newlen, p));
default:
return (sysctl_bounded_arr(cpuctl_vars, nitems(cpuctl_vars),
name, namelen, oldp, oldlenp, newp, newlen));
Index: sys/arch/amd64/amd64/pstate.c
===================================================================
RCS file: sys/arch/amd64/amd64/pstate.c
diff -N sys/arch/amd64/amd64/pstate.c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ sys/arch/amd64/amd64/pstate.c 7 Nov 2022 17:58:51 -0000
@@ -0,0 +1,303 @@
+/* $OpenBSD$ */
+/*
+ * Copyright (c) 2020 joshua stein <jcs@jcs.org>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+/*
+ * "The default HWP control field values are expected to be suitable for many
+ * applications. The OS can enable autonomous HWP for these common cases by:
+ *
+ * Setting IA32_HWP_REQUEST.Desired Performance = 0
+ * (hardware autonomous selection determines the performance target).
+ *
+ * Set IA32_HWP_REQUEST.Activity Window = 0 (enable HW dynamic selection of
+ * window size).
+ *
+ * To maximize HWP benefit for the common cases, the OS should set:
+ * IA32_HWP_REQUEST.Minimum_Performance =
+ * IA32_HWP_CAPABILITIES.Lowest_Performance and
+ * IA32_HWP_REQUEST.Maximum_Performance =
+ * IA32_HWP_CAPABILITIES.Highest_Performance."
+ */
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/sysctl.h>
+#include <sys/malloc.h>
+
+#include <machine/cpu.h>
+#include <machine/cpufunc.h>
+#include <machine/specialreg.h>
+#include <machine/bus.h>
+
+extern int setperf_prio;
+extern int perflevel;
+#ifdef MULTIPROCESSOR
+void mp_setperf(int);
+#endif
+
+static int pstate_hwp = 0;
+static int pstate_hwp_bias_style = -1;
+enum {
+ PSTATE_HWP_BIAS_EPP,
+ PSTATE_HWP_BIAS_EPB,
+};
+
+/* IA32_HWP_REQUEST */
+union hwp_request {
+ uint64_t msr;
+ struct {
+ uint8_t min_perf;
+ uint8_t max_perf;
+ uint8_t desired_perf;
+ uint8_t epp;
+ uint16_t act_win : 10;
+ uint8_t package : 1;
+ uint32_t reserved : 21;
+ } __packed fields;
+} pstate_hwp_req;
+
+uint64_t pstate_epb;
+
+/* IA32_HWP_CAPABILITIES */
+union hwp_capabilities {
+ uint64_t msr;
+ struct {
+ uint8_t highest_perf;
+ uint8_t guaranteed_perf;
+ uint8_t most_efficient;
+ uint8_t lowest_perf;
+ uint32_t reserved;
+ } __packed fields;
+} pstate_hwp_cap;
+
+static struct {
+ int epb_min;
+ int epb_max;
+ int epp;
+ char *label;
+} pstate_epp_labels[] = {
+ { 0x00, 0x03, 0x00, "performance" },
+ { 0x04, 0x07, 0x80, "balance_performance" },
+ { 0x08, 0x0b, 0xc0, "balance_powersave" },
+ { 0x0c, 0x0f, 0xff, "powersave" },
+};
+
+const char *pstate_hwp_bias_label(int);
+void pstate_commit(void);
+
+void
+pstate_init(struct cpu_info *ci)
+{
+ const char *cpu_device = ci->ci_dev->dv_xname;
+ union hwp_request hwp_req;
+ uint64_t msr;
+ int16_t eppepb;
+
+ if (rdmsr_safe(MSR_PLATFORM_INFO, &msr) != 0)
+ return;
+
+ /* power management must be enabled before reading capabilities */
+ wrmsr(IA32_PM_ENABLE, 1);
+ if (rdmsr(IA32_PM_ENABLE) != 1) {
+ printf("%s: enabling HWP failed\n", cpu_device);
+ return;
+ }
+
+ if (rdmsr_safe(IA32_HWP_CAPABILITIES, &pstate_hwp_cap.msr) != 0) {
+ printf("%s: no HWP capabilities\n", cpu_device);
+ /* XXX: what are we supposed to do now? */
+ return;
+ }
+
+ if (ci->ci_feature_tpmflags_eax & TPM_HWP_EPP) {
+ pstate_hwp_bias_style = PSTATE_HWP_BIAS_EPP;
+ pstate_hwp_req.msr = rdmsr(IA32_HWP_REQUEST);
+ eppepb = hwp_req.fields.epp;
+ } else if (ci->ci_feature_tpmflags_ecx & TPM_EPB) {
+ pstate_hwp_bias_style = PSTATE_HWP_BIAS_EPB;
+ eppepb = pstate_epb = rdmsr(IA32_ENERGY_PERF_BIAS) & 0x0f;
+ } else {
+ printf("%s: no energy bias control\n", cpu_device);
+ return;
+ }
+
+ /* XXX: should we force epb to performance by default? */
+
+ pstate_hwp = 1;
+ setperf_prio = 1;
+ cpu_setperf = pstate_setperf;
+
+ printf("%s: HWP enabled, bias %s, highest perf %d MHz, "
+ "guaranteed %d MHz, most efficient %d MHz, lowest perf %d MHz\n",
+ cpu_device, pstate_hwp_bias_label(eppepb),
+ pstate_hwp_cap.fields.highest_perf * 100,
+ pstate_hwp_cap.fields.guaranteed_perf * 100,
+ pstate_hwp_cap.fields.most_efficient * 100,
+ pstate_hwp_cap.fields.lowest_perf * 100);
+}
+
+const char *
+pstate_hwp_bias_label(int val)
+{
+ int i;
+
+ for (i = 0; i < (sizeof(pstate_epp_labels) /
+ sizeof(pstate_epp_labels[0])); i++) {
+ if (pstate_hwp_bias_style == PSTATE_HWP_BIAS_EPP) {
+ if (val == pstate_epp_labels[i].epp)
+ return pstate_epp_labels[i].label;
+ } else if (pstate_hwp_bias_style == PSTATE_HWP_BIAS_EPB) {
+ if (val >= pstate_epp_labels[i].epb_min &&
+ val <= pstate_epp_labels[i].epb_max)
+ return pstate_epp_labels[i].label;
+ }
+ }
+
+ return "unknown";
+}
+
+void
+pstate_setperf(int level)
+{
+ // printf("%s: %s(%d)\n", curcpu()->ci_dev->dv_xname, __func__, level);
+
+ if (pstate_hwp_bias_style == PSTATE_HWP_BIAS_EPP)
+ wrmsr(IA32_HWP_REQUEST, pstate_hwp_req.msr);
+ else if (pstate_hwp_bias_style == PSTATE_HWP_BIAS_EPB)
+ wrmsr(IA32_ENERGY_PERF_BIAS, pstate_epb);
+}
+
+void
+pstate_commit(void)
+{
+#ifdef MULTIPROCESSOR
+ /*
+ * This will broadcast X86_IPI_SETPERF to call pstate_setperf on each
+ * CPU, so we can wrmsr on each
+ */
+ mp_setperf(perflevel);
+#else
+ setperf(perflevel);
+#endif
+}
+
+/* TODO: update cpuspeed in response to hwp notifications */
+
+int
+pstate_hwp_sysctl(int *name, u_int namelen, void *oldp, size_t *oldlenp,
+ void *newp, size_t newlen, struct proc *p)
+{
+ uint64_t epb = 0;
+ const char *bias;
+ char newbias[64];
+ int newval, err, i, found = 0;
+
+ if (namelen != 1)
+ return ENOTDIR;
+
+ if (!pstate_hwp)
+ return EOPNOTSUPP;
+
+ if (name[0] < 1 || name[0] >= HWP_MAXID)
+ return EOPNOTSUPP;
+
+ pstate_hwp_req.msr = rdmsr(IA32_HWP_REQUEST);
+
+ switch (name[0]) {
+ case HWP_MIN_PERF:
+ case HWP_MAX_PERF:
+ case HWP_DESIRED_PERF:
+ switch (name[0]) {
+ case HWP_MIN_PERF:
+ newval = pstate_hwp_req.fields.min_perf;
+ break;
+ case HWP_MAX_PERF:
+ newval = pstate_hwp_req.fields.max_perf;
+ break;
+ case HWP_DESIRED_PERF:
+ newval = pstate_hwp_req.fields.desired_perf;
+ break;
+ }
+
+ if (newlen == 0)
+ return sysctl_rdint(oldp, oldlenp, newp, newval);
+
+ err = sysctl_int(oldp, oldlenp, newp, newlen, &newval);
+ if (err)
+ return err;
+
+ switch (name[0]) {
+ case HWP_MIN_PERF:
+ pstate_hwp_req.fields.min_perf = newval;
+ break;
+ case HWP_MAX_PERF:
+ pstate_hwp_req.fields.max_perf = newval;
+ break;
+ case HWP_DESIRED_PERF:
+ pstate_hwp_req.fields.desired_perf = newval;
+ break;
+ }
+
+ printf("%s: name[0] %d, newval %d [%zu], writing hwpreq 0x%llx\n",
+ curcpu()->ci_dev->dv_xname, name[0], newval, newlen,
+ pstate_hwp_req.msr);
+
+ pstate_commit();
+ return 0;
+
+ case HWP_EPP:
+ if (pstate_hwp_bias_style == PSTATE_HWP_BIAS_EPP)
+ epb = pstate_hwp_req.fields.epp;
+ else if (pstate_hwp_bias_style == PSTATE_HWP_BIAS_EPB)
+ pstate_epb = epb = rdmsr(IA32_ENERGY_PERF_BIAS) & 0x0f;
+
+ bias = pstate_hwp_bias_label(epb);
+
+ if (newlen == 0)
+ return sysctl_rdstring(oldp, oldlenp, newp, bias);
+
+ memcpy(newbias, bias, sizeof(newbias));
+ err = sysctl_string(oldp, oldlenp, newp, newlen, newbias,
+ sizeof(newbias));
+ if (err)
+ return err;
+
+ for (i = 0; i < (sizeof(pstate_epp_labels) /
+ sizeof(pstate_epp_labels[0])); i++) {
+ if (strcmp(pstate_epp_labels[i].label, newbias) != 0)
+ continue;
+
+ if (pstate_hwp_bias_style == PSTATE_HWP_BIAS_EPP)
+ pstate_hwp_req.fields.epp =
+ pstate_epp_labels[i].epp;
+ else if (pstate_hwp_bias_style == PSTATE_HWP_BIAS_EPB)
+ pstate_epb = pstate_epp_labels[i].epb_max;
+
+ found = 1;
+ }
+
+ if (!found)
+ return EINVAL;
+
+ printf("%s: changing epp/epb bias to \"%s\" (0x%llx)\n",
+ curcpu()->ci_dev->dv_xname, newbias, pstate_hwp_req.msr);
+
+ pstate_commit();
+ return 0;
+ }
+
+ return EOPNOTSUPP;
+}
Index: sys/arch/amd64/conf/files.amd64
===================================================================
RCS file: /cvs/src/sys/arch/amd64/conf/files.amd64,v
retrieving revision 1.106
diff -u -p -u -p -r1.106 files.amd64
--- sys/arch/amd64/conf/files.amd64 16 Oct 2022 15:03:39 -0000 1.106
+++ sys/arch/amd64/conf/files.amd64 7 Nov 2022 17:58:51 -0000
@@ -64,6 +64,7 @@ file arch/amd64/isa/clock.c
file arch/amd64/amd64/powernow-k8.c !small_kernel
file arch/amd64/amd64/est.c !small_kernel
file arch/amd64/amd64/k1x-pstate.c !small_kernel
+file arch/amd64/amd64/pstate.c !small_kernel
include "dev/rasops/files.rasops"
include "dev/wsfont/files.wsfont"
Index: sys/arch/amd64/include/cpu.h
===================================================================
RCS file: /cvs/src/sys/arch/amd64/include/cpu.h,v
retrieving revision 1.151
diff -u -p -u -p -r1.151 cpu.h
--- sys/arch/amd64/include/cpu.h 20 Sep 2022 14:28:27 -0000 1.151
+++ sys/arch/amd64/include/cpu.h 7 Nov 2022 17:58:51 -0000
@@ -156,7 +156,8 @@ struct cpu_info {
u_int32_t ci_feature_sefflags_ecx;/* [I] */
u_int32_t ci_feature_sefflags_edx;/* [I] */
u_int32_t ci_feature_amdspec_ebx; /* [I] */
- u_int32_t ci_feature_tpmflags; /* [I] */
+ u_int32_t ci_feature_tpmflags_eax;/* [I] */
+ u_int32_t ci_feature_tpmflags_ecx;/* [I] */
u_int32_t ci_pnfeatset; /* [I] */
u_int32_t ci_efeature_eax; /* [I] */
u_int32_t ci_efeature_ecx; /* [I] */
@@ -446,9 +447,16 @@ void k8_powernow_setperf(int);
void k1x_init(struct cpu_info *);
void k1x_setperf(int);
+/* est.c */
void est_init(struct cpu_info *);
void est_setperf(int);
+/* pstate.c */
+void pstate_init(struct cpu_info *);
+void pstate_setperf(int);
+int pstate_hwp_sysctl(int *, u_int, void *, size_t *, void *, size_t,
+ struct proc *);
+
#ifdef MULTIPROCESSOR
/* mp_setperf.c */
void mp_setperf_init(void);
@@ -474,7 +482,8 @@ void mp_setperf_init(void);
#define CPU_TSCFREQ 16 /* TSC frequency */
#define CPU_INVARIANTTSC 17 /* has invariant TSC */
#define CPU_PWRACTION 18 /* action caused by power button */
-#define CPU_MAXID 19 /* number of valid machdep ids */
+#define CPU_HWP 19 /* hardware p-state knobs */
+#define CPU_MAXID 20 /* number of valid machdep ids */
#define CTL_MACHDEP_NAMES { \
{ 0, 0 }, \
@@ -496,6 +505,28 @@ void mp_setperf_init(void);
{ "tscfreq", CTLTYPE_QUAD }, \
{ "invarianttsc", CTLTYPE_INT }, \
{ "pwraction", CTLTYPE_INT }, \
+ { "hwp", CTLTYPE_INT }, \
+}
+
+/*
+ * CTL_HWP definitions.
+ */
+#define HWP_MIN_PERF 1
+#define HWP_MIN_PERF_NAME "min_perf"
+#define HWP_MAX_PERF 2
+#define HWP_MAX_PERF_NAME "max_perf"
+#define HWP_DESIRED_PERF 3
+#define HWP_DESIRED_PERF_NAME "desired_perf"
+#define HWP_EPP 4
+#define HWP_EPP_NAME "epp_bias"
+#define HWP_MAXID 5
+
+#define CTL_HWP_NAMES { \
+ { 0, 0 }, \
+ { HWP_MIN_PERF_NAME, CTLTYPE_INT }, \
+ { HWP_MAX_PERF_NAME, CTLTYPE_INT }, \
+ { HWP_DESIRED_PERF_NAME, CTLTYPE_INT }, \
+ { HWP_EPP_NAME, CTLTYPE_STRING }, \
}
#endif /* !_MACHINE_CPU_H_ */
Index: sys/arch/amd64/include/specialreg.h
===================================================================
RCS file: /cvs/src/sys/arch/amd64/include/specialreg.h,v
retrieving revision 1.95
diff -u -p -u -p -r1.95 specialreg.h
--- sys/arch/amd64/include/specialreg.h 24 Oct 2022 00:56:33 -0000 1.95
+++ sys/arch/amd64/include/specialreg.h 7 Nov 2022 17:58:51 -0000
@@ -217,10 +217,20 @@
* Thermal and Power Management (CPUID function 0x6) EAX bits
*/
#define TPM_SENSOR 0x00000001 /* Digital temp sensor */
+#define TPM_TURBO 0x00000002 /* Turbo Boost available */
#define TPM_ARAT 0x00000004 /* APIC Timer Always Running */
+#define TPM_HWP 0x00000080 /* Hardware P-States supported */
+#define TPM_HWP_NOTIFY 0x00000100 /* HWP Notification */
+#define TPM_HWP_ACT_WIN 0x00000200 /* HWP Activity Window */
+#define TPM_HWP_EPP 0x00000400 /* HWP Energy Perf. Preference */
/* Thermal and Power Management (CPUID function 0x6) ECX bits */
#define TPM_EFFFREQ 0x00000001 /* APERF & MPERF MSR present */
+/*
+ * Thermal and Power Management (CPUID function 0x6) ECX bits
+ */
+#define TPM_EPB 0x00000008 /* IA32_ENERGY_PERF_BIAS supported */
+
/*
* "Architectural Performance Monitoring" bits (CPUID function 0x0a):
* EAX bits, EBX bits, EDX bits.
@@ -354,6 +364,7 @@
#define MSR_PERFCTR0 0x0c1
#define MSR_PERFCTR1 0x0c2
#define MSR_FSB_FREQ 0x0cd /* Core Duo/Solo only */
+#define MSR_PLATFORM_INFO 0x0ce
#define MSR_MPERF 0x0e7
#define MSR_APERF 0x0e8
#define MSR_MTRRcap 0x0fe
@@ -917,11 +928,28 @@
#define C3_CRYPT_CWLO_KEY192 0x0000040c /* 192bit, 12 rds */
#define C3_CRYPT_CWLO_KEY256 0x0000080e /* 256bit, 15 rds */
+/* Hardware-Controlled Performance States (HWP) */
+#define IA32_ENERGY_PERF_BIAS 0x1b0
+#define IA32_PM_ENABLE 0x770
+#define IA32_HWP_CAPABILITIES 0x771
+#define IA32_HWP_REQUEST_PKG 0x772
+#define IA32_HWP_INTERRUPT 0x773
+#define IA32_HWP_REQUEST 0x774
+#define IA32_HWP_STATUS 0x777
+#define MSR_PPERF 0x64e
+
/* Intel Silicon Debug */
#define IA32_DEBUG_INTERFACE 0xc80
#define IA32_DEBUG_INTERFACE_ENABLE 0x00000001
#define IA32_DEBUG_INTERFACE_LOCK 0x40000000
#define IA32_DEBUG_INTERFACE_MASK 0x80000000
+
+/* Config TDP MSRs */
+#define MSR_CONFIG_TDP_NOMINAL 0x00000648
+#define MSR_CONFIG_TDP_LEVEL_1 0x00000649
+#define MSR_CONFIG_TDP_LEVEL_2 0x0000064A
+#define MSR_CONFIG_TDP_CONTROL 0x0000064B
+#define MSR_TURBO_ACTIVATION_RATIO 0x0000064C
/*
* VMX
Index: sbin/sysctl/sysctl.c
===================================================================
RCS file: /cvs/src/sbin/sysctl/sysctl.c,v
retrieving revision 1.258
diff -u -p -u -p -r1.258 sysctl.c
--- sbin/sysctl/sysctl.c 12 Jul 2021 15:09:19 -0000 1.258
+++ sbin/sysctl/sysctl.c 7 Nov 2022 17:58:51 -0000
@@ -223,6 +223,7 @@ int sysctl_chipset(char *, char **, int
int sysctl_audio(char *, char **, int *, int, int *);
int sysctl_video(char *, char **, int *, int, int *);
int sysctl_witness(char *, char **, int *, int, int *);
+int sysctl_hwp(char *, char **, int *, int, int *);
void vfsinit(void);
char *equ = "=";
@@ -771,6 +772,14 @@ parse(char *string, int flags)
break;
}
#endif
+#ifdef CPU_HWP
+ if (mib[1] == CPU_HWP) {
+ len = sysctl_hwp(string, &bufp, mib, flags, &type);
+ if (len < 0)
+ return;
+ break;
+ }
+#endif
break;
case CTL_FS:
@@ -2910,6 +2919,30 @@ sysctl_witness(char *string, char **bufp
*typep = witnesslist.list[indx].ctl_type;
return (3);
}
+
+#ifdef CPU_HWP
+/*
+ * handle machdep.hwp requests
+ */
+struct ctlname hwpname[] = CTL_HWP_NAMES;
+struct list hwplist = { hwpname, HWP_MAXID };
+
+int
+sysctl_hwp(char *string, char **bufpp, int mib[], int flags, int *typep)
+{
+ int indx;
+
+ if (*bufpp == NULL) {
+ listall(string, &hwplist);
+ return (-1);
+ }
+ if ((indx = findname(string, "third", bufpp, &hwplist)) == -1)
+ return (-1);
+ mib[2] = indx;
+ *typep = hwplist.list[indx].ctl_type;
+ return (3);
+}
+#endif
/*
* Scan a list of names searching for a particular name.

25
apm.diff Normal file
View File

@ -0,0 +1,25 @@
Index: usr.sbin/apm/apm.c
===================================================================
RCS file: /cvs/src/usr.sbin/apm/apm.c,v
retrieving revision 1.41
diff -u -p -u -p -r1.41 apm.c
--- usr.sbin/apm/apm.c 13 Feb 2022 21:27:51 -0000 1.41
+++ usr.sbin/apm/apm.c 10 Sep 2022 08:24:23 -0000
@@ -376,8 +376,15 @@ balony:
} else if (domin) {
if (reply.batterystate.battery_state ==
APM_BATT_CHARGING)
- printf(", %d minutes recharge time estimate\n",
- reply.batterystate.minutes_left);
+ {
+ if (reply.batterystate.minutes_left ==
+ (u_int)-1)
+ printf(", unknown");
+ else
+ printf(", %d minutes",
+ reply.batterystate.minutes_left);
+ printf(" recharge time estimate\n");
+ }
else if (reply.batterystate.minutes_left == 0 &&
reply.batterystate.battery_life > 10)
printf(", unknown life estimate\n");

768
azpainter-304.diff Normal file
View File

@ -0,0 +1,768 @@
Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/azpainter/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- Makefile 11 Mar 2022 19:22:07 -0000 1.4
+++ Makefile 12 Mar 2022 15:16:58 -0000
@@ -1,21 +1,27 @@
-V = 2.1.6
+V = 3.0.4
COMMENT = full color painting software for illustrations
-DISTNAME = azpainter-${V}
-EXTRACT_SUFX = .tar.xz
+DISTNAME = azpainter-v${V}
+PKGNAME = azpainter-${V}
+EXTRACT_SUFX = .tar.bz2
CATEGORIES = graphics multimedia x11
-HOMEPAGE = https://osdn.net/projects/azpainter/
+HOMEPAGE = http://azsky2.html.xdomain.jp/
MAINTAINER = Brian Callahan <bcallah@openbsd.org>
# GPLv3+
PERMIT_PACKAGE = Yes
-WANTLIB += X11 Xext Xi c fontconfig freetype jpeg m png pthread
-WANTLIB += z
+WANTLIB += X11 Xcursor Xext Xi c fontconfig freetype iconv jpeg
+WANTLIB += m png pthread tiff webp z
-MASTER_SITES = https://github.com/Symbian9/azpainter/releases/download/v${V}/
+MASTER_SITES = https://gitlab.com/azelpg/azpainter/-/archive/v${V}/
+
+# C11
+COMPILER = base-clang ports-gcc
+COMPILER_LANGS = c
LIB_DEPENDS = graphics/jpeg \
+ graphics/libwebp \
graphics/png
RUN_DEPENDS = devel/desktop-file-utils \
@@ -27,10 +33,13 @@ RUN_DEPENDS = devel/desktop-file-utils \
CONFIGURE_STYLE = simple
CONFIGURE_ARGS = CC="${CC}"
-CFLAGS += -std=gnu99
+CFLAGS += -std=gnu11
USE_GMAKE = Yes
NO_TEST = Yes
+
+do-gen:
+ sed -i "s,%LOCALBASE%,${LOCALBASE},g" ${WRKSRC}/src/main.c
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/graphics/azpainter/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo 20 May 2020 17:06:29 -0000 1.2
+++ distinfo 12 Mar 2022 15:16:58 -0000
@@ -1,2 +1,2 @@
-SHA256 (azpainter-2.1.6.tar.xz) = hfP5NedrQg8uXiclFDaP375MJcAdqh4WGsKKbh7bDSw=
-SIZE (azpainter-2.1.6.tar.xz) = 747464
+SHA256 (azpainter-v3.0.4.tar.bz2) = o8g4Kt87ZP4Mgl/VYHUoag5OJ+QXL+VhcWeVXxO+5qU=
+SIZE (azpainter-v3.0.4.tar.bz2) = 986326
Index: patches/patch-Makefile_in
===================================================================
RCS file: /cvs/ports/graphics/azpainter/patches/patch-Makefile_in,v
retrieving revision 1.2
diff -u -p -r1.2 patch-Makefile_in
--- patches/patch-Makefile_in 11 Mar 2022 19:22:07 -0000 1.2
+++ patches/patch-Makefile_in 12 Mar 2022 15:16:58 -0000
@@ -3,12 +3,12 @@ Respect CFLAGS.
Index: Makefile.in
--- Makefile.in.orig
+++ Makefile.in
-@@ -11,7 +11,7 @@ package_full := $(package_name)-$(package_version)
- instfile := install -m 644
+@@ -15,7 +15,7 @@ inst_dir := install -m 755 -d
+ inst_file := install -m 644
CC := @CC@
--CFLAGS := @CFLAGS@ -pthread -Isrc/include -Imlib/include -I. -DHAVE_CONFIG_H \
-+CFLAGS += @CFLAGS@ -pthread -Isrc/include -Imlib/include -I. -DHAVE_CONFIG_H \
- -DPACKAGE_DATA_DIR=\"$(datadir)\"
+-CFLAGS := @CFLAGS@ -pthread -Isrc/include -Imlk/include -I. -DHAVE_CONFIG_H
++CFLAGS += @CFLAGS@ -pthread -Isrc/include -Imlk/include -I. -DHAVE_CONFIG_H
LDFLAGS := @LDFLAGS@ -pthread
LIBS := @LIBS@ -lm
+
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/graphics/azpainter/patches/patch-configure,v
retrieving revision 1.2
diff -u -p -r1.2 patch-configure
--- patches/patch-configure 11 Mar 2022 19:22:07 -0000 1.2
+++ patches/patch-configure 12 Mar 2022 15:16:58 -0000
@@ -1,14 +1,27 @@
Don't hardcode optimization flags.
+Add OpenBSD to supported OS list.
Index: configure
--- configure.orig
+++ configure
-@@ -214,8 +214,6 @@ done
- if test -z "$CFLAGS";then
+@@ -274,7 +274,7 @@ if test -z "$CFLAGS";then
if test "$cf_debug" = yes;then
- CFLAGS_ADD=`fc_add_string "$CFLAGS_ADD" "-g"`
-- else
-- CFLAGS_ADD=`fc_add_string "$CFLAGS_ADD" "-O2"`
+ CFLAGS_ADD=`fc_add_string "$CFLAGS_ADD" "-g -Wall"`
+ else
+- CFLAGS_ADD=`fc_add_string "$CFLAGS_ADD" "-O2 -Wall"`
++ CFLAGS_ADD=`fc_add_string "$CFLAGS_ADD" "-Wall"`
fi
fi
+@@ -290,6 +290,11 @@ elif test "$tmp1" = Darwin;then
+ CFLAGS=`fc_add_string "$CFLAGS" "-DMLK_NO_SIMD"`
+ elif test "$tmp1" = FreeBSD;then
+ cf_os=freebsd
++ cf_make=gmake
++ CFLAGS=`fc_add_string "$CFLAGS" "-I/usr/local/include"`
++ LDFLAGS=`fc_add_string "$LDFLAGS" "-L/usr/local/lib"`
++elif test "$tmp1" = OpenBSD;then
++ cf_os=openbsd
+ cf_make=gmake
+ CFLAGS=`fc_add_string "$CFLAGS" "-I/usr/local/include"`
+ LDFLAGS=`fc_add_string "$LDFLAGS" "-L/usr/local/lib"`
Index: patches/patch-mlib_Makefile_in
===================================================================
RCS file: patches/patch-mlib_Makefile_in
diff -N patches/patch-mlib_Makefile_in
--- patches/patch-mlib_Makefile_in 11 Mar 2022 19:22:07 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-Respect CFLAGS
-
-Index: mlib/Makefile.in
---- mlib/Makefile.in.orig
-+++ mlib/Makefile.in
-@@ -1,7 +1,7 @@
- # mlib
-
- CC := @CC@
--CFLAGS := @CFLAGS@ -pthread -Iinclude -I.. -Isrc/private -DHAVE_CONFIG_H
-+CFLAGS += @CFLAGS@ -pthread -Iinclude -I.. -Isrc/private -DHAVE_CONFIG_H
-
- TARGET := libmlib.a
-
Index: patches/patch-mlib_include_mTextParam_h
===================================================================
RCS file: patches/patch-mlib_include_mTextParam_h
diff -N patches/patch-mlib_include_mTextParam_h
--- patches/patch-mlib_include_mTextParam_h 11 Mar 2022 19:22:07 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-Fix occurrences of code where char is considered as signed on all platforms.
-
-Index: mlib/include/mTextParam.h
---- mlib/include/mTextParam.h.orig
-+++ mlib/include/mTextParam.h
-@@ -27,7 +27,7 @@ extern "C" {
- typedef struct _mTextParam mTextParam;
-
- void mTextParamFree(mTextParam *p);
--mTextParam *mTextParamCreate(const char *text,char split,char splitparam);
-+mTextParam *mTextParamCreate(const char *text,char split,signed char splitparam);
-
- mBool mTextParamGetInt(mTextParam *p,const char *key,int *dst);
- mBool mTextParamGetInt_range(mTextParam *p,const char *key,int *dst,int min,int max);
Index: patches/patch-mlib_include_mUtilStr_h
===================================================================
RCS file: patches/patch-mlib_include_mUtilStr_h
diff -N patches/patch-mlib_include_mUtilStr_h
--- patches/patch-mlib_include_mUtilStr_h 11 Mar 2022 19:22:07 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-Fix occurrences of code where char is considered as signed on all platforms.
-
-Index: mlib/include/mUtilStr.h
---- mlib/include/mUtilStr.h.orig
-+++ mlib/include/mUtilStr.h
-@@ -55,7 +55,7 @@ mBool mIsMatchString(const char *text,const char *patt
- mBool mIsMatchStringSum(const char *text,const char *pattern,char split,mBool bNoCase);
- int mGetEqStringIndex(const char *text,const char *enumtext,char split,mBool bNoCase);
-
--char *mGetFormatStrParam(const char *text,const char *key,char split,char paramsplit,mBool bNoCase);
-+char *mGetFormatStrParam(const char *text,const char *key,signed char split,signed char paramsplit,mBool bNoCase);
-
- #ifdef __cplusplus
- }
Index: patches/patch-mlib_src_mStr_c
===================================================================
RCS file: patches/patch-mlib_src_mStr_c
diff -N patches/patch-mlib_src_mStr_c
--- patches/patch-mlib_src_mStr_c 11 Mar 2022 19:22:07 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-Fix occurrences of code where char is considered as signed on all platforms.
-
-Index: mlib/src/mStr.c
---- mlib/src/mStr.c.orig
-+++ mlib/src/mStr.c
-@@ -793,7 +793,8 @@ int mStrSetURIList(mStr *str,const char *uri,mBool loc
-
- void mStrSetURLEncode(mStr *str,const char *text)
- {
-- char c,flag,m[6];
-+ char flag,m[6];
-+ signed char c;
-
- mStrEmpty(str);
-
Index: patches/patch-mlib_src_mTextParam_c
===================================================================
RCS file: patches/patch-mlib_src_mTextParam_c
diff -N patches/patch-mlib_src_mTextParam_c
--- patches/patch-mlib_src_mTextParam_c 11 Mar 2022 19:22:07 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-Fix occurrences of code where char is considered as signed on all platforms.
-
-Index: mlib/src/mTextParam.c
---- mlib/src/mTextParam.c.orig
-+++ mlib/src/mTextParam.c
-@@ -185,7 +185,7 @@ void mTextParamFree(mTextParam *p)
- * @param split ';' など、各値を区切る文字
- * @param splitparam '=' など、キーと値を区切る文字 (-1 で '=') */
-
--mTextParam *mTextParamCreate(const char *text,char split,char splitparam)
-+mTextParam *mTextParamCreate(const char *text,char split,signed char splitparam)
- {
- mTextParam *p;
-
Index: patches/patch-mlib_src_mUtilStr_c
===================================================================
RCS file: patches/patch-mlib_src_mUtilStr_c
diff -N patches/patch-mlib_src_mUtilStr_c
--- patches/patch-mlib_src_mUtilStr_c 11 Mar 2022 19:22:07 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-Fix occurrences of code where char is considered as signed on all platforms.
-
-Index: mlib/src/mUtilStr.c
---- mlib/src/mUtilStr.c.orig
-+++ mlib/src/mUtilStr.c
-@@ -655,7 +655,7 @@ int mGetEqStringIndex(const char *text,const char *enu
- * @return 確保された文字列。NULL でなし */
-
- char *mGetFormatStrParam(const char *text,const char *key,
-- char split,char paramsplit,mBool bNoCase)
-+ signed char split,signed char paramsplit,mBool bNoCase)
- {
- const char *pc,*pend,*pkeyend;
- int ret;
Index: patches/patch-mlk_src_gui_mlk_gui_c
===================================================================
RCS file: patches/patch-mlk_src_gui_mlk_gui_c
diff -N patches/patch-mlk_src_gui_mlk_gui_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-mlk_src_gui_mlk_gui_c 12 Mar 2022 15:16:58 -0000
@@ -0,0 +1,48 @@
+We know where the datadir is, since we create it.
+
+Index: mlk/src/gui/mlk_gui.c
+--- mlk/src/gui/mlk_gui.c.orig
++++ mlk/src/gui/mlk_gui.c
+@@ -587,40 +587,12 @@ void mGuiThreadWakeup(void)
+
+ void mGuiSetPath_data_exe(const char *path)
+ {
+- char *env;
+
+ mFree(MLKAPP->path_data);
+ MLKAPP->path_data = NULL;
+
+- //
+-
+- env = getenv("MLK_APPDATADIR");
+-
+- if(env)
+- //環境変数の絶対パス
+- MLKAPP->path_data = mStrdup(env);
+- else
+- {
+- //実行ファイルのディレクトリからの相対位置
+-
+- char *pc;
+- mStr str = MSTR_INIT;
+-
+- pc = mGetSelfExePath();
+- if(!pc) return;
+-
+- mStrSetText(&str, pc);
+- mFree(pc);
+-
+- mStrPathRemoveBasename(&str);
+- mStrPathJoin(&str, path);
+-
+- mStrPathNormalize(&str);
+-
+- MLKAPP->path_data = mStrdup(str.buf);
+-
+- mStrFree(&str);
+- }
++ //環境変数の絶対パス
++ MLKAPP->path_data = mStrdup(path);
+ }
+
+ /**@ 設定ファイルのディレクトリのパスをセット (ホーム)
Index: patches/patch-src_configfile_c
===================================================================
RCS file: patches/patch-src_configfile_c
diff -N patches/patch-src_configfile_c
--- patches/patch-src_configfile_c 11 Mar 2022 19:22:07 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-Fix occurrences of code where char is considered as signed on all platforms.
-
-Index: src/configfile.c
---- src/configfile.c.orig
-+++ src/configfile.c
-@@ -166,7 +166,7 @@ static void _load_draw_rule_record(mIniRead *ini)
- static void _normalize_panel_layout(ConfigData *cf)
- {
- char *pc;
-- char buf[4];
-+ signed char buf[4];
- int i,no,pos;
-
- //----- ペイン
Index: patches/patch-src_main_c
===================================================================
RCS file: patches/patch-src_main_c
diff -N patches/patch-src_main_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_main_c 12 Mar 2022 15:16:58 -0000
@@ -0,0 +1,14 @@
+Needed to display toolbar icons and other resources.
+
+Index: src/main.c
+--- src/main.c.orig
++++ src/main.c
+@@ -382,7 +382,7 @@ static int _init_main(int argc,char **argv)
+
+ //パスセット
+
+- mGuiSetPath_data_exe("../share/azpainter3");
++ mGuiSetPath_data_exe("%LOCALBASE%/share/azpainter3");
+ mGuiSetPath_config_home(".config/azpainter");
+
+ //翻訳データ
Index: patches/patch-src_other_FillPolygon_c
===================================================================
RCS file: patches/patch-src_other_FillPolygon_c
diff -N patches/patch-src_other_FillPolygon_c
--- patches/patch-src_other_FillPolygon_c 11 Mar 2022 19:22:07 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,23 +0,0 @@
-Fix occurrences of code where char is considered as signed on all platforms.
-
-Index: src/other/FillPolygon.c
---- src/other/FillPolygon.c.orig
-+++ src/other/FillPolygon.c
-@@ -317,7 +317,7 @@ mBool FillPolygon_getIntersection_noAA(FillPolygon *p,
- {
- int i,x;
- mDoublePoint *ptbuf,*pt1,*pt2;
-- char dir;
-+ signed char dir;
- double y;
-
- //交点クリア
-@@ -413,7 +413,7 @@ static mBool _get_intersection_aa(FillPolygon *p,doubl
- {
- mDoublePoint *ptbuf,pt1,pt2,pttmp;
- int i,x;
-- char dir;
-+ signed char dir;
-
- //交点クリア
-
Index: patches/patch-src_other_undo_compress_c
===================================================================
RCS file: patches/patch-src_other_undo_compress_c
diff -N patches/patch-src_other_undo_compress_c
--- patches/patch-src_other_undo_compress_c 11 Mar 2022 19:22:07 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,23 +0,0 @@
-Fix occurrences of code where char is considered as signed on all platforms.
-
-Index: src/other/undo_compress.c
---- src/other/undo_compress.c.orig
-+++ src/other/undo_compress.c
-@@ -91,7 +91,7 @@ void UndoByteDecode(uint8_t *dst,uint8_t *src,int srcs
- {
- uint8_t *ps,*psend;
- int len;
-- char lenb;
-+ signed char lenb;
-
- ps = src;
- psend = src + srcsize;
-@@ -193,7 +193,7 @@ int UndoWordDecode(uint8_t *dst,uint8_t *src,int srcsi
- uint8_t *ps,*psend;
- uint16_t *pd,val;
- int len,size;
-- char lenb;
-+ signed char lenb;
-
- pd = (uint16_t *)dst;
- ps = src;
Index: patches/patch-src_widget_DockObject_c
===================================================================
RCS file: patches/patch-src_widget_DockObject_c
diff -N patches/patch-src_widget_DockObject_c
--- patches/patch-src_widget_DockObject_c 11 Mar 2022 19:22:07 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-Fix occurrences of code where char is considered as signed on all platforms.
-
-Index: src/widget/DockObject.c
---- src/widget/DockObject.c.orig
-+++ src/widget/DockObject.c
-@@ -313,7 +313,7 @@ void DockObjects_all_windowMode(int type)
-
- void DockObject_normalize_layout_config()
- {
-- char buf[DOCKWIDGET_NUM + 2];
-+ signed char buf[DOCKWIDGET_NUM + 2];
- int i,pos,paneno,no;
- char *pc;
-
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/graphics/azpainter/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST 11 Mar 2022 19:22:07 -0000 1.3
+++ pkg/PLIST 12 Mar 2022 15:16:58 -0000
@@ -1,203 +1,123 @@
@bin bin/azpainter
share/applications/azpainter.desktop
-share/azpainter/
-share/azpainter/13x13/
-share/azpainter/13x13/layer.png
-share/azpainter/16x16/
-share/azpainter/16x16/brushedit.png
-share/azpainter/16x16/canvasview.png
-share/azpainter/16x16/imgviewer.png
-share/azpainter/16x16/layer.png
-share/azpainter/16x16/tool.png
-share/azpainter/16x16/toolbar.png
-share/azpainter/16x16/toolsub.png
-share/azpainter/20x20/
-share/azpainter/20x20/brushedit.png
-share/azpainter/20x20/canvasview.png
-share/azpainter/20x20/imgviewer.png
-share/azpainter/20x20/tool.png
-share/azpainter/20x20/toolbar.png
-share/azpainter/20x20/toolsub.png
-share/azpainter/24x24/
-share/azpainter/24x24/brushedit.png
-share/azpainter/24x24/canvasview.png
-share/azpainter/24x24/imgviewer.png
-share/azpainter/24x24/tool.png
-share/azpainter/24x24/toolbar.png
-share/azpainter/24x24/toolsub.png
-share/azpainter/brush/
-share/azpainter/brush-2.dat
-share/azpainter/brush/circle1.png
-share/azpainter/brush/ellipse.png
-share/azpainter/coltype.png
-share/azpainter/doc/
-share/azpainter/doc/AUTHORS
-share/azpainter/doc/ChangeLog
-share/azpainter/doc/GPL3
-share/azpainter/doc/README
-share/azpainter/doc/README_ja
-share/azpainter/doc/manual_ja.html
-share/azpainter/grad.dat
-share/azpainter/icon.png
-share/azpainter/palette-2.dat
-share/azpainter/sckey-2.conf
-share/azpainter/texture/
-share/azpainter/texture/tone300/
-share/azpainter/texture/tone300/05L01.png
-share/azpainter/texture/tone300/05L02.png
-share/azpainter/texture/tone300/05L05.png
-share/azpainter/texture/tone300/05L10.png
-share/azpainter/texture/tone300/05L20.png
-share/azpainter/texture/tone300/08L01.png
-share/azpainter/texture/tone300/08L02.png
-share/azpainter/texture/tone300/08L05.png
-share/azpainter/texture/tone300/10L02.png
-share/azpainter/texture/tone300/10L05.png
-share/azpainter/texture/tone300/10L10.png
-share/azpainter/texture/tone300/10L20.png
-share/azpainter/texture/tone300/10L30.png
-share/azpainter/texture/tone300/15L02.png
-share/azpainter/texture/tone300/15L05.png
-share/azpainter/texture/tone300/15L10.png
-share/azpainter/texture/tone300/15L20.png
-share/azpainter/texture/tone300/20L02.png
-share/azpainter/texture/tone300/20L05.png
-share/azpainter/texture/tone300/20L10.png
-share/azpainter/texture/tone300/20L20.png
-share/azpainter/texture/tone300/20L30.png
-share/azpainter/texture/tone300/20L40.png
-share/azpainter/texture/tone300/30L10.png
-share/azpainter/texture/tone300/30L20.png
-share/azpainter/texture/tone300/30L30.png
-share/azpainter/texture/tone300/30L40.png
-share/azpainter/texture/tone300/40L10.png
-share/azpainter/texture/tone300/40L20.png
-share/azpainter/texture/tone300/40L30.png
-share/azpainter/texture/tone300/50L10.png
-share/azpainter/texture/tone300/50L20.png
-share/azpainter/texture/tone300/60L10.png
-share/azpainter/texture/tone600/
-share/azpainter/texture/tone600/27.5L05.png
-share/azpainter/texture/tone600/27.5L10.png
-share/azpainter/texture/tone600/27.5L20.png
-share/azpainter/texture/tone600/27.5L30.png
-share/azpainter/texture/tone600/27.5L40.png
-share/azpainter/texture/tone600/30L05.png
-share/azpainter/texture/tone600/30L10.png
-share/azpainter/texture/tone600/30L20.png
-share/azpainter/texture/tone600/30L30.png
-share/azpainter/texture/tone600/32.5L05.png
-share/azpainter/texture/tone600/32.5L10.png
-share/azpainter/texture/tone600/32.5L20.png
-share/azpainter/texture/tone600/32.5L30.png
-share/azpainter/texture/tone600/42.5L05.png
-share/azpainter/texture/tone600/42.5L10.png
-share/azpainter/texture/tone600/42.5L20.png
-share/azpainter/texture/tone600/42.5L30.png
-share/azpainter/texture/tone600/50L05.png
-share/azpainter/texture/tone600/50L10.png
-share/azpainter/texture/tone600/50L20.png
-share/azpainter/texture/tone600/50L30.png
-share/azpainter/texture/tone600/55L05.png
-share/azpainter/texture/tone600/55L10.png
-share/azpainter/texture/tone600/55L20.png
-share/azpainter/texture/tone600/55L30.png
-share/azpainter/texture/tone600/60L05.png
-share/azpainter/texture/tone600/60L10.png
-share/azpainter/texture/tone600/60L30.png
-share/azpainter/texture/tone600/65L05.png
-share/azpainter/texture/tone600/65L10.png
-share/azpainter/texture/tone600/85L05.png
-share/azpainter/texture/various/
-share/azpainter/texture/various/brick.png
-share/azpainter/texture/various/check1.png
-share/azpainter/texture/various/check2.png
-share/azpainter/texture/various/check3.png
-share/azpainter/texture/various/check4.png
-share/azpainter/texture/various/check5.png
-share/azpainter/texture/various/check6.png
-share/azpainter/texture/various/cross.png
-share/azpainter/texture/various/dot01.png
-share/azpainter/texture/various/dot02.png
-share/azpainter/texture/various/dot03.png
-share/azpainter/texture/various/dot04.png
-share/azpainter/texture/various/dot05.png
-share/azpainter/texture/various/dot06.png
-share/azpainter/texture/various/dot07.png
-share/azpainter/texture/various/dot08.png
-share/azpainter/texture/various/dot09.png
-share/azpainter/texture/various/dot10.png
-share/azpainter/texture/various/flower.png
-share/azpainter/texture/various/gradient1.png
-share/azpainter/texture/various/gradient2.png
-share/azpainter/texture/various/grid01.png
-share/azpainter/texture/various/grid02.png
-share/azpainter/texture/various/grid03.png
-share/azpainter/texture/various/grid04.png
-share/azpainter/texture/various/grid05.png
-share/azpainter/texture/various/grid06.png
-share/azpainter/texture/various/grid07.png
-share/azpainter/texture/various/grid08.png
-share/azpainter/texture/various/gridsl1.png
-share/azpainter/texture/various/gridsl2.png
-share/azpainter/texture/various/heart.png
-share/azpainter/texture/various/horz1.png
-share/azpainter/texture/various/horz2.png
-share/azpainter/texture/various/horz3.png
-share/azpainter/texture/various/horz4.png
-share/azpainter/texture/various/horz5.png
-share/azpainter/texture/various/horz6.png
-share/azpainter/texture/various/horz7.png
-share/azpainter/texture/various/jag1.png
-share/azpainter/texture/various/jag2.png
-share/azpainter/texture/various/slant1.png
-share/azpainter/texture/various/slant2.png
-share/azpainter/texture/various/slant3.png
-share/azpainter/texture/various/slant4.png
-share/azpainter/texture/various/slant5.png
-share/azpainter/texture/various/slant6.png
-share/azpainter/texture/various/slant7.png
-share/azpainter/texture/various/slant8.png
-share/azpainter/texture/various/speed_horz.png
-share/azpainter/texture/various/speed_vert.png
-share/azpainter/texture/various/square_dot.png
-share/azpainter/texture/various/star.png
-share/azpainter/texture/various/tone00.png
-share/azpainter/texture/various/tone01.png
-share/azpainter/texture/various/tone02.png
-share/azpainter/texture/various/tone03.png
-share/azpainter/texture/various/tone04.png
-share/azpainter/texture/various/tone05.png
-share/azpainter/texture/various/tone06.png
-share/azpainter/texture/various/tone07.png
-share/azpainter/texture/various/tone08.png
-share/azpainter/texture/various/tone09.png
-share/azpainter/texture/various/tone10.png
-share/azpainter/texture/various/triangle1.png
-share/azpainter/texture/various/triangle2.png
-share/azpainter/texture/various/vert1.png
-share/azpainter/texture/various/vert2.png
-share/azpainter/texture/various/vert3.png
-share/azpainter/texture/various/vert4.png
-share/azpainter/texture/various/vert5.png
-share/azpainter/texture/various/vert6.png
-share/azpainter/texture/various/vert7.png
-share/azpainter/texture/various/wall.png
-share/azpainter/texture/various/white_circle.png
-share/azpainter/texture/various/x-mark.png
-share/azpainter/theme/
-share/azpainter/theme/black.theme
-share/azpainter/tr/
-share/azpainter/tr/be.mtr
-share/azpainter/tr/en.mtr
-share/azpainter/tr/es_ES.mtr
-share/azpainter/tr/fr.mtr
-share/azpainter/tr/it.mtr
-share/azpainter/tr/ja.mtr
-share/azpainter/tr/pt_BR.mtr
-share/azpainter/tr/ru.mtr
-share/azpainter/tr/uk.mtr
-share/azpainter/tr/zh_CN.mtr
+share/azpainter3/
+share/azpainter3/brush/
+share/azpainter3/brush/circle1.png
+share/azpainter3/brush/ellipse.png
+share/azpainter3/confdef/
+share/azpainter3/confdef/brushsize.dat
+share/azpainter3/confdef/colpalette.dat
+share/azpainter3/confdef/grad.dat
+share/azpainter3/confdef/toollist.dat
+share/azpainter3/img/
+share/azpainter3/img/appicon.png
+share/azpainter3/img/colpal_edit.png
+share/azpainter3/img/colpal_type.png
+share/azpainter3/img/coltype.png
+share/azpainter3/img/icon_other-16.png
+share/azpainter3/img/icon_other-20.png
+share/azpainter3/img/icon_other-24.png
+share/azpainter3/img/icon_tool-16.png
+share/azpainter3/img/icon_tool-20.png
+share/azpainter3/img/icon_tool-24.png
+share/azpainter3/img/icon_toolbar-16.png
+share/azpainter3/img/icon_toolbar-20.png
+share/azpainter3/img/icon_toolbar-24.png
+share/azpainter3/img/icon_toolsub-16.png
+share/azpainter3/img/icon_toolsub-20.png
+share/azpainter3/img/icon_toolsub-24.png
+share/azpainter3/img/layer_check.png
+share/azpainter3/img/layer_cmd.png
+share/azpainter3/texture/
+share/azpainter3/texture/various/
+share/azpainter3/texture/various/brick.png
+share/azpainter3/texture/various/check1.png
+share/azpainter3/texture/various/check2.png
+share/azpainter3/texture/various/check3.png
+share/azpainter3/texture/various/check4.png
+share/azpainter3/texture/various/check5.png
+share/azpainter3/texture/various/check6.png
+share/azpainter3/texture/various/cross.png
+share/azpainter3/texture/various/dot01.png
+share/azpainter3/texture/various/dot02.png
+share/azpainter3/texture/various/dot03.png
+share/azpainter3/texture/various/dot04.png
+share/azpainter3/texture/various/dot05.png
+share/azpainter3/texture/various/dot06.png
+share/azpainter3/texture/various/dot07.png
+share/azpainter3/texture/various/dot08.png
+share/azpainter3/texture/various/dot09.png
+share/azpainter3/texture/various/dot10.png
+share/azpainter3/texture/various/flower.png
+share/azpainter3/texture/various/gradient1.png
+share/azpainter3/texture/various/gradient2.png
+share/azpainter3/texture/various/grid01.png
+share/azpainter3/texture/various/grid02.png
+share/azpainter3/texture/various/grid03.png
+share/azpainter3/texture/various/grid04.png
+share/azpainter3/texture/various/grid05.png
+share/azpainter3/texture/various/grid06.png
+share/azpainter3/texture/various/grid07.png
+share/azpainter3/texture/various/grid08.png
+share/azpainter3/texture/various/gridsl1.png
+share/azpainter3/texture/various/gridsl2.png
+share/azpainter3/texture/various/heart.png
+share/azpainter3/texture/various/horz1.png
+share/azpainter3/texture/various/horz2.png
+share/azpainter3/texture/various/horz3.png
+share/azpainter3/texture/various/horz4.png
+share/azpainter3/texture/various/horz5.png
+share/azpainter3/texture/various/horz6.png
+share/azpainter3/texture/various/horz7.png
+share/azpainter3/texture/various/jag1.png
+share/azpainter3/texture/various/jag2.png
+share/azpainter3/texture/various/slant1.png
+share/azpainter3/texture/various/slant2.png
+share/azpainter3/texture/various/slant3.png
+share/azpainter3/texture/various/slant4.png
+share/azpainter3/texture/various/slant5.png
+share/azpainter3/texture/various/slant6.png
+share/azpainter3/texture/various/slant7.png
+share/azpainter3/texture/various/slant8.png
+share/azpainter3/texture/various/speed_horz.png
+share/azpainter3/texture/various/speed_vert.png
+share/azpainter3/texture/various/square_dot.png
+share/azpainter3/texture/various/star.png
+share/azpainter3/texture/various/tone00.png
+share/azpainter3/texture/various/tone01.png
+share/azpainter3/texture/various/tone02.png
+share/azpainter3/texture/various/tone03.png
+share/azpainter3/texture/various/tone04.png
+share/azpainter3/texture/various/tone05.png
+share/azpainter3/texture/various/tone06.png
+share/azpainter3/texture/various/tone07.png
+share/azpainter3/texture/various/tone08.png
+share/azpainter3/texture/various/tone09.png
+share/azpainter3/texture/various/tone10.png
+share/azpainter3/texture/various/triangle1.png
+share/azpainter3/texture/various/triangle2.png
+share/azpainter3/texture/various/vert1.png
+share/azpainter3/texture/various/vert2.png
+share/azpainter3/texture/various/vert3.png
+share/azpainter3/texture/various/vert4.png
+share/azpainter3/texture/various/vert5.png
+share/azpainter3/texture/various/vert6.png
+share/azpainter3/texture/various/vert7.png
+share/azpainter3/texture/various/wall.png
+share/azpainter3/texture/various/white_circle.png
+share/azpainter3/texture/various/x-mark.png
+share/azpainter3/tr/
+share/azpainter3/tr/help-en.mtr
+share/azpainter3/tr/help-ja.mtr
+share/azpainter3/tr/ja.mtr
+share/azpainter3/tr/pt_BR.mtr
+share/azpainter3/tr/zh_CN.mtr
+share/doc/azpainter/
+share/doc/azpainter/ChangeLog
+share/doc/azpainter/GPL3
+share/doc/azpainter/ReadMe_en
+share/doc/azpainter/ReadMe_ja
+share/doc/azpainter/manual_ja.html
share/icons/hicolor/48x48/apps/application-x-azpainter-apd.png
share/icons/hicolor/48x48/apps/azpainter.png
share/icons/hicolor/scalable/apps/application-x-azpainter-apd.svg

34
bsd.port.mk.diff Normal file
View File

@ -0,0 +1,34 @@
Index: ./share/man/man5/bsd.port.mk.5
===================================================================
RCS file: /home/cvs/src/share/man/man5/bsd.port.mk.5,v
retrieving revision 1.550
diff -u -p -u -p -r1.550 bsd.port.mk.5
--- ./share/man/man5/bsd.port.mk.5 22 Nov 2021 11:17:39 -0000 1.550
+++ ./share/man/man5/bsd.port.mk.5 12 Dec 2021 12:02:38 -0000
@@ -3562,6 +3562,7 @@ This is often because of confusion betwe
RUN_DEPENDS is needed for dlopen'd libraries.
.Pp
Might be intentional sometimes, if some compile flavors create static binaries,
+or the port rebuild needs to be linked to the update of a runtime dependency
for instance.
Also, will happen for multi-packages, where one sets LIB_DEPENDS to have
a given build dependency (and corresponding WANTLIB for a given SUBPACKAGE).
@@ -3569,6 +3570,18 @@ a given build dependency (and correspond
See
.Cm print-package-args Pq Cm lib-depends-args
for details.
+.Pp
+Many ports are using
+.Xr dlopen 3
+to probe for a library and fall back to reduced functionality if it is
+not found.
+This makes it necessary to rebuild the port when the library is updated.
+In such a case, add it to WANTLIB and LIB_DEPENDS.
+The
+.Cm lib-depends-check
+will warn about it, but it is the only way to ensure that the port is
+rebuild when the library is updated.
+A comment in the Makefile about this expected warning should be added.
.It "Warning: FULLPKGNAME-sub defined but not FULLPKGPATH-sub"
.Ev FULLPKGNAME-sub
has been explicitly defined by the port, instead of relying on the default,

40
bsd.port.mk1.diff Normal file
View File

@ -0,0 +1,40 @@
Index: ./share/man/man5/bsd.port.mk.5
===================================================================
RCS file: /home/cvs/src/share/man/man5/bsd.port.mk.5,v
retrieving revision 1.550
diff -u -p -u -p -r1.550 bsd.port.mk.5
--- ./share/man/man5/bsd.port.mk.5 22 Nov 2021 11:17:39 -0000 1.550
+++ ./share/man/man5/bsd.port.mk.5 12 Dec 2021 12:42:20 -0000
@@ -3558,17 +3558,27 @@ usage.
.It LIB_DEPENDS <spec> not needed for <FULLPKGPATH>
There doesn't seem to be any WANTLIB to match the given LIB_DEPENDS.
Thus, the LIB_DEPENDS won't turn into a @depends line in the created package.
-This is often because of confusion between LIB_DEPENDS and RUN_DEPENDS:
-RUN_DEPENDS is needed for dlopen'd libraries.
+This is often because of confusion between LIB_DEPENDS and RUN_DEPENDS.
.Pp
-Might be intentional sometimes, if some compile flavors create static binaries,
-for instance.
-Also, will happen for multi-packages, where one sets LIB_DEPENDS to have
+This can be intentional when libraries are needed, but can not be
+found dynamically linked:
+.Pp
+Libraries loaded by
+.Xr dlopen 3
+should be added to WANTLIB and LIB_DEPENDS to ensure a rebuild when the
+library is updated.
+.Pp
+Some compile flavors create static binaries, but should be rebuild when
+the library changes.
+.Pp
+It will happen for multi-packages, where one sets LIB_DEPENDS to have
a given build dependency (and corresponding WANTLIB for a given SUBPACKAGE).
.Pp
See
.Cm print-package-args Pq Cm lib-depends-args
for details.
+.Pp
+In such cases, add a comment to the Makefile about the intentional warning.
.It "Warning: FULLPKGNAME-sub defined but not FULLPKGPATH-sub"
.Ev FULLPKGNAME-sub
has been explicitly defined by the port, instead of relying on the default,

34
bsd.port.mk2.diff Normal file
View File

@ -0,0 +1,34 @@
Index: ./share/man/man5/bsd.port.mk.5
===================================================================
RCS file: /home/cvs/src/share/man/man5/bsd.port.mk.5,v
retrieving revision 1.550
diff -u -p -u -p -r1.550 bsd.port.mk.5
--- ./share/man/man5/bsd.port.mk.5 22 Nov 2021 11:17:39 -0000 1.550
+++ ./share/man/man5/bsd.port.mk.5 12 Dec 2021 13:07:44 -0000
@@ -3558,17 +3558,16 @@ usage.
.It LIB_DEPENDS <spec> not needed for <FULLPKGPATH>
There doesn't seem to be any WANTLIB to match the given LIB_DEPENDS.
Thus, the LIB_DEPENDS won't turn into a @depends line in the created package.
-This is often because of confusion between LIB_DEPENDS and RUN_DEPENDS:
-RUN_DEPENDS is needed for dlopen'd libraries.
+This is often because of confusion between LIB_DEPENDS and RUN_DEPENDS.
.Pp
-Might be intentional sometimes, if some compile flavors create static binaries,
-for instance.
-Also, will happen for multi-packages, where one sets LIB_DEPENDS to have
-a given build dependency (and corresponding WANTLIB for a given SUBPACKAGE).
-.Pp
-See
-.Cm print-package-args Pq Cm lib-depends-args
-for details.
+Needed libraries should always be added to LIB_DEPENDS and WANTLIB.
+In cases where the libraries are not dynamically linked in,
+.Cm lib-depends-check
+will raise a warning, because it can't detect the dependency.
+For example for statically linked libraries, or libraries that are
+loaded by
+.Xr dlopen 3 .
+In this case, add a comment to the Makefile about the intentional warning.
.It "Warning: FULLPKGNAME-sub defined but not FULLPKGPATH-sub"
.Ev FULLPKGNAME-sub
has been explicitly defined by the port, instead of relying on the default,

42
bsd.port.mk3.diff Normal file
View File

@ -0,0 +1,42 @@
Index: ./share/man/man5/bsd.port.mk.5
===================================================================
RCS file: /home/cvs/src/share/man/man5/bsd.port.mk.5,v
retrieving revision 1.550
diff -u -p -u -p -r1.550 bsd.port.mk.5
--- ./share/man/man5/bsd.port.mk.5 22 Nov 2021 11:17:39 -0000 1.550
+++ ./share/man/man5/bsd.port.mk.5 12 Dec 2021 13:46:56 -0000
@@ -3482,6 +3482,15 @@ instead, assuming they understand the im
See
.Cm print-package-args Pq Cm wantlib-args
for details.
+.It Extra: <spec>
+Check if these libraries are really used.
+Needed libraries should always be added to LIB_DEPENDS and WANTLIB.
+In cases where the libraries are not dynamically linked in, this warning
+is shown, because we can't detect the dependency.
+If the libraries have been statically linked, or are
+loaded by
+.Xr dlopen 3 ,
+add a comment to the Makefile about it above the LIB_DEPENDS line.
.It "Fatal: can't flavor a SUBDIR"
A dependency mentions top_subdir,flavor.
Flavor would then be ignored, as it is only applied to individual ports.
@@ -3558,17 +3567,7 @@ usage.
.It LIB_DEPENDS <spec> not needed for <FULLPKGPATH>
There doesn't seem to be any WANTLIB to match the given LIB_DEPENDS.
Thus, the LIB_DEPENDS won't turn into a @depends line in the created package.
-This is often because of confusion between LIB_DEPENDS and RUN_DEPENDS:
-RUN_DEPENDS is needed for dlopen'd libraries.
-.Pp
-Might be intentional sometimes, if some compile flavors create static binaries,
-for instance.
-Also, will happen for multi-packages, where one sets LIB_DEPENDS to have
-a given build dependency (and corresponding WANTLIB for a given SUBPACKAGE).
-.Pp
-See
-.Cm print-package-args Pq Cm lib-depends-args
-for details.
+This is often because of confusion between LIB_DEPENDS and RUN_DEPENDS.
.It "Warning: FULLPKGNAME-sub defined but not FULLPKGPATH-sub"
.Ev FULLPKGNAME-sub
has been explicitly defined by the port, instead of relying on the default,

191
bzflag-2.4.22.diff Normal file
View File

@ -0,0 +1,191 @@
Index: games/bzflag/Makefile
===================================================================
RCS file: /home/cvs/ports/games/bzflag/Makefile,v
retrieving revision 1.49
diff -u -p -u -p -r1.49 Makefile
--- games/bzflag/Makefile 20 Mar 2020 16:44:23 -0000 1.49
+++ games/bzflag/Makefile 23 Dec 2021 22:50:03 -0000
@@ -2,7 +2,7 @@
COMMENT= graphical multiplayer 3D tank war game
-V= 2.4.14
+V= 2.4.22
DISTNAME= bzflag-${V}
CATEGORIES= games x11
MASTER_SITES= https://download.bzflag.org/bzflag/source/${V}/
@@ -13,16 +13,19 @@ HOMEPAGE= https://www.bzflag.org/
# LGPLv2.1 only or MPL 2.0
PERMIT_PACKAGE= Yes
-WANTLIB += GL GLU SDL2 X11 X11-xcb Xdamage Xext Xfixes Xxf86vm
-WANTLIB += c cares crypto curl curses drm expat glapi m
-WANTLIB += nghttp2 pthread samplerate sndio ssl usbhid xcb
-WANTLIB += xcb-dri2 xcb-dri3 xcb-glx xcb-present xcb-sync
-WANTLIB += xshmfence z ${COMPILER_LIBCXX}
+WANTLIB += ${COMPILER_LIBCXX} GL GLEW GLU ICE SDL2 SM X11
+WANTLIB += X11-xcb Xau Xcursor Xdmcp Xext Xfixes Xi Xinerama
+WANTLIB += Xmu Xrandr Xrender Xss Xt Xxf86vm c cares crypto
+WANTLIB += curl curses drm expat glapi m nghttp2 pthread
+WANTLIB += samplerate sndio ssl usbhid xcb xcb-dri2 xcb-dri3
+WANTLIB += xcb-glx xcb-present xcb-shm xcb-sync xcb-xfixes
+WANTLIB += xshmfence z
# C++11
COMPILER= base-clang ports-gcc
LIB_DEPENDS= devel/sdl2 \
+ graphics/glew \
net/curl \
net/libcares
RUN_DEPENDS= devel/desktop-file-utils
Index: games/bzflag/distinfo
===================================================================
RCS file: /home/cvs/ports/games/bzflag/distinfo,v
retrieving revision 1.13
diff -u -p -u -p -r1.13 distinfo
--- games/bzflag/distinfo 15 Sep 2018 19:26:50 -0000 1.13
+++ games/bzflag/distinfo 23 Dec 2021 17:09:27 -0000
@@ -1,2 +1,2 @@
-SHA256 (bzflag-2.4.14.tar.bz2) = tWx3fHHU0d9VRG+d5unpKAGynYHDlmkIe6aAzmZFz/U=
-SIZE (bzflag-2.4.14.tar.bz2) = 14065461
+SHA256 (bzflag-2.4.22.tar.bz2) = nmRlMwK2V72LX5b+EVCp/4Ch1Tptfoo1E4xrGwIAak0=
+SIZE (bzflag-2.4.22.tar.bz2) = 14169079
Index: games/bzflag/patches/patch-src_platform_SDLMedia_cxx
===================================================================
RCS file: /home/cvs/ports/games/bzflag/patches/patch-src_platform_SDLMedia_cxx,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 patch-src_platform_SDLMedia_cxx
--- games/bzflag/patches/patch-src_platform_SDLMedia_cxx 3 Sep 2012 07:19:34 -0000 1.4
+++ games/bzflag/patches/patch-src_platform_SDLMedia_cxx 23 Dec 2021 17:09:27 -0000
@@ -1,13 +1,13 @@
$OpenBSD: patch-src_platform_SDLMedia_cxx,v 1.4 2012/09/03 07:19:34 ajacoutot Exp $
---- src/platform/SDLMedia.cxx.orig Sun Jul 15 19:32:02 2012
-+++ src/platform/SDLMedia.cxx Tue Aug 7 07:18:22 2012
-@@ -109,8 +109,7 @@ bool SDLMedia::openAudio()
+Index: src/platform/SDLMedia.cxx
+--- src/platform/SDLMedia.cxx.orig
++++ src/platform/SDLMedia.cxx
+@@ -130,7 +130,7 @@ bool SDLMedia::openAudio()
+ // how big a fragment to use? we want to hold at around 1/10th of
+ // a second.
+ // probably SDL is using multiple buffering, make it a 3rd
+- int fragmentSize = (int)(0.03f * (float)audioOutputRate);
++ int fragmentSize = (int)(0.1f * (float)audioOutputRate);
+ int n;
- // how big a fragment to use? we want to hold at around 1/10th of
- // a second.
-- // probably SDL is using multiple buffering, make it a 3rd
-- int fragmentSize = (int)(0.03f * (float)audioOutputRate);
-+ int fragmentSize = (int)(0.1f * (float)audioOutputRate);
- int n;
-
- n = 0;
+ n = 0;
Index: games/bzflag/pkg/PLIST
===================================================================
RCS file: /home/cvs/ports/games/bzflag/pkg/PLIST,v
retrieving revision 1.15
diff -u -p -u -p -r1.15 PLIST
--- games/bzflag/pkg/PLIST 4 Sep 2018 12:46:12 -0000 1.15
+++ games/bzflag/pkg/PLIST 23 Dec 2021 17:09:27 -0000
@@ -3,39 +3,39 @@
@bin bin/bzflag
@bin bin/bzfs
lib/bzflag/
-lib/bzflag/CustomZoneSample.so
-lib/bzflag/HoldTheFlag.so
-lib/bzflag/Phoenix.so
-lib/bzflag/RogueGenocide.so
-lib/bzflag/SAMPLE_PLUGIN.so
-lib/bzflag/TimeLimit.so
-lib/bzflag/airspawn.so
-lib/bzflag/autoFlagReset.so
-lib/bzflag/bzfscron.so
-lib/bzflag/chathistory.so
-lib/bzflag/customPollTypeSample.so
-lib/bzflag/customflagsample.so
-lib/bzflag/fairCTF.so
-lib/bzflag/fastmap.so
-lib/bzflag/flagStay.so
-lib/bzflag/keepaway.so
-lib/bzflag/killall.so
-lib/bzflag/koth.so
-lib/bzflag/logDetail.so
-lib/bzflag/nagware.so
-lib/bzflag/playHistoryTracker.so
-lib/bzflag/rabbitTimer.so
-lib/bzflag/rabidRabbit.so
-lib/bzflag/recordmatch.so
-lib/bzflag/regFlag.so
-lib/bzflag/serverControl.so
-lib/bzflag/serverSidePlayerSample.so
-lib/bzflag/shockwaveDeath.so
-lib/bzflag/superUser.so
-lib/bzflag/teamflagreset.so
-lib/bzflag/thiefControl.so
-lib/bzflag/timedctf.so
-lib/bzflag/wwzones.so
+@so lib/bzflag/CustomZoneSample.so
+@so lib/bzflag/HoldTheFlag.so
+@so lib/bzflag/Phoenix.so
+@so lib/bzflag/RogueGenocide.so
+@so lib/bzflag/SAMPLE_PLUGIN.so
+@so lib/bzflag/TimeLimit.so
+@so lib/bzflag/airspawn.so
+@so lib/bzflag/autoFlagReset.so
+@so lib/bzflag/bzfscron.so
+@so lib/bzflag/chathistory.so
+@so lib/bzflag/customPollTypeSample.so
+@so lib/bzflag/customflagsample.so
+@so lib/bzflag/fairCTF.so
+@so lib/bzflag/fastmap.so
+@so lib/bzflag/flagStay.so
+@so lib/bzflag/keepaway.so
+@so lib/bzflag/killall.so
+@so lib/bzflag/koth.so
+@so lib/bzflag/logDetail.so
+@so lib/bzflag/nagware.so
+@so lib/bzflag/playHistoryTracker.so
+@so lib/bzflag/rabbitTimer.so
+@so lib/bzflag/rabidRabbit.so
+@so lib/bzflag/recordmatch.so
+@so lib/bzflag/regFlag.so
+@so lib/bzflag/serverControl.so
+@so lib/bzflag/serverSidePlayerSample.so
+@so lib/bzflag/shockwaveDeath.so
+@so lib/bzflag/superUser.so
+@so lib/bzflag/teamflagreset.so
+@so lib/bzflag/thiefControl.so
+@so lib/bzflag/timedctf.so
+@so lib/bzflag/wwzones.so
@man man/man5/bzw.5
@man man/man6/bzadmin.6
@man man/man6/bzflag.6
@@ -75,6 +75,8 @@ share/bzflag/flag_won.wav
share/bzflag/flap.wav
share/bzflag/fonts/
share/bzflag/fonts/DejaVu.License
+share/bzflag/fonts/DejaVuSansCondensedBold_10.fmt
+share/bzflag/fonts/DejaVuSansCondensedBold_10.png
share/bzflag/fonts/DejaVuSansCondensedBold_12.fmt
share/bzflag/fonts/DejaVuSansCondensedBold_12.png
share/bzflag/fonts/DejaVuSansCondensedBold_16.fmt
@@ -91,6 +93,8 @@ share/bzflag/fonts/DejaVuSansCondensedBo
share/bzflag/fonts/DejaVuSansCondensedBold_64.png
share/bzflag/fonts/DejaVuSansCondensedBold_8.fmt
share/bzflag/fonts/DejaVuSansCondensedBold_8.png
+share/bzflag/fonts/DejaVuSansMonoBold_10.fmt
+share/bzflag/fonts/DejaVuSansMonoBold_10.png
share/bzflag/fonts/DejaVuSansMonoBold_12.fmt
share/bzflag/fonts/DejaVuSansMonoBold_12.png
share/bzflag/fonts/DejaVuSansMonoBold_16.fmt
@@ -139,6 +143,7 @@ share/bzflag/l10n/bzflag_lt.po
share/bzflag/l10n/bzflag_nl.po
share/bzflag/l10n/bzflag_pt.po
share/bzflag/l10n/bzflag_ru.po
+share/bzflag/l10n/bzflag_sk.po
share/bzflag/l10n/bzflag_sv.po
share/bzflag/land.wav
share/bzflag/laser.wav

29
cheese-41.1.diff Normal file
View File

@ -0,0 +1,29 @@
Index: x11/gnome/cheese/Makefile
===================================================================
RCS file: /home/cvs/ports/x11/gnome/cheese/Makefile,v
retrieving revision 1.36
diff -u -p -u -p -r1.36 Makefile
--- x11/gnome/cheese/Makefile 12 Mar 2022 09:32:57 -0000 1.36
+++ x11/gnome/cheese/Makefile 23 Mar 2022 12:03:43 -0000
@@ -6,6 +6,8 @@ COMMENT-libs= webcam display and captur
GNOME_PROJECT= cheese
GNOME_VERSION= 41.1
+REVISION-libs= 0
+
PKGNAME-libs= libcheese-${GNOME_VERSION}
CATEGORIES= multimedia
Index: x11/gnome/cheese/pkg/PLIST-libs
===================================================================
RCS file: /home/cvs/ports/x11/gnome/cheese/pkg/PLIST-libs,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 PLIST-libs
--- x11/gnome/cheese/pkg/PLIST-libs 12 Mar 2022 09:32:57 -0000 1.1
+++ x11/gnome/cheese/pkg/PLIST-libs 23 Mar 2022 12:03:49 -0000
@@ -16,5 +16,4 @@ lib/pkgconfig/cheese-gtk.pc
lib/pkgconfig/cheese.pc
share/gir-1.0/Cheese-3.0.gir
share/glib-2.0/schemas/org.gnome.Cheese.gschema.xml
-share/metainfo/org.gnome.Cheese.appdata.xml
@tag glib-compile-schemas

30
cheese-41.1p0.diff Normal file
View File

@ -0,0 +1,30 @@
Index: x11/gnome/cheese/Makefile
===================================================================
RCS file: /home/cvs/ports/x11/gnome/cheese/Makefile,v
retrieving revision 1.36
diff -u -p -u -p -r1.36 Makefile
--- x11/gnome/cheese/Makefile 12 Mar 2022 09:32:57 -0000 1.36
+++ x11/gnome/cheese/Makefile 23 Mar 2022 11:31:34 -0000
@@ -6,6 +6,8 @@ COMMENT-libs= webcam display and captur
GNOME_PROJECT= cheese
GNOME_VERSION= 41.1
+REVISION= 0
+
PKGNAME-libs= libcheese-${GNOME_VERSION}
CATEGORIES= multimedia
Index: x11/gnome/cheese/pkg/PLIST-libs
===================================================================
RCS file: /home/cvs/ports/x11/gnome/cheese/pkg/PLIST-libs,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 PLIST-libs
--- x11/gnome/cheese/pkg/PLIST-libs 12 Mar 2022 09:32:57 -0000 1.1
+++ x11/gnome/cheese/pkg/PLIST-libs 23 Mar 2022 11:33:22 -0000
@@ -16,5 +16,5 @@ lib/pkgconfig/cheese-gtk.pc
lib/pkgconfig/cheese.pc
share/gir-1.0/Cheese-3.0.gir
share/glib-2.0/schemas/org.gnome.Cheese.gschema.xml
-share/metainfo/org.gnome.Cheese.appdata.xml
+@comment share/metainfo/org.gnome.Cheese.appdata.xml # included in -main
@tag glib-compile-schemas

85
chessx-1.5.6.diff Normal file
View File

@ -0,0 +1,85 @@
? games/chessx/patches/patch-CMakeLists_txt
? games/chessx/patches/patch-src_CMakeLists_txt
Index: games/chessx/Makefile
===================================================================
RCS file: /cvs/ports/games/chessx/Makefile,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 Makefile
--- games/chessx/Makefile 11 Mar 2022 19:04:11 -0000 1.11
+++ games/chessx/Makefile 29 Aug 2022 11:02:22 -0000
@@ -1,35 +1,43 @@
-COMMENT = free chess database and analyzer
-DISTNAME = chessx-1.4.6
-CATEGORIES = games
-HOMEPAGE = http://chessx.sourceforge.net/
-REVISION = 5
+COMMENT = free chess database and analyzer
+
+V = 1.5.6
+GH_ACCOUNT = Isarhamster
+GH_PROJECT = chessx
+GH_TAGNAME = v${V}-lw
+
+DISTNAME = chessx-${V}
+
+CATEGORIES = games
+
+HOMEPAGE = https://chessx.sourceforge.net/
# GPLv2+
PERMIT_PACKAGE = Yes
-WANTLIB = GL Qt5Core Qt5Gui Qt5Multimedia Qt5Network Qt5PrintSupport
-WANTLIB += Qt5Svg Qt5Widgets Qt5Xml c m pthread quazip5 z
-WANTLIB += ${COMPILER_LIBCXX}
-
-MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=chessx/}
-EXTRACT_SUFX = .tgz
-
-MODULES = x11/qt5 devel/qmake
-RUN_DEPENDS = devel/desktop-file-utils
-LIB_DEPENDS = archivers/quazip \
- x11/qt5/qtmultimedia \
- x11/qt5/qtsvg
+WANTLIB += ${COMPILER_LIBCXX} Qt5Core Qt5Gui Qt5Multimedia Qt5Network
+WANTLIB += Qt5PrintSupport Qt5Svg Qt5TextToSpeech Qt5Widgets Qt5Xml c m
+WANTLIB += pulse pulse-mainloop-glib quazip1-qt5 z
+
+MODULES = x11/qt5 \
+ devel/cmake
+
+RUN_DEPENDS = devel/desktop-file-utils
+
+LIB_DEPENDS = archivers/quazip>=1.3 \
+ x11/qt5/qtmultimedia \
+ x11/qt5/qtspeech \
+ x11/qt5/qtsvg
-NO_TEST = Yes
+NO_TEST = Yes
-CXXFLAGS += -I${LOCALBASE}/include/quazip5
+CXXFLAGS += -I${LOCALBASE}/include/QuaZip-Qt5/quazip/
# make sure bundled quazip is not picked up
post-extract:
rm -R ${WRKDIST}/src/quazip
do-install:
- ${INSTALL_PROGRAM} ${WRKBUILD}/release/chessx ${PREFIX}/bin/
+ ${INSTALL_PROGRAM} ${WRKBUILD}/chessx ${PREFIX}/bin/
${INSTALL_DATA_DIR} ${PREFIX}/share/applications/
${INSTALL_DATA} ${WRKSRC}/unix/chessx.desktop ${PREFIX}/share/applications/
Index: games/chessx/distinfo
===================================================================
RCS file: /cvs/ports/games/chessx/distinfo,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 distinfo
--- games/chessx/distinfo 2 Jul 2017 00:51:50 -0000 1.2
+++ games/chessx/distinfo 29 Aug 2022 11:02:22 -0000
@@ -1,2 +1,2 @@
-SHA256 (chessx-1.4.6.tgz) = rZUZEKO9U/VlX56FEB55abU2B4Rz4Joqfd7W7xcaaO0=
-SIZE (chessx-1.4.6.tgz) = 4223076
+SHA256 (chessx-1.5.6.tar.gz) = NKOv9azN6Szn6UC5E68Du4KWIwYdaswjfL5aBLpkIoE=
+SIZE (chessx-1.5.6.tar.gz) = 22796472

89
cooling.diff Normal file
View File

@ -0,0 +1,89 @@
Index: sys/dev/acpi/acpitz.c
===================================================================
RCS file: /home/cvs/src/sys/dev/acpi/acpitz.c,v
retrieving revision 1.58
diff -u -p -r1.58 acpitz.c
--- sys/dev/acpi/acpitz.c 6 Apr 2022 18:59:27 -0000 1.58
+++ sys/dev/acpi/acpitz.c 27 Jun 2022 07:42:36 -0000
@@ -224,6 +224,12 @@ acpitz_attach(struct device *parent, str
else
printf(": critical temperature is %d degC\n", KTOC(sc->sc_crt));
+ if ((sc->sc_psv = acpitz_gettempreading(sc, "_PSV")) == -1)
+ printf(" `--> no cpu throttle point defined\n");
+ else
+ printf(" `--> throttle cpu at %d degC\n", KTOC(sc->sc_psv));
+
+
sc->sc_hot = acpitz_gettempreading(sc, "_HOT");
sc->sc_tc1 = acpitz_getreading(sc, "_TC1");
sc->sc_tc2 = acpitz_getreading(sc, "_TC2");
@@ -383,8 +389,8 @@ acpitz_refresh(void *arg)
nperf = acpitz_perflevel;
if (sc->sc_psv <= sc->sc_tmp) {
/* Passive cooling enabled */
- dnprintf(1, "%s: enabling passive %d %d\n",
- DEVNAME(sc), sc->sc_tmp, sc->sc_psv);
+ printf("%s: enabling passive %d degC >= %d degC\n",
+ DEVNAME(sc), KTOC(sc->sc_tmp), KTOC(sc->sc_psv));
if (!sc->sc_pse)
sc->sc_acpi->sc_pse++;
sc->sc_pse = 1;
@@ -400,8 +406,8 @@ acpitz_refresh(void *arg)
}
else {
/* Passive cooling disabled, increase % */
- dnprintf(1, "%s: disabling passive %d %d\n",
- DEVNAME(sc), sc->sc_tmp, sc->sc_psv);
+ printf("%s: disabling passive %d degC < %d degC\n",
+ DEVNAME(sc), KTOC(sc->sc_tmp), KTOC(sc->sc_psv));
if (sc->sc_pse)
sc->sc_acpi->sc_pse--;
sc->sc_pse = 0;
Index: sys/arch/amd64/amd64/k1x-pstate.c
===================================================================
RCS file: /home/cvs/src/sys/arch/amd64/amd64/k1x-pstate.c,v
retrieving revision 1.11
diff -u -p -r1.11 k1x-pstate.c
--- sys/arch/amd64/amd64/k1x-pstate.c 11 Aug 2021 18:31:48 -0000 1.11
+++ sys/arch/amd64/amd64/k1x-pstate.c 27 Jun 2022 07:44:46 -0000
@@ -41,14 +41,8 @@
extern int setperf_prio;
-#define MSR_K1X_LIMIT 0xc0010061
#define MSR_K1X_CONTROL 0xc0010062
#define MSR_K1X_STATUS 0xc0010063
-#define MSR_K1X_CONFIG 0xc0010064
-
-/* MSR_K1X_LIMIT */
-#define K1X_PSTATE_MAX_VAL(x) (((x) >> 4) & 0x7)
-#define K1X_PSTATE_LIMIT(x) (((x)) & 0x7)
/* MSR_K1X_CONFIG */
#define K1X_FID(x) ((x) & 0x3f)
@@ -95,19 +89,15 @@ void
k1x_transition(struct k1x_cpu_state *cstate, int level)
{
u_int64_t msr;
- int i, cfid, fid = cstate->state_table[level].fid;
+ int cfid, fid = cstate->state_table[level].fid;
wrmsr(MSR_K1X_CONTROL, fid);
- for (i = 0; i < 100; i++) {
- msr = rdmsr(MSR_K1X_STATUS);
- cfid = K1X_FID(msr);
- if (cfid == fid)
- break;
- DELAY(100);
- }
+ msr = rdmsr(MSR_K1X_STATUS);
+ cfid = K1X_FID(msr);
+
if (cfid == fid) {
cpuspeed = cstate->state_table[level].freq;
-#if 0
+#if 1
(void)printf("Target: %d Current: %d Pstate: %d\n",
cstate->state_table[level].freq,
cpuspeed, cfid);

16
cpuid.diff Normal file
View File

@ -0,0 +1,16 @@
Index: files/cpuid.c
===================================================================
RCS file: /cvs/ports/sysutils/cpuid/files/cpuid.c,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 cpuid.c
--- files/cpuid.c 25 Apr 2016 18:28:14 -0000 1.1.1.1
+++ files/cpuid.c 8 Nov 2022 11:30:17 -0000
@@ -15,7 +15,7 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-
+#include <ctype.h>
#include <err.h>
#include <errno.h>
#include <limits.h>

186
ctunnel-0.8.diff Normal file
View File

@ -0,0 +1,186 @@
Index: Makefile
===================================================================
RCS file: /cvs/ports/security/ctunnel/Makefile,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 Makefile
--- Makefile 11 Mar 2022 19:53:20 -0000 1.8
+++ Makefile 14 Nov 2022 20:55:49 -0000
@@ -1,9 +1,10 @@
COMMENT= provide cryptographic tunnel
-DISTNAME= ctunnel-0.4
+GH_ACCOUNT= alienrobotarmy
+GH_PROJECT= ctunnel
+GH_COMMIT= ec5e388e1dd3b684cd1cea1ed5c67f99d42bf4f3
+DISTNAME= ctunnel-0.8
CATEGORIES= security
-REVISION= 1
-FIX_EXTRACT_PERMISSIONS=Yes
HOMEPAGE= http://nardcore.org/ctunnel/
@@ -12,9 +13,7 @@ MAINTAINER= Pierre-Emmanuel Andre <pea@o
# GPLv2
PERMIT_PACKAGE= Yes
-MASTER_SITES= ${HOMEPAGE}
-
-WANTLIB= c crypto pthread z
+WANTLIB += c crypto pthread util z
NO_TEST= Yes
@@ -22,6 +21,6 @@ USE_GMAKE= Yes
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ctunnel
- ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/ctunnel/
+ ${INSTALL_DATA} ${WRKSRC}/README.md ${PREFIX}/share/doc/ctunnel/
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/security/ctunnel/distinfo,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 distinfo
--- distinfo 18 Jan 2015 03:15:01 -0000 1.3
+++ distinfo 14 Nov 2022 20:55:49 -0000
@@ -1,2 +1,2 @@
-SHA256 (ctunnel-0.4.tar.gz) = 7KPyu6t7L2ucQvcjUdT8FLC2e8ZxRXc0lznLdD5KnTo=
-SIZE (ctunnel-0.4.tar.gz) = 24880
+SHA256 (ctunnel-0.8-ec5e388e.tar.gz) = fUlQ9Ka6EeXaqyTG+PqEhRK0/Ro5a1QD89vPQL9bT6M=
+SIZE (ctunnel-0.8-ec5e388e.tar.gz) = 49370
Index: patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/security/ctunnel/patches/patch-Makefile,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-Makefile
--- patches/patch-Makefile 11 Mar 2022 19:53:20 -0000 1.3
+++ patches/patch-Makefile 14 Nov 2022 20:55:49 -0000
@@ -1,11 +1,15 @@
---- Makefile.orig Wed Jun 2 05:55:03 2010
-+++ Makefile Wed Jan 12 09:31:45 2011
-@@ -5,7 +5,7 @@ clean:
+Index: Makefile
+--- Makefile.orig
++++ Makefile
+@@ -5,8 +5,8 @@ clean:
$(MAKE) -C src/ clean
install:
$(MAKE) -C src/ install
+- install -d $(PREFIX)/share/man/man1
- install ctunnel.1 $(PREFIX)/share/man/man1
++ install -d $(PREFIX)/man/man1
+ install ctunnel.1 $(PREFIX)/man/man1
uninstall:
$(MAKE) -C src/ uninstall
- rm -f $(PREFIX)/share/man/man1/ctunnel.1
+- rm -f $(PREFIX)/share/man/man1/ctunnel.1
++ rm -f $(PREFIX)/man/man1/ctunnel.1
Index: patches/patch-Makefile_cfg
===================================================================
RCS file: /cvs/ports/security/ctunnel/patches/patch-Makefile_cfg,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-Makefile_cfg
--- patches/patch-Makefile_cfg 11 Mar 2022 19:53:20 -0000 1.2
+++ patches/patch-Makefile_cfg 14 Nov 2022 20:55:49 -0000
@@ -1,10 +1,10 @@
---- Makefile.cfg.orig Wed Jan 12 09:21:13 2011
-+++ Makefile.cfg Wed Jan 12 09:21:58 2011
-@@ -1,4 +1,4 @@
--CRYPTO_TYPE=GCRYPT
--#CRYPTO_TYPE=OPENSSL
-+#CRYPTO_TYPE=GCRYPT
-+CRYPTO_TYPE=OPENSSL
-
+Index: Makefile.cfg
+--- Makefile.cfg.orig
++++ Makefile.cfg
+@@ -1,6 +1,3 @@
+ #CRYPTO_TYPE=GCRYPT
+ CRYPTO_TYPE=OPENSSL
+-TUNTAP=yes
+ #OPTS=-mmacosx-version-min=10.4
+-
-PREFIX=/usr/local
-+#PREFIX=/usr/local
Index: patches/patch-include_ctunnel_h
===================================================================
RCS file: /cvs/ports/security/ctunnel/patches/patch-include_ctunnel_h,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-include_ctunnel_h
--- patches/patch-include_ctunnel_h 11 Mar 2022 19:53:20 -0000 1.2
+++ patches/patch-include_ctunnel_h 14 Nov 2022 20:55:49 -0000
@@ -1,6 +1,7 @@
---- include/ctunnel.h.orig Wed Jan 12 09:24:23 2011
-+++ include/ctunnel.h Wed Jan 12 09:24:33 2011
-@@ -10,8 +10,8 @@
+Index: include/ctunnel.h
+--- include/ctunnel.h.orig
++++ include/ctunnel.h
+@@ -13,8 +13,8 @@
#include <syslog.h>
#include <sys/socket.h>
#include <netinet/in.h>
Index: patches/patch-src_Makefile
===================================================================
RCS file: /cvs/ports/security/ctunnel/patches/patch-src_Makefile,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-src_Makefile
--- patches/patch-src_Makefile 11 Mar 2022 19:53:20 -0000 1.3
+++ patches/patch-src_Makefile 14 Nov 2022 20:55:49 -0000
@@ -1,12 +1,14 @@
---- src/Makefile.orig Thu Jun 3 08:05:01 2010
-+++ src/Makefile Sun Aug 19 15:28:03 2012
-@@ -1,6 +1,7 @@
+Index: src/Makefile
+--- src/Makefile.orig
++++ src/Makefile
+@@ -1,7 +1,8 @@
include ../Makefile.cfg
-CC=gcc
--CFLAGS=-Wall -Wcast-align -Wshadow -Wstrict-prototypes -g -O2 -DHAVE_$(CRYPTO_TYPE) -I../include -I./include
+CC?=gcc
-+CFLAGS ?=
-+CFLAGS +=-Wall -Wcast-align -Wshadow -Wstrict-prototypes -DHAVE_$(CRYPTO_TYPE) -I../include -I./include
- LDFLAGS=-lz -lpthread
+ BUILD=$(shell svnversion . | sed -e 's/^[0-9].*://g' -e 's/[a-zA-Z]//g')
+-CFLAGS=-g -Wall -Wextra -Wcast-align -Wshadow -Wstrict-prototypes -O2 -Wno-makunused-but-set-parameter -Wno-unused-variable ${OPTS} -DHAVE_$(CRYPTO_TYPE) -I../include -I./include
++CFLAGS?=
++CFLAGS+=-g -Wall -Wextra -Wcast-align -Wshadow -Wstrict-prototypes -Wno-makunused-but-set-parameter -Wno-unused-variable ${OPTS} -DHAVE_$(CRYPTO_TYPE) -I../include -I./include
+ LDFLAGS=-lz -lpthread -lutil -lc
- ifeq ($(CRYPTO_TYPE),OPENSSL)
+ #objects := $(patsubst %.c,%.o,$(wildcard *.c))
Index: patches/patch-src_crypto_c
===================================================================
RCS file: patches/patch-src_crypto_c
diff -N patches/patch-src_crypto_c
--- patches/patch-src_crypto_c 11 Mar 2022 19:53:20 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-Index: src/crypto.c
---- src/crypto.c.orig
-+++ src/crypto.c
-@@ -21,7 +21,7 @@
- #ifdef HAVE_OPENSSL
- crypto_ctx *openssl_crypto_init(struct options opt, int dir)
- {
-- crypto_ctx *ctx = calloc(1, sizeof(crypto_ctx));
-+ crypto_ctx *ctx = EVP_CIPHER_CTX_new();
-
- /* STREAM CIPHERS ONLY */
- EVP_CIPHER_CTX_init(ctx);
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/security/ctunnel/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 PLIST
--- pkg/PLIST 11 Mar 2022 19:53:20 -0000 1.3
+++ pkg/PLIST 14 Nov 2022 20:55:49 -0000
@@ -1,4 +1,4 @@
@bin bin/ctunnel
@man man/man1/ctunnel.1
share/doc/ctunnel/
-share/doc/ctunnel/README
+share/doc/ctunnel/README.md

40
darktable-3.6.1.diff Normal file
View File

@ -0,0 +1,40 @@
Index: graphics/darktable/Makefile
===================================================================
RCS file: /home/cvs/ports/graphics/darktable/Makefile,v
retrieving revision 1.112
diff -u -p -u -p -r1.112 Makefile
--- graphics/darktable/Makefile 9 Oct 2021 22:05:09 -0000 1.112
+++ graphics/darktable/Makefile 9 Dec 2021 08:03:39 -0000
@@ -4,11 +4,10 @@ ONLY_FOR_ARCHS= amd64 aarch64
COMMENT= virtual lighttable and darkroom for photographers
-V= 3.6.0
+V= 3.6.1
DISTNAME= darktable-$V
PORTROACH= limitw:1,even skipv:release-$V
EXTRACT_SUFX= .tar.xz
-REVISION= 1
CATEGORIES= graphics x11
@@ -57,6 +56,7 @@ LIB_DEPENDS= devel/gettext,-runtime \
graphics/openexr \
graphics/openjp2 \
net/curl \
+ print/cups,-libs \
textproc/pugixml \
x11/gnome/librsvg \
x11/gnome/libsecret \
Index: graphics/darktable/distinfo
===================================================================
RCS file: /home/cvs/ports/graphics/darktable/distinfo,v
retrieving revision 1.39
diff -u -p -u -p -r1.39 distinfo
--- graphics/darktable/distinfo 4 Jul 2021 17:23:53 -0000 1.39
+++ graphics/darktable/distinfo 9 Dec 2021 07:02:07 -0000
@@ -1,2 +1,2 @@
-SHA256 (darktable-3.6.0.tar.xz) = hrzQGErzi5PDaI3/09XBnMZfJo7Pk1jWSfoR/ibHCjk=
-SIZE (darktable-3.6.0.tar.xz) = 4691608
+SHA256 (darktable-3.6.1.tar.xz) = or/HwQO4JJRUV6m/7Z5S8Af6HQMPnbyz/wMnhRvkLRQ=
+SIZE (darktable-3.6.1.tar.xz) = 4685928

178
diff.diff Normal file
View File

@ -0,0 +1,178 @@
Index: bin/ksh/lex.c
===================================================================
RCS file: /home/cvs/src/bin/ksh/lex.c,v
retrieving revision 1.78
diff -u -p -r1.78 lex.c
--- bin/ksh/lex.c 15 Jan 2018 14:58:05 -0000 1.78
+++ bin/ksh/lex.c 23 Oct 2021 13:53:47 -0000
@@ -1157,6 +1157,10 @@ getsc_line(Source *s)
s->line++;
histsave(s->line, s->str, 1);
}
+ /* Set xterm title */
+ char *d = str_val(global("DISPLAY"));
+ if(d[0] > 0)
+ shellf("%c]0;$ %s%c", '\033', s->str, '\007');
}
if (interactive)
set_prompt(PS2);
Index: bin/ksh/main.c
===================================================================
RCS file: /home/cvs/src/bin/ksh/main.c,v
retrieving revision 1.98
diff -u -p -r1.98 main.c
--- bin/ksh/main.c 28 Jun 2019 13:34:59 -0000 1.98
+++ bin/ksh/main.c 23 Oct 2021 13:53:47 -0000
@@ -609,6 +609,11 @@ shell(Source *volatile s, volatile int t
j_notify();
mcheck();
set_prompt(PS1);
+ /* Reset xterm title */
+ char *d = str_val(global("DISPLAY"));
+ if(d[0] > 0)
+ shellf("%c]0;$ ksh (%s)%c", '\033',
+ str_val(global("PWD")), '\007');
}
t = compile(s);
Index: sys/dev/pci/azalia.c
===================================================================
RCS file: /home/cvs/src/sys/dev/pci/azalia.c,v
retrieving revision 1.266
diff -u -p -r1.266 azalia.c
--- sys/dev/pci/azalia.c 30 Oct 2021 03:24:59 -0000 1.266
+++ sys/dev/pci/azalia.c 9 Nov 2021 21:37:03 -0000
@@ -279,6 +279,9 @@ int azalia_suspend(azalia_t *);
int azalia_resume(azalia_t *);
int azalia_resume_codec(codec_t *);
+/* sysctl */
+int audio_hdmi_enable = 0;
+
/* variables */
struct cfattach azalia_ca = {
sizeof(azalia_t), azalia_pci_match, azalia_pci_attach,
@@ -954,9 +957,10 @@ azalia_init_codecs(azalia_t *az)
c = -1;
for (i = 0; i < az->ncodecs; i++) {
codec = &az->codecs[i];
- if ((codec->audiofunc < 0) ||
- (codec->codec_type == AZ_CODEC_TYPE_HDMI))
- continue;
+ if(audio_hdmi_enable)
+ if ((codec->audiofunc < 0) ||
+ (codec->codec_type == AZ_CODEC_TYPE_HDMI))
+ continue;
if (codec->codec_type == AZ_CODEC_TYPE_DIGITAL) {
if (c < 0)
c = i;
Index: sys/kern/init_sysent.c
===================================================================
RCS file: /home/cvs/src/sys/kern/init_sysent.c,v
retrieving revision 1.230
diff -u -p -r1.230 init_sysent.c
--- sys/kern/init_sysent.c 27 Oct 2021 03:25:11 -0000 1.230
+++ sys/kern/init_sysent.c 9 Nov 2021 22:05:42 -0000
@@ -1,4 +1,4 @@
-/* $OpenBSD: init_sysent.c,v 1.230 2021/10/27 03:25:11 visa Exp $ */
+/* $OpenBSD$ */
/*
* System call switch table.
Index: sys/kern/kern_sysctl.c
===================================================================
RCS file: /home/cvs/src/sys/kern/kern_sysctl.c,v
retrieving revision 1.396
diff -u -p -r1.396 kern_sysctl.c
--- sys/kern/kern_sysctl.c 30 Oct 2021 23:24:48 -0000 1.396
+++ sys/kern/kern_sysctl.c 10 Nov 2021 18:57:10 -0000
@@ -126,6 +126,7 @@ extern fixpt_t ccpu;
extern long numvnodes;
extern int allowdt;
extern int audio_record_enable;
+extern int audio_hdmi_enable;
extern int video_record_enable;
int allowkmem;
@@ -2427,13 +2428,17 @@ int
sysctl_audio(int *name, u_int namelen, void *oldp, size_t *oldlenp,
void *newp, size_t newlen)
{
+ int error = 0;
if (namelen != 1)
return (ENOTDIR);
- if (name[0] != KERN_AUDIO_RECORD)
- return (ENOENT);
+ if (name[0] == KERN_AUDIO_RECORD)
+ error = sysctl_int(oldp, oldlenp, newp, newlen, &audio_record_enable);
- return (sysctl_int(oldp, oldlenp, newp, newlen, &audio_record_enable));
+ if (name[0] == KERN_AUDIO_HDMI)
+ error = sysctl_int(oldp, oldlenp, newp, newlen, &audio_hdmi_enable);
+
+ return (error);
}
#endif
Index: sys/kern/syscalls.c
===================================================================
RCS file: /home/cvs/src/sys/kern/syscalls.c,v
retrieving revision 1.229
diff -u -p -r1.229 syscalls.c
--- sys/kern/syscalls.c 27 Oct 2021 03:25:11 -0000 1.229
+++ sys/kern/syscalls.c 9 Nov 2021 22:05:42 -0000
@@ -1,4 +1,4 @@
-/* $OpenBSD: syscalls.c,v 1.229 2021/10/27 03:25:11 visa Exp $ */
+/* $OpenBSD$ */
/*
* System call names.
Index: sys/sys/syscall.h
===================================================================
RCS file: /home/cvs/src/sys/sys/syscall.h,v
retrieving revision 1.228
diff -u -p -r1.228 syscall.h
--- sys/sys/syscall.h 27 Oct 2021 03:25:11 -0000 1.228
+++ sys/sys/syscall.h 9 Nov 2021 22:05:42 -0000
@@ -1,4 +1,4 @@
-/* $OpenBSD: syscall.h,v 1.228 2021/10/27 03:25:11 visa Exp $ */
+/* $OpenBSD$ */
/*
* System call numbers.
Index: sys/sys/syscallargs.h
===================================================================
RCS file: /home/cvs/src/sys/sys/syscallargs.h,v
retrieving revision 1.231
diff -u -p -r1.231 syscallargs.h
--- sys/sys/syscallargs.h 27 Oct 2021 03:25:11 -0000 1.231
+++ sys/sys/syscallargs.h 9 Nov 2021 22:05:42 -0000
@@ -1,4 +1,4 @@
-/* $OpenBSD: syscallargs.h,v 1.231 2021/10/27 03:25:11 visa Exp $ */
+/* $OpenBSD$ */
/*
* System call argument lists.
Index: sys/sys/sysctl.h
===================================================================
RCS file: /home/cvs/src/sys/sys/sysctl.h,v
retrieving revision 1.219
diff -u -p -r1.219 sysctl.h
--- sys/sys/sysctl.h 30 Oct 2021 23:24:48 -0000 1.219
+++ sys/sys/sysctl.h 7 Nov 2021 18:52:34 -0000
@@ -317,11 +317,13 @@ struct ctlname {
* KERN_AUDIO
*/
#define KERN_AUDIO_RECORD 1
-#define KERN_AUDIO_MAXID 2
+#define KERN_AUDIO_HDMI 2
+#define KERN_AUDIO_MAXID 3
#define CTL_KERN_AUDIO_NAMES { \
{ 0, 0 }, \
{ "record", CTLTYPE_INT }, \
+ { "hdmi", CTLTYPE_INT }, \
}
/*

805
dmd-20990.diff Normal file
View File

@ -0,0 +1,805 @@
Index: Makefile
===================================================================
RCS file: /cvs/ports/lang/dmd/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- Makefile 11 Mar 2022 19:28:54 -0000 1.5
+++ Makefile 12 Mar 2022 16:22:12 -0000
@@ -1,14 +1,13 @@
# i386 forthcoming
ONLY_FOR_ARCHS = amd64
-V = 2.098.0
+V = 2.099.0
COMMENT = reference compiler for the D programming language
-DISTFILES = dmd-${V}.tar.gz \
- dmd-${V}-bootstrap-p0.tar.gz \
- druntime-${V}.tar.gz \
- phobos-${V}.tar.gz
+DISTFILES = dmd-${V}{v${V}}.tar.gz:1 \
+ dmd-${V}-bootstrap.tar.gz:0 \
+ druntime-${V}{v${V}}.tar.gz:2 \
+ phobos-${V}{v${V}}.tar.gz:3
PKGNAME = dmd-${V}
-REVISION = 0
CATEGORIES = lang
HOMEPAGE = https://dlang.org/
@@ -19,12 +18,15 @@ PERMIT_PACKAGE = Yes
WANTLIB += c c++abi execinfo m pthread
-MASTER_SITES = https://github.com/ibara/dmd/releases/download/bootstrap-${V}/
+MASTER_SITES0 = https://github.com/ibara/dmd/releases/download/bootstrap-${V}/
+MASTER_SITES1 = https://github.com/dlang/dmd/archive/refs/tags/
+MASTER_SITES2 = https://github.com/dlang/druntime/archive/refs/tags/
+MASTER_SITES3 = https://github.com/dlang/phobos/archive/refs/tags/
USE_GMAKE = Yes
MAKE_ENV = HOST_CXX="${CXX}" \
- HOST_DMD="${WRKDIR}/dmd-${V}-bootstrap/openbsd/bin${MODEL}/dmd" \
- LD_LIBRARY_PATH="${WRKSRC}/dmd-${V}-bootstrap/openbsd/bin${MODEL}"
+ HOST_DMD="${WRKDIR}/dmd-bootstrap/openbsd/bin${MODEL}/dmd" \
+ LD_LIBRARY_PATH="${WRKSRC}/dmd-bootstrap/openbsd/bin${MODEL}"
MAKE_FILE = posix.mak
NO_TEST = Yes
@@ -36,23 +38,23 @@ MODEL = 64
MODEL = 32
.endif
-# Fix up the build system.
-do-gen:
- sed -i "s,TOPDIR,${WRKDIR},g" \
- ${WRKDIR}/druntime-${V}/posix.mak \
- ${WRKDIR}/phobos-${V}/posix.mak
+# Prevent churn.
+post-extract:
+ mv ${WRKSRC}/dmd-${V} ${WRKSRC}/dmd
+ mv ${WRKSRC}/druntime-${V} ${WRKSRC}/druntime
+ mv ${WRKSRC}/phobos-${V} ${WRKSRC}/phobos
# We need to do this manually.
# Yes, this is all really correct.
do-build:
- cd ${WRKDIR}/phobos-${V} && \
+ cd ${WRKDIR}/phobos && \
${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} -f ${MAKE_FILE} && \
${SETENV} ${MAKE_PROGRAM} -f ${MAKE_FILE} install
- cd ${WRKDIR}/druntime-${V} && \
+ cd ${WRKDIR}/druntime && \
${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} -f ${MAKE_FILE} && \
${SETENV} ${MAKE_PROGRAM} -f ${MAKE_FILE} install
mkdir ${WRKDIR}/install/openbsd/bin${MODEL}
- cp ${WRKDIR}/dmd-${V}/generated/openbsd/release/${MODEL}/dmd \
+ cp ${WRKDIR}/dmd/generated/openbsd/release/${MODEL}/dmd \
${WRKDIR}/install/openbsd/bin${MODEL}
# We need to do this manually too.
@@ -61,8 +63,8 @@ do-install:
${PREFIX}/bin
${INSTALL_DATA} ${WRKDIR}/install/openbsd/lib${MODEL}/libphobos2.a \
${PREFIX}/lib
- ${INSTALL_MAN} ${WRKDIR}/dmd-${V}/dmd.1 ${PREFIX}/man/man1
- ${INSTALL_MAN} ${WRKDIR}/dmd-${V}/docs/man/man5/dmd.conf.5 \
+ ${INSTALL_MAN} ${WRKDIR}/dmd-bootstrap/dmd.1 ${PREFIX}/man/man1
+ ${INSTALL_MAN} ${WRKDIR}/dmd/docs/man/man5/dmd.conf.5 \
${PREFIX}/man/man5
${INSTALL_DATA_DIR} ${PREFIX}/include/dmd
cp -R ${WRKDIR}/install/src/{druntime,phobos} ${PREFIX}/include/dmd
@@ -70,7 +72,7 @@ do-install:
${INSTALL_DATA} ${WRKDIR}/install/phobos-LICENSE.txt \
${PREFIX}/share/doc/dmd/LICENSE.txt
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/dmd
- cp -R ${WRKDIR}/dmd-${V}/samples/* ${PREFIX}/share/examples/dmd
+ cp -R ${WRKDIR}/dmd/samples/* ${PREFIX}/share/examples/dmd
${INSTALL_DATA_DIR} ${PREFIX}/share/dmd
${SUBST_CMD} -c -m 444 ${FILESDIR}/dmd.conf \
${PREFIX}/share/dmd/dmd.conf
Index: distinfo
===================================================================
RCS file: /cvs/ports/lang/dmd/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo 29 Nov 2021 01:23:22 -0000 1.3
+++ distinfo 12 Mar 2022 16:22:12 -0000
@@ -1,8 +1,8 @@
-SHA256 (dmd-2.098.0-bootstrap-p0.tar.gz) = wjPmbUtDh6UBPMphduS4pr8LVLb99E0NfpIJpjw5M20=
-SHA256 (dmd-2.098.0.tar.gz) = PcjGCztmfGCUtJselt3795Di9Sy43P6wBaSamM8haqY=
-SHA256 (druntime-2.098.0.tar.gz) = 427NFmgYFramws7kWk/+HRWf0HUCSeGsOB7epahEx6I=
-SHA256 (phobos-2.098.0.tar.gz) = S/fIj+0Uh1VRVpeTErcblgnpHdO4eIBNcVkkKW4NWbo=
-SIZE (dmd-2.098.0-bootstrap-p0.tar.gz) = 11521977
-SIZE (dmd-2.098.0.tar.gz) = 3759833
-SIZE (druntime-2.098.0.tar.gz) = 1864644
-SIZE (phobos-2.098.0.tar.gz) = 2444864
+SHA256 (dmd-2.099.0-bootstrap.tar.gz) = zOgJZmP67jnx/c5SbCm7YiL7lnyrSsE9MpuknqA9xF4=
+SHA256 (dmd-2.099.0.tar.gz) = jIV1sraLff4jb+wTu98m0GM2W07QhWMyD0KbICxbii4=
+SHA256 (druntime-2.099.0.tar.gz) = 3h+a58FYBrzRRZ1Wx6xyFkef+I9aOw6og9UNY599/EI=
+SHA256 (phobos-2.099.0.tar.gz) = EAdcdo1aX7PgPwROq+5W6/eIm+jby8IZYwDD4jqvovc=
+SIZE (dmd-2.099.0-bootstrap.tar.gz) = 9975650
+SIZE (dmd-2.099.0.tar.gz) = 3878279
+SIZE (druntime-2.099.0.tar.gz) = 1880109
+SIZE (phobos-2.099.0.tar.gz) = 2470150
Index: patches/patch-dmd-2_098_0-bootstrap_openbsd_bin64_dmd_conf
===================================================================
RCS file: patches/patch-dmd-2_098_0-bootstrap_openbsd_bin64_dmd_conf
diff -N patches/patch-dmd-2_098_0-bootstrap_openbsd_bin64_dmd_conf
--- patches/patch-dmd-2_098_0-bootstrap_openbsd_bin64_dmd_conf 11 Mar 2022 19:28:54 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-Use the bootstrap libphobos2.a when linking the initially built dmd.
-
-Index: dmd-2.098.0-bootstrap/openbsd/bin64/dmd.conf
---- dmd-2.098.0-bootstrap/openbsd/bin64/dmd.conf.orig
-+++ dmd-2.098.0-bootstrap/openbsd/bin64/dmd.conf
-@@ -2,4 +2,4 @@
- DFLAGS=-I/usr/local/include/dmd/phobos -I/usr/local/include/dmd/druntime/import -L-L/usr/lib -L-L/usr/local/lib -L--export-dynamic -fPIC
-
- [Environment64]
--DFLAGS=-I/usr/local/include/dmd/phobos -I/usr/local/include/dmd/druntime/import -L-L/usr/lib -L-L/usr/local/lib -L--export-dynamic -fPIC
-+DFLAGS=-I%@P%/../../../druntime-2.098.0/src -I%@P%/../../../phobos-2.098.0 -L-L%@P%/../../../phobos-2.098.0/generated/openbsd/release/64 -L--export-dynamic -fPIC -L-L%@P%/../../../dmd-2.098.0-bootstrap/openbsd/lib64
Index: patches/patch-dmd-2_098_0_dmd_1
===================================================================
RCS file: patches/patch-dmd-2_098_0_dmd_1
diff -N patches/patch-dmd-2_098_0_dmd_1
--- patches/patch-dmd-2_098_0_dmd_1 11 Mar 2022 19:28:54 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,269 +0,0 @@
-Pre-gen'd manual page for dmd.1
-
-Index: dmd-2.098.0/dmd.1
---- dmd-2.098.0/dmd.1.orig
-+++ dmd-2.098.0/dmd.1
-@@ -0,0 +1,263 @@
-+.TH DMD 1 "2021-10-13" "The D Language Foundation" "The D Language Foundation"
-+.SH NAME
-+dmd \- Digital Mars D2.x Compiler
-+.SH SYNOPSIS
-+.B dmd \fIfiles\fR ... [ \fI-switch\fR ... ]
-+.SH DESCRIPTION
-+.B dmd
-+Compiles source code written in the D programming language.
-+.SH OPTIONS
-+.IP "file, file.d, file.htm, file.html"
-+D source files to compile
-+.IP file.di
-+D interface files
-+.IP file.o
-+Object files to link in
-+.IP file.a
-+Library files to link in
-+.IP @cmdfile
-+A file to read more command-line arguments from,
-+which may contain # single-line comments
-+.IP -allinst
-+Generate code for all template instantiations
-+.IP -betterC
-+Omit generating some runtime information and helper functions
-+.IP -boundscheck=[on|safeonly|off]
-+Bounds checks on, in @safe only, or off
-+.IP -c
-+Compile only, do not link
-+.IP -check=[assert|bounds|in|invariant|out|switch][=[on|off]]
-+Enable or disable specific checks
-+.IP -check=[h|help|?]
-+List information on all available checks
-+.IP -checkaction=[D|C|halt|context]
-+Behavior on assert/boundscheck/finalswitch failure
-+.IP -checkaction=[h|help|?]
-+List information on all available check actions
-+.IP -color
-+Turn colored console output on
-+.IP -color=[on|off|auto]
-+Force colored console output on or off, or only when not redirected (default)
-+.IP -conf=\fIfilename\fR
-+Use config file at \fIfilename\fR
-+.IP -cov
-+Do code coverage analysis
-+.IP -cov=ctfe
-+Include code executed during CTFE in coverage report
-+.IP -cov=\fInnn\fR
-+Require at least nnn% code coverage
-+.IP -D
-+Generate documentation
-+.IP -Dd\fIdirectory\fR
-+Write documentation file to \fIdirectory\fR
-+.IP -Df\fIfilename\fR
-+Write documentation file to \fIfilename\fR
-+.IP -d
-+Silently allow deprecated features and symbols
-+.IP -de
-+Issue an error when deprecated features or symbols are used (halt compilation)
-+.IP -dw
-+Issue a message when deprecated features or symbols are used (default)
-+.IP -debug
-+Compile in debug code
-+.IP -debug=\fIlevel\fR
-+Compile in debug code <= \fIlevel\fR
-+.IP -debug=\fIident\fR
-+Compile in debug code identified by \fIident\fR
-+.IP -debuglib=\fIname\fR
-+Set symbolic debug library to \fIname\fR
-+.IP -defaultlib=\fIname\fR
-+Set default library to \fIname\fR
-+.IP -deps
-+Print module dependencies (imports/file/version/debug/lib)
-+.IP -deps=\fIfilename\fR
-+Write module dependencies to \fIfilename\fR (only imports)
-+.IP -extern-std=\fIstandard\fR
-+Set C++ name mangling compatibility with \fIstandard\fR
-+.IP -extern-std=[h|help|?]
-+List all supported standards
-+.IP -fPIC
-+Generate position independent code
-+.IP -fPIE
-+Generate position independent executables
-+.IP -g
-+Add symbolic debug info
-+.IP -gdwarf=\fIversion\fR
-+Add DWARF symbolic debug info
-+.IP -gf
-+Emit debug info for all referenced types
-+.IP -gs
-+Always emit stack frame
-+.IP -gx
-+Add stack stomp code
-+.IP -H
-+Generate 'header' file
-+.IP -Hd=\fIdirectory\fR
-+Write 'header' file to \fIdirectory\fR
-+.IP -Hf=\fIfilename\fR
-+Write 'header' file to \fIfilename\fR
-+.IP -HC[=[silent|verbose]]
-+Generate C++ 'header' file
-+.IP -HC=[?|h|help]
-+List available modes for C++ 'header' file generation
-+.IP -HCd=\fIdirectory\fR
-+Write C++ 'header' file to \fIdirectory\fR
-+.IP -HCf=\fIfilename\fR
-+Write C++ 'header' file to \fIfilename\fR
-+.IP --help
-+Print help and exit
-+.IP -I=\fIdirectory\fR
-+Look for imports also in \fIdirectory\fR
-+.IP -i[=\fIpattern\fR]
-+Include imported modules in the compilation
-+.IP -ignore
-+Ignore unsupported pragmas
-+.IP -inline
-+Do function inlining
-+.IP -J=\fIdirectory\fR
-+Look for string imports also in \fIdirectory\fR
-+.IP -L=\fIlinkerflag\fR
-+Pass \fIlinkerflag\fR to link
-+.IP -lib
-+Generate library rather than object files
-+.IP -lowmem
-+Enable garbage collection for the compiler
-+.IP -m32
-+Generate 32 bit code
-+.IP -m64
-+Generate 64 bit code
-+.IP -main
-+Add default main() if not present already (e.g. for unittesting)
-+.IP -makedeps[=\fIfilename\fR]
-+Print dependencies in Makefile compatible format to \fIfilename\fR or stdout.
-+.IP -man
-+Open web browser on manual page
-+.IP -map
-+Generate linker .map file
-+.IP -mcpu=\fIid\fR
-+Generate instructions for architecture identified by \fIid\fR
-+.IP -mcpu=[h|help|?]
-+List all architecture options
-+.IP -mixin=\fIfilename\fR
-+Expand and save mixins to file specified by \fIfilename\fR
-+.IP -mv=\fIpackage.module\fR=<filespec>
-+Use <filespec> as source file for \fIpackage.module\fR
-+.IP -noboundscheck
-+No array bounds checking (deprecated, use -boundscheck=off)
-+.IP -O
-+Optimize
-+.IP -o-
-+Do not write object file
-+.IP -od=\fIdirectory\fR
-+Write object & library files to \fIdirectory\fR
-+.IP -of=\fIfilename\fR
-+Name output file to \fIfilename\fR
-+.IP -op
-+Preserve source path for output files
-+.IP -preview=\fIname\fR
-+Enable an upcoming language change identified by \fIname\fR
-+.IP -preview=[h|help|?]
-+List all upcoming language changes
-+.IP -profile
-+Profile runtime performance of generated code
-+.IP -profile=gc
-+Profile runtime allocations
-+.IP -release
-+Compile release version
-+.IP -revert=\fIname\fR
-+Revert language change identified by \fIname\fR
-+.IP -revert=[h|help|?]
-+List all revertable language changes
-+.IP -run \fIsrcfile\fR
-+Compile, link, and run the program \fIsrcfile\fR
-+.IP -shared
-+Generate shared library (DLL)
-+.IP -target=\fItriple\fR
-+Use \fItriple\fR as <arch>-[<vendor>-]<os>[-<cenv>[-<cppenv]]
-+.IP -transition=\fIname\fR
-+Help with language change identified by \fIname\fR
-+.IP -transition=[h|help|?]
-+List all language changes
-+.IP -unittest
-+Compile in unit tests
-+.IP -v
-+Verbose
-+.IP -vcolumns
-+Print character (column) numbers in diagnostics
-+.IP -verror-style=[digitalmars|gnu]
-+Set the style for file/line number annotations on compiler messages
-+.IP -verrors=\fInum\fR
-+Limit the number of error messages (0 means unlimited)
-+.IP -verrors=context
-+Show error messages with the context of the erroring source line
-+.IP -verrors=spec
-+Show errors from speculative compiles such as __traits(compiles,...)
-+.IP --version
-+Print compiler version and exit
-+.IP -version=\fIlevel\fR
-+Compile in version code >= \fIlevel\fR
-+.IP -version=\fIident\fR
-+Compile in version code identified by \fIident\fR
-+.IP -vgc
-+List all gc allocations including hidden ones
-+.IP -vtls
-+List all variables going into thread local storage
-+.IP -vtemplates=[list-instances]
-+List statistics on template instantiations
-+.IP -w
-+Warnings as errors (compilation will halt)
-+.IP -wi
-+Warnings as messages (compilation will continue)
-+.IP -X
-+Generate JSON file
-+.IP -Xf=\fIfilename\fR
-+Write JSON file to \fIfilename\fR
-+.IP -Xcc=\fIdriverflag\fR
-+Pass \fIdriverflag\fR to linker driver (cc)
-+.SH TRANSITIONS
-+Language changes listed by \fB-transition=id\fR:
-+.IP \fIfield\fR
-+List all non-mutable fields which occupy an object instance
-+.IP \fItls\fR
-+List all variables going into thread local storage
-+.IP \fIvmarkdown\fR
-+List instances of Markdown replacements in Ddoc
-+.SH LINKING
-+Linking is done directly by the
-+.B dmd
-+compiler after a successful compile. To prevent
-+.B dmd
-+from running the linker, use the
-+.B -c
-+switch.
-+.PP
-+The actual linking is done by running \fBgcc\fR.
-+This ensures compatibility with modules compiled with
-+\fBgcc\fR.
-+.SH FILES
-+.I /etc/dmd.conf
-+dmd will look for the initialization file
-+.I dmd.conf
-+in the directory \fI/etc\fR.
-+If found, environment variable settings in the file will
-+override any existing settings.
-+.SH ENVIRONMENT
-+The D compiler dmd uses the following environment
-+variables:
-+.IP DFLAGS 10
-+The value of
-+.B DFLAGS
-+is treated as if it were appended on the command line to
-+\fBdmd\fR.
-+.SH AUTHOR
-+Copyright (c) 1999-2021 by The D Language Foundation written by Walter Bright
-+.SH "ONLINE DOCUMENTATION"
-+.UR https://dlang.org/dmd.html
-+https://dlang.org/dmd.html
-+.UE
-+.SH "SEE ALSO"
-+.BR dmd.conf (5)
-+.BR rdmd (1)
-+.BR dumpobj (1)
-+.BR obj2asm (1)
-+.BR gcc (1)
Index: patches/patch-dmd-2_098_0_posix_mak
===================================================================
RCS file: patches/patch-dmd-2_098_0_posix_mak
diff -N patches/patch-dmd-2_098_0_posix_mak
--- patches/patch-dmd-2_098_0_posix_mak 11 Mar 2022 19:28:54 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,9 +0,0 @@
-Index: dmd-2.098.0/posix.mak
---- dmd-2.098.0/posix.mak.orig
-+++ dmd-2.098.0/posix.mak
-@@ -1,4 +1,4 @@
--INSTALL_DIR=$(PWD)/../install
-+INSTALL_DIR=../install
- ECTAGS_LANGS = Make,C,C++,D,Sh
- ECTAGS_FILES = src/dmd/*.[chd] src/dmd/backend/*.[chd] src/dmd/root/*.[chd]
-
Index: patches/patch-dmd-2_098_0_src_dmd_link_d
===================================================================
RCS file: patches/patch-dmd-2_098_0_src_dmd_link_d
diff -N patches/patch-dmd-2_098_0_src_dmd_link_d
--- patches/patch-dmd-2_098_0_src_dmd_link_d 11 Mar 2022 19:28:54 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-https://github.com/dlang/dmd/pull/13157
-
-Index: dmd-2.098.0/src/dmd/link.d
---- dmd-2.098.0/src/dmd/link.d.orig
-+++ dmd-2.098.0/src/dmd/link.d
-@@ -751,6 +751,8 @@ public int runLINK()
- {
- // Link against -lc++abi for Unwind symbols
- argv.push("-lc++abi");
-+ // Links against -lexecinfo for backtrace symbols
-+ argv.push("-lexecinfo");
- }
- if (global.params.verbose)
- {
Index: patches/patch-dmd-bootstrap_openbsd_bin64_dmd_conf
===================================================================
RCS file: patches/patch-dmd-bootstrap_openbsd_bin64_dmd_conf
diff -N patches/patch-dmd-bootstrap_openbsd_bin64_dmd_conf
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-dmd-bootstrap_openbsd_bin64_dmd_conf 12 Mar 2022 16:22:12 -0000
@@ -0,0 +1,11 @@
+Use the bootstrap libphobos2.a when linking the initially built dmd.
+
+Index: dmd-bootstrap/openbsd/bin64/dmd.conf
+--- dmd-bootstrap/openbsd/bin64/dmd.conf.orig
++++ dmd-bootstrap/openbsd/bin64/dmd.conf
+@@ -2,4 +2,4 @@
+ DFLAGS=-I${TRUEPREFIX}/include/dmd/phobos -I${TRUEPREFIX}/include/dmd/druntime/import -L-L/usr/lib -L-L${TRUEPREFIX}/lib -L--export-dynamic -fPIC
+
+ [Environment64]
+-DFLAGS=-I${TRUEPREFIX}/include/dmd/phobos -I${TRUEPREFIX}/include/dmd/druntime/import -L-L/usr/lib -L-L${TRUEPREFIX}/lib -L--export-dynamic -fPIC
++DFLAGS=-I%@P%/../../../druntime/src -I%@P%/../../../phobos -L-L%@P%/../../../phobos/generated/openbsd/release/64 -L--export-dynamic -fPIC -L-L%@P%/../../../dmd-bootstrap/openbsd/lib64
Index: patches/patch-dmd_posix_mak
===================================================================
RCS file: patches/patch-dmd_posix_mak
diff -N patches/patch-dmd_posix_mak
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-dmd_posix_mak 12 Mar 2022 16:22:12 -0000
@@ -0,0 +1,9 @@
+Index: dmd/posix.mak
+--- dmd/posix.mak.orig
++++ dmd/posix.mak
+@@ -1,4 +1,4 @@
+-INSTALL_DIR=$(PWD)/../install
++INSTALL_DIR=../install
+ ECTAGS_LANGS = Make,C,C++,D,Sh
+ ECTAGS_FILES = src/dmd/*.[chd] src/dmd/backend/*.[chd] src/dmd/root/*.[chd]
+
Index: patches/patch-druntime-2_098_0_mak_COPY
===================================================================
RCS file: patches/patch-druntime-2_098_0_mak_COPY
diff -N patches/patch-druntime-2_098_0_mak_COPY
--- patches/patch-druntime-2_098_0_mak_COPY 11 Mar 2022 19:28:54 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-Make sure these get installed.
-
-Index: druntime-2.098.0/mak/COPY
---- druntime-2.098.0/mak/COPY.orig
-+++ druntime-2.098.0/mak/COPY
-@@ -258,9 +258,11 @@ COPY=\
- \
- $(IMPDIR)\core\sys\openbsd\dlfcn.d \
- $(IMPDIR)\core\sys\openbsd\err.d \
-+ $(IMPDIR)\core\sys\openbsd\execinfo.d \
- $(IMPDIR)\core\sys\openbsd\stdlib.d \
- $(IMPDIR)\core\sys\openbsd\string.d \
- $(IMPDIR)\core\sys\openbsd\time.d \
-+ $(IMPDIR)\core\sys\openbsd\unistd.d \
- \
- $(IMPDIR)\core\sys\openbsd\sys\cdefs.d \
- $(IMPDIR)\core\sys\openbsd\sys\elf.d \
Index: patches/patch-druntime-2_098_0_mak_SRCS
===================================================================
RCS file: patches/patch-druntime-2_098_0_mak_SRCS
diff -N patches/patch-druntime-2_098_0_mak_SRCS
--- patches/patch-druntime-2_098_0_mak_SRCS 11 Mar 2022 19:28:54 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-Make sure these get installed.
-
-Index: druntime-2.098.0/mak/SRCS
---- druntime-2.098.0/mak/SRCS.orig
-+++ druntime-2.098.0/mak/SRCS
-@@ -259,9 +259,11 @@ SRCS=\
- \
- src\core\sys\openbsd\dlfcn.d \
- src\core\sys\openbsd\err.d \
-+ src\core\sys\openbsd\execinfo.d \
- src\core\sys\openbsd\stdlib.d \
- src\core\sys\openbsd\string.d \
- src\core\sys\openbsd\time.d \
-+ src\core\sys\openbsd\unistd.d \
- \
- src\core\sys\openbsd\sys\cdefs.d \
- src\core\sys\openbsd\sys\elf.d \
Index: patches/patch-druntime-2_098_0_posix_mak
===================================================================
RCS file: patches/patch-druntime-2_098_0_posix_mak
diff -N patches/patch-druntime-2_098_0_posix_mak
--- patches/patch-druntime-2_098_0_posix_mak 11 Mar 2022 19:28:54 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,42 +0,0 @@
-Index: druntime-2.098.0/posix.mak
---- druntime-2.098.0/posix.mak.orig
-+++ druntime-2.098.0/posix.mak
-@@ -5,7 +5,7 @@
-
- QUIET:=
-
--DMD_DIR=../dmd
-+DMD_DIR=TOPDIR/dmd-2.098.0
- DUB=dub
- TOOLS_DIR=../tools
-
-@@ -64,11 +64,9 @@ MAKEFILE = $(firstword $(MAKEFILE_LIST))
- DDOCFLAGS=-conf= -c -w -o- -Isrc -Iimport -version=CoreDdoc
-
- # Set CFLAGS
--CFLAGS=$(MODEL_FLAG) -fPIC -DHAVE_UNISTD_H
-+CFLAGS+=$(MODEL_FLAG) -fPIC -DHAVE_UNISTD_H
- ifeq ($(BUILD),debug)
- CFLAGS += -g
--else
-- CFLAGS += -O3
- endif
- ifeq (solaris,$(OS))
- CFLAGS+=-D_REENTRANT # for thread-safe errno
-@@ -342,7 +340,7 @@ $(IMPDIR)/%.d : src/%.d
- ######################## Build DMD if non-existent ##############################
-
- $(DMD):
-- $(MAKE) -C $(DMD_DIR)/src -f posix.mak BUILD=$(BUILD) OS=$(OS) MODEL=$(MODEL)
-+ $(MAKE) -C $(DMD_DIR) -f posix.mak BUILD=$(BUILD) OS=$(OS) MODEL=$(MODEL)
-
- ################### C/ASM Targets ############################
-
-@@ -464,7 +462,6 @@ benchmark-compile-only: $(ROOT)/benchmark $(DMD)
- DMD=$(DMD) $< --repeat=0 --dflags="$(PHOBOS_DFLAGS) -de"
-
- #################### test for undesired white spaces ##########################
--MANIFEST = $(shell git ls-tree --name-only -r HEAD)
-
- CWS_MAKEFILES = $(filter mak/% %.mak %/Makefile,$(MANIFEST))
- NOT_MAKEFILES = $(filter-out $(CWS_MAKEFILES) src/rt/minit.obj test/%.exp,$(MANIFEST))
Index: patches/patch-druntime-2_098_0_src_core_sys_posix_sys_mman_d
===================================================================
RCS file: patches/patch-druntime-2_098_0_src_core_sys_posix_sys_mman_d
diff -N patches/patch-druntime-2_098_0_src_core_sys_posix_sys_mman_d
--- patches/patch-druntime-2_098_0_src_core_sys_posix_sys_mman_d 11 Mar 2022 19:28:54 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-Fibers need mmap(2) MAP_STACK.
-
-Index: druntime-2.098.0/src/core/sys/posix/sys/mman.d
---- druntime-2.098.0/src/core/sys/posix/sys/mman.d.orig
-+++ druntime-2.098.0/src/core/sys/posix/sys/mman.d
-@@ -460,6 +460,7 @@ else version (OpenBSD)
- enum MAP_PRIVATE = 0x0002;
- enum MAP_FIXED = 0x0010;
- enum MAP_ANON = 0x1000;
-+ enum MAP_STACK = 0x4000;
-
- enum MAP_FAILED = cast(void*)-1;
-
Index: patches/patch-druntime-2_098_0_src_core_thread_fiber_d
===================================================================
RCS file: patches/patch-druntime-2_098_0_src_core_thread_fiber_d
diff -N patches/patch-druntime-2_098_0_src_core_thread_fiber_d
--- patches/patch-druntime-2_098_0_src_core_thread_fiber_d 11 Mar 2022 19:28:54 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,20 +0,0 @@
-Fibers need mmap(2) MAP_STACK.
-
-Index: druntime-2.098.0/src/core/thread/fiber.d
---- druntime-2.098.0/src/core/thread/fiber.d.orig
-+++ druntime-2.098.0/src/core/thread/fiber.d
-@@ -982,10 +982,13 @@ class Fiber (private)
- // Allocate more for the memory guard
- sz += guardPageSize;
-
-+ int mmap_flags = MAP_PRIVATE | MAP_ANON;
-+ version (OpenBSD)
-+ mmap_flags |= MAP_STACK;
- m_pmem = mmap( null,
- sz,
- PROT_READ | PROT_WRITE,
-- MAP_PRIVATE | MAP_ANON,
-+ mmap_flags,
- -1,
- 0 );
- if ( m_pmem == MAP_FAILED )
Index: patches/patch-druntime_posix_mak
===================================================================
RCS file: patches/patch-druntime_posix_mak
diff -N patches/patch-druntime_posix_mak
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-druntime_posix_mak 12 Mar 2022 16:22:12 -0000
@@ -0,0 +1,33 @@
+Index: druntime/posix.mak
+--- druntime/posix.mak.orig
++++ druntime/posix.mak
+@@ -65,11 +65,9 @@ MAKEFILE = $(firstword $(MAKEFILE_LIST))
+ DDOCFLAGS=-conf= -c -w -o- -Isrc -Iimport -version=CoreDdoc
+
+ # Set CFLAGS
+-CFLAGS=$(MODEL_FLAG) -fPIC -DHAVE_UNISTD_H
++CFLAGS+=$(MODEL_FLAG) -fPIC -DHAVE_UNISTD_H
+ ifeq ($(BUILD),debug)
+ CFLAGS += -g
+-else
+- CFLAGS += -O3
+ endif
+ ifeq (solaris,$(OS))
+ CFLAGS+=-D_REENTRANT # for thread-safe errno
+@@ -350,7 +348,7 @@ $(IMPDIR)/%.h : src/%.h
+ ######################## Build DMD if non-existent ##############################
+
+ $(DMD):
+- $(MAKE) -C $(DMD_DIR)/src -f posix.mak BUILD=$(BUILD) OS=$(OS) MODEL=$(MODEL)
++ $(MAKE) -C $(DMD_DIR) -f posix.mak BUILD=$(BUILD) OS=$(OS) MODEL=$(MODEL)
+
+ ################### C/ASM Targets ############################
+
+@@ -469,7 +467,6 @@ benchmark-compile-only: $(ROOT)/benchmark $(DMD)
+ DMD=$(DMD) $< --repeat=0 --dflags="$(PHOBOS_DFLAGS) -de"
+
+ #################### test for undesired white spaces ##########################
+-MANIFEST = $(shell git ls-tree --name-only -r HEAD)
+
+ CWS_MAKEFILES = $(filter mak/% %.mak %/Makefile,$(MANIFEST))
+ NOT_MAKEFILES = $(filter-out $(CWS_MAKEFILES) src/rt/minit.obj test/%.exp,$(MANIFEST))
Index: patches/patch-phobos-2_098_0_posix_mak
===================================================================
RCS file: patches/patch-phobos-2_098_0_posix_mak
diff -N patches/patch-phobos-2_098_0_posix_mak
--- patches/patch-phobos-2_098_0_posix_mak 11 Mar 2022 19:28:54 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,35 +0,0 @@
-Index: phobos-2.098.0/posix.mak
---- phobos-2.098.0/posix.mak.orig
-+++ phobos-2.098.0/posix.mak
-@@ -32,7 +32,7 @@ QUIET:=@
-
- DEBUGGER=gdb
- GIT_HOME=https://github.com/dlang
--DMD_DIR=../dmd
-+DMD_DIR=../dmd-2.098.0
-
- include $(DMD_DIR)/src/osmodel.mak
-
-@@ -67,7 +67,7 @@ endif
-
- # Configurable stuff that's rarely edited
- INSTALL_DIR = ../install
--DRUNTIME_PATH = ../druntime
-+DRUNTIME_PATH = ../druntime-2.098.0
- DLANG_ORG_DIR = ../dlang.org
- ZIPFILE = phobos.zip
- ROOT_OF_THEM_ALL = generated
-@@ -107,12 +107,10 @@ endif
- OUTFILEFLAG = -o
- NODEFAULTLIB=-defaultlib= -debuglib=
- ifeq (,$(findstring win,$(OS)))
-- CFLAGS=$(MODEL_FLAG) -fPIC -DHAVE_UNISTD_H
-+ CFLAGS+=$(MODEL_FLAG) -fPIC -DHAVE_UNISTD_H
- NODEFAULTLIB += -L-lpthread -L-lm
- ifeq ($(BUILD),debug)
- CFLAGS += -g
-- else
-- CFLAGS += -O3
- endif
- else
- ifeq ($(OS),win32)
Index: patches/patch-phobos_posix_mak
===================================================================
RCS file: patches/patch-phobos_posix_mak
diff -N patches/patch-phobos_posix_mak
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-phobos_posix_mak 12 Mar 2022 16:22:12 -0000
@@ -0,0 +1,17 @@
+Index: phobos/posix.mak
+--- phobos/posix.mak.orig
++++ phobos/posix.mak
+@@ -107,12 +107,10 @@ endif
+ OUTFILEFLAG = -o
+ NODEFAULTLIB=-defaultlib= -debuglib=
+ ifeq (,$(findstring win,$(OS)))
+- CFLAGS=$(MODEL_FLAG) -fPIC -DHAVE_UNISTD_H
++ CFLAGS+=$(MODEL_FLAG) -fPIC -DHAVE_UNISTD_H
+ NODEFAULTLIB += -L-lpthread -L-lm
+ ifeq ($(BUILD),debug)
+ CFLAGS += -g
+- else
+- CFLAGS += -O3
+ endif
+ else
+ ifeq ($(OS),win32)
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/lang/dmd/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- pkg/PLIST 11 Mar 2022 19:28:55 -0000 1.2
+++ pkg/PLIST 12 Mar 2022 16:22:12 -0000
@@ -2,6 +2,7 @@
include/dmd/
include/dmd/druntime/
include/dmd/druntime/import/
+include/dmd/druntime/import/__builtins.di
include/dmd/druntime/import/core/
include/dmd/druntime/import/core/atomic.d
include/dmd/druntime/import/core/attribute.d
@@ -268,6 +269,7 @@ include/dmd/druntime/import/core/sys/ope
include/dmd/druntime/import/core/sys/openbsd/dlfcn.d
include/dmd/druntime/import/core/sys/openbsd/err.d
include/dmd/druntime/import/core/sys/openbsd/execinfo.d
+include/dmd/druntime/import/core/sys/openbsd/pthread_np.d
include/dmd/druntime/import/core/sys/openbsd/stdlib.d
include/dmd/druntime/import/core/sys/openbsd/string.d
include/dmd/druntime/import/core/sys/openbsd/sys/
@@ -545,6 +547,7 @@ include/dmd/druntime/import/core/volatil
include/dmd/druntime/import/etc/
include/dmd/druntime/import/etc/linux/
include/dmd/druntime/import/etc/linux/memoryerror.d
+include/dmd/druntime/import/importc.h
include/dmd/druntime/import/object.d
include/dmd/phobos/
include/dmd/phobos/etc/
@@ -561,13 +564,13 @@ include/dmd/phobos/etc/c/zlib.d
include/dmd/phobos/etc/c/zlib/ChangeLog
include/dmd/phobos/etc/c/zlib/README
include/dmd/phobos/etc/c/zlib/adler32.c
-include/dmd/phobos/etc/c/zlib/algorithm.txt
include/dmd/phobos/etc/c/zlib/compress.c
include/dmd/phobos/etc/c/zlib/crc32.c
include/dmd/phobos/etc/c/zlib/crc32.h
include/dmd/phobos/etc/c/zlib/deflate.c
include/dmd/phobos/etc/c/zlib/deflate.h
-include/dmd/phobos/etc/c/zlib/example.c
+include/dmd/phobos/etc/c/zlib/doc/
+include/dmd/phobos/etc/c/zlib/doc/algorithm.txt
include/dmd/phobos/etc/c/zlib/gzclose.c
include/dmd/phobos/etc/c/zlib/gzguts.h
include/dmd/phobos/etc/c/zlib/gzlib.c
@@ -582,8 +585,11 @@ include/dmd/phobos/etc/c/zlib/inflate.h
include/dmd/phobos/etc/c/zlib/inftrees.c
include/dmd/phobos/etc/c/zlib/inftrees.h
include/dmd/phobos/etc/c/zlib/linux.mak
-include/dmd/phobos/etc/c/zlib/minigzip.c
include/dmd/phobos/etc/c/zlib/osx.mak
+include/dmd/phobos/etc/c/zlib/test/
+include/dmd/phobos/etc/c/zlib/test/example.c
+include/dmd/phobos/etc/c/zlib/test/infcover.c
+include/dmd/phobos/etc/c/zlib/test/minigzip.c
include/dmd/phobos/etc/c/zlib/trees.c
include/dmd/phobos/etc/c/zlib/trees.h
include/dmd/phobos/etc/c/zlib/uncompr.c
@@ -609,6 +615,7 @@ include/dmd/phobos/std/ascii.d
include/dmd/phobos/std/base64.d
include/dmd/phobos/std/bigint.d
include/dmd/phobos/std/bitmanip.d
+include/dmd/phobos/std/checkedint.d
include/dmd/phobos/std/compiler.d
include/dmd/phobos/std/complex.d
include/dmd/phobos/std/concurrency.d

879
dmd.diff Normal file
View File

@ -0,0 +1,879 @@
Index: lang/dmd/Makefile
===================================================================
RCS file: /cvs/ports/lang/dmd/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- lang/dmd/Makefile 29 Nov 2021 01:23:22 -0000 1.4
+++ lang/dmd/Makefile 24 Dec 2021 16:24:30 -0000
@@ -3,14 +3,13 @@
# i386 forthcoming
ONLY_FOR_ARCHS = amd64
-V = 2.098.0
+V = 2.098.1
COMMENT = reference compiler for the D programming language
DISTFILES = dmd-${V}.tar.gz \
- dmd-${V}-bootstrap-p0.tar.gz \
+ dmd-${V}-bootstrap.tar.gz \
druntime-${V}.tar.gz \
phobos-${V}.tar.gz
PKGNAME = dmd-${V}
-REVISION = 0
CATEGORIES = lang
HOMEPAGE = https://dlang.org/
@@ -25,8 +24,8 @@ MASTER_SITES = https://github.com/ibara/
USE_GMAKE = Yes
MAKE_ENV = HOST_CXX="${CXX}" \
- HOST_DMD="${WRKDIR}/dmd-${V}-bootstrap/openbsd/bin${MODEL}/dmd" \
- LD_LIBRARY_PATH="${WRKSRC}/dmd-${V}-bootstrap/openbsd/bin${MODEL}"
+ HOST_DMD="${WRKDIR}/dmd-bootstrap/openbsd/bin${MODEL}/dmd" \
+ LD_LIBRARY_PATH="${WRKSRC}/dmd-bootstrap/openbsd/bin${MODEL}"
MAKE_FILE = posix.mak
NO_TEST = Yes
@@ -38,23 +37,17 @@ MODEL = 64
MODEL = 32
.endif
-# Fix up the build system.
-do-gen:
- sed -i "s,TOPDIR,${WRKDIR},g" \
- ${WRKDIR}/druntime-${V}/posix.mak \
- ${WRKDIR}/phobos-${V}/posix.mak
-
# We need to do this manually.
# Yes, this is all really correct.
do-build:
- cd ${WRKDIR}/phobos-${V} && \
+ cd ${WRKDIR}/phobos && \
${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} -f ${MAKE_FILE} && \
${SETENV} ${MAKE_PROGRAM} -f ${MAKE_FILE} install
- cd ${WRKDIR}/druntime-${V} && \
+ cd ${WRKDIR}/druntime && \
${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} -f ${MAKE_FILE} && \
${SETENV} ${MAKE_PROGRAM} -f ${MAKE_FILE} install
mkdir ${WRKDIR}/install/openbsd/bin${MODEL}
- cp ${WRKDIR}/dmd-${V}/generated/openbsd/release/${MODEL}/dmd \
+ cp ${WRKDIR}/dmd/generated/openbsd/release/${MODEL}/dmd \
${WRKDIR}/install/openbsd/bin${MODEL}
# We need to do this manually too.
@@ -63,8 +56,8 @@ do-install:
${PREFIX}/bin
${INSTALL_DATA} ${WRKDIR}/install/openbsd/lib${MODEL}/libphobos2.a \
${PREFIX}/lib
- ${INSTALL_MAN} ${WRKDIR}/dmd-${V}/dmd.1 ${PREFIX}/man/man1
- ${INSTALL_MAN} ${WRKDIR}/dmd-${V}/docs/man/man5/dmd.conf.5 \
+ ${INSTALL_MAN} ${WRKDIR}/dmd-bootstrap/dmd.1 ${PREFIX}/man/man1
+ ${INSTALL_MAN} ${WRKDIR}/dmd/docs/man/man5/dmd.conf.5 \
${PREFIX}/man/man5
${INSTALL_DATA_DIR} ${PREFIX}/include/dmd
cp -R ${WRKDIR}/install/src/{druntime,phobos} ${PREFIX}/include/dmd
@@ -72,7 +65,7 @@ do-install:
${INSTALL_DATA} ${WRKDIR}/install/phobos-LICENSE.txt \
${PREFIX}/share/doc/dmd/LICENSE.txt
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/dmd
- cp -R ${WRKDIR}/dmd-${V}/samples/* ${PREFIX}/share/examples/dmd
+ cp -R ${WRKDIR}/dmd/samples/* ${PREFIX}/share/examples/dmd
${INSTALL_DATA_DIR} ${PREFIX}/share/dmd
${SUBST_CMD} -c -m 444 ${FILESDIR}/dmd.conf \
${PREFIX}/share/dmd/dmd.conf
Index: lang/dmd/distinfo
===================================================================
RCS file: /cvs/ports/lang/dmd/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- lang/dmd/distinfo 29 Nov 2021 01:23:22 -0000 1.3
+++ lang/dmd/distinfo 24 Dec 2021 16:24:30 -0000
@@ -1,8 +1,8 @@
-SHA256 (dmd-2.098.0-bootstrap-p0.tar.gz) = wjPmbUtDh6UBPMphduS4pr8LVLb99E0NfpIJpjw5M20=
-SHA256 (dmd-2.098.0.tar.gz) = PcjGCztmfGCUtJselt3795Di9Sy43P6wBaSamM8haqY=
-SHA256 (druntime-2.098.0.tar.gz) = 427NFmgYFramws7kWk/+HRWf0HUCSeGsOB7epahEx6I=
-SHA256 (phobos-2.098.0.tar.gz) = S/fIj+0Uh1VRVpeTErcblgnpHdO4eIBNcVkkKW4NWbo=
-SIZE (dmd-2.098.0-bootstrap-p0.tar.gz) = 11521977
-SIZE (dmd-2.098.0.tar.gz) = 3759833
-SIZE (druntime-2.098.0.tar.gz) = 1864644
-SIZE (phobos-2.098.0.tar.gz) = 2444864
+SHA256 (dmd-2.098.1-bootstrap.tar.gz) = LG4qiMt2D64XG0ohtwodV/LDgnJJSZ7Z1tdheETeyyU=
+SHA256 (dmd-2.098.1.tar.gz) = BebVh/MHJP6brltsxA7lCuVaomCLTDZmHsnIyh3aEcI=
+SHA256 (druntime-2.098.1.tar.gz) = 2HNH2yq2vKpQA+Of9vbEyHEGUwJaYJnxJVXwl+yOqAg=
+SHA256 (phobos-2.098.1.tar.gz) = PzzZHM+1bAiaAMNJAPwwQ/4MdJKE3CHQrFuPv0ao3mw=
+SIZE (dmd-2.098.1-bootstrap.tar.gz) = 10136318
+SIZE (dmd-2.098.1.tar.gz) = 3790186
+SIZE (druntime-2.098.1.tar.gz) = 1852823
+SIZE (phobos-2.098.1.tar.gz) = 2447805
Index: lang/dmd/patches/patch-dmd-2_098_0-bootstrap_openbsd_bin64_dmd_conf
===================================================================
RCS file: lang/dmd/patches/patch-dmd-2_098_0-bootstrap_openbsd_bin64_dmd_conf
diff -N lang/dmd/patches/patch-dmd-2_098_0-bootstrap_openbsd_bin64_dmd_conf
--- lang/dmd/patches/patch-dmd-2_098_0-bootstrap_openbsd_bin64_dmd_conf 13 Oct 2021 04:38:52 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-dmd-2_098_0-bootstrap_openbsd_bin64_dmd_conf,v 1.1.1.1 2021/10/13 04:38:52 bcallah Exp $
-
-Use the bootstrap libphobos2.a when linking the initially built dmd.
-
-Index: dmd-2.098.0-bootstrap/openbsd/bin64/dmd.conf
---- dmd-2.098.0-bootstrap/openbsd/bin64/dmd.conf.orig
-+++ dmd-2.098.0-bootstrap/openbsd/bin64/dmd.conf
-@@ -2,4 +2,4 @@
- DFLAGS=-I/usr/local/include/dmd/phobos -I/usr/local/include/dmd/druntime/import -L-L/usr/lib -L-L/usr/local/lib -L--export-dynamic -fPIC
-
- [Environment64]
--DFLAGS=-I/usr/local/include/dmd/phobos -I/usr/local/include/dmd/druntime/import -L-L/usr/lib -L-L/usr/local/lib -L--export-dynamic -fPIC
-+DFLAGS=-I%@P%/../../../druntime-2.098.0/src -I%@P%/../../../phobos-2.098.0 -L-L%@P%/../../../phobos-2.098.0/generated/openbsd/release/64 -L--export-dynamic -fPIC -L-L%@P%/../../../dmd-2.098.0-bootstrap/openbsd/lib64
Index: lang/dmd/patches/patch-dmd-2_098_0_dmd_1
===================================================================
RCS file: lang/dmd/patches/patch-dmd-2_098_0_dmd_1
diff -N lang/dmd/patches/patch-dmd-2_098_0_dmd_1
--- lang/dmd/patches/patch-dmd-2_098_0_dmd_1 13 Oct 2021 04:38:52 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,271 +0,0 @@
-$OpenBSD: patch-dmd-2_098_0_dmd_1,v 1.1.1.1 2021/10/13 04:38:52 bcallah Exp $
-
-Pre-gen'd manual page for dmd.1
-
-Index: dmd-2.098.0/dmd.1
---- dmd-2.098.0/dmd.1.orig
-+++ dmd-2.098.0/dmd.1
-@@ -0,0 +1,263 @@
-+.TH DMD 1 "2021-10-13" "The D Language Foundation" "The D Language Foundation"
-+.SH NAME
-+dmd \- Digital Mars D2.x Compiler
-+.SH SYNOPSIS
-+.B dmd \fIfiles\fR ... [ \fI-switch\fR ... ]
-+.SH DESCRIPTION
-+.B dmd
-+Compiles source code written in the D programming language.
-+.SH OPTIONS
-+.IP "file, file.d, file.htm, file.html"
-+D source files to compile
-+.IP file.di
-+D interface files
-+.IP file.o
-+Object files to link in
-+.IP file.a
-+Library files to link in
-+.IP @cmdfile
-+A file to read more command-line arguments from,
-+which may contain # single-line comments
-+.IP -allinst
-+Generate code for all template instantiations
-+.IP -betterC
-+Omit generating some runtime information and helper functions
-+.IP -boundscheck=[on|safeonly|off]
-+Bounds checks on, in @safe only, or off
-+.IP -c
-+Compile only, do not link
-+.IP -check=[assert|bounds|in|invariant|out|switch][=[on|off]]
-+Enable or disable specific checks
-+.IP -check=[h|help|?]
-+List information on all available checks
-+.IP -checkaction=[D|C|halt|context]
-+Behavior on assert/boundscheck/finalswitch failure
-+.IP -checkaction=[h|help|?]
-+List information on all available check actions
-+.IP -color
-+Turn colored console output on
-+.IP -color=[on|off|auto]
-+Force colored console output on or off, or only when not redirected (default)
-+.IP -conf=\fIfilename\fR
-+Use config file at \fIfilename\fR
-+.IP -cov
-+Do code coverage analysis
-+.IP -cov=ctfe
-+Include code executed during CTFE in coverage report
-+.IP -cov=\fInnn\fR
-+Require at least nnn% code coverage
-+.IP -D
-+Generate documentation
-+.IP -Dd\fIdirectory\fR
-+Write documentation file to \fIdirectory\fR
-+.IP -Df\fIfilename\fR
-+Write documentation file to \fIfilename\fR
-+.IP -d
-+Silently allow deprecated features and symbols
-+.IP -de
-+Issue an error when deprecated features or symbols are used (halt compilation)
-+.IP -dw
-+Issue a message when deprecated features or symbols are used (default)
-+.IP -debug
-+Compile in debug code
-+.IP -debug=\fIlevel\fR
-+Compile in debug code <= \fIlevel\fR
-+.IP -debug=\fIident\fR
-+Compile in debug code identified by \fIident\fR
-+.IP -debuglib=\fIname\fR
-+Set symbolic debug library to \fIname\fR
-+.IP -defaultlib=\fIname\fR
-+Set default library to \fIname\fR
-+.IP -deps
-+Print module dependencies (imports/file/version/debug/lib)
-+.IP -deps=\fIfilename\fR
-+Write module dependencies to \fIfilename\fR (only imports)
-+.IP -extern-std=\fIstandard\fR
-+Set C++ name mangling compatibility with \fIstandard\fR
-+.IP -extern-std=[h|help|?]
-+List all supported standards
-+.IP -fPIC
-+Generate position independent code
-+.IP -fPIE
-+Generate position independent executables
-+.IP -g
-+Add symbolic debug info
-+.IP -gdwarf=\fIversion\fR
-+Add DWARF symbolic debug info
-+.IP -gf
-+Emit debug info for all referenced types
-+.IP -gs
-+Always emit stack frame
-+.IP -gx
-+Add stack stomp code
-+.IP -H
-+Generate 'header' file
-+.IP -Hd=\fIdirectory\fR
-+Write 'header' file to \fIdirectory\fR
-+.IP -Hf=\fIfilename\fR
-+Write 'header' file to \fIfilename\fR
-+.IP -HC[=[silent|verbose]]
-+Generate C++ 'header' file
-+.IP -HC=[?|h|help]
-+List available modes for C++ 'header' file generation
-+.IP -HCd=\fIdirectory\fR
-+Write C++ 'header' file to \fIdirectory\fR
-+.IP -HCf=\fIfilename\fR
-+Write C++ 'header' file to \fIfilename\fR
-+.IP --help
-+Print help and exit
-+.IP -I=\fIdirectory\fR
-+Look for imports also in \fIdirectory\fR
-+.IP -i[=\fIpattern\fR]
-+Include imported modules in the compilation
-+.IP -ignore
-+Ignore unsupported pragmas
-+.IP -inline
-+Do function inlining
-+.IP -J=\fIdirectory\fR
-+Look for string imports also in \fIdirectory\fR
-+.IP -L=\fIlinkerflag\fR
-+Pass \fIlinkerflag\fR to link
-+.IP -lib
-+Generate library rather than object files
-+.IP -lowmem
-+Enable garbage collection for the compiler
-+.IP -m32
-+Generate 32 bit code
-+.IP -m64
-+Generate 64 bit code
-+.IP -main
-+Add default main() if not present already (e.g. for unittesting)
-+.IP -makedeps[=\fIfilename\fR]
-+Print dependencies in Makefile compatible format to \fIfilename\fR or stdout.
-+.IP -man
-+Open web browser on manual page
-+.IP -map
-+Generate linker .map file
-+.IP -mcpu=\fIid\fR
-+Generate instructions for architecture identified by \fIid\fR
-+.IP -mcpu=[h|help|?]
-+List all architecture options
-+.IP -mixin=\fIfilename\fR
-+Expand and save mixins to file specified by \fIfilename\fR
-+.IP -mv=\fIpackage.module\fR=<filespec>
-+Use <filespec> as source file for \fIpackage.module\fR
-+.IP -noboundscheck
-+No array bounds checking (deprecated, use -boundscheck=off)
-+.IP -O
-+Optimize
-+.IP -o-
-+Do not write object file
-+.IP -od=\fIdirectory\fR
-+Write object & library files to \fIdirectory\fR
-+.IP -of=\fIfilename\fR
-+Name output file to \fIfilename\fR
-+.IP -op
-+Preserve source path for output files
-+.IP -preview=\fIname\fR
-+Enable an upcoming language change identified by \fIname\fR
-+.IP -preview=[h|help|?]
-+List all upcoming language changes
-+.IP -profile
-+Profile runtime performance of generated code
-+.IP -profile=gc
-+Profile runtime allocations
-+.IP -release
-+Compile release version
-+.IP -revert=\fIname\fR
-+Revert language change identified by \fIname\fR
-+.IP -revert=[h|help|?]
-+List all revertable language changes
-+.IP -run \fIsrcfile\fR
-+Compile, link, and run the program \fIsrcfile\fR
-+.IP -shared
-+Generate shared library (DLL)
-+.IP -target=\fItriple\fR
-+Use \fItriple\fR as <arch>-[<vendor>-]<os>[-<cenv>[-<cppenv]]
-+.IP -transition=\fIname\fR
-+Help with language change identified by \fIname\fR
-+.IP -transition=[h|help|?]
-+List all language changes
-+.IP -unittest
-+Compile in unit tests
-+.IP -v
-+Verbose
-+.IP -vcolumns
-+Print character (column) numbers in diagnostics
-+.IP -verror-style=[digitalmars|gnu]
-+Set the style for file/line number annotations on compiler messages
-+.IP -verrors=\fInum\fR
-+Limit the number of error messages (0 means unlimited)
-+.IP -verrors=context
-+Show error messages with the context of the erroring source line
-+.IP -verrors=spec
-+Show errors from speculative compiles such as __traits(compiles,...)
-+.IP --version
-+Print compiler version and exit
-+.IP -version=\fIlevel\fR
-+Compile in version code >= \fIlevel\fR
-+.IP -version=\fIident\fR
-+Compile in version code identified by \fIident\fR
-+.IP -vgc
-+List all gc allocations including hidden ones
-+.IP -vtls
-+List all variables going into thread local storage
-+.IP -vtemplates=[list-instances]
-+List statistics on template instantiations
-+.IP -w
-+Warnings as errors (compilation will halt)
-+.IP -wi
-+Warnings as messages (compilation will continue)
-+.IP -X
-+Generate JSON file
-+.IP -Xf=\fIfilename\fR
-+Write JSON file to \fIfilename\fR
-+.IP -Xcc=\fIdriverflag\fR
-+Pass \fIdriverflag\fR to linker driver (cc)
-+.SH TRANSITIONS
-+Language changes listed by \fB-transition=id\fR:
-+.IP \fIfield\fR
-+List all non-mutable fields which occupy an object instance
-+.IP \fItls\fR
-+List all variables going into thread local storage
-+.IP \fIvmarkdown\fR
-+List instances of Markdown replacements in Ddoc
-+.SH LINKING
-+Linking is done directly by the
-+.B dmd
-+compiler after a successful compile. To prevent
-+.B dmd
-+from running the linker, use the
-+.B -c
-+switch.
-+.PP
-+The actual linking is done by running \fBgcc\fR.
-+This ensures compatibility with modules compiled with
-+\fBgcc\fR.
-+.SH FILES
-+.I /etc/dmd.conf
-+dmd will look for the initialization file
-+.I dmd.conf
-+in the directory \fI/etc\fR.
-+If found, environment variable settings in the file will
-+override any existing settings.
-+.SH ENVIRONMENT
-+The D compiler dmd uses the following environment
-+variables:
-+.IP DFLAGS 10
-+The value of
-+.B DFLAGS
-+is treated as if it were appended on the command line to
-+\fBdmd\fR.
-+.SH AUTHOR
-+Copyright (c) 1999-2021 by The D Language Foundation written by Walter Bright
-+.SH "ONLINE DOCUMENTATION"
-+.UR https://dlang.org/dmd.html
-+https://dlang.org/dmd.html
-+.UE
-+.SH "SEE ALSO"
-+.BR dmd.conf (5)
-+.BR rdmd (1)
-+.BR dumpobj (1)
-+.BR obj2asm (1)
-+.BR gcc (1)
Index: lang/dmd/patches/patch-dmd-2_098_0_posix_mak
===================================================================
RCS file: lang/dmd/patches/patch-dmd-2_098_0_posix_mak
diff -N lang/dmd/patches/patch-dmd-2_098_0_posix_mak
--- lang/dmd/patches/patch-dmd-2_098_0_posix_mak 13 Oct 2021 04:38:51 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-$OpenBSD: patch-dmd-2_098_0_posix_mak,v 1.1.1.1 2021/10/13 04:38:51 bcallah Exp $
-
-Index: dmd-2.098.0/posix.mak
---- dmd-2.098.0/posix.mak.orig
-+++ dmd-2.098.0/posix.mak
-@@ -1,4 +1,4 @@
--INSTALL_DIR=$(PWD)/../install
-+INSTALL_DIR=../install
- ECTAGS_LANGS = Make,C,C++,D,Sh
- ECTAGS_FILES = src/dmd/*.[chd] src/dmd/backend/*.[chd] src/dmd/root/*.[chd]
-
Index: lang/dmd/patches/patch-dmd-2_098_0_src_dmd_link_d
===================================================================
RCS file: lang/dmd/patches/patch-dmd-2_098_0_src_dmd_link_d
diff -N lang/dmd/patches/patch-dmd-2_098_0_src_dmd_link_d
--- lang/dmd/patches/patch-dmd-2_098_0_src_dmd_link_d 13 Oct 2021 04:38:52 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$OpenBSD: patch-dmd-2_098_0_src_dmd_link_d,v 1.1.1.1 2021/10/13 04:38:52 bcallah Exp $
-
-https://github.com/dlang/dmd/pull/13157
-
-Index: dmd-2.098.0/src/dmd/link.d
---- dmd-2.098.0/src/dmd/link.d.orig
-+++ dmd-2.098.0/src/dmd/link.d
-@@ -751,6 +751,8 @@ public int runLINK()
- {
- // Link against -lc++abi for Unwind symbols
- argv.push("-lc++abi");
-+ // Links against -lexecinfo for backtrace symbols
-+ argv.push("-lexecinfo");
- }
- if (global.params.verbose)
- {
Index: lang/dmd/patches/patch-dmd-bootstrap_openbsd_bin64_dmd_conf
===================================================================
RCS file: lang/dmd/patches/patch-dmd-bootstrap_openbsd_bin64_dmd_conf
diff -N lang/dmd/patches/patch-dmd-bootstrap_openbsd_bin64_dmd_conf
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/dmd/patches/patch-dmd-bootstrap_openbsd_bin64_dmd_conf 24 Dec 2021 16:24:30 -0000
@@ -0,0 +1,13 @@
+$OpenBSD$
+
+Use the bootstrap libphobos2.a when linking the initially built dmd.
+
+Index: dmd-bootstrap/openbsd/bin64/dmd.conf
+--- dmd-bootstrap/openbsd/bin64/dmd.conf.orig
++++ dmd-bootstrap/openbsd/bin64/dmd.conf
+@@ -2,4 +2,4 @@
+ DFLAGS=-I${TRUEPREFIX}/include/dmd/phobos -I${TRUEPREFIX}/include/dmd/druntime/import -L-L/usr/lib -L-L${TRUEPREFIX}/lib -L--export-dynamic -fPIC
+
+ [Environment64]
+-DFLAGS=-I${TRUEPREFIX}/include/dmd/phobos -I${TRUEPREFIX}/include/dmd/druntime/import -L-L/usr/lib -L-L${TRUEPREFIX}/lib -L--export-dynamic -fPIC
++DFLAGS=-I%@P%/../../../druntime/src -I%@P%/../../../phobos -L-L%@P%/../../../phobos/generated/openbsd/release/64 -L--export-dynamic -fPIC -L-L%@P%/../../../dmd-bootstrap/openbsd/lib64
Index: lang/dmd/patches/patch-dmd_posix_mak
===================================================================
RCS file: lang/dmd/patches/patch-dmd_posix_mak
diff -N lang/dmd/patches/patch-dmd_posix_mak
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/dmd/patches/patch-dmd_posix_mak 24 Dec 2021 16:24:30 -0000
@@ -0,0 +1,11 @@
+$OpenBSD$
+
+Index: dmd/posix.mak
+--- dmd/posix.mak.orig
++++ dmd/posix.mak
+@@ -1,4 +1,4 @@
+-INSTALL_DIR=$(PWD)/../install
++INSTALL_DIR=../install
+ ECTAGS_LANGS = Make,C,C++,D,Sh
+ ECTAGS_FILES = src/dmd/*.[chd] src/dmd/backend/*.[chd] src/dmd/root/*.[chd]
+
Index: lang/dmd/patches/patch-dmd_src_dmd_link_d
===================================================================
RCS file: lang/dmd/patches/patch-dmd_src_dmd_link_d
diff -N lang/dmd/patches/patch-dmd_src_dmd_link_d
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/dmd/patches/patch-dmd_src_dmd_link_d 24 Dec 2021 16:24:30 -0000
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+https://github.com/dlang/dmd/pull/13157
+
+Index: dmd/src/dmd/link.d
+--- dmd/src/dmd/link.d.orig
++++ dmd/src/dmd/link.d
+@@ -748,6 +748,8 @@ public int runLINK()
+ {
+ // Link against -lc++abi for Unwind symbols
+ argv.push("-lc++abi");
++ // Link against -lexecinfo for backtrace symbols
++ argv.push("-lexecinfo");
+ }
+ if (global.params.verbose)
+ {
Index: lang/dmd/patches/patch-druntime-2_098_0_mak_COPY
===================================================================
RCS file: lang/dmd/patches/patch-druntime-2_098_0_mak_COPY
diff -N lang/dmd/patches/patch-druntime-2_098_0_mak_COPY
--- lang/dmd/patches/patch-druntime-2_098_0_mak_COPY 13 Oct 2021 04:38:51 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,19 +0,0 @@
-$OpenBSD: patch-druntime-2_098_0_mak_COPY,v 1.1.1.1 2021/10/13 04:38:51 bcallah Exp $
-
-Make sure these get installed.
-
-Index: druntime-2.098.0/mak/COPY
---- druntime-2.098.0/mak/COPY.orig
-+++ druntime-2.098.0/mak/COPY
-@@ -258,9 +258,11 @@ COPY=\
- \
- $(IMPDIR)\core\sys\openbsd\dlfcn.d \
- $(IMPDIR)\core\sys\openbsd\err.d \
-+ $(IMPDIR)\core\sys\openbsd\execinfo.d \
- $(IMPDIR)\core\sys\openbsd\stdlib.d \
- $(IMPDIR)\core\sys\openbsd\string.d \
- $(IMPDIR)\core\sys\openbsd\time.d \
-+ $(IMPDIR)\core\sys\openbsd\unistd.d \
- \
- $(IMPDIR)\core\sys\openbsd\sys\cdefs.d \
- $(IMPDIR)\core\sys\openbsd\sys\elf.d \
Index: lang/dmd/patches/patch-druntime-2_098_0_mak_SRCS
===================================================================
RCS file: lang/dmd/patches/patch-druntime-2_098_0_mak_SRCS
diff -N lang/dmd/patches/patch-druntime-2_098_0_mak_SRCS
--- lang/dmd/patches/patch-druntime-2_098_0_mak_SRCS 13 Oct 2021 04:38:52 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,19 +0,0 @@
-$OpenBSD: patch-druntime-2_098_0_mak_SRCS,v 1.1.1.1 2021/10/13 04:38:52 bcallah Exp $
-
-Make sure these get installed.
-
-Index: druntime-2.098.0/mak/SRCS
---- druntime-2.098.0/mak/SRCS.orig
-+++ druntime-2.098.0/mak/SRCS
-@@ -259,9 +259,11 @@ SRCS=\
- \
- src\core\sys\openbsd\dlfcn.d \
- src\core\sys\openbsd\err.d \
-+ src\core\sys\openbsd\execinfo.d \
- src\core\sys\openbsd\stdlib.d \
- src\core\sys\openbsd\string.d \
- src\core\sys\openbsd\time.d \
-+ src\core\sys\openbsd\unistd.d \
- \
- src\core\sys\openbsd\sys\cdefs.d \
- src\core\sys\openbsd\sys\elf.d \
Index: lang/dmd/patches/patch-druntime-2_098_0_posix_mak
===================================================================
RCS file: lang/dmd/patches/patch-druntime-2_098_0_posix_mak
diff -N lang/dmd/patches/patch-druntime-2_098_0_posix_mak
--- lang/dmd/patches/patch-druntime-2_098_0_posix_mak 13 Oct 2021 04:38:52 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,44 +0,0 @@
-$OpenBSD: patch-druntime-2_098_0_posix_mak,v 1.1.1.1 2021/10/13 04:38:52 bcallah Exp $
-
-Index: druntime-2.098.0/posix.mak
---- druntime-2.098.0/posix.mak.orig
-+++ druntime-2.098.0/posix.mak
-@@ -5,7 +5,7 @@
-
- QUIET:=
-
--DMD_DIR=../dmd
-+DMD_DIR=TOPDIR/dmd-2.098.0
- DUB=dub
- TOOLS_DIR=../tools
-
-@@ -64,11 +64,9 @@ MAKEFILE = $(firstword $(MAKEFILE_LIST))
- DDOCFLAGS=-conf= -c -w -o- -Isrc -Iimport -version=CoreDdoc
-
- # Set CFLAGS
--CFLAGS=$(MODEL_FLAG) -fPIC -DHAVE_UNISTD_H
-+CFLAGS+=$(MODEL_FLAG) -fPIC -DHAVE_UNISTD_H
- ifeq ($(BUILD),debug)
- CFLAGS += -g
--else
-- CFLAGS += -O3
- endif
- ifeq (solaris,$(OS))
- CFLAGS+=-D_REENTRANT # for thread-safe errno
-@@ -342,7 +340,7 @@ $(IMPDIR)/%.d : src/%.d
- ######################## Build DMD if non-existent ##############################
-
- $(DMD):
-- $(MAKE) -C $(DMD_DIR)/src -f posix.mak BUILD=$(BUILD) OS=$(OS) MODEL=$(MODEL)
-+ $(MAKE) -C $(DMD_DIR) -f posix.mak BUILD=$(BUILD) OS=$(OS) MODEL=$(MODEL)
-
- ################### C/ASM Targets ############################
-
-@@ -464,7 +462,6 @@ benchmark-compile-only: $(ROOT)/benchmark $(DMD)
- DMD=$(DMD) $< --repeat=0 --dflags="$(PHOBOS_DFLAGS) -de"
-
- #################### test for undesired white spaces ##########################
--MANIFEST = $(shell git ls-tree --name-only -r HEAD)
-
- CWS_MAKEFILES = $(filter mak/% %.mak %/Makefile,$(MANIFEST))
- NOT_MAKEFILES = $(filter-out $(CWS_MAKEFILES) src/rt/minit.obj test/%.exp,$(MANIFEST))
Index: lang/dmd/patches/patch-druntime-2_098_0_src_core_sys_posix_sys_mman_d
===================================================================
RCS file: lang/dmd/patches/patch-druntime-2_098_0_src_core_sys_posix_sys_mman_d
diff -N lang/dmd/patches/patch-druntime-2_098_0_src_core_sys_posix_sys_mman_d
--- lang/dmd/patches/patch-druntime-2_098_0_src_core_sys_posix_sys_mman_d 13 Oct 2021 04:38:52 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-$OpenBSD: patch-druntime-2_098_0_src_core_sys_posix_sys_mman_d,v 1.1.1.1 2021/10/13 04:38:52 bcallah Exp $
-
-Fibers need mmap(2) MAP_STACK.
-
-Index: druntime-2.098.0/src/core/sys/posix/sys/mman.d
---- druntime-2.098.0/src/core/sys/posix/sys/mman.d.orig
-+++ druntime-2.098.0/src/core/sys/posix/sys/mman.d
-@@ -460,6 +460,7 @@ else version (OpenBSD)
- enum MAP_PRIVATE = 0x0002;
- enum MAP_FIXED = 0x0010;
- enum MAP_ANON = 0x1000;
-+ enum MAP_STACK = 0x4000;
-
- enum MAP_FAILED = cast(void*)-1;
-
Index: lang/dmd/patches/patch-druntime-2_098_0_src_core_thread_fiber_d
===================================================================
RCS file: lang/dmd/patches/patch-druntime-2_098_0_src_core_thread_fiber_d
diff -N lang/dmd/patches/patch-druntime-2_098_0_src_core_thread_fiber_d
--- lang/dmd/patches/patch-druntime-2_098_0_src_core_thread_fiber_d 13 Oct 2021 04:38:52 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,22 +0,0 @@
-$OpenBSD: patch-druntime-2_098_0_src_core_thread_fiber_d,v 1.1.1.1 2021/10/13 04:38:52 bcallah Exp $
-
-Fibers need mmap(2) MAP_STACK.
-
-Index: druntime-2.098.0/src/core/thread/fiber.d
---- druntime-2.098.0/src/core/thread/fiber.d.orig
-+++ druntime-2.098.0/src/core/thread/fiber.d
-@@ -982,10 +982,13 @@ class Fiber (private)
- // Allocate more for the memory guard
- sz += guardPageSize;
-
-+ int mmap_flags = MAP_PRIVATE | MAP_ANON;
-+ version (OpenBSD)
-+ mmap_flags |= MAP_STACK;
- m_pmem = mmap( null,
- sz,
- PROT_READ | PROT_WRITE,
-- MAP_PRIVATE | MAP_ANON,
-+ mmap_flags,
- -1,
- 0 );
- if ( m_pmem == MAP_FAILED )
Index: lang/dmd/patches/patch-druntime_mak_COPY
===================================================================
RCS file: lang/dmd/patches/patch-druntime_mak_COPY
diff -N lang/dmd/patches/patch-druntime_mak_COPY
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/dmd/patches/patch-druntime_mak_COPY 24 Dec 2021 16:24:30 -0000
@@ -0,0 +1,18 @@
+$OpenBSD$
+
+Index: druntime/mak/COPY
+--- druntime/mak/COPY.orig
++++ druntime/mak/COPY
+@@ -257,10 +257,12 @@ COPY=\
+ \
+ $(IMPDIR)\core\sys\openbsd\dlfcn.d \
+ $(IMPDIR)\core\sys\openbsd\err.d \
++ $(IMPDIR)\core\sys\openbsd\execinfo.d \
+ $(IMPDIR)\core\sys\openbsd\pthread_np.d \
+ $(IMPDIR)\core\sys\openbsd\stdlib.d \
+ $(IMPDIR)\core\sys\openbsd\string.d \
+ $(IMPDIR)\core\sys\openbsd\time.d \
++ $(IMPDIR)\core\sys\openbsd\unistd.d \
+ \
+ $(IMPDIR)\core\sys\openbsd\sys\cdefs.d \
+ $(IMPDIR)\core\sys\openbsd\sys\elf.d \
Index: lang/dmd/patches/patch-druntime_mak_SRCS
===================================================================
RCS file: lang/dmd/patches/patch-druntime_mak_SRCS
diff -N lang/dmd/patches/patch-druntime_mak_SRCS
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/dmd/patches/patch-druntime_mak_SRCS 24 Dec 2021 16:24:30 -0000
@@ -0,0 +1,18 @@
+$OpenBSD$
+
+Index: druntime/mak/SRCS
+--- druntime/mak/SRCS.orig
++++ druntime/mak/SRCS
+@@ -257,10 +257,12 @@ SRCS=\
+ \
+ src\core\sys\openbsd\dlfcn.d \
+ src\core\sys\openbsd\err.d \
++ src\core\sys\openbsd\execinfo.d \
+ src\core\sys\openbsd\pthread_np.d \
+ src\core\sys\openbsd\stdlib.d \
+ src\core\sys\openbsd\string.d \
+ src\core\sys\openbsd\time.d \
++ src\core\sys\openbsd\unistd.d \
+ \
+ src\core\sys\openbsd\sys\cdefs.d \
+ src\core\sys\openbsd\sys\elf.d \
Index: lang/dmd/patches/patch-druntime_posix_mak
===================================================================
RCS file: lang/dmd/patches/patch-druntime_posix_mak
diff -N lang/dmd/patches/patch-druntime_posix_mak
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/dmd/patches/patch-druntime_posix_mak 24 Dec 2021 16:24:30 -0000
@@ -0,0 +1,35 @@
+$OpenBSD$
+
+Index: druntime/posix.mak
+--- druntime/posix.mak.orig
++++ druntime/posix.mak
+@@ -64,11 +64,9 @@ MAKEFILE = $(firstword $(MAKEFILE_LIST))
+ DDOCFLAGS=-conf= -c -w -o- -Isrc -Iimport -version=CoreDdoc
+
+ # Set CFLAGS
+-CFLAGS=$(MODEL_FLAG) -fPIC -DHAVE_UNISTD_H
++CFLAGS+=$(MODEL_FLAG) -fPIC -DHAVE_UNISTD_H
+ ifeq ($(BUILD),debug)
+ CFLAGS += -g
+-else
+- CFLAGS += -O3
+ endif
+ ifeq (solaris,$(OS))
+ CFLAGS+=-D_REENTRANT # for thread-safe errno
+@@ -342,7 +340,7 @@ $(IMPDIR)/%.d : src/%.d
+ ######################## Build DMD if non-existent ##############################
+
+ $(DMD):
+- $(MAKE) -C $(DMD_DIR)/src -f posix.mak BUILD=$(BUILD) OS=$(OS) MODEL=$(MODEL)
++ $(MAKE) -C $(DMD_DIR) -f posix.mak BUILD=$(BUILD) OS=$(OS) MODEL=$(MODEL)
+
+ ################### C/ASM Targets ############################
+
+@@ -461,7 +459,6 @@ benchmark-compile-only: $(ROOT)/benchmark $(DMD)
+ DMD=$(DMD) $< --repeat=0 --dflags="$(PHOBOS_DFLAGS) -de"
+
+ #################### test for undesired white spaces ##########################
+-MANIFEST = $(shell git ls-tree --name-only -r HEAD)
+
+ CWS_MAKEFILES = $(filter mak/% %.mak %/Makefile,$(MANIFEST))
+ NOT_MAKEFILES = $(filter-out $(CWS_MAKEFILES) src/rt/minit.obj test/%.exp,$(MANIFEST))
Index: lang/dmd/patches/patch-phobos-2_098_0_posix_mak
===================================================================
RCS file: lang/dmd/patches/patch-phobos-2_098_0_posix_mak
diff -N lang/dmd/patches/patch-phobos-2_098_0_posix_mak
--- lang/dmd/patches/patch-phobos-2_098_0_posix_mak 13 Oct 2021 04:38:51 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,37 +0,0 @@
-$OpenBSD: patch-phobos-2_098_0_posix_mak,v 1.1.1.1 2021/10/13 04:38:51 bcallah Exp $
-
-Index: phobos-2.098.0/posix.mak
---- phobos-2.098.0/posix.mak.orig
-+++ phobos-2.098.0/posix.mak
-@@ -32,7 +32,7 @@ QUIET:=@
-
- DEBUGGER=gdb
- GIT_HOME=https://github.com/dlang
--DMD_DIR=../dmd
-+DMD_DIR=../dmd-2.098.0
-
- include $(DMD_DIR)/src/osmodel.mak
-
-@@ -67,7 +67,7 @@ endif
-
- # Configurable stuff that's rarely edited
- INSTALL_DIR = ../install
--DRUNTIME_PATH = ../druntime
-+DRUNTIME_PATH = ../druntime-2.098.0
- DLANG_ORG_DIR = ../dlang.org
- ZIPFILE = phobos.zip
- ROOT_OF_THEM_ALL = generated
-@@ -107,12 +107,10 @@ endif
- OUTFILEFLAG = -o
- NODEFAULTLIB=-defaultlib= -debuglib=
- ifeq (,$(findstring win,$(OS)))
-- CFLAGS=$(MODEL_FLAG) -fPIC -DHAVE_UNISTD_H
-+ CFLAGS+=$(MODEL_FLAG) -fPIC -DHAVE_UNISTD_H
- NODEFAULTLIB += -L-lpthread -L-lm
- ifeq ($(BUILD),debug)
- CFLAGS += -g
-- else
-- CFLAGS += -O3
- endif
- else
- ifeq ($(OS),win32)
Index: lang/dmd/patches/patch-phobos_posix_mak
===================================================================
RCS file: lang/dmd/patches/patch-phobos_posix_mak
diff -N lang/dmd/patches/patch-phobos_posix_mak
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/dmd/patches/patch-phobos_posix_mak 24 Dec 2021 16:24:30 -0000
@@ -0,0 +1,19 @@
+$OpenBSD$
+
+Index: phobos/posix.mak
+--- phobos/posix.mak.orig
++++ phobos/posix.mak
+@@ -107,12 +107,10 @@ endif
+ OUTFILEFLAG = -o
+ NODEFAULTLIB=-defaultlib= -debuglib=
+ ifeq (,$(findstring win,$(OS)))
+- CFLAGS=$(MODEL_FLAG) -fPIC -DHAVE_UNISTD_H
++ CFLAGS+=$(MODEL_FLAG) -fPIC -DHAVE_UNISTD_H
+ NODEFAULTLIB += -L-lpthread -L-lm
+ ifeq ($(BUILD),debug)
+ CFLAGS += -g
+- else
+- CFLAGS += -O3
+ endif
+ else
+ ifeq ($(OS),win32)
Index: lang/dmd/pkg/PLIST
===================================================================
RCS file: /cvs/ports/lang/dmd/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- lang/dmd/pkg/PLIST 13 Oct 2021 04:38:51 -0000 1.1.1.1
+++ lang/dmd/pkg/PLIST 24 Dec 2021 16:24:30 -0000
@@ -227,7 +227,6 @@ include/dmd/druntime/import/core/sys/lin
include/dmd/druntime/import/core/sys/linux/netinet/
include/dmd/druntime/import/core/sys/linux/netinet/in_.d
include/dmd/druntime/import/core/sys/linux/netinet/tcp.d
-include/dmd/druntime/import/core/sys/linux/perf_event.d
include/dmd/druntime/import/core/sys/linux/sched.d
include/dmd/druntime/import/core/sys/linux/stdio.d
include/dmd/druntime/import/core/sys/linux/string.d
@@ -269,6 +268,7 @@ include/dmd/druntime/import/core/sys/ope
include/dmd/druntime/import/core/sys/openbsd/dlfcn.d
include/dmd/druntime/import/core/sys/openbsd/err.d
include/dmd/druntime/import/core/sys/openbsd/execinfo.d
+include/dmd/druntime/import/core/sys/openbsd/pthread_np.d
include/dmd/druntime/import/core/sys/openbsd/stdlib.d
include/dmd/druntime/import/core/sys/openbsd/string.d
include/dmd/druntime/import/core/sys/openbsd/sys/
Index: devel/dtools/Makefile
===================================================================
RCS file: /cvs/ports/devel/dtools/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- devel/dtools/Makefile 17 Oct 2021 01:43:18 -0000 1.2
+++ devel/dtools/Makefile 24 Dec 2021 16:24:30 -0000
@@ -5,13 +5,12 @@ ONLY_FOR_ARCHS = amd64
COMMENT = ancillary tools for the D programming language compiler
DISTNAME = d${GH_PROJECT}-${GH_TAGNAME:S/^v//}
-REVISION = 0
CATEGORIES = devel
# Keep GH_TAGNAME in sync with lang/dmd
GH_ACCOUNT = dlang
GH_PROJECT = tools
-GH_TAGNAME = v2.098.0
+GH_TAGNAME = v2.098.1
HOMEPAGE = https://dlang.org/
MAINTAINER = Brian Callahan <bcallah@openbsd.org>
Index: devel/dtools/distinfo
===================================================================
RCS file: /cvs/ports/devel/dtools/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- devel/dtools/distinfo 15 Oct 2021 13:44:26 -0000 1.1.1.1
+++ devel/dtools/distinfo 24 Dec 2021 16:24:30 -0000
@@ -1,2 +1,2 @@
-SHA256 (dtools-2.098.0.tar.gz) = lGbmLtLPgIAhWFJPxOf/gMvvwPrf8jqJM/byiStCy1Y=
-SIZE (dtools-2.098.0.tar.gz) = 129687
+SHA256 (dtools-2.098.1.tar.gz) = WdtBu00AyE+1ezE/aCTQ54/HyHydW/onIt0o6VgG5mc=
+SIZE (dtools-2.098.1.tar.gz) = 129699

34
dtools-2.099.0.diff Normal file
View File

@ -0,0 +1,34 @@
Index: devel/dtools/Makefile
===================================================================
RCS file: /home/cvs/ports/devel/dtools/Makefile,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 Makefile
--- devel/dtools/Makefile 11 Mar 2022 18:49:59 -0000 1.3
+++ devel/dtools/Makefile 20 Mar 2022 19:16:30 -0000
@@ -3,13 +3,12 @@ ONLY_FOR_ARCHS = amd64
COMMENT = ancillary tools for the D programming language compiler
DISTNAME = d${GH_PROJECT}-${GH_TAGNAME:S/^v//}
-REVISION = 0
CATEGORIES = devel
# Keep GH_TAGNAME in sync with lang/dmd
GH_ACCOUNT = dlang
GH_PROJECT = tools
-GH_TAGNAME = v2.098.0
+GH_TAGNAME = v2.099.0
HOMEPAGE = https://dlang.org/
MAINTAINER = Brian Callahan <bcallah@openbsd.org>
Index: devel/dtools/distinfo
===================================================================
RCS file: /home/cvs/ports/devel/dtools/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 distinfo
--- devel/dtools/distinfo 15 Oct 2021 13:44:26 -0000 1.1.1.1
+++ devel/dtools/distinfo 20 Mar 2022 19:15:08 -0000
@@ -1,2 +1,2 @@
-SHA256 (dtools-2.098.0.tar.gz) = lGbmLtLPgIAhWFJPxOf/gMvvwPrf8jqJM/byiStCy1Y=
-SIZE (dtools-2.098.0.tar.gz) = 129687
+SHA256 (dtools-2.099.0.tar.gz) = igxrOqmGRzQr0uIoMucmijQ8XYb2rjlynyY3Qh3Xpgc=
+SIZE (dtools-2.099.0.tar.gz) = 129869

28
dtools-2.099.0p0.diff Normal file
View File

@ -0,0 +1,28 @@
Index: devel/dtools/Makefile
===================================================================
RCS file: /home/cvs/ports/devel/dtools/Makefile,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 Makefile
--- devel/dtools/Makefile 11 Mar 2022 18:49:59 -0000 1.3
+++ devel/dtools/Makefile 20 Mar 2022 19:15:04 -0000
@@ -9,7 +9,7 @@ CATEGORIES = devel
# Keep GH_TAGNAME in sync with lang/dmd
GH_ACCOUNT = dlang
GH_PROJECT = tools
-GH_TAGNAME = v2.098.0
+GH_TAGNAME = v2.099.0
HOMEPAGE = https://dlang.org/
MAINTAINER = Brian Callahan <bcallah@openbsd.org>
Index: devel/dtools/distinfo
===================================================================
RCS file: /home/cvs/ports/devel/dtools/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 distinfo
--- devel/dtools/distinfo 15 Oct 2021 13:44:26 -0000 1.1.1.1
+++ devel/dtools/distinfo 20 Mar 2022 19:15:08 -0000
@@ -1,2 +1,2 @@
-SHA256 (dtools-2.098.0.tar.gz) = lGbmLtLPgIAhWFJPxOf/gMvvwPrf8jqJM/byiStCy1Y=
-SIZE (dtools-2.098.0.tar.gz) = 129687
+SHA256 (dtools-2.099.0.tar.gz) = igxrOqmGRzQr0uIoMucmijQ8XYb2rjlynyY3Qh3Xpgc=
+SIZE (dtools-2.099.0.tar.gz) = 129869

53
dub-1280.diff Normal file
View File

@ -0,0 +1,53 @@
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/dub/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- Makefile 11 Mar 2022 18:49:59 -0000 1.2
+++ Makefile 20 Mar 2022 19:50:44 -0000
@@ -3,7 +3,7 @@ CATEGORIES = devel
GH_ACCOUNT = dlang
GH_PROJECT = dub
-GH_TAGNAME = v1.27.0
+GH_TAGNAME = v1.28.0
MAINTAINER = Brian Callahan <bcallah@openbsd.org>
@@ -11,7 +11,7 @@ MAINTAINER = Brian Callahan <bcallah@ope
PERMIT_PACKAGE = Yes
FLAVORS = dmd
-FLAVOR ?=
+FLAVOR ?= dmd
.if ${FLAVOR:Mdmd}
ONLY_FOR_ARCHS = amd64
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/dub/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo 19 Oct 2021 13:35:27 -0000 1.1.1.1
+++ distinfo 20 Mar 2022 19:50:44 -0000
@@ -1,2 +1,2 @@
-SHA256 (dub-1.27.0.tar.gz) = +4APM1XxZ6x/mX934x4zHbnTNHd3n9qvKFGzq87MgBo=
-SIZE (dub-1.27.0.tar.gz) = 1313521
+SHA256 (dub-1.28.0.tar.gz) = vwcu3u3Gdh/kB668VcuatiS9YarCYRQEmQcXwr4AymY=
+SIZE (dub-1.28.0.tar.gz) = 1314672
Index: patches/patch-source_dub_dub_d
===================================================================
RCS file: /cvs/ports/devel/dub/patches/patch-source_dub_dub_d,v
retrieving revision 1.2
diff -u -p -r1.2 patch-source_dub_dub_d
--- patches/patch-source_dub_dub_d 11 Mar 2022 18:49:59 -0000 1.2
+++ patches/patch-source_dub_dub_d 20 Mar 2022 19:50:44 -0000
@@ -3,7 +3,7 @@ The GDC binary is named egdc on OpenBSD.
Index: source/dub/dub.d
--- source/dub/dub.d.orig
+++ source/dub/dub.d
-@@ -1478,7 +1478,7 @@ class Dub {
+@@ -1479,7 +1479,7 @@ class Dub {
version (Windows) enum sep = ";", exe = ".exe";
version (Posix) enum sep = ":", exe = "";

355
dunst.diff Normal file
View File

@ -0,0 +1,355 @@
diff 31bccecebaefd3b23c4e4dac76105b5dd0ae1159 /usr/ports
blob - ae82b7b8711d1ac1a7ab6b9373246aeee4998970
file + x11/dunst/Makefile
--- x11/dunst/Makefile
+++ x11/dunst/Makefile
@@ -4,7 +4,7 @@ COMMENT = customizable and lightweight notification-da
GH_ACCOUNT = dunst-project
GH_PROJECT = dunst
-GH_TAGNAME = v1.5.0
+GH_TAGNAME = v1.7.3
CATEGORIES = x11
@@ -19,9 +19,15 @@ WANTLIB += X11 Xext Xinerama Xrandr Xss c cairo gdk_pi
WANTLIB += gio-2.0 glib-2.0 gobject-2.0 harfbuzz intl m notify
WANTLIB += pango-1.0 pangocairo-1.0 pthread
+# C11 with GNU extensions
+COMPILER = base-clang ports-gcc
+COMPILER_LANGS = c
+CFLAGS += -std=c11
+
USE_GMAKE = Yes
-BUILD_DEPENDS = x11/dbus
+BUILD_DEPENDS = graphics/png \
+ x11/dbus
LIB_DEPENDS += devel/gettext,-runtime \
devel/glib2 \
@@ -32,11 +38,20 @@ LIB_DEPENDS += devel/gettext,-runtime \
RUN_DEPENDS += x11/dbus
+TEST_DEPENDS += shells/bash
+
+MAKE_FLAGS = WAYLAND=0
+
FAKE_FLAGS = PREFIX="${PREFIX}" \
MANPREFIX="${PREFIX}/man" \
- DATADIR="${PREFIX}/share/examples"
+ DATADIR="${PREFIX}/share/examples" \
+ SYSCONFDIR="/etc"
pre-configure:
- ${SUBST_CMD} ${WRKSRC}/docs/dunst.pod ${WRKSRC}/dunstrc
+ ${SUBST_CMD} ${WRKSRC}/docs/dunst.1.pod \
+ ${WRKSRC}/docs/dunst.5.pod ${WRKSRC}/dunstrc
+post-install:
+ mv ${WRKINST}/${SYSCONFDIR}/dunst ${PREFIX}/share
+
.include <bsd.port.mk>
blob - 9db4c3129a491cc257474d7627d25426e7527c8b
file + x11/dunst/distinfo
--- x11/dunst/distinfo
+++ x11/dunst/distinfo
@@ -1,2 +1,2 @@
-SHA256 (dunst-1.5.0.tar.gz) = LDkK3xRLX6D/AH6jYWyQ8btTffaoBCGWmT9VhdG8jJo=
-SIZE (dunst-1.5.0.tar.gz) = 169272
+SHA256 (dunst-1.7.3.tar.gz) = FQx4JpAobhY2Y7DrJgW3M5JyQBWXOLg2WAi4UeCvu+4=
+SIZE (dunst-1.7.3.tar.gz) = 4596283
blob - 3799afc73b4cd2c5eded360894771790b0be9812
file + x11/dunst/patches/patch-config_mk
--- x11/dunst/patches/patch-config_mk
+++ x11/dunst/patches/patch-config_mk
@@ -1,14 +1,16 @@
-$OpenBSD: patch-config_mk,v 1.4 2019/08/02 13:49:29 sthen Exp $
+$OpenBSD$
Index: config.mk
--- config.mk.orig
+++ config.mk
-@@ -26,7 +26,7 @@ VALGRIND ?= valgrind
+@@ -36,8 +36,8 @@ endif
# flags
- DEFAULT_CPPFLAGS = -D_DEFAULT_SOURCE -DVERSION=\"${VERSION}\"
--DEFAULT_CFLAGS = -g --std=gnu99 -pedantic -Wall -Wno-overlength-strings -Os ${STATIC}
-+DEFAULT_CFLAGS = -g --std=gnu99 -pedantic -Wall -Wno-overlength-strings ${STATIC}
- DEFAULT_LDFLAGS = -lm
+ DEFAULT_CPPFLAGS = -D_DEFAULT_SOURCE -DVERSION=\"${VERSION}\" -DSYSCONFDIR=\"${SYSCONFDIR}\"
+-DEFAULT_CFLAGS = -g -std=gnu99 -pedantic -Wall -Wno-overlength-strings -Os ${ENABLE_WAYLAND} ${EXTRA_CFLAGS}
+-DEFAULT_LDFLAGS = -lm -lrt
++DEFAULT_CFLAGS = -g -std=gnu99 -pedantic -Wall -Wno-overlength-strings ${ENABLE_WAYLAND} ${EXTRA_CFLAGS}
++DEFAULT_LDFLAGS = -lm
CPPFLAGS_DEBUG := -DDEBUG_BUILD
+ CFLAGS_DEBUG := -O0
blob - /dev/null
file + x11/dunst/patches/patch-docs_dunst_1_pod
--- /dev/null
+++ x11/dunst/patches/patch-docs_dunst_1_pod
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: docs/dunst.1.pod
+--- docs/dunst.1.pod.orig
++++ docs/dunst.1.pod
+@@ -61,7 +61,7 @@ Display a notification on startup.
+
+ A default configuration file is included (usually ##SYSCONFDIR##/dunst/dunstrc)
+ and serves as the least important configuration file. Note: this was previously
+-/usr/share/dunst/dunstrc. You can edit this file to change the system-wide
++${PREFIX}/share/dunst/dunstrc. You can edit this file to change the system-wide
+ defaults or copy it to a more important location to override its settings. See
+ the FILES section for more details on where dunst searches for its
+ configuration files and how settings get applied.
blob - /dev/null
file + x11/dunst/patches/patch-docs_dunst_5_pod
--- /dev/null
+++ x11/dunst/patches/patch-docs_dunst_5_pod
@@ -0,0 +1,38 @@
+$OpenBSD$
+
+Index: docs/dunst.5.pod
+--- docs/dunst.5.pod.orig
++++ docs/dunst.5.pod
+@@ -384,7 +384,7 @@ gets the last say.
+
+ If B<icon_position> is set to off, this setting is ignored.
+
+-=item B<icon_path> (default: "/usr/share/icons/gnome/16x16/status/:/usr/share/icons/gnome/16x16/devices/")
++=item B<icon_path> (default: "${PREFIX}/share/icons/gnome/16x16/status/:${PREFIX}/share/icons/gnome/16x16/devices/")
+
+ Can be set to a colon-separated list of paths to search for icons to use with
+ notifications.
+@@ -398,7 +398,7 @@ replace this and will need new settings.
+ Comma-separated of names of the the themes to use for looking up icons. This has
+ to be the name of the directory in which the theme is located, not the
+ human-friendly name of the theme. So for example, the theme B<Breeze Dark> is
+-located in F</usr/share/icons/breeze-dark>. In this case you have to set the
++located in F<${PREFIX}/share/icons/breeze-dark>. In this case you have to set the
+ theme to B<breeze-dark>.
+
+ The first theme in the list is the most important. Only if the icon cannot be
+@@ -438,12 +438,12 @@ Maximum number of notifications that will be kept in h
+ is reached, older notifications will be deleted once a new one arrives. See
+ HISTORY.
+
+-=item B<dmenu> (default: "/usr/bin/dmenu")
++=item B<dmenu> (default: "${LOCALBASE}/bin/dmenu")
+
+ The command that will be run when opening the context menu. Should be either
+ a dmenu command or a dmenu-compatible menu.
+
+-=item B<browser> (default: "/usr/bin/xdg-open")
++=item B<browser> (default: "${LOCALBASE}/bin/xdg-open")
+
+ The command that will be run when opening a URL. The URL to be opened will be
+ appended to the end of the value of this setting.
blob - 1e98aaef0aa8338f814d67e488c66c20fe902e47
file + /dev/null
--- x11/dunst/patches/patch-docs_dunst_pod
+++ /dev/null
@@ -1,14 +0,0 @@
-$OpenBSD: patch-docs_dunst_pod,v 1.2 2019/08/02 13:49:29 sthen Exp $
-
-Index: docs/dunst.pod
---- docs/dunst.pod.orig
-+++ docs/dunst.pod
-@@ -35,7 +35,7 @@ rules or using the output in other scripts.
-
- =head1 CONFIGURATION
-
--An example configuration file is included (usually /usr/share/dunst/dunstrc).
-+An example configuration file is included in ${PREFIX}/share/examples/dunst/dunstrc.
- To change the configuration, copy this file to ~/.config/dunst/dunstrc and edit
- it accordingly.
-
blob - 15732ef815d39f5ea0d692dfcb38152d28985d71
file + x11/dunst/patches/patch-dunstrc
--- x11/dunst/patches/patch-dunstrc
+++ x11/dunst/patches/patch-dunstrc
@@ -3,7 +3,7 @@ $OpenBSD: patch-dunstrc,v 1.3 2020/09/25 13:53:53 fein
Index: dunstrc
--- dunstrc.orig
+++ dunstrc
-@@ -175,7 +175,7 @@
+@@ -196,7 +196,7 @@
max_icon_size = 32
# Paths to default icons.
@@ -12,16 +12,16 @@ Index: dunstrc
### History ###
-@@ -189,10 +189,10 @@
+@@ -210,10 +210,10 @@
### Misc/Advanced ###
# dmenu path.
- dmenu = /usr/bin/dmenu -p dunst:
-+ dmenu = ${PREFIX}/bin/dmenu -p dunst:
++ dmenu = ${LOCALBASE}/bin/dmenu -p dunst:
# Browser for opening urls in context menu.
-- browser = /usr/bin/firefox -new-tab
-+ browser = ${PREFIX}/bin/firefox -new-tab
+- browser = /usr/bin/xdg-open
++ browser = ${LOCALBASE}/bin/xdg-open
# Always run rule-defined scripts, even if the notification is suppressed
always_run_script = true
blob - /dev/null
file + x11/dunst/patches/patch-src_dunst_c
--- /dev/null
+++ x11/dunst/patches/patch-src_dunst_c
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: src/dunst.c
+--- src/dunst.c.orig
++++ src/dunst.c
+@@ -95,7 +95,7 @@ static gboolean run(void *data)
+ gint64 sleep = queues_get_next_datachange(now);
+ gint64 timeout_at = now + sleep;
+
+- LOG_D("Sleeping for %li ms", sleep/1000);
++ LOG_D("Sleeping for %lli ms", (long long)sleep/1000);
+
+ if (sleep >= 0) {
+ if (next_timeout < now || timeout_at < next_timeout) {
blob - /dev/null
file + x11/dunst/patches/patch-src_icon-lookup_c
--- /dev/null
+++ x11/dunst/patches/patch-src_icon-lookup_c
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+Don't use malloc.h header on OpenBSD.
+
+Index: src/icon-lookup.c
+--- src/icon-lookup.c.orig
++++ src/icon-lookup.c
+@@ -3,7 +3,6 @@
+
+ #include <glib.h>
+ #include <stdio.h>
+-#include <malloc.h>
+ #include <unistd.h>
+ #include <assert.h>
+
blob - /dev/null
file + x11/dunst/patches/patch-src_input_c
--- /dev/null
+++ x11/dunst/patches/patch-src_input_c
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+Index: src/input.c
+--- src/input.c.orig
++++ src/input.c
+@@ -4,7 +4,9 @@
+ #include "settings.h"
+ #include "queues.h"
+ #include <stddef.h>
++#ifdef __linux__
+ #include <linux/input-event-codes.h>
++#endif
+
+ struct notification *get_notification_at(const int y) {
+ int curr_y = settings.frame_width;
blob - 8ae676aa4d74ae8e8c1f04e30d7e6ded087b6d55
file + x11/dunst/patches/patch-src_notification_c
--- x11/dunst/patches/patch-src_notification_c
+++ x11/dunst/patches/patch-src_notification_c
@@ -3,7 +3,7 @@ $OpenBSD: patch-src_notification_c,v 1.3 2020/09/25 13
Index: src/notification.c
--- src/notification.c.orig
+++ src/notification.c
-@@ -58,7 +58,7 @@ void notification_print(const struct notification *n)
+@@ -60,7 +60,7 @@ void notification_print(const struct notification *n)
printf("\ticon_id: '%s'\n", n->icon_id);
printf("\tdesktop_entry: '%s'\n", n->desktop_entry ? n->desktop_entry : "");
printf("\tcategory: %s\n", n->category);
@@ -12,7 +12,18 @@ Index: src/notification.c
printf("\turgency: %s\n", notification_urgency_to_string(n->urgency));
printf("\ttransient: %d\n", n->transient);
printf("\tformatted: '%s'\n", n->msg);
-@@ -574,14 +574,14 @@ void notification_update_text_to_render(struct notific
+@@ -140,8 +140,8 @@ void notification_run_script(struct notification *n)
+ // Set environment variables
+ gchar *n_id_str = g_strdup_printf("%i", n->id);
+ gchar *n_progress_str = g_strdup_printf("%i", n->progress);
+- gchar *n_timeout_str = g_strdup_printf("%li", n->timeout/1000);
+- gchar *n_timestamp_str = g_strdup_printf("%li", n->timestamp / 1000);
++ gchar *n_timeout_str = g_strdup_printf("%lli", (long long)n->timeout/1000);
++ gchar *n_timestamp_str = g_strdup_printf("%lli", (long long)n->timestamp / 1000);
+ safe_setenv("DUNST_APP_NAME", appname);
+ safe_setenv("DUNST_SUMMARY", summary);
+ safe_setenv("DUNST_BODY", body);
+@@ -668,14 +668,14 @@ void notification_update_text_to_render(struct notific
char *new_buf;
if (hours > 0) {
new_buf =
blob - /dev/null
file + x11/dunst/patches/patch-src_settings_h
--- /dev/null
+++ x11/dunst/patches/patch-src_settings_h
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: src/settings.h
+--- src/settings.h.orig
++++ src/settings.h
+@@ -13,6 +13,8 @@
+
+ #define LIST_END (-1)
+
++enum mouse_button { BTN_LEFT, BTN_RIGHT, BTN_MIDDLE, BTN_TOUCH };
++
+ enum alignment { ALIGN_LEFT, ALIGN_CENTER, ALIGN_RIGHT };
+ enum icon_position { ICON_LEFT, ICON_RIGHT, ICON_OFF };
+ enum vertical_alignment { VERTICAL_TOP, VERTICAL_CENTER, VERTICAL_BOTTOM };
blob - /dev/null
file + x11/dunst/patches/patch-src_x11_x_c
--- /dev/null
+++ x11/dunst/patches/patch-src_x11_x_c
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+Index: src/x11/x.c
+--- src/x11/x.c.orig
++++ src/x11/x.c
+@@ -19,7 +19,9 @@
+ #include <X11/Xlib.h>
+ #include <X11/Xresource.h>
+ #include <X11/Xutil.h>
++#ifdef __linux__
+ #include <linux/input-event-codes.h>
++#endif
+
+ #include "../dbus.h"
+ #include "../draw.h"
blob - 519e7006b95a24d6fbfe6efbc643647ee977696f
file + x11/dunst/pkg/PLIST
--- x11/dunst/pkg/PLIST
+++ x11/dunst/pkg/PLIST
@@ -4,6 +4,11 @@ bin/dunstctl
@bin bin/dunstify
@man man/man1/dunst.1
@man man/man1/dunstctl.1
-share/dbus-1/services/org.knopwob.dunst.service
-share/examples/dunst/
-share/examples/dunst/dunstrc
+@man man/man5/dunst.5
+share/dunst/
+@sample ${SYSCONFDIR}/dunst/
+share/dunst/dunstrc
+@sample ${SYSCONFDIR}/dunst/dunstrc
+share/examples/dbus-1/
+share/examples/dbus-1/services/
+share/examples/dbus-1/services/org.knopwob.dunst.service

176
faster2.diff Normal file
View File

@ -0,0 +1,176 @@
? a
? afresh
? faster.diff
? faster2.diff
? todo
? OpenBSD/.swp
? OpenBSD/strict.diff
Index: OpenBSD/Add.pm
===================================================================
RCS file: /cvs/src/usr.sbin/pkg_add/OpenBSD/Add.pm,v
retrieving revision 1.187
diff -u -p -r1.187 Add.pm
--- OpenBSD/Add.pm 9 Mar 2022 12:27:51 -0000 1.187
+++ OpenBSD/Add.pm 13 Mar 2022 11:58:19 -0000
@@ -466,6 +466,7 @@ sub find_safe_dir
my $fullname = $self->fullname;
my $filename = $state->{destdir}.$fullname;
my $d = dirname($filename);
+ my $orig = $d;
# we go back up until we find an existing directory.
# hopefully this will be on the same file system.
@@ -483,6 +484,12 @@ sub find_safe_dir
if (!-e _ && !$state->{not}) {
$state->make_path($d, $fullname);
}
+ if ($state->{current_set}{simple_update} &&
+ $d eq $orig &&
+ !-e $filename) {
+ $self->{avoid_temp} = $filename;
+ }
+
return $d;
}
@@ -503,6 +510,18 @@ sub create_temp
return ($fh, $tempname);
}
+sub may_create_temp
+{
+ my ($self, $d, $state) = @_;
+ if ($self->{avoid_temp}) {
+ if (open(my $fh, '>', $self->{avoid_temp})) {
+ return ($fh, $self->{avoid_temp});
+ }
+ }
+ delete $self->{avoid_temp};
+ return $self->create_temp($d, $state);
+}
+
sub tie
{
my ($self, $state) = @_;
@@ -513,6 +532,16 @@ sub tie
$self->SUPER::extract($state);
my $d = $self->find_safe_dir($state);
+ my $src = $self->{tieto}->realname($state);
+ my $dest = $self->realname($state);
+ if ($state->{current_set}{simple_update} && $src eq $dest) {
+ $state->say("No name change on tied file #1", $src)
+ if $state->verbose >= 3;
+ $self->{tieto}{dont_delete} = 1;
+ $self->{avoid_temp} = 1;
+ return;
+ }
+ delete $self->{avoid_temp};
if ($state->{not}) {
$state->say("link #1 -> #2",
$self->name, $d) if $state->verbose >= 3;
@@ -520,7 +549,6 @@ sub tie
my ($fh, $tempname) = $self->create_temp($d, $state);
return if !defined $tempname;
- my $src = $self->{tieto}->realname($state);
unlink($tempname);
$state->say("link #1 -> #2", $src, $tempname)
if $state->verbose >= 3;
@@ -528,6 +556,7 @@ sub tie
}
}
+
sub extract
{
my ($self, $state, $file) = @_;
@@ -540,13 +569,13 @@ sub extract
$self->name, $d) if $state->verbose >= 3;
$state->{archive}->skip;
} else {
- my ($fh, $tempname) = $self->create_temp($d, $state);
- if (!defined $tempname) {
+ my ($fh, $filename) = $self->may_create_temp($d, $state);
+ if (!defined $filename) {
$state->{archive}->skip;
return;
}
- $state->say("extract #1 -> #2", $self->name, $tempname)
+ $state->say("extract #1 -> #2", $self->name, $filename)
if $state->verbose >= 3;
@@ -555,7 +584,7 @@ sub extract
$self->stringize);
}
$file->extract_to_fh($fh);
- $self->may_check_digest($tempname, $state);
+ $self->may_check_digest($filename, $state);
}
}
@@ -576,17 +605,21 @@ sub install
} elsif (defined $self->{symlink}) {
symlink($self->{symlink}, $destdir.$fullname);
} else {
- if (!defined $self->{tempname}) {
- return if $state->allow_nonroot($fullname);
- $state->fatal("No tempname for #1", $fullname);
+ if (defined $self->{avoid_temp}) {
+ delete $self->{avoid_temp};
+ } else {
+ if (!defined $self->{tempname}) {
+ return if $state->allow_nonroot($fullname);
+ $state->fatal("No tempname for #1", $fullname);
+ }
+ rename($self->{tempname}, $destdir.$fullname) or
+ $state->fatal("can't move #1 to #2: #3",
+ $self->{tempname}, $fullname, $!);
+ $state->say("moving #1 -> #2",
+ $self->{tempname}, $destdir.$fullname)
+ if $state->verbose >= 5;
+ delete $self->{tempname};
}
- rename($self->{tempname}, $destdir.$fullname) or
- $state->fatal("can't move #1 to #2: #3",
- $self->{tempname}, $fullname, $!);
- $state->say("moving #1 -> #2",
- $self->{tempname}, $destdir.$fullname)
- if $state->verbose >= 5;
- delete $self->{tempname};
}
$self->set_modes($state, $destdir.$fullname);
}
Index: OpenBSD/Delete.pm
===================================================================
RCS file: /cvs/src/usr.sbin/pkg_add/OpenBSD/Delete.pm,v
retrieving revision 1.160
diff -u -p -r1.160 Delete.pm
--- OpenBSD/Delete.pm 24 Jul 2019 18:05:26 -0000 1.160
+++ OpenBSD/Delete.pm 13 Mar 2022 11:58:19 -0000
@@ -448,6 +448,7 @@ sub is_intact
sub delete
{
my ($self, $state) = @_;
+ return if $self->{dont_delete};
my $realname = $self->realname($state);
if (defined $self->{symlink}) {
Index: OpenBSD/PkgAdd.pm
===================================================================
RCS file: /cvs/src/usr.sbin/pkg_add/OpenBSD/PkgAdd.pm,v
retrieving revision 1.122
diff -u -p -r1.122 PkgAdd.pm
--- OpenBSD/PkgAdd.pm 12 Oct 2021 09:06:37 -0000 1.122
+++ OpenBSD/PkgAdd.pm 13 Mar 2022 11:58:19 -0000
@@ -102,7 +102,7 @@ sub tie_files
$self->{tieto} = $tied;
$tied->{tied} = 1;
$state->say("Tying #1 to #2", $self->stringize,
- $tied->stringize) if $state->verbose >= 3;
+ $tied->realname) if $state->verbose >= 3;
}
}

169
faster3.diff Normal file
View File

@ -0,0 +1,169 @@
Index: OpenBSD/Add.pm
===================================================================
RCS file: /cvs/src/usr.sbin/pkg_add/OpenBSD/Add.pm,v
retrieving revision 1.187
diff -u -p -r1.187 Add.pm
--- OpenBSD/Add.pm 9 Mar 2022 12:27:51 -0000 1.187
+++ OpenBSD/Add.pm 13 Mar 2022 12:11:29 -0000
@@ -466,6 +466,7 @@ sub find_safe_dir
my $fullname = $self->fullname;
my $filename = $state->{destdir}.$fullname;
my $d = dirname($filename);
+ my $orig = $d;
# we go back up until we find an existing directory.
# hopefully this will be on the same file system.
@@ -483,6 +484,12 @@ sub find_safe_dir
if (!-e _ && !$state->{not}) {
$state->make_path($d, $fullname);
}
+ if ($state->{current_set}{simple_update} &&
+ $d eq $orig &&
+ !-e $filename) {
+ $self->{avoid_temp} = $filename;
+ }
+
return $d;
}
@@ -503,6 +510,18 @@ sub create_temp
return ($fh, $tempname);
}
+sub may_create_temp
+{
+ my ($self, $d, $state) = @_;
+ if ($self->{avoid_temp}) {
+ if (open(my $fh, '>', $self->{avoid_temp})) {
+ return ($fh, $self->{avoid_temp});
+ }
+ }
+ delete $self->{avoid_temp};
+ return $self->create_temp($d, $state);
+}
+
sub tie
{
my ($self, $state) = @_;
@@ -513,14 +532,22 @@ sub tie
$self->SUPER::extract($state);
my $d = $self->find_safe_dir($state);
+ my $src = $self->{tieto}->realname($state);
+ my $dest = $self->realname($state);
+ if ($state->{current_set}{simple_update} && $src eq $dest) {
+ $state->say("No name change on tied file #1", $src)
+ if $state->verbose >= 3;
+ $self->{tieto}{dont_delete} = 1;
+ $self->{avoid_temp} = 1;
+ return;
+ }
if ($state->{not}) {
$state->say("link #1 -> #2",
$self->name, $d) if $state->verbose >= 3;
} else {
- my ($fh, $tempname) = $self->create_temp($d, $state);
+ my ($fh, $tempname) = $self->may_create_temp($d, $state);
return if !defined $tempname;
- my $src = $self->{tieto}->realname($state);
unlink($tempname);
$state->say("link #1 -> #2", $src, $tempname)
if $state->verbose >= 3;
@@ -528,6 +555,7 @@ sub tie
}
}
+
sub extract
{
my ($self, $state, $file) = @_;
@@ -540,13 +568,13 @@ sub extract
$self->name, $d) if $state->verbose >= 3;
$state->{archive}->skip;
} else {
- my ($fh, $tempname) = $self->create_temp($d, $state);
- if (!defined $tempname) {
+ my ($fh, $filename) = $self->may_create_temp($d, $state);
+ if (!defined $filename) {
$state->{archive}->skip;
return;
}
- $state->say("extract #1 -> #2", $self->name, $tempname)
+ $state->say("extract #1 -> #2", $self->name, $filename)
if $state->verbose >= 3;
@@ -555,7 +583,7 @@ sub extract
$self->stringize);
}
$file->extract_to_fh($fh);
- $self->may_check_digest($tempname, $state);
+ $self->may_check_digest($filename, $state);
}
}
@@ -576,17 +604,21 @@ sub install
} elsif (defined $self->{symlink}) {
symlink($self->{symlink}, $destdir.$fullname);
} else {
- if (!defined $self->{tempname}) {
- return if $state->allow_nonroot($fullname);
- $state->fatal("No tempname for #1", $fullname);
+ if (defined $self->{avoid_temp}) {
+ delete $self->{avoid_temp};
+ } else {
+ if (!defined $self->{tempname}) {
+ return if $state->allow_nonroot($fullname);
+ $state->fatal("No tempname for #1", $fullname);
+ }
+ rename($self->{tempname}, $destdir.$fullname) or
+ $state->fatal("can't move #1 to #2: #3",
+ $self->{tempname}, $fullname, $!);
+ $state->say("moving #1 -> #2",
+ $self->{tempname}, $destdir.$fullname)
+ if $state->verbose >= 5;
+ delete $self->{tempname};
}
- rename($self->{tempname}, $destdir.$fullname) or
- $state->fatal("can't move #1 to #2: #3",
- $self->{tempname}, $fullname, $!);
- $state->say("moving #1 -> #2",
- $self->{tempname}, $destdir.$fullname)
- if $state->verbose >= 5;
- delete $self->{tempname};
}
$self->set_modes($state, $destdir.$fullname);
}
Index: OpenBSD/Delete.pm
===================================================================
RCS file: /cvs/src/usr.sbin/pkg_add/OpenBSD/Delete.pm,v
retrieving revision 1.160
diff -u -p -r1.160 Delete.pm
--- OpenBSD/Delete.pm 24 Jul 2019 18:05:26 -0000 1.160
+++ OpenBSD/Delete.pm 13 Mar 2022 12:11:29 -0000
@@ -448,6 +448,7 @@ sub is_intact
sub delete
{
my ($self, $state) = @_;
+ return if $self->{dont_delete};
my $realname = $self->realname($state);
if (defined $self->{symlink}) {
Index: OpenBSD/PkgAdd.pm
===================================================================
RCS file: /cvs/src/usr.sbin/pkg_add/OpenBSD/PkgAdd.pm,v
retrieving revision 1.122
diff -u -p -r1.122 PkgAdd.pm
--- OpenBSD/PkgAdd.pm 12 Oct 2021 09:06:37 -0000 1.122
+++ OpenBSD/PkgAdd.pm 13 Mar 2022 12:11:29 -0000
@@ -102,7 +102,7 @@ sub tie_files
$self->{tieto} = $tied;
$tied->{tied} = 1;
$state->say("Tying #1 to #2", $self->stringize,
- $tied->stringize) if $state->verbose >= 3;
+ $tied->realname) if $state->verbose >= 3;
}
}

153
faster4.diff Normal file
View File

@ -0,0 +1,153 @@
Index: OpenBSD/Add.pm
===================================================================
RCS file: /cvs/src/usr.sbin/pkg_add/OpenBSD/Add.pm,v
retrieving revision 1.187
diff -u -p -r1.187 Add.pm
--- OpenBSD/Add.pm 9 Mar 2022 12:27:51 -0000 1.187
+++ OpenBSD/Add.pm 15 Mar 2022 10:08:07 -0000
@@ -466,6 +466,7 @@ sub find_safe_dir
my $fullname = $self->fullname;
my $filename = $state->{destdir}.$fullname;
my $d = dirname($filename);
+ my $orig = $d;
# we go back up until we find an existing directory.
# hopefully this will be on the same file system.
@@ -483,6 +484,12 @@ sub find_safe_dir
if (!-e _ && !$state->{not}) {
$state->make_path($d, $fullname);
}
+ if ($state->{current_set}{simple_update} &&
+ $d eq $orig &&
+ !-e $filename) {
+ $self->{avoid_temp} = $filename;
+ }
+
return $d;
}
@@ -503,6 +510,18 @@ sub create_temp
return ($fh, $tempname);
}
+sub may_create_temp
+{
+ my ($self, $d, $state) = @_;
+ if ($self->{avoid_temp}) {
+ if (open(my $fh, '>', $self->{avoid_temp})) {
+ return ($fh, $self->{avoid_temp});
+ }
+ }
+ delete $self->{avoid_temp};
+ return $self->create_temp($d, $state);
+}
+
sub tie
{
my ($self, $state) = @_;
@@ -513,14 +532,22 @@ sub tie
$self->SUPER::extract($state);
my $d = $self->find_safe_dir($state);
+ my $src = $self->{tieto}->realname($state);
+ my $dest = $self->realname($state);
+ if ($state->{current_set}{simple_update} && $src eq $dest) {
+ $state->say("No name change on tied file #1", $src)
+ if $state->verbose >= 3;
+ $self->{tieto}{dont_delete} = 1;
+ $self->{avoid_temp} = 1;
+ return;
+ }
if ($state->{not}) {
$state->say("link #1 -> #2",
$self->name, $d) if $state->verbose >= 3;
} else {
- my ($fh, $tempname) = $self->create_temp($d, $state);
+ my ($fh, $tempname) = $self->may_create_temp($d, $state);
return if !defined $tempname;
- my $src = $self->{tieto}->realname($state);
unlink($tempname);
$state->say("link #1 -> #2", $src, $tempname)
if $state->verbose >= 3;
@@ -528,6 +555,7 @@ sub tie
}
}
+
sub extract
{
my ($self, $state, $file) = @_;
@@ -540,13 +568,13 @@ sub extract
$self->name, $d) if $state->verbose >= 3;
$state->{archive}->skip;
} else {
- my ($fh, $tempname) = $self->create_temp($d, $state);
- if (!defined $tempname) {
+ my ($fh, $filename) = $self->may_create_temp($d, $state);
+ if (!defined $filename) {
$state->{archive}->skip;
return;
}
- $state->say("extract #1 -> #2", $self->name, $tempname)
+ $state->say("extract #1 -> #2", $self->name, $filename)
if $state->verbose >= 3;
@@ -555,7 +583,7 @@ sub extract
$self->stringize);
}
$file->extract_to_fh($fh);
- $self->may_check_digest($tempname, $state);
+ $self->may_check_digest($filename, $state);
}
}
@@ -576,17 +604,21 @@ sub install
} elsif (defined $self->{symlink}) {
symlink($self->{symlink}, $destdir.$fullname);
} else {
- if (!defined $self->{tempname}) {
- return if $state->allow_nonroot($fullname);
- $state->fatal("No tempname for #1", $fullname);
+ if (defined $self->{avoid_temp}) {
+ delete $self->{avoid_temp};
+ } else {
+ if (!defined $self->{tempname}) {
+ return if $state->allow_nonroot($fullname);
+ $state->fatal("No tempname for #1", $fullname);
+ }
+ rename($self->{tempname}, $destdir.$fullname) or
+ $state->fatal("can't move #1 to #2: #3",
+ $self->{tempname}, $fullname, $!);
+ $state->say("moving #1 -> #2",
+ $self->{tempname}, $destdir.$fullname)
+ if $state->verbose >= 5;
+ delete $self->{tempname};
}
- rename($self->{tempname}, $destdir.$fullname) or
- $state->fatal("can't move #1 to #2: #3",
- $self->{tempname}, $fullname, $!);
- $state->say("moving #1 -> #2",
- $self->{tempname}, $destdir.$fullname)
- if $state->verbose >= 5;
- delete $self->{tempname};
}
$self->set_modes($state, $destdir.$fullname);
}
Index: OpenBSD/Delete.pm
===================================================================
RCS file: /cvs/src/usr.sbin/pkg_add/OpenBSD/Delete.pm,v
retrieving revision 1.160
diff -u -p -r1.160 Delete.pm
--- OpenBSD/Delete.pm 24 Jul 2019 18:05:26 -0000 1.160
+++ OpenBSD/Delete.pm 15 Mar 2022 10:08:07 -0000
@@ -448,6 +448,7 @@ sub is_intact
sub delete
{
my ($self, $state) = @_;
+ return if $self->{dont_delete};
my $realname = $self->realname($state);
if (defined $self->{symlink}) {

29
feh.diff Normal file
View File

@ -0,0 +1,29 @@
? feh.diff
Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/feh/Makefile,v
retrieving revision 1.108
diff -u -p -u -p -r1.108 Makefile
--- Makefile 3 Oct 2021 19:19:20 -0000 1.108
+++ Makefile 19 Feb 2022 17:02:59 -0000
@@ -2,7 +2,7 @@
COMMENT= lightweight image viewer
-DISTNAME= feh-3.7.2
+DISTNAME= feh-3.8
EXTRACT_SUFX= .tar.bz2
CATEGORIES= graphics
FIX_EXTRACT_PERMISSIONS=Yes
Index: distinfo
===================================================================
RCS file: /cvs/ports/graphics/feh/distinfo,v
retrieving revision 1.70
diff -u -p -u -p -r1.70 distinfo
--- distinfo 3 Oct 2021 19:19:20 -0000 1.70
+++ distinfo 19 Feb 2022 17:02:59 -0000
@@ -1,2 +1,2 @@
-SHA256 (feh-3.7.2.tar.bz2) = hHGP0nIM9UDSRXaElP4OtOWY9Es54jJrrow2ioKcglg=
-SIZE (feh-3.7.2.tar.bz2) = 2121677
+SHA256 (feh-3.8.tar.bz2) = fzw0VSs5M21+vuLXxL9Wl6qqLGwQLDV/boLqJAvWK6k=
+SIZE (feh-3.8.tar.bz2) = 2122631

25
firefox-95.0.1p0.diff Normal file
View File

@ -0,0 +1,25 @@
Index: www/mozilla-firefox/Makefile
===================================================================
RCS file: /home/cvs/ports/www/mozilla-firefox/Makefile,v
retrieving revision 1.477
diff -u -p -u -p -r1.477 Makefile
--- www/mozilla-firefox/Makefile 16 Dec 2021 15:07:59 -0000 1.477
+++ www/mozilla-firefox/Makefile 24 Dec 2021 15:57:30 -0000
@@ -10,6 +10,8 @@ MOZILLA_BRANCH = release
MOZILLA_PROJECT = firefox
MOZILLA_CODENAME = browser
+REVISION = 0
+
WRKDIST = ${WRKDIR}/${MOZILLA_DIST}-${MOZILLA_DIST_VERSION:C/b[0-9]*//}
HOMEPAGE = https://www.mozilla.org/firefox/
SO_VERSION = 108.0
@@ -38,7 +40,7 @@ BUILD_DEPENDS += devel/cbindgen>=0.19.0
BUILD_DEPENDS += devel/m4
# uses pledge()
-WANTLIB += X11-xcb Xcursor Xi intl xcb xcb-shm harfbuzz ${COMPILER_LIBCXX}
+WANTLIB += X11-xcb Xcursor Xi Xrandr intl xcb xcb-shm harfbuzz ${COMPILER_LIBCXX}
WANTLIB += Xcomposite Xdamage Xfixes
# Regression tests are too hard to adapt to run here

53
firefox-combined.diff Normal file
View File

@ -0,0 +1,53 @@
Index: www/firefox-esr/Makefile
===================================================================
RCS file: /home/cvs/ports/www/firefox-esr/Makefile,v
retrieving revision 1.157
diff -u -p -u -p -r1.157 Makefile
--- www/firefox-esr/Makefile 16 Dec 2021 15:09:12 -0000 1.157
+++ www/firefox-esr/Makefile 24 Dec 2021 21:35:24 -0000
@@ -9,6 +9,8 @@ MOZILLA_PROJECT = firefox-esr
MOZILLA_CODENAME = browser
MOZILLA_DIST = firefox
+REVISION = 0
+
WRKDIST = ${WRKDIR}/${MOZILLA_DIST}-${MOZILLA_DIST_VERSION:C/esr//}
HOMEPAGE = https://www.mozilla.org/firefox/organizations/
PKGNAME = ${MOZILLA_PROJECT}-${MOZILLA_VERSION:S/esr//}
@@ -36,8 +38,9 @@ BUILD_DEPENDS += devel/cbindgen>=0.19.0
BUILD_DEPENDS += devel/m4
# uses pledge()
-WANTLIB += X11-xcb Xcursor Xi intl xcb xcb-shm harfbuzz ${COMPILER_LIBCXX}
-WANTLIB += Xcomposite Xdamage Xfixes
+WANTLIB += ${COMPILER_LIBCXX} X11-xcb Xcomposite Xcursor
+WANTLIB += Xdamage Xfixes Xi Xt gthread-2.0 harfbuzz intl
+WANTLIB += pangoft2-1.0 xcb xcb-shm
# Regression tests are too hard to adapt to run here
NO_TEST = Yes
Index: www/mozilla-firefox/Makefile
===================================================================
RCS file: /home/cvs/ports/www/mozilla-firefox/Makefile,v
retrieving revision 1.477
diff -u -p -u -p -r1.477 Makefile
--- www/mozilla-firefox/Makefile 16 Dec 2021 15:07:59 -0000 1.477
+++ www/mozilla-firefox/Makefile 24 Dec 2021 15:57:30 -0000
@@ -10,6 +10,8 @@ MOZILLA_BRANCH = release
MOZILLA_PROJECT = firefox
MOZILLA_CODENAME = browser
+REVISION = 0
+
WRKDIST = ${WRKDIR}/${MOZILLA_DIST}-${MOZILLA_DIST_VERSION:C/b[0-9]*//}
HOMEPAGE = https://www.mozilla.org/firefox/
SO_VERSION = 108.0
@@ -38,7 +40,7 @@ BUILD_DEPENDS += devel/cbindgen>=0.19.0
BUILD_DEPENDS += devel/m4
# uses pledge()
-WANTLIB += X11-xcb Xcursor Xi intl xcb xcb-shm harfbuzz ${COMPILER_LIBCXX}
+WANTLIB += X11-xcb Xcursor Xi Xrandr intl xcb xcb-shm harfbuzz ${COMPILER_LIBCXX}
WANTLIB += Xcomposite Xdamage Xfixes
# Regression tests are too hard to adapt to run here

28
firefox-esr-91.4.1p0.diff Normal file
View File

@ -0,0 +1,28 @@
Index: www/firefox-esr/Makefile
===================================================================
RCS file: /home/cvs/ports/www/firefox-esr/Makefile,v
retrieving revision 1.157
diff -u -p -u -p -r1.157 Makefile
--- www/firefox-esr/Makefile 16 Dec 2021 15:09:12 -0000 1.157
+++ www/firefox-esr/Makefile 24 Dec 2021 21:35:24 -0000
@@ -9,6 +9,8 @@ MOZILLA_PROJECT = firefox-esr
MOZILLA_CODENAME = browser
MOZILLA_DIST = firefox
+REVISION = 0
+
WRKDIST = ${WRKDIR}/${MOZILLA_DIST}-${MOZILLA_DIST_VERSION:C/esr//}
HOMEPAGE = https://www.mozilla.org/firefox/organizations/
PKGNAME = ${MOZILLA_PROJECT}-${MOZILLA_VERSION:S/esr//}
@@ -36,8 +38,9 @@ BUILD_DEPENDS += devel/cbindgen>=0.19.0
BUILD_DEPENDS += devel/m4
# uses pledge()
-WANTLIB += X11-xcb Xcursor Xi intl xcb xcb-shm harfbuzz ${COMPILER_LIBCXX}
-WANTLIB += Xcomposite Xdamage Xfixes
+WANTLIB += ${COMPILER_LIBCXX} X11-xcb Xcomposite Xcursor
+WANTLIB += Xdamage Xfixes Xi Xt gthread-2.0 harfbuzz intl
+WANTLIB += pangoft2-1.0 xcb xcb-shm
# Regression tests are too hard to adapt to run here
NO_TEST = Yes

538
fish-3.4.0.diff Normal file
View File

@ -0,0 +1,538 @@
Index: shells/fish/Makefile
===================================================================
RCS file: /home/cvs/ports/shells/fish/Makefile,v
retrieving revision 1.29
diff -u -p -u -p -r1.29 Makefile
--- shells/fish/Makefile 11 Mar 2022 19:54:24 -0000 1.29
+++ shells/fish/Makefile 15 Mar 2022 12:03:28 -0000
@@ -1,8 +1,7 @@
COMMENT = friendly interactive shell
-V = 3.3.1
+V = 3.4.0
DISTNAME = fish-$V
-REVISION = 1
CATEGORIES = shells
Index: shells/fish/distinfo
===================================================================
RCS file: /home/cvs/ports/shells/fish/distinfo,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 distinfo
--- shells/fish/distinfo 26 Jul 2021 10:28:57 -0000 1.10
+++ shells/fish/distinfo 15 Mar 2022 12:03:28 -0000
@@ -1,2 +1,2 @@
-SHA256 (fish-3.3.1.tar.xz) = tbTuGlJpdiy76ZOkvWUH5nXkEAzpu+hCFKXusrGfrok=
-SIZE (fish-3.3.1.tar.xz) = 3489152
+SHA256 (fish-3.4.0.tar.xz) = tbSKuEhrGe9xajL39GuIuepTVhVfDpZ+6Z9Ak2RUE8U=
+SIZE (fish-3.4.0.tar.xz) = 3292216
Index: shells/fish/patches/patch-src_history_cpp
===================================================================
RCS file: shells/fish/patches/patch-src_history_cpp
diff -N shells/fish/patches/patch-src_history_cpp
--- shells/fish/patches/patch-src_history_cpp 11 Mar 2022 19:54:24 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,27 +0,0 @@
-Backport commit 3ed8a57bc59c931e890c60df38222f4532d09b66
-
-Don't use mmap for history files on OpenBSD
-OpenBSD's mmap is famously unsychronized with file IO. In theory fsync
-and msync can be used to synchronize but I was unable to get it to work.
-Just don't use mmap for history on OpenBSD. This fixes the history merge
-tests.
-
-Index: src/history.cpp
---- src/history.cpp.orig
-+++ src/history.cpp
-@@ -1321,7 +1321,15 @@ struct history_t::impl_wrapper_t {
- void history_impl_t::resolve_pending() { this->has_pending_item = false; }
-
- bool history_t::chaos_mode = false;
-+
-+/* OpenBSD's mmap is not synchronized with other file operations. In particular it appears we may
-+ * write() a file, fsync() it, close it, mmap() it, and call msync(), and we still may not see the
-+ * newly written data. Just don't try mmap here. */
-+#if defined(__OpenBSD__)
-+bool history_t::never_mmap = true;
-+#else
- bool history_t::never_mmap = false;
-+#endif
-
- history_t::history_t(wcstring name) : wrap_(make_unique<impl_wrapper_t>(std::move(name))) {}
-
Index: shells/fish/pkg/PLIST
===================================================================
RCS file: /home/cvs/ports/shells/fish/pkg/PLIST,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 PLIST
--- shells/fish/pkg/PLIST 11 Mar 2022 19:54:24 -0000 1.12
+++ shells/fish/pkg/PLIST 15 Mar 2022 12:03:28 -0000
@@ -99,6 +99,7 @@ share/doc/fish/cmds/or.html
share/doc/fish/cmds/popd.html
share/doc/fish/cmds/prevd.html
share/doc/fish/cmds/printf.html
+share/doc/fish/cmds/prompt_hostname.html
share/doc/fish/cmds/prompt_login.html
share/doc/fish/cmds/prompt_pwd.html
share/doc/fish/cmds/psub.html
@@ -226,9 +227,11 @@ share/fish/completions/apt.fish
share/fish/completions/aptitude.fish
share/fish/completions/arc.fish
share/fish/completions/arepack.fish
+share/fish/completions/argparse.fish
share/fish/completions/arp.fish
share/fish/completions/as.fish
share/fish/completions/asciidoctor.fish
+share/fish/completions/asd.fish
share/fish/completions/asp.fish
share/fish/completions/at.fish
share/fish/completions/atd.fish
@@ -236,14 +239,18 @@ share/fish/completions/atom.fish
share/fish/completions/atool.fish
share/fish/completions/atq.fish
share/fish/completions/atrm.fish
+share/fish/completions/attrib.fish
+share/fish/completions/attributes.fish
share/fish/completions/aunpack.fish
share/fish/completions/aura.fish
share/fish/completions/avifdec.fish
share/fish/completions/avifenc.fish
share/fish/completions/awk.fish
share/fish/completions/aws.fish
+share/fish/completions/az.fish
share/fish/completions/badblocks.fish
share/fish/completions/base64.fish
+share/fish/completions/basename.fish
share/fish/completions/bb-wrapper.fish
share/fish/completions/bc.fish
share/fish/completions/bd.fish
@@ -251,6 +258,7 @@ share/fish/completions/begin.fish
share/fish/completions/bg.fish
share/fish/completions/bind.fish
share/fish/completions/bison.fish
+share/fish/completions/black.fish
share/fish/completions/block.fish
share/fish/completions/bluetoothctl.fish
share/fish/completions/bootctl.fish
@@ -285,20 +293,28 @@ share/fish/completions/cdrecord.fish
share/fish/completions/cf.fish
share/fish/completions/chgrp.fish
share/fish/completions/chmod.fish
+share/fish/completions/choice.fish
share/fish/completions/chown.fish
share/fish/completions/chronyc.fish
share/fish/completions/chsh.fish
share/fish/completions/cjxl.fish
share/fish/completions/clang++.fish
share/fish/completions/clang.fish
+share/fish/completions/clasp.fish
+share/fish/completions/clean.fish
+share/fish/completions/cleanmgr.fish
share/fish/completions/climate.fish
share/fish/completions/cmark.fish
+share/fish/completions/cmd.fish
+share/fish/completions/cmdkey.fish
share/fish/completions/code.fish
+share/fish/completions/color.fish
share/fish/completions/colordiff.fish
share/fish/completions/colorsvn.fish
share/fish/completions/combine.fish
share/fish/completions/command.fish
share/fish/completions/commandline.fish
+share/fish/completions/comp.fish
share/fish/completions/compare.fish
share/fish/completions/complete.fish
share/fish/completions/composer.fish
@@ -314,10 +330,12 @@ share/fish/completions/coredumpctl.fish
share/fish/completions/cowsay.fish
share/fish/completions/cowthink.fish
share/fish/completions/cp.fish
+share/fish/completions/cpupower.fish
share/fish/completions/create_ap.fish
share/fish/completions/createdb.fish
share/fish/completions/cryptsetup.fish
share/fish/completions/csc.fish
+share/fish/completions/csharp.fish
share/fish/completions/csi.fish
share/fish/completions/cupsaccept.fish
share/fish/completions/cupsdisable.fish
@@ -331,6 +349,7 @@ share/fish/completions/cygpath.fish
share/fish/completions/cygport.fish
share/fish/completions/cygstart.fish
share/fish/completions/darcs.fish
+share/fish/completions/dart.fish
share/fish/completions/date.fish
share/fish/completions/dconf.fish
share/fish/completions/dd.fish
@@ -357,6 +376,7 @@ share/fish/completions/downgrade.fish
share/fish/completions/dpkg-reconfigure.fish
share/fish/completions/dpkg.fish
share/fish/completions/dropdb.fish
+share/fish/completions/dscacheutil.fish
share/fish/completions/du.fish
share/fish/completions/dumpcap.fish
share/fish/completions/duply.fish
@@ -369,6 +389,7 @@ share/fish/completions/eix-sync.fish
share/fish/completions/eix.fish
share/fish/completions/elatex.fish
share/fish/completions/elixir.fish
+share/fish/completions/elvish.fish
share/fish/completions/emacs.fish
share/fish/completions/emaint.fish
share/fish/completions/emerge.fish
@@ -380,10 +401,12 @@ share/fish/completions/epkginfo.fish
share/fish/completions/equery.fish
share/fish/completions/eselect.fish
share/fish/completions/etex.fish
+share/fish/completions/ethtool.fish
share/fish/completions/eval.fish
share/fish/completions/evince.fish
share/fish/completions/exec.fish
share/fish/completions/exercism.fish
+share/fish/completions/exif.fish
share/fish/completions/exit.fish
share/fish/completions/expand.fish
share/fish/completions/ezjail-admin.fish
@@ -397,16 +420,19 @@ share/fish/completions/fgrep.fish
share/fish/completions/figlet.fish
share/fish/completions/file.fish
share/fish/completions/find.fish
+share/fish/completions/findstr.fish
share/fish/completions/firewall-cmd.fish
share/fish/completions/fish.fish
share/fish/completions/fish_add_path.fish
share/fish/completions/fish_config.fish
share/fish/completions/fish_indent.fish
share/fish/completions/fish_key_reader.fish
+share/fish/completions/fish_opt.fish
share/fish/completions/flac.fish
share/fish/completions/flatpak.fish
share/fish/completions/fluxbox-remote.fish
share/fish/completions/for.fish
+share/fish/completions/forfiles.fish
share/fish/completions/fossil.fish
share/fish/completions/fsharpc.fish
share/fish/completions/fsharpi.fish
@@ -419,15 +445,19 @@ share/fish/completions/fuser.fish
share/fish/completions/fusermount.fish
share/fish/completions/fzf.fish
share/fish/completions/g++.fish
+share/fish/completions/gacutil.fish
share/fish/completions/gapplication.fish
share/fish/completions/gcc.fish
share/fish/completions/gdb.fish
share/fish/completions/gdbus.fish
share/fish/completions/gem.fish
+share/fish/completions/gendarme.fish
share/fish/completions/gh.fish
share/fish/completions/gio.fish
+share/fish/completions/git-sizer.fish
share/fish/completions/git.fish
share/fish/completions/gitk.fish
+share/fish/completions/gnome-extensions.fish
share/fish/completions/go.fish
share/fish/completions/godoc.fish
share/fish/completions/gofmt.fish
@@ -439,6 +469,7 @@ share/fish/completions/gpg.fish
share/fish/completions/gpg1.fish
share/fish/completions/gpg2.fish
share/fish/completions/gphoto2.fish
+share/fish/completions/gping.fish
share/fish/completions/gprof.fish
share/fish/completions/gradle.fish
share/fish/completions/grep.fish
@@ -482,6 +513,8 @@ share/fish/completions/ifconfig.fish
share/fish/completions/ifdata.fish
share/fish/completions/ifdown.fish
share/fish/completions/ifup.fish
+share/fish/completions/ikdasm.fish
+share/fish/completions/ilasm.fish
share/fish/completions/import.fish
share/fish/completions/imv.fish
share/fish/completions/invoke-rc.d.fish
@@ -489,6 +522,8 @@ share/fish/completions/ip.fish
share/fish/completions/ipset.fish
share/fish/completions/iptables.fish
share/fish/completions/irb.fish
+share/fish/completions/isatty.fish
+share/fish/completions/istioctl.fish
share/fish/completions/iw.fish
share/fish/completions/j.fish
share/fish/completions/jbake.fish
@@ -511,6 +546,8 @@ share/fish/completions/kitchen.fish
share/fish/completions/kitty.fish
share/fish/completions/kldload.fish
share/fish/completions/kldunload.fish
+share/fish/completions/kmutil.fish
+share/fish/completions/kubectl.fish
share/fish/completions/latex.fish
share/fish/completions/latexmk.fish
share/fish/completions/launchctl.fish
@@ -558,6 +595,7 @@ share/fish/completions/makepkg.fish
share/fish/completions/man.fish
share/fish/completions/mariner.fish
share/fish/completions/math.fish
+share/fish/completions/matlab.fish
share/fish/completions/mc.fish
share/fish/completions/md5sum.fish
share/fish/completions/mdadm.fish
@@ -571,6 +609,7 @@ share/fish/completions/meson.fish
share/fish/completions/micro.fish
share/fish/completions/minikube.fish
share/fish/completions/mix.fish
+share/fish/completions/mkbundle.fish
share/fish/completions/mkdir.fish
share/fish/completions/mkdocs.fish
share/fish/completions/mkdosfs.fish
@@ -585,6 +624,9 @@ share/fish/completions/mocp.fish
share/fish/completions/modinfo.fish
share/fish/completions/modprobe.fish
share/fish/completions/mogrify.fish
+share/fish/completions/mono.fish
+share/fish/completions/monodis.fish
+share/fish/completions/monop.fish
share/fish/completions/montage.fish
share/fish/completions/mosh.fish
share/fish/completions/mount.fish
@@ -615,6 +657,7 @@ share/fish/completions/netctl.fish
share/fish/completions/nethack.fish
share/fish/completions/networkctl.fish
share/fish/completions/nextd.fish
+share/fish/completions/ng.fish
share/fish/completions/ngrok.fish
share/fish/completions/nice.fish
share/fish/completions/ninja.fish
@@ -623,12 +666,14 @@ share/fish/completions/nm.fish
share/fish/completions/nmap.fish
share/fish/completions/nmcli.fish
share/fish/completions/node.fish
+share/fish/completions/nodeenv.fish
share/fish/completions/not.fish
share/fish/completions/npm.fish
share/fish/completions/nvim.fish
share/fish/completions/nvram.fish
share/fish/completions/objdump.fish
share/fish/completions/obnam.fish
+share/fish/completions/octave.fish
share/fish/completions/oggenc.fish
share/fish/completions/omega.fish
share/fish/completions/opam.fish
@@ -639,6 +684,7 @@ share/fish/completions/opkg.fish
share/fish/completions/optipng.fish
share/fish/completions/or.fish
share/fish/completions/p4.fish
+share/fish/completions/pabcnetcclear.fish
share/fish/completions/pacaur.fish
share/fish/completions/pacman-color.fish
share/fish/completions/pacman-key.fish
@@ -692,6 +738,7 @@ share/fish/completions/portmaster.fish
share/fish/completions/ports.fish
share/fish/completions/poweroff.fish
share/fish/completions/powerpill.fish
+share/fish/completions/powershell.fish
share/fish/completions/prevd.fish
share/fish/completions/prime-run.fish
share/fish/completions/prt-get.fish
@@ -713,17 +760,21 @@ share/fish/completions/python.fish
share/fish/completions/python2.fish
share/fish/completions/python3.fish
share/fish/completions/pzstd.fish
+share/fish/completions/qmk.fish
share/fish/completions/qubes-gpg-client.fish
share/fish/completions/quilt.fish
+share/fish/completions/rakudo.fish
share/fish/completions/random.fish
share/fish/completions/ranger.fish
share/fish/completions/rbenv.fish
share/fish/completions/rc-service.fish
+share/fish/completions/rc-status.fish
share/fish/completions/rc-update.fish
share/fish/completions/rcctl.fish
share/fish/completions/read.fish
share/fish/completions/readlink.fish
share/fish/completions/realpath.fish
+share/fish/completions/reg.fish
share/fish/completions/reject.fish
share/fish/completions/rejmerge.fish
share/fish/completions/renice.fish
@@ -735,6 +786,7 @@ share/fish/completions/rm.fish
share/fish/completions/rmdir.fish
share/fish/completions/rmmod.fish
share/fish/completions/root.fish
+share/fish/completions/roswell.fish
share/fish/completions/rpm.fish
share/fish/completions/rst2html.fish
share/fish/completions/rst2html4.fish
@@ -755,8 +807,10 @@ share/fish/completions/rustup.fish
share/fish/completions/s3cmd.fish
share/fish/completions/sass-convert.fish
share/fish/completions/sass.fish
+share/fish/completions/sbcl.fish
share/fish/completions/sbt.fish
share/fish/completions/scanimage.fish
+share/fish/completions/schtasks.fish
share/fish/completions/scons.fish
share/fish/completions/scp.fish
share/fish/completions/screen.fish
@@ -770,6 +824,7 @@ share/fish/completions/set.fish
share/fish/completions/set_color.fish
share/fish/completions/setfacl.fish
share/fish/completions/setsid.fish
+share/fish/completions/setx.fish
share/fish/completions/setxkbmap.fish
share/fish/completions/sfdx.fish
share/fish/completions/sftp.fish
@@ -778,6 +833,7 @@ share/fish/completions/sha224sum.fish
share/fish/completions/sha256sum.fish
share/fish/completions/sha384sum.fish
share/fish/completions/sha512sum.fish
+share/fish/completions/shortcuts.fish
share/fish/completions/signify.fish
share/fish/completions/snap.fish
share/fish/completions/sort.fish
@@ -789,10 +845,12 @@ share/fish/completions/sphinx-apidoc.fis
share/fish/completions/sphinx-autogen.fish
share/fish/completions/sphinx-build.fish
share/fish/completions/sphinx-quickstart.fish
+share/fish/completions/sqlsharp.fish
share/fish/completions/src.fish
share/fish/completions/ssh.fish
share/fish/completions/sshfs.fish
share/fish/completions/stack.fish
+share/fish/completions/starship.fish
share/fish/completions/stat.fish
share/fish/completions/status.fish
share/fish/completions/strace.fish
@@ -828,6 +886,7 @@ share/fish/completions/tmux.fish
share/fish/completions/tmuxinator.fish
share/fish/completions/tokei.fish
share/fish/completions/top.fish
+share/fish/completions/topgrade.fish
share/fish/completions/totem.fish
share/fish/completions/touch.fish
share/fish/completions/tr.fish
@@ -884,8 +943,12 @@ share/fish/completions/wicd-cli.fish
share/fish/completions/wicd-client.fish
share/fish/completions/wicd-gtk.fish
share/fish/completions/windscribe.fish
+share/fish/completions/wine.fish
+share/fish/completions/wineboot.fish
+share/fish/completions/winemaker.fish
share/fish/completions/wireshark.fish
share/fish/completions/wpa_cli.fish
+share/fish/completions/wslpath.fish
share/fish/completions/wvdial.fish
share/fish/completions/xargs.fish
share/fish/completions/xbps-alternatives.fish
@@ -915,6 +978,7 @@ share/fish/completions/xprop.fish
share/fish/completions/xrandr.fish
share/fish/completions/xrdb.fish
share/fish/completions/xsel.fish
+share/fish/completions/xsp.fish
share/fish/completions/xsv.fish
share/fish/completions/xterm.fish
share/fish/completions/xxh128sum.fish
@@ -928,6 +992,7 @@ share/fish/completions/yarn.fish
share/fish/completions/yast2.fish
share/fish/completions/yum.fish
share/fish/completions/zcat.fish
+share/fish/completions/zef.fish
share/fish/completions/zfs.fish
share/fish/completions/zip.fish
share/fish/completions/zopfli.fish
@@ -948,6 +1013,7 @@ share/fish/functions/__fish_any_arg_in.f
share/fish/functions/__fish_anypython.fish
share/fish/functions/__fish_append.fish
share/fish/functions/__fish_apropos.fish
+share/fish/functions/__fish_argcomplete_complete.fish
share/fish/functions/__fish_cancel_commandline.fish
share/fish/functions/__fish_commandline_is_singlequoted.fish
share/fish/functions/__fish_complete_atool_archive_contents.fish
@@ -1019,6 +1085,7 @@ share/fish/functions/__fish_move_last.fi
share/fish/functions/__fish_no_arguments.fish
share/fish/functions/__fish_not_contain_opt.fish
share/fish/functions/__fish_npm_helper.fish
+share/fish/functions/__fish_nth_token.fish
share/fish/functions/__fish_number_of_cmd_args_wo_opts.fish
share/fish/functions/__fish_paginate.fish
share/fish/functions/__fish_parent_directories.fish
@@ -1062,6 +1129,8 @@ share/fish/functions/__fish_print_rpm_pa
share/fish/functions/__fish_print_service_names.fish
share/fish/functions/__fish_print_svn_rev.fish
share/fish/functions/__fish_print_users.fish
+share/fish/functions/__fish_print_windows_drives.fish
+share/fish/functions/__fish_print_windows_users.fish
share/fish/functions/__fish_print_xbps_packages.fish
share/fish/functions/__fish_print_xdg_applications_directories.fish
share/fish/functions/__fish_print_xdg_mimetypes.fish
@@ -1092,7 +1161,6 @@ share/fish/functions/alias.fish
share/fish/functions/cd.fish
share/fish/functions/cdh.fish
share/fish/functions/contains_seq.fish
-share/fish/functions/delete-or-exit.fish
share/fish/functions/diff.fish
share/fish/functions/dirh.fish
share/fish/functions/dirs.fish
@@ -1139,11 +1207,9 @@ share/fish/functions/la.fish
share/fish/functions/ll.fish
share/fish/functions/ls.fish
share/fish/functions/man.fish
-share/fish/functions/nextd-or-forward-word.fish
share/fish/functions/nextd.fish
share/fish/functions/open.fish
share/fish/functions/popd.fish
-share/fish/functions/prevd-or-backward-word.fish
share/fish/functions/prevd.fish
share/fish/functions/prompt_hostname.fish
share/fish/functions/prompt_login.fish
@@ -1242,6 +1308,7 @@ share/fish/man/man1/
@man share/fish/man/man1/popd.1
@man share/fish/man/man1/prevd.1
@man share/fish/man/man1/printf.1
+@man share/fish/man/man1/prompt_hostname.1
@man share/fish/man/man1/prompt_login.1
@man share/fish/man/man1/prompt_pwd.1
@man share/fish/man/man1/psub.1
@@ -1325,6 +1392,32 @@ share/fish/tools/web_config/sample_promp
share/fish/tools/web_config/sample_prompts/scales.fish
share/fish/tools/web_config/sample_prompts/simple.fish
share/fish/tools/web_config/sample_prompts/terlar.fish
+share/fish/tools/web_config/themes/
+share/fish/tools/web_config/themes/Base16 Default Dark.theme
+share/fish/tools/web_config/themes/Base16 Default Light.theme
+share/fish/tools/web_config/themes/Base16 Eighties.theme
+share/fish/tools/web_config/themes/Bay Cruise.theme
+share/fish/tools/web_config/themes/Dracula.theme
+share/fish/tools/web_config/themes/Fairground.theme
+share/fish/tools/web_config/themes/Just a Touch.theme
+share/fish/tools/web_config/themes/Lava.theme
+share/fish/tools/web_config/themes/Mono Lace.theme
+share/fish/tools/web_config/themes/Mono Smoke.theme
+share/fish/tools/web_config/themes/None.theme
+share/fish/tools/web_config/themes/Nord.theme
+share/fish/tools/web_config/themes/Old School.theme
+share/fish/tools/web_config/themes/Seaweed.theme
+share/fish/tools/web_config/themes/Snow Day.theme
+share/fish/tools/web_config/themes/Solarized Dark.theme
+share/fish/tools/web_config/themes/Solarized Light.theme
+share/fish/tools/web_config/themes/Tomorrow Night Bright.theme
+share/fish/tools/web_config/themes/Tomorrow Night.theme
+share/fish/tools/web_config/themes/Tomorrow.theme
+share/fish/tools/web_config/themes/ayu Dark.theme
+share/fish/tools/web_config/themes/ayu Light.theme
+share/fish/tools/web_config/themes/ayu Mirage.theme
+share/fish/tools/web_config/themes/coolbeans.theme
+share/fish/tools/web_config/themes/fish default.theme
share/fish/tools/web_config/webconfig.py
share/fish/vendor_completions.d/
share/fish/vendor_conf.d/
@@ -1332,8 +1425,6 @@ share/fish/vendor_functions.d/
share/locale/de/LC_MESSAGES/fish.mo
share/locale/en/LC_MESSAGES/fish.mo
share/locale/fr/LC_MESSAGES/fish.mo
-share/locale/nb/LC_MESSAGES/fish.mo
-share/locale/nn/LC_MESSAGES/fish.mo
share/locale/pl/LC_MESSAGES/fish.mo
share/locale/pt_BR/LC_MESSAGES/fish.mo
share/locale/sv/LC_MESSAGES/fish.mo

24
fnc-0.13.diff Normal file
View File

@ -0,0 +1,24 @@
diff /usr/ports
commit - 11c4773666fdabe0d68f0f66b6475bc761751e82
path + /usr/ports
blob - deae0331206e94fc9e9e053fc998060ba53ff7b9
file + devel/fnc/Makefile
--- devel/fnc/Makefile
+++ devel/fnc/Makefile
@@ -1,6 +1,6 @@
COMMENT = a terminal frontend for fossil
-V = 0.12
+V = 0.13
DISTNAME = fnc-${V}
CATEGORIES = devel
blob - b10dafc374f8bef3ec0f7ed27719837debdb957b
file + devel/fnc/distinfo
--- devel/fnc/distinfo
+++ devel/fnc/distinfo
@@ -1,2 +1,2 @@
-SHA256 (fnc-0.12.tar.gz) = ra+5YaSQTjWkk8HN25ywOdB1TBiiDw+MRyqGRlpEjxU=
-SIZE (fnc-0.12.tar.gz) = 3077617
+SHA256 (fnc-0.13.tar.gz) = JX191L3QuhZvYgJTYD10y3KIadPmhZsckLliJzWdyog=
+SIZE (fnc-0.13.tar.gz) = 3103502

44
fuse-zip-0.7.2.diff Normal file
View File

@ -0,0 +1,44 @@
Index: archivers/fuse-zip/Makefile
===================================================================
RCS file: /home/cvs/ports/archivers/fuse-zip/Makefile,v
retrieving revision 1.15
diff -u -p -u -p -r1.15 Makefile
--- archivers/fuse-zip/Makefile 9 Feb 2020 15:31:02 -0000 1.15
+++ archivers/fuse-zip/Makefile 13 Oct 2021 08:41:30 -0000
@@ -2,7 +2,7 @@
COMMENT = navigate zip archives through FUSE
-DISTNAME = fuse-zip-0.6.2
+DISTNAME = fuse-zip-0.7.2
CATEGORIES = archivers
Index: archivers/fuse-zip/distinfo
===================================================================
RCS file: /home/cvs/ports/archivers/fuse-zip/distinfo,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 distinfo
--- archivers/fuse-zip/distinfo 9 Feb 2020 15:31:02 -0000 1.6
+++ archivers/fuse-zip/distinfo 13 Oct 2021 08:41:30 -0000
@@ -1,2 +1,2 @@
-SHA256 (fuse-zip-0.6.2.tar.gz) = 05/QZLezTjUeMJ3mKXNCwh3MbK9g4igE+IjHwfkFSY4=
-SIZE (fuse-zip-0.6.2.tar.gz) = 692612
+SHA256 (fuse-zip-0.7.2.tar.gz) = PdC+AFZ3RC8f2XaaAt/AtPzdOesWflaX2y8U9P7liRU=
+SIZE (fuse-zip-0.7.2.tar.gz) = 713290
Index: archivers/fuse-zip/patches/patch-fuse-zip_1
===================================================================
RCS file: /home/cvs/ports/archivers/fuse-zip/patches/patch-fuse-zip_1,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-fuse-zip_1
--- archivers/fuse-zip/patches/patch-fuse-zip_1 7 Dec 2018 13:20:31 -0000 1.2
+++ archivers/fuse-zip/patches/patch-fuse-zip_1 13 Oct 2021 08:41:30 -0000
@@ -2,7 +2,7 @@ $OpenBSD: patch-fuse-zip_1,v 1.2 2018/12
Index: fuse-zip.1
--- fuse-zip.1.orig
+++ fuse-zip.1
-@@ -75,10 +75,6 @@ Be patient. Wait for fuse-zip process finish after unm
+@@ -86,10 +86,6 @@ Be patient. Wait for fuse-zip process finish after unm
.SH "PERMISSIONS"
Access check will not be performed unless
\fB-o default_permissions\fP mount option is given.

154
gas-2.37.diff Normal file
View File

@ -0,0 +1,154 @@
Index: devel/gas/Makefile
===================================================================
RCS file: /home/cvs/ports/devel/gas/Makefile,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 Makefile
--- devel/gas/Makefile 12 Jul 2019 20:44:09 -0000 1.3
+++ devel/gas/Makefile 30 Nov 2021 21:09:13 -0000
@@ -2,9 +2,10 @@
COMMENT = GNU assembler
-V = 2.31.1
+V = 2.37
DISTNAME = binutils-$V
PKGNAME = gas-$V
+EXTRACT_SUFX = .tar.xz
CATEGORIES = devel
@@ -19,6 +20,9 @@ WANTLIB += c z
MASTER_SITES = ${MASTER_SITE_GNU:=binutils/}
+BUILD_DEPENDS = textproc/texi2mdoc
+
+USE_GMAKE= Yes
CONFIGURE_STYLE = gnu
CONFIGURE_ARGS += --disable-ld \
--disable-gold \
@@ -34,7 +38,11 @@ LIBTOOL_FLAGS = --tag=disable-shared
post-extract:
@rm -rf ${WRKSRC}/{binutils,gprof}
+# texi2mdoc is here because upstream manpage generation is broken
+# remove once doc/as.1 is not a 0 byte file anymore
post-install:
cd ${PREFIX}/info && mv as.info gas.info
+ texi2mdoc -I ${WRKSRC}/bfd/doc:${WRKSRC}/libiberty \
+ ${WRKSRC}/gas/doc/as.texi > ${PREFIX}/man/man1/gas.1
.include <bsd.port.mk>
Index: devel/gas/distinfo
===================================================================
RCS file: /home/cvs/ports/devel/gas/distinfo,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 distinfo
--- devel/gas/distinfo 26 Dec 2018 19:47:27 -0000 1.2
+++ devel/gas/distinfo 30 Nov 2021 20:46:56 -0000
@@ -1,2 +1,2 @@
-SHA256 (binutils-2.31.1.tar.gz) = 6I+NNr0KddN2WkrQiNgZ41+NesYogEl4Di/vytGN3og=
-SIZE (binutils-2.31.1.tar.gz) = 40476369
+SHA256 (binutils-2.37.tar.xz) = gg2XJPAgo+acszeJOgtjwtsWHa3LDgb8Edwp6x6Eoyw=
+SIZE (binutils-2.37.tar.xz) = 22916924
Index: devel/gas/patches/patch-bfd_Makefile_in
===================================================================
RCS file: /home/cvs/ports/devel/gas/patches/patch-bfd_Makefile_in,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-bfd_Makefile_in
--- devel/gas/patches/patch-bfd_Makefile_in 26 Dec 2018 19:47:27 -0000 1.2
+++ devel/gas/patches/patch-bfd_Makefile_in 30 Nov 2021 20:46:56 -0000
@@ -1,8 +1,9 @@
$OpenBSD: patch-bfd_Makefile_in,v 1.2 2018/12/26 19:47:27 pascal Exp $
+
Index: bfd/Makefile.in
--- bfd/Makefile.in.orig
+++ bfd/Makefile.in
-@@ -459,7 +459,7 @@ AUTOMAKE_OPTIONS = no-dist foreign
+@@ -461,7 +461,7 @@ AUTOMAKE_OPTIONS = no-dist foreign
ACLOCAL_AMFLAGS = -I . -I .. -I ../config
INCDIR = $(srcdir)/../include
CSEARCH = -I. -I$(srcdir) -I$(INCDIR)
Index: devel/gas/patches/patch-bfd_config_bfd
===================================================================
RCS file: /home/cvs/ports/devel/gas/patches/patch-bfd_config_bfd,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-bfd_config_bfd
--- devel/gas/patches/patch-bfd_config_bfd 26 Dec 2018 21:27:19 -0000 1.3
+++ devel/gas/patches/patch-bfd_config_bfd 30 Nov 2021 20:46:56 -0000
@@ -1,16 +1,17 @@
$OpenBSD: patch-bfd_config_bfd,v 1.3 2018/12/26 21:27:19 pascal Exp $
+
Index: bfd/config.bfd
--- bfd/config.bfd.orig
+++ bfd/config.bfd
-@@ -81,7 +81,6 @@ case $targ in
+@@ -80,7 +80,6 @@ case $targ in
arm*-*-aout | \
arm-*-coff | \
arm-*-netbsd* | \
- arm-*-openbsd* | \
arm-*-oabi | \
arm-*-riscix* | \
- arm-epoc-pe* | \
-@@ -244,6 +243,11 @@ case "${targ}" in
+ arm*-*-symbianelf* | \
+@@ -245,6 +244,11 @@ case "${targ}" in
targ_selvecs="aarch64_elf64_be_vec arm_elf32_le_vec arm_elf32_be_vec"
want64=true
;;
@@ -22,7 +23,7 @@ Index: bfd/config.bfd
aarch64-*-fuchsia*)
targ_defvec=aarch64_elf64_le_vec
targ_selvecs="aarch64_elf64_be_vec arm_elf32_le_vec arm_elf32_be_vec"
-@@ -355,6 +359,10 @@ case "${targ}" in
+@@ -352,6 +356,10 @@ case "${targ}" in
targ_selvecs="arm_elf32_le_vec"
;;
arm-*-netbsdelf*)
Index: devel/gas/patches/patch-gas_Makefile_in
===================================================================
RCS file: /home/cvs/ports/devel/gas/patches/patch-gas_Makefile_in,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-gas_Makefile_in
--- devel/gas/patches/patch-gas_Makefile_in 26 Dec 2018 19:47:27 -0000 1.2
+++ devel/gas/patches/patch-gas_Makefile_in 30 Nov 2021 20:46:56 -0000
@@ -1,8 +1,9 @@
$OpenBSD: patch-gas_Makefile_in,v 1.2 2018/12/26 19:47:27 pascal Exp $
+
Index: gas/Makefile.in
--- gas/Makefile.in.orig
+++ gas/Makefile.in
-@@ -1662,7 +1662,7 @@ cgen.@OBJEXT@: cgen.c cgen.h cgen-desc.h subsegs.h \
+@@ -1636,7 +1636,7 @@ cgen.@OBJEXT@: cgen.c cgen.h cgen-desc.h subsegs.h \
.PHONY: install-exec-local install-data-local
.PHONY: install-exec-bindir install-exec-tooldir
Index: devel/gas/patches/patch-gas_configure_tgt
===================================================================
RCS file: /home/cvs/ports/devel/gas/patches/patch-gas_configure_tgt,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-gas_configure_tgt
--- devel/gas/patches/patch-gas_configure_tgt 26 Dec 2018 21:27:19 -0000 1.3
+++ devel/gas/patches/patch-gas_configure_tgt 30 Nov 2021 20:46:56 -0000
@@ -1,16 +1,17 @@
$OpenBSD: patch-gas_configure_tgt,v 1.3 2018/12/26 21:27:19 pascal Exp $
+
Index: gas/configure.tgt
--- gas/configure.tgt.orig
+++ gas/configure.tgt
-@@ -127,6 +127,7 @@ case ${generic_target} in
- case ${cpu}-${os} in
+@@ -131,6 +131,7 @@ case ${generic_target} in
aarch64*-linux-gnu_ilp32) arch=aarch64:32 ;;
esac ;;
+ aarch64*-*-netbsd*) fmt=elf em=nbsd;;
+ aarch64-*-openbsd*) fmt=elf;;
alpha-*-*vms*) fmt=evax ;;
alpha-*-osf*) fmt=ecoff ;;
-@@ -153,6 +154,7 @@ case ${generic_target} in
+@@ -156,6 +157,7 @@ case ${generic_target} in
arm-*-uclinux*) fmt=elf em=linux ;;
arm-*-nacl*) fmt=elf em=nacl ;;
arm-*-netbsdelf*) fmt=elf em=nbsd ;;

51
gitea-1.17.4p1.diff Normal file
View File

@ -0,0 +1,51 @@
Index: www/gitea/Makefile
===================================================================
RCS file: /cvs/ports/www/gitea/Makefile,v
retrieving revision 1.87
diff -u -p -u -p -r1.87 Makefile
--- www/gitea/Makefile 8 Jan 2023 09:21:31 -0000 1.87
+++ www/gitea/Makefile 8 Jan 2023 10:11:19 -0000
@@ -3,7 +3,7 @@ COMMENT = compact self-hosted Git servi
VERSION = 1.17.4
DISTNAME = gitea-src-${VERSION}
PKGNAME = gitea-${VERSION}
-REVISION = 0
+REVISION = 1
MASTER_SITES = https://github.com/go-gitea/gitea/releases/download/v${VERSION}/
@@ -33,6 +33,8 @@ RUN_DEPENDS = devel/git \
ALL_TARGET = code.gitea.io/gitea
WRKSRC = ${MODGO_WORKSPACE}/src/${ALL_TARGET}
+
+SUBST_VARS = VARBASE
pre-configure:
${SUBST_CMD} ${WRKDIST}/custom/conf/app.example.ini
Index: www/gitea/pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/gitea/pkg/PLIST,v
retrieving revision 1.28
diff -u -p -u -p -r1.28 PLIST
--- www/gitea/pkg/PLIST 8 Nov 2022 11:17:16 -0000 1.28
+++ www/gitea/pkg/PLIST 8 Jan 2023 10:11:19 -0000
@@ -17,6 +17,9 @@ share/gitea/conf/app.example.ini
@owner _gitea
@group _gitea
@sample ${SYSCONFDIR}/gitea/app.ini
+@mode 750
+@group daemon
+@sample ${VARBASE}/www/run/gitea/
@mode
@owner
@group
@@ -1192,7 +1195,7 @@ share/gitea/templates/user/settings/secu
@sample ${LOCALSTATEDIR}/gitea/
@sample ${LOCALSTATEDIR}/gitea/custom/
@sample ${LOCALSTATEDIR}/log/gitea/
-@cwd /var/www
+@cwd ${VARBASE}/www
@mode
@owner
@group

42
gitea.diff Normal file
View File

@ -0,0 +1,42 @@
Index: Makefile
===================================================================
RCS file: /cvs/ports/www/gitea/Makefile,v
retrieving revision 1.86
diff -u -p -u -p -r1.86 Makefile
--- Makefile 23 Dec 2022 22:09:27 -0000 1.86
+++ Makefile 7 Jan 2023 14:36:08 -0000
@@ -3,6 +3,7 @@ COMMENT = compact self-hosted Git servi
VERSION = 1.17.4
DISTNAME = gitea-src-${VERSION}
PKGNAME = gitea-${VERSION}
+REVISION = 0
MASTER_SITES = https://github.com/go-gitea/gitea/releases/download/v${VERSION}/
@@ -27,7 +28,8 @@ MODGO_LDFLAGS += -X code.gitea.io/gitea/
MODGO_LDFLAGS += -X main.Version=${VERSION}
MODGO_LDFLAGS += -X 'main.Tags=${GO_TAGS}'
-RUN_DEPENDS = devel/git
+RUN_DEPENDS = devel/git \
+ shells/bash
ALL_TARGET = code.gitea.io/gitea
WRKSRC = ${MODGO_WORKSPACE}/src/${ALL_TARGET}
Index: pkg/README
===================================================================
RCS file: /cvs/ports/www/gitea/pkg/README,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 README
--- pkg/README 6 Mar 2022 11:05:26 -0000 1.6
+++ pkg/README 7 Jan 2023 14:36:08 -0000
@@ -55,6 +55,9 @@ Relevant configuration directives in ${S
HTTP_ADDR = /var/www/run/gitea/gitea.sock
LOCAL_ROOT_URL = %(ROOT_URL)s
+Create the socket path with the following command:
+# mkdir /var/www/run/gitea && chown _gitea /var/www/run/gitea
+
Customizing gitea
=================
For custom public files, templates, gitignores, labels, licenses and READMEs,

50
gitea1.diff Normal file
View File

@ -0,0 +1,50 @@
Index: Makefile
===================================================================
RCS file: /cvs/ports/www/gitea/Makefile,v
retrieving revision 1.86
diff -u -p -u -p -r1.86 Makefile
--- Makefile 23 Dec 2022 22:09:27 -0000 1.86
+++ Makefile 7 Jan 2023 15:47:40 -0000
@@ -3,6 +3,7 @@ COMMENT = compact self-hosted Git servi
VERSION = 1.17.4
DISTNAME = gitea-src-${VERSION}
PKGNAME = gitea-${VERSION}
+REVISION = 0
MASTER_SITES = https://github.com/go-gitea/gitea/releases/download/v${VERSION}/
@@ -27,7 +28,8 @@ MODGO_LDFLAGS += -X code.gitea.io/gitea/
MODGO_LDFLAGS += -X main.Version=${VERSION}
MODGO_LDFLAGS += -X 'main.Tags=${GO_TAGS}'
-RUN_DEPENDS = devel/git
+RUN_DEPENDS = devel/git \
+ shells/bash
ALL_TARGET = code.gitea.io/gitea
WRKSRC = ${MODGO_WORKSPACE}/src/${ALL_TARGET}
Index: pkg/README
===================================================================
RCS file: /cvs/ports/www/gitea/pkg/README,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 README
--- pkg/README 6 Mar 2022 11:05:26 -0000 1.6
+++ pkg/README 7 Jan 2023 15:47:40 -0000
@@ -43,7 +43,7 @@ Relevant configuration directives in ${S
listen on $ext_addr tls port 443
tls certificate "/etc/ssl/gitea.example.com.pem"
tls key "/etc/ssl/private/gitea.example.com.key"
- location "*" { fastcgi socket "/run/gitea/gitea.sock" }
+ location "*" { fastcgi socket "/run/gitea.sock" }
}
Relevant configuration directives in ${SYSCONFDIR}/gitea/app.ini:
@@ -52,7 +52,7 @@ Relevant configuration directives in ${S
PROTOCOL = fcgi+unix
DOMAIN = gitea.example.com
ROOT_URL = https://%(DOMAIN)s/
- HTTP_ADDR = /var/www/run/gitea/gitea.sock
+ HTTP_ADDR = /var/www/run/gitea.sock
LOCAL_ROOT_URL = %(ROOT_URL)s
Customizing gitea

3038
github-cli-2.6.0.diff Normal file

File diff suppressed because it is too large Load Diff

101
glances-3.2.3.diff Normal file
View File

@ -0,0 +1,101 @@
Index: sysutils/glances/Makefile
===================================================================
RCS file: /home/cvs/ports/sysutils/glances/Makefile,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 Makefile
--- sysutils/glances/Makefile 30 Oct 2021 22:01:00 -0000 1.5
+++ sysutils/glances/Makefile 31 Oct 2021 20:26:46 -0000
@@ -2,8 +2,7 @@
COMMENT = cross-platform curses-based monitoring tool
-MODPY_EGG_VERSION = 3.1.7
-REVISION = 0
+MODPY_EGG_VERSION = 3.2.3
DISTNAME = Glances-${MODPY_EGG_VERSION}
PKGNAME = ${DISTNAME:L}
@@ -21,6 +20,7 @@ MODPY_PI = Yes
MODPY_SETUPTOOLS = Yes
RUN_DEPENDS = devel/py-future${MODPY_FLAVOR} \
sysutils/py-psutil${MODPY_FLAVOR} \
+ textproc/py-defusedxml${MODPY_FLAVOR} \
www/py-bottle${MODPY_FLAVOR}
pre-configure:
Index: sysutils/glances/distinfo
===================================================================
RCS file: /home/cvs/ports/sysutils/glances/distinfo,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 distinfo
--- sysutils/glances/distinfo 24 May 2021 17:41:15 -0000 1.3
+++ sysutils/glances/distinfo 31 Oct 2021 20:25:30 -0000
@@ -1,2 +1,2 @@
-SHA256 (Glances-3.1.7.tar.gz) = vSguNd8/Kd0fP2lVSJ63tztW2SBZ9pObHhWsjNFYGwg=
-SIZE (Glances-3.1.7.tar.gz) = 6789093
+SHA256 (Glances-3.2.3.tar.gz) = n/padJpItbPZdQ7DHYNbDasNp4Po3UuYssLow2Vk91E=
+SIZE (Glances-3.2.3.tar.gz) = 6854435
Index: sysutils/glances/patches/patch-glances_plugins_glances_quicklook_py
===================================================================
RCS file: sysutils/glances/patches/patch-glances_plugins_glances_quicklook_py
diff -N sysutils/glances/patches/patch-glances_plugins_glances_quicklook_py
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ sysutils/glances/patches/patch-glances_plugins_glances_quicklook_py 31 Oct 2021 20:47:56 -0000
@@ -0,0 +1,18 @@
+$OpenBSD$
+
+Cpu hz is not supported
+
+Index: glances/plugins/glances_quicklook.py
+--- glances/plugins/glances_quicklook.py.orig
++++ glances/plugins/glances_quicklook.py
+@@ -82,8 +82,8 @@ class Plugin(GlancesPlugin):
+ # Get additional information
+ cpu_info = cpu_percent.get_info()
+ stats['cpu_name'] = cpu_info['cpu_name']
+- stats['cpu_hz_current'] = self._mhz_to_hz(cpu_info['cpu_hz_current']) if cpu_info['cpu_hz_current'] is not None else None
+- stats['cpu_hz'] = self._mhz_to_hz(cpu_info['cpu_hz']) if cpu_info['cpu_hz'] is not None else None
++ # stats['cpu_hz_current'] = self._mhz_to_hz(cpu_info['cpu_hz_current']) if cpu_info['cpu_hz_current'] is not None else None
++ # stats['cpu_hz'] = self._mhz_to_hz(cpu_info['cpu_hz']) if cpu_info['cpu_hz'] is not None else None
+
+ elif self.input_method == 'snmp':
+ # Not available
Index: sysutils/glances/pkg/PLIST
===================================================================
RCS file: /home/cvs/ports/sysutils/glances/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 PLIST
--- sysutils/glances/pkg/PLIST 24 May 2021 17:41:15 -0000 1.3
+++ sysutils/glances/pkg/PLIST 31 Oct 2021 20:25:52 -0000
@@ -81,6 +81,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/glances/exports/${MODPY_PYCACHE}glances_elasticsearch.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/glances/exports/${MODPY_PYCACHE}glances_export.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/glances/exports/${MODPY_PYCACHE}glances_graph.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/glances/exports/${MODPY_PYCACHE}glances_graphite.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/glances/exports/${MODPY_PYCACHE}glances_influxdb.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/glances/exports/${MODPY_PYCACHE}glances_influxdb2.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/glances/exports/${MODPY_PYCACHE}glances_json.${MODPY_PYC_MAGIC_TAG}pyc
@@ -99,6 +100,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/glances/exports/glances_elasticsearch.py
lib/python${MODPY_VERSION}/site-packages/glances/exports/glances_export.py
lib/python${MODPY_VERSION}/site-packages/glances/exports/glances_graph.py
+lib/python${MODPY_VERSION}/site-packages/glances/exports/glances_graphite.py
lib/python${MODPY_VERSION}/site-packages/glances/exports/glances_influxdb.py
lib/python${MODPY_VERSION}/site-packages/glances/exports/glances_influxdb2.py
lib/python${MODPY_VERSION}/site-packages/glances/exports/glances_json.py
@@ -128,6 +130,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/glances/outputs/${MODPY_PYCACHE}glances_curses_browser.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/glances/outputs/${MODPY_PYCACHE}glances_sparklines.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/glances/outputs/${MODPY_PYCACHE}glances_stdout.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/glances/outputs/${MODPY_PYCACHE}glances_stdout_apidoc.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/glances/outputs/${MODPY_PYCACHE}glances_stdout_csv.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/glances/outputs/${MODPY_PYCACHE}glances_stdout_issue.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/glances/outputs/glances_bars.py
@@ -136,6 +139,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/glances/outputs/glances_curses_browser.py
lib/python${MODPY_VERSION}/site-packages/glances/outputs/glances_sparklines.py
lib/python${MODPY_VERSION}/site-packages/glances/outputs/glances_stdout.py
+lib/python${MODPY_VERSION}/site-packages/glances/outputs/glances_stdout_apidoc.py
lib/python${MODPY_VERSION}/site-packages/glances/outputs/glances_stdout_csv.py
lib/python${MODPY_VERSION}/site-packages/glances/outputs/glances_stdout_issue.py
lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/

15
go-1.17.7.diff Normal file
View File

@ -0,0 +1,15 @@
Index: lang/go/go.port.mk
===================================================================
RCS file: /home/cvs/ports/lang/go/go.port.mk,v
retrieving revision 1.50
diff -u -p -u -p -r1.50 go.port.mk
--- lang/go/go.port.mk 11 Mar 2022 19:29:00 -0000 1.50
+++ lang/go/go.port.mk 13 Mar 2022 12:50:50 -0000
@@ -190,7 +190,6 @@ modgo-gen-modules:
@exit 1
.endif
- @printf '# $$%s$$\n\n' OpenBSD
.if empty(MODGO_VERSION) || ${MODGO_VERSION} == "latest"
@${_PERLSCRIPT}/modgo-gen-modules-helper ${MODGO_MODNAME}
.else

2001
gopass-1.14.10.diff Normal file

File diff suppressed because it is too large Load Diff

98
grep_regress.diff Normal file
View File

@ -0,0 +1,98 @@
Index: regress/usr.bin/grep/Makefile
===================================================================
RCS file: /home/cvs/src/regress/usr.bin/grep/Makefile,v
retrieving revision 1.17
diff -u -p -u -p -r1.17 Makefile
--- regress/usr.bin/grep/Makefile 12 Dec 2012 15:11:25 -0000 1.17
+++ regress/usr.bin/grep/Makefile 26 Dec 2021 10:15:02 -0000
@@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.17 2012/12/12 15:11:25 weerd Exp $
REGRESS_TARGETS=t1 t2 t3 t4 t5 t6 t7 t8 t9 t10 t11 t12 t13 t14 t15 t16 t17 \
- t18 t19 t20 t21 t22 t23 t24 t25 t26
+ t18 t19 t20 t21 t22 t23 t24 t25 t26 t27
t1:
grep t.s ${.CURDIR}/in | diff - ${.CURDIR}/t1.out
@@ -102,8 +102,13 @@ t25:
t26:
echo 'aaab' | grep -o 'a*' | head -n 10 | diff - ${.CURDIR}/t26.out
+t27:
+ grep -A1 'C' ${.CURDIR}/t27.in | diff - ${.CURDIR}/t27a.out
+ grep -B1 'C' ${.CURDIR}/t27.in | diff - ${.CURDIR}/t27b.out
+ grep -C1 'C' ${.CURDIR}/t27.in | diff - ${.CURDIR}/t27c.out
+
.PHONY: t1 t2 t3 t4 t5 t6 t7 t8 t9 t10 t11 t12 t13 t14 t15 t16 t17 t18 t19 t20
-.PHONY: t21 t22 t23 t24 t25 t26
+.PHONY: t21 t22 t23 t24 t25 t26 t27
.include <bsd.regress.mk>
Index: regress/usr.bin/grep/t27.in
===================================================================
RCS file: regress/usr.bin/grep/t27.in
diff -N regress/usr.bin/grep/t27.in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ regress/usr.bin/grep/t27.in 26 Dec 2021 10:32:02 -0000
@@ -0,0 +1,12 @@
+A
+B
+C
+D
+A
+B
+C
+D
+A
+B
+C
+D
Index: regress/usr.bin/grep/t27a.out
===================================================================
RCS file: regress/usr.bin/grep/t27a.out
diff -N regress/usr.bin/grep/t27a.out
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ regress/usr.bin/grep/t27a.out 26 Dec 2021 10:07:48 -0000
@@ -0,0 +1,8 @@
+C
+D
+--
+C
+D
+--
+C
+D
Index: regress/usr.bin/grep/t27b.out
===================================================================
RCS file: regress/usr.bin/grep/t27b.out
diff -N regress/usr.bin/grep/t27b.out
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ regress/usr.bin/grep/t27b.out 26 Dec 2021 10:10:21 -0000
@@ -0,0 +1,8 @@
+B
+C
+--
+B
+C
+--
+B
+C
Index: regress/usr.bin/grep/t27c.out
===================================================================
RCS file: regress/usr.bin/grep/t27c.out
diff -N regress/usr.bin/grep/t27c.out
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ regress/usr.bin/grep/t27c.out 26 Dec 2021 10:07:48 -0000
@@ -0,0 +1,11 @@
+B
+C
+D
+--
+B
+C
+D
+--
+B
+C
+D

82
hcloud-1.28.1.diff Normal file
View File

@ -0,0 +1,82 @@
Index: sysutils/hcloud/Makefile
===================================================================
RCS file: /home/cvs/ports/sysutils/hcloud/Makefile,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 Makefile
--- sysutils/hcloud/Makefile 22 Aug 2021 08:06:22 -0000 1.4
+++ sysutils/hcloud/Makefile 14 Oct 2021 18:03:08 -0000
@@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.4 2021/08/22 08:06:22 paco Exp $
COMMENT = command-line interface for Hetzner Cloud
-V = 1.28.0
+V = 1.28.1
MODGO_MODNAME = github.com/hetznercloud/cli
MODGO_VERSION = v${V}
Index: sysutils/hcloud/distinfo
===================================================================
RCS file: /home/cvs/ports/sysutils/hcloud/distinfo,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 distinfo
--- sysutils/hcloud/distinfo 22 Aug 2021 08:06:22 -0000 1.3
+++ sysutils/hcloud/distinfo 14 Oct 2021 18:07:25 -0000
@@ -173,8 +173,8 @@ SHA256 (go_modules/github.com/hashicorp/
SHA256 (go_modules/github.com/hashicorp/memberlist/@v/v0.1.3.zip) = n4PgUrCl2W9tgUSkDCl66jcTe+9/WKpJa8XqtODFTgs=
SHA256 (go_modules/github.com/hashicorp/serf/@v/v0.8.2.mod) = I9yqxHBk+M9Ol/75IK5Q1CuH1d6svvakQxz6UMhk6cY=
SHA256 (go_modules/github.com/hashicorp/serf/@v/v0.8.2.zip) = D0MWWOaWJfYd79Ngc+iTziHwT+WpZIS4EtR+MtQVS+A=
-SHA256 (go_modules/github.com/hetznercloud/hcloud-go/@v/v1.31.0.mod) = pH/e32tk/MEDZj1g1Eu72QdSrJJLmKLH4gELHTZyZVs=
-SHA256 (go_modules/github.com/hetznercloud/hcloud-go/@v/v1.31.0.zip) = CCuBEwP8GLwtEc3i6DqW6r+I+RokTkgFDYf0V/gStd0=
+SHA256 (go_modules/github.com/hetznercloud/hcloud-go/@v/v1.31.1.mod) = pH/e32tk/MEDZj1g1Eu72QdSrJJLmKLH4gELHTZyZVs=
+SHA256 (go_modules/github.com/hetznercloud/hcloud-go/@v/v1.31.1.zip) = 5tvh+gfkufn6ldP9XHFl2smh6LlkMvKOatVdZL4Ds8I=
SHA256 (go_modules/github.com/inconshreveable/mousetrap/@v/v1.0.0.mod) = OR2uvJOw35u4momxS/pgJo2eueJ2I+xBUEGrq6vdAFw=
SHA256 (go_modules/github.com/inconshreveable/mousetrap/@v/v1.0.0.zip) = w/oIE+ePXO8Q3A6ZEsQ+aOBv+XCpjpjEBQ/hTbv9GMc=
SHA256 (go_modules/github.com/jonboulle/clockwork/@v/v0.1.0.mod) = PMMYAca/5LbFDx2wDyf3Nj1kNyU264DEt62dz4yftuA=
@@ -498,7 +498,7 @@ SHA256 (go_modules/honnef.co/go/tools/@v
SHA256 (go_modules/honnef.co/go/tools/@v/v0.0.1-2019.2.3.zip) = U5glEUxIdoD5nfgPYQdBDh5Tu/1d65MbhNH68tIhY44=
SHA256 (go_modules/rsc.io/binaryregexp/@v/v0.2.0.mod) = AyRzu+VUpUpEX6hVu7K/piNNeG9h8ZJt6WtaqF6R8T0=
SHA256 (go_modules/rsc.io/binaryregexp/@v/v0.2.0.zip) = s+cGqiePp/iA0y+hzEDvgoLR/H1uADVlee0NuI87AEc=
-SHA256 (hcloud-v1.28.0.zip) = RjsrPMj38qXURs4/NmzcOLbC15YO61fahTHrtxLhTQ0=
+SHA256 (hcloud-v1.28.1.zip) = 3j9fBFnFeZj7B9pLJGDTC/vxrkGxfbwQfhgquJh66dU=
SIZE (go_modules/cloud.google.com/go/@v/v0.26.0.mod) = 27
SIZE (go_modules/cloud.google.com/go/@v/v0.34.0.mod) = 27
SIZE (go_modules/cloud.google.com/go/@v/v0.38.0.mod) = 1006
@@ -674,8 +674,8 @@ SIZE (go_modules/github.com/hashicorp/me
SIZE (go_modules/github.com/hashicorp/memberlist/@v/v0.1.3.zip) = 103250
SIZE (go_modules/github.com/hashicorp/serf/@v/v0.8.2.mod) = 774
SIZE (go_modules/github.com/hashicorp/serf/@v/v0.8.2.zip) = 540021
-SIZE (go_modules/github.com/hetznercloud/hcloud-go/@v/v1.31.0.mod) = 307
-SIZE (go_modules/github.com/hetznercloud/hcloud-go/@v/v1.31.0.zip) = 138471
+SIZE (go_modules/github.com/hetznercloud/hcloud-go/@v/v1.31.1.mod) = 307
+SIZE (go_modules/github.com/hetznercloud/hcloud-go/@v/v1.31.1.zip) = 141261
SIZE (go_modules/github.com/inconshreveable/mousetrap/@v/v1.0.0.mod) = 44
SIZE (go_modules/github.com/inconshreveable/mousetrap/@v/v1.0.0.zip) = 3712
SIZE (go_modules/github.com/jonboulle/clockwork/@v/v0.1.0.mod) = 38
@@ -999,4 +999,4 @@ SIZE (go_modules/honnef.co/go/tools/@v/v
SIZE (go_modules/honnef.co/go/tools/@v/v0.0.1-2019.2.3.zip) = 506912
SIZE (go_modules/rsc.io/binaryregexp/@v/v0.2.0.mod) = 36
SIZE (go_modules/rsc.io/binaryregexp/@v/v0.2.0.zip) = 450232
-SIZE (hcloud-v1.28.0.zip) = 276982
+SIZE (hcloud-v1.28.1.zip) = 279028
Index: sysutils/hcloud/modules.inc
===================================================================
RCS file: /home/cvs/ports/sysutils/hcloud/modules.inc,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 modules.inc
--- sysutils/hcloud/modules.inc 22 Aug 2021 08:06:22 -0000 1.3
+++ sysutils/hcloud/modules.inc 14 Oct 2021 18:03:03 -0000
@@ -1,4 +1,4 @@
-# $OpenBSD: modules.inc,v 1.3 2021/08/22 08:06:22 paco Exp $
+# $OpenBSD$
MODGO_MODULES = \
cloud.google.com/go v0.46.3 \
@@ -77,7 +77,7 @@ MODGO_MODULES = \
github.com/hashicorp/mdns v1.0.0 \
github.com/hashicorp/memberlist v0.1.3 \
github.com/hashicorp/serf v0.8.2 \
- github.com/hetznercloud/hcloud-go v1.31.0 \
+ github.com/hetznercloud/hcloud-go v1.31.1 \
github.com/inconshreveable/mousetrap v1.0.0 \
github.com/jonboulle/clockwork v0.1.0 \
github.com/json-iterator/go v1.1.6 \

1100
hcloud-1.29.0.diff Normal file

File diff suppressed because it is too large Load Diff

1637
hcloud-1.30.3.diff Normal file

File diff suppressed because it is too large Load Diff

433
hcloud-1.31.0.diff Normal file
View File

@ -0,0 +1,433 @@
diff /usr/ports
commit - 11c4773666fdabe0d68f0f66b6475bc761751e82
path + /usr/ports
blob - 74c544092c21bd0eda45cb10bcde88f804ea85f9
file + sysutils/hcloud/Makefile
--- sysutils/hcloud/Makefile
+++ sysutils/hcloud/Makefile
@@ -1,5 +1,5 @@
COMMENT = command-line interface for Hetzner Cloud
-V = 1.30.3
+V = 1.31.0
MODGO_MODNAME = github.com/hetznercloud/cli
MODGO_VERSION = v${V}
blob - 64aa01673359878b2b8417688624e46f050eb7a4
file + sysutils/hcloud/distinfo
--- sysutils/hcloud/distinfo
+++ sysutils/hcloud/distinfo
@@ -67,8 +67,8 @@ SHA256 (go_modules/github.com/hetznercloud/hcloud-go/@
SHA256 (go_modules/github.com/google/gofuzz/@v/v1.0.0.zip) = dSVwJiV1u8tfAQfb2ApGOrrK9R6U4V+W9bxBZv8tM+E=
SHA256 (go_modules/github.com/guptarohit/asciigraph/@v/v0.5.5.mod) = U6yrsr8kHxtWra3zhHTdIdO9sC/T7xbMTI3t1MCAHTk=
SHA256 (go_modules/github.com/guptarohit/asciigraph/@v/v0.5.5.zip) = wrgdpXpQQl0xOmhO/RPZdBxOnfTDzKkt6jTVYtNCcaE=
-SHA256 (go_modules/github.com/hetznercloud/hcloud-go/@v/v1.35.2.mod) = eua4IX8fd2bTNN8OdbTDkhMUDNfSN0Znv8xj/XmXkB8=
-SHA256 (go_modules/github.com/hetznercloud/hcloud-go/@v/v1.35.2.zip) = 5HJq/JAoT3t39PLNORcg5ey2owQFO5W5ia800lK2uvw=
+SHA256 (go_modules/github.com/hetznercloud/hcloud-go/@v/v1.37.0.mod) = eua4IX8fd2bTNN8OdbTDkhMUDNfSN0Znv8xj/XmXkB8=
+SHA256 (go_modules/github.com/hetznercloud/hcloud-go/@v/v1.37.0.zip) = wn6Ix13jOFjQye9Nm/UeP4clJgXHAWTvmUO+mLGxErk=
SHA256 (go_modules/github.com/inconshreveable/mousetrap/@v/v1.0.0.mod) = OR2uvJOw35u4momxS/pgJo2eueJ2I+xBUEGrq6vdAFw=
SHA256 (go_modules/github.com/inconshreveable/mousetrap/@v/v1.0.0.zip) = w/oIE+ePXO8Q3A6ZEsQ+aOBv+XCpjpjEBQ/hTbv9GMc=
SHA256 (go_modules/github.com/jpillora/backoff/@v/v1.0.0.mod) = vVTHrC9+ZiFhIBdJ1ig6I0ZcrnO6o4+lp86WJ3EDxns=
@@ -108,8 +108,8 @@ SHA256 (go_modules/github.com/pelletier/go-toml/@v/v1.
SHA256 (go_modules/github.com/mwitkow/go-conntrack/@v/v0.0.0-20161129095857-cc309e4a2223.mod) = PxWlGPNyKPLQjGtDdi1DhppauK57o7USS/lhA15xzBg=
SHA256 (go_modules/github.com/mwitkow/go-conntrack/@v/v0.0.0-20190716064945-2f068394615f.mod) = PxWlGPNyKPLQjGtDdi1DhppauK57o7USS/lhA15xzBg=
SHA256 (go_modules/github.com/mwitkow/go-conntrack/@v/v0.0.0-20190716064945-2f068394615f.zip) = 1vxRNJDVxz4/ZO3jzxi6lzpPjvTDnJgWzGCA45yMSAo=
-SHA256 (go_modules/github.com/pelletier/go-toml/@v/v1.9.5.mod) = wOwmx/hD02ii1ak5A1nFZ+vjFhcb1lHTHc6tG7Lgetk=
-SHA256 (go_modules/github.com/pelletier/go-toml/@v/v1.9.5.zip) = 3j3NpmDMgAzYbQMnOiWVbWf0Fuj8vk0gAaLLSgHmrGA=
+SHA256 (go_modules/github.com/pelletier/go-toml/v2/@v/v2.0.6.mod) = nnkRjVzXHeJoNkQB4SFfrBoGPS8+lwyS0irrghOlKm0=
+SHA256 (go_modules/github.com/pelletier/go-toml/v2/@v/v2.0.6.zip) = AZ5KAXOefKNwHV97SvVxesXrTW1JIbiEJdf0DK2xvX0=
SHA256 (go_modules/github.com/pkg/errors/@v/v0.8.0.mod) = 3yjGqCPxgddheWlxd8DFlDxv+zjzwQstxTvjYO59RYk=
SHA256 (go_modules/github.com/pkg/errors/@v/v0.8.1.mod) = 3yjGqCPxgddheWlxd8DFlDxv+zjzwQstxTvjYO59RYk=
SHA256 (go_modules/github.com/pkg/errors/@v/v0.9.1.mod) = 3yjGqCPxgddheWlxd8DFlDxv+zjzwQstxTvjYO59RYk=
@@ -137,8 +137,8 @@ SHA256 (go_modules/github.com/rjeczalik/interfaces/@v/
SHA256 (go_modules/github.com/rivo/uniseg/@v/v0.1.0.mod) = bHMYonqNVHOo62YedfsAUoF24O/FkxDtJ3yhO9EqU/E=
SHA256 (go_modules/github.com/rivo/uniseg/@v/v0.2.0.mod) = bHMYonqNVHOo62YedfsAUoF24O/FkxDtJ3yhO9EqU/E=
SHA256 (go_modules/github.com/rivo/uniseg/@v/v0.2.0.zip) = MZnZS+UChBQiIGYso7AOGd3R3r5OgN3HRf9CA+y2AcA=
-SHA256 (go_modules/github.com/rjeczalik/interfaces/@v/v0.1.1.mod) = 2APNjezWorRXqp6JFMzvvgmCy8Fn5fUKrf4P1eCJSVY=
-SHA256 (go_modules/github.com/rjeczalik/interfaces/@v/v0.1.1.zip) = aSIoWFJzsR4Mi8+ca9yvhEAzVUaPLVZ/Qz+ioPus3iE=
+SHA256 (go_modules/github.com/rjeczalik/interfaces/@v/v0.3.0.mod) = rnDSoI+lIXEvEiyKN5mZQUEkrRfFJVP63kbfRiYhD3I=
+SHA256 (go_modules/github.com/rjeczalik/interfaces/@v/v0.3.0.zip) = UmJ08cSzQFKUBLkbVf788Ag08WOw5WZiHFlXuS6b2AY=
SHA256 (go_modules/github.com/russross/blackfriday/v2/@v/v2.1.0.mod) = w5VHzOboZujPo5XSk3vOMIAc0H8LkBwhMySPH7oS9Y0=
SHA256 (go_modules/github.com/russross/blackfriday/v2/@v/v2.1.0.zip) = eFJ1DVigU844sB8sIDIIgXVk9VLr83GytjAIHXAExq4=
SHA256 (go_modules/github.com/sirupsen/logrus/@v/v1.2.0.mod) = 1nBJZSdJq8ZWDyLe46J6q3laMu4sfgeKVGFaYberuZs=
@@ -152,7 +152,8 @@ SHA256 (go_modules/github.com/stretchr/objx/@v/v0.4.0.
SHA256 (go_modules/github.com/stretchr/objx/@v/v0.1.0.mod) = E1A1TVLSKHpiM27MDVYjLUxHaZr5u6ScZ8K0glTamPE=
SHA256 (go_modules/github.com/stretchr/objx/@v/v0.1.1.mod) = E1A1TVLSKHpiM27MDVYjLUxHaZr5u6ScZ8K0glTamPE=
SHA256 (go_modules/github.com/stretchr/objx/@v/v0.4.0.mod) = MbL9ze6HDw9hv/r6+5YiCWflvKCKdqkg1XQhb8H5E1U=
-SHA256 (go_modules/github.com/stretchr/objx/@v/v0.4.0.zip) = +1x0NztDheV+kAsqnd7Huh7aLA2T+rTTB8FQl9yqB2U=
+SHA256 (go_modules/github.com/stretchr/objx/@v/v0.5.0.mod) = yzJlQO/LEnSm5Olw1/yd4ugGLwigWPwpbYWQJeYugHo=
+SHA256 (go_modules/github.com/stretchr/objx/@v/v0.5.0.zip) = GgCzu1rUHLcmNKzga36334V0BNd6fKtOQBp8cpVh/kw=
SHA256 (go_modules/github.com/stretchr/testify/@v/v1.2.2.mod) = SrRj9ow3AEH5UMEMq1EEkD1FmMUM+CT5qtG3t/aSVa8=
SHA256 (go_modules/github.com/stretchr/testify/@v/v1.3.0.mod) = qwY9UVSo6HMLztTFJpjldw61C/rjR768NeykiLjj9uM=
SHA256 (go_modules/github.com/stretchr/testify/@v/v1.4.0.mod) = awx7cQMNT8VdTm5uJMC/wCViE0H3YUHjrsAETEzomVA=
@@ -160,10 +161,12 @@ SHA256 (go_modules/github.com/stretchr/testify/@v/v1.8
SHA256 (go_modules/github.com/stretchr/testify/@v/v1.7.0.mod) = //gWjZjmoHFWxFShtuklUJ8xd+lsFVUW1/lrQHnMo78=
SHA256 (go_modules/github.com/stretchr/testify/@v/v1.7.1.mod) = //gWjZjmoHFWxFShtuklUJ8xd+lsFVUW1/lrQHnMo78=
SHA256 (go_modules/github.com/stretchr/testify/@v/v1.8.0.mod) = 4HYHTBVgrR3amLiwD+pjCMS2zNBt3QiNIttGJu1o9zg=
-SHA256 (go_modules/github.com/stretchr/testify/@v/v1.8.0.zip) = 2ICt9ElEkSC0WaIiD1OcaWSP15fe1bdFzzrdYOyECB4=
+SHA256 (go_modules/github.com/stretchr/testify/@v/v1.8.1.mod) = rxpdyzMazno/n8G11+7pwLyCtKKhgv5M7CrdIX4oU9Y=
+SHA256 (go_modules/github.com/stretchr/testify/@v/v1.8.1.zip) = NvZOTyKfh2cu+N4cdWZIxBZedqvQNDYlF1eDl+gkhWw=
SHA256 (go_modules/github.com/yuin/goldmark/@v/v1.1.27.mod) = 4sdj+GGtoFxhUMMvgEvKMclqGLlEMg4O6bvw1sYHWtc=
SHA256 (go_modules/github.com/yuin/goldmark/@v/v1.3.5.mod) = 2rHWY7hg6+VF/NzsJOX5M9UXvSAZr2jXprWodkqmGw8=
-SHA256 (go_modules/github.com/yuin/goldmark/@v/v1.3.5.zip) = KZ83ljX6sY9KloHDcALcZnJwSaQaaPGbefnmpgT3Hgk=
+SHA256 (go_modules/github.com/yuin/goldmark/@v/v1.4.13.mod) = 7n/kRmIDoB06wZrcE0zeyZvG3nGZLCjz3Zp0SAv/BgM=
+SHA256 (go_modules/github.com/yuin/goldmark/@v/v1.4.13.zip) = u0GmArF0NF/aOSyK2D/MkyF8KFx2NplndjC+kP63peM=
SHA256 (go_modules/golang.org/x/crypto/@v/v0.0.0-20180904163835-0709b304e793.mod) = XQEUTZSEElkdjxHUn3p0+trOWOEtc2bPCvmSFH5SSG0=
SHA256 (go_modules/golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod) = M+0HClpm4JYGhaxThkQOG1mJnnTYo4oRgGhecqIZXe0=
SHA256 (go_modules/golang.org/x/crypto/@v/v0.0.0-20191011191535-87dc89f01550.mod) = OrnwH0YQ/ns5vYXWjo2XglNR5+KCw5zaQUV8KidvO+M=
@@ -172,11 +175,12 @@ SHA256 (go_modules/golang.org/x/mod/@v/v0.4.2.zip) = O
SHA256 (go_modules/golang.org/x/crypto/@v/v0.0.0-20220722155217-630584e8d5aa.zip) = /K1+qkhVnrCrAl/ZAL3hpDb8CZk3sB0ElzVeHlXtQCw=
SHA256 (go_modules/golang.org/x/mod/@v/v0.2.0.mod) = sojwiP2FGIWm00gzni9YjlipTmx25eY0rh1nwnSetBM=
SHA256 (go_modules/golang.org/x/mod/@v/v0.4.2.mod) = sojwiP2FGIWm00gzni9YjlipTmx25eY0rh1nwnSetBM=
-SHA256 (go_modules/golang.org/x/mod/@v/v0.4.2.zip) = ObybFXBmYwC6XIYkRiH/vMY7AHzmnmt6Rv+6dpGSliE=
+SHA256 (go_modules/golang.org/x/mod/@v/v0.6.0-dev.0.20220419223038-86c51ed26bb4.mod) = QtGQI/+PLq5wC8VJXzcezZmKItGbqYXQr19pkAslQIM=
+SHA256 (go_modules/golang.org/x/mod/@v/v0.7.0.mod) = YkVnRZxumUesSr3gtwNO5h3Ltqk3P1lwCUwLs+gSGWQ=
+SHA256 (go_modules/golang.org/x/mod/@v/v0.7.0.zip) = JKvR2xMymHPXIDTcJ++tCcvDfTnPKLj/e7PCrcju3vc=
SHA256 (go_modules/golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod) = Pgj0h93aGFG4kd9bHQS7GgG4TW1wKqgtnvvM3gqn34E=
SHA256 (go_modules/golang.org/x/net/@v/v0.0.0-20181114220301-adae6a3d119a.mod) = Pgj0h93aGFG4kd9bHQS7GgG4TW1wKqgtnvvM3gqn34E=
SHA256 (go_modules/golang.org/x/net/@v/v0.0.0-20190108225652-1e06a53dbb7e.mod) = Pgj0h93aGFG4kd9bHQS7GgG4TW1wKqgtnvvM3gqn34E=
-SHA256 (go_modules/golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod) = 9wRnadqsAr61fLzEgSgN9Z+0A8lv6CYigquoWMf3+k0=
SHA256 (go_modules/golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod) = 9wRnadqsAr61fLzEgSgN9Z+0A8lv6CYigquoWMf3+k0=
SHA256 (go_modules/golang.org/x/net/@v/v0.0.0-20190613194153-d28f0bde5980.mod) = 5u/a94opUD8IDPbSYV4onPsdnjq31XD1NmjsorSrQdo=
SHA256 (go_modules/golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod) = 5u/a94opUD8IDPbSYV4onPsdnjq31XD1NmjsorSrQdo=
@@ -184,7 +188,8 @@ SHA256 (go_modules/golang.org/x/net/@v/v0.0.0-20211112
SHA256 (go_modules/golang.org/x/net/@v/v0.0.0-20200625001655-4c5254603344.mod) = 2Mnbvf1Z9KsIDGIZn5Nk0QtGPk79upGlgvuu9CznUS8=
SHA256 (go_modules/golang.org/x/net/@v/v0.0.0-20210405180319-a5a99cb37ef4.mod) = 9rD5lo9afZhvy1fr4qFAlRGLvRy/Z4XQA/ev1xHcsb0=
SHA256 (go_modules/golang.org/x/net/@v/v0.0.0-20211112202133-69e39bad7dc2.mod) = +pFfXQIs+wy4Zaou4306d0G0BvhOtKg3hi4pzGmrTvQ=
-SHA256 (go_modules/golang.org/x/net/@v/v0.0.0-20211112202133-69e39bad7dc2.zip) = VjiFMxEVUNreaFmoz0SPT0f6B2apqqTAd8RhmL/iDuc=
+SHA256 (go_modules/golang.org/x/net/@v/v0.2.0.mod) = B+xkXjNT/CZz8tje5cFOuSi5wTEnpAn+PsQOq6Tb2zA=
+SHA256 (go_modules/golang.org/x/net/@v/v0.2.0.zip) = Qz5kVllICHDXOMIk3uwi7mrZ7L/T5BKoqpFej45GnM0=
SHA256 (go_modules/golang.org/x/oauth2/@v/v0.0.0-20190226205417-e64efc72b421.mod) = hp9E5OzVzaUxZVEKMIUVZw3X7ckgBegHnKClyGRSmys=
SHA256 (go_modules/golang.org/x/oauth2/@v/v0.0.0-20190226205417-e64efc72b421.zip) = 0cVZKTH3eBeEhxbnHlGi/N1mc5Kda+wElZsHHxyoGQA=
SHA256 (go_modules/golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod) = Qh9hOWhtWJHz3FpWPQmVeA0yefZcrU0iXOpSaGeUFhw=
@@ -193,7 +198,8 @@ SHA256 (go_modules/golang.org/x/sync/@v/v0.0.0-2021022
SHA256 (go_modules/golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.mod) = Qh9hOWhtWJHz3FpWPQmVeA0yefZcrU0iXOpSaGeUFhw=
SHA256 (go_modules/golang.org/x/sync/@v/v0.0.0-20201207232520-09787c993a3a.mod) = Qh9hOWhtWJHz3FpWPQmVeA0yefZcrU0iXOpSaGeUFhw=
SHA256 (go_modules/golang.org/x/sync/@v/v0.0.0-20210220032951-036812b2e83c.mod) = Qh9hOWhtWJHz3FpWPQmVeA0yefZcrU0iXOpSaGeUFhw=
-SHA256 (go_modules/golang.org/x/sync/@v/v0.0.0-20210220032951-036812b2e83c.zip) = kqhmOvA1poMdzJzJ2JWh9LtR/CHv6X8E+gZ2/BSZKkY=
+SHA256 (go_modules/golang.org/x/sync/@v/v0.1.0.mod) = Qh9hOWhtWJHz3FpWPQmVeA0yefZcrU0iXOpSaGeUFhw=
+SHA256 (go_modules/golang.org/x/sync/@v/v0.1.0.zip) = 9RC+xgCeGYgtGZU+cnMTfTTfhsZZSTRdcvEjolXC7NI=
SHA256 (go_modules/golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod) = iWkRXko5EIhIMk55ob2KhEUjDm46rMvp+AV/tQ//yME=
SHA256 (go_modules/golang.org/x/sys/@v/v0.0.0-20181116152217-5ac8a444bdc5.mod) = iWkRXko5EIhIMk55ob2KhEUjDm46rMvp+AV/tQ//yME=
SHA256 (go_modules/golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod) = iWkRXko5EIhIMk55ob2KhEUjDm46rMvp+AV/tQ//yME=
@@ -208,30 +214,36 @@ SHA256 (go_modules/golang.org/x/sys/@v/v0.0.0-20210423
SHA256 (go_modules/golang.org/x/sys/@v/v0.0.0-20201119102817-f84b799fce68.mod) = GBl56L1X0tngZBgtqGyaYRGqaXVeiI8IQx7OR0Kuw0M=
SHA256 (go_modules/golang.org/x/sys/@v/v0.0.0-20210124154548-22da62e12c0c.mod) = GBl56L1X0tngZBgtqGyaYRGqaXVeiI8IQx7OR0Kuw0M=
SHA256 (go_modules/golang.org/x/sys/@v/v0.0.0-20210330210617-4fbd30eecc44.mod) = GBl56L1X0tngZBgtqGyaYRGqaXVeiI8IQx7OR0Kuw0M=
-SHA256 (go_modules/golang.org/x/sys/@v/v0.0.0-20210423082822-04245dca01da.mod) = GBl56L1X0tngZBgtqGyaYRGqaXVeiI8IQx7OR0Kuw0M=
SHA256 (go_modules/golang.org/x/sys/@v/v0.0.0-20210510120138-977fb7262007.mod) = 8DMzMJb+GY8xUd7tk/LeunTlC7/nc5E0BFvDt85KUCQ=
SHA256 (go_modules/golang.org/x/sys/@v/v0.0.0-20210603081109-ebe580a85c40.mod) = 8DMzMJb+GY8xUd7tk/LeunTlC7/nc5E0BFvDt85KUCQ=
SHA256 (go_modules/golang.org/x/sys/@v/v0.0.0-20210615035016-665e8c7367d1.mod) = 8DMzMJb+GY8xUd7tk/LeunTlC7/nc5E0BFvDt85KUCQ=
SHA256 (go_modules/golang.org/x/sys/@v/v0.0.0-20220503163025-988cb79eb6c6.mod) = 8DMzMJb+GY8xUd7tk/LeunTlC7/nc5E0BFvDt85KUCQ=
-SHA256 (go_modules/golang.org/x/sys/@v/v0.0.0-20220503163025-988cb79eb6c6.zip) = YHp5H/iE1TuhMexU/XAdlWkpgYkFytMtIrvnoifHDCc=
+SHA256 (go_modules/golang.org/x/sys/@v/v0.0.0-20220722155257-8c9f86f7a55f.mod) = 8DMzMJb+GY8xUd7tk/LeunTlC7/nc5E0BFvDt85KUCQ=
+SHA256 (go_modules/golang.org/x/sys/@v/v0.2.0.mod) = 8DMzMJb+GY8xUd7tk/LeunTlC7/nc5E0BFvDt85KUCQ=
+SHA256 (go_modules/golang.org/x/sys/@v/v0.2.0.zip) = BSykLpkAJte9n+z4pg5Q6WVWEUJz5VGbRBSbKk6/bG8=
SHA256 (go_modules/golang.org/x/term/@v/v0.0.0-20201126162022-7de9c90e9dd1.mod) = TLqxT3cGdxsnHZlaGzzBMf5aJGqtx+5tG6bwvYlHgfo=
-SHA256 (go_modules/golang.org/x/term/@v/v0.0.0-20201126162022-7de9c90e9dd1.zip) = R1qG8R3RSLR0zkBcXb3V9ryuBWw+ROUkRaRZJt1ppVI=
+SHA256 (go_modules/golang.org/x/term/@v/v0.2.0.mod) = 7fgz2hAZAP4s6NsjQJ5CRI9EGJjT19juRRmI47MMkwI=
+SHA256 (go_modules/golang.org/x/term/@v/v0.2.0.zip) = 3iTJmJ4lpGftCN9JAIAgqQp5jO1NjRY+eUDmaGbln8k=
SHA256 (go_modules/golang.org/x/text/@v/v0.3.0.mod) = NoedWG/YAB6E2oeHGQoR5PeHSeKoHf6Lm2kxiZ//Mc8=
SHA256 (go_modules/golang.org/x/text/@v/v0.3.2.mod) = bDx63ysK1xQ9kT9GmNGQhCI2ml5vGYYg+X8+UvmhuN0=
SHA256 (go_modules/golang.org/x/text/@v/v0.3.3.mod) = +7eojtFAUV55Dsp6EP/TGcl4axHGpsfln4D3+ze7RUI=
SHA256 (go_modules/golang.org/x/text/@v/v0.3.6.mod) = +7eojtFAUV55Dsp6EP/TGcl4axHGpsfln4D3+ze7RUI=
-SHA256 (go_modules/golang.org/x/text/@v/v0.3.6.zip) = KvreZIpMskCvt7O/jjcZthUWnJDWKBvW1Lo0Ypx0RXk=
+SHA256 (go_modules/golang.org/x/text/@v/v0.4.0.mod) = FZKedvzgSupMkqNUQmu0M3BoRkWk7gPy510MLrFGYwQ=
+SHA256 (go_modules/golang.org/x/text/@v/v0.4.0.zip) = Fq8BrhqsuwJ2YtOWYr1S6S4oi6TOEE6gEWU0qB39PDA=
SHA256 (go_modules/golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod) = oOAvBnj+Ytw8S0vHf6kSybcN4Q+p988veq0DNzkrUq8=
SHA256 (go_modules/golang.org/x/tools/@v/v0.0.0-20190501045030-23463209683d.mod) = E1GJ3wIxXXXWLidVHRrMrR21vTwaKodW9jpp9zsbUhc=
SHA256 (go_modules/golang.org/x/tools/@v/v0.0.0-20191119224855-298f0cb1881e.mod) = iNR5Jl+Ib15ZjXbAA9DyV7QtvxuJXYIKErWrCzUBrKE=
SHA256 (go_modules/golang.org/x/tools/@v/v0.0.0-20200526224456-8b020aee10d2.mod) = 724vlCRCFJcXgPm6MdkIBpKK1BDIKwTYiI+BU0H3pmc=
SHA256 (go_modules/golang.org/x/tools/@v/v0.1.1.mod) = A2l2BTdO47D6m1AupFbZxq4YNdrCLjW6oqmcQFig/jE=
-SHA256 (go_modules/golang.org/x/tools/@v/v0.1.1.zip) = I2bC5nnQXQ0HyF4aBR3q0wL6tYon92/KMaosv7xXo5s=
+SHA256 (go_modules/golang.org/x/tools/@v/v0.1.12.mod) = KouTZYmPCCL6zmW6CJoTU+aKZdNC8wDKMXzOzN5kIfM=
+SHA256 (go_modules/golang.org/x/tools/@v/v0.3.0.mod) = vggr0axg3OieFugmUvAtEjYQnJXz/XbBZbUA2X6jmE4=
+SHA256 (go_modules/golang.org/x/tools/@v/v0.3.0.zip) = uxAVIj7tt+Uncvz5VfFMTqvwaCKcKAQ/Nr8opHXl4ac=
SHA256 (go_modules/golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod) = ql4+ybt7n2gWCe+sAZ2d4ae6dxkkj/Hqon54iC2z1/U=
SHA256 (go_modules/golang.org/x/xerrors/@v/v0.0.0-20191011141410-1b5146add898.mod) = ql4+ybt7n2gWCe+sAZ2d4ae6dxkkj/Hqon54iC2z1/U=
SHA256 (go_modules/golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod) = ql4+ybt7n2gWCe+sAZ2d4ae6dxkkj/Hqon54iC2z1/U=
SHA256 (go_modules/golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.mod) = ql4+ybt7n2gWCe+sAZ2d4ae6dxkkj/Hqon54iC2z1/U=
-SHA256 (go_modules/golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.zip) = OAqqM2iuFlYou0h89OaVpVwUIAcri3pvWcEi9qI7slU=
+SHA256 (go_modules/golang.org/x/xerrors/@v/v0.0.0-20220907171357-04be3eba64a2.mod) = ycRP1T5v9jnosGWFs/PV/uHCe3X0P4WgrSsYLDxo230=
+SHA256 (go_modules/golang.org/x/xerrors/@v/v0.0.0-20220907171357-04be3eba64a2.zip) = ucSB2zPEtoK6i6NIAY3b0hVb0ifMOP+fa0yyt0u8PBQ=
SHA256 (go_modules/google.golang.org/appengine/@v/v1.4.0.mod) = +VuAj+0sb+uyOo0R6SdDWDs3hhWE0wI0mtpa4Co4dN0=
SHA256 (go_modules/google.golang.org/appengine/@v/v1.4.0.zip) = 1NuoOYRKkr2TVYEqU/CG/zMBqo9Zspo+L3mdJ76Ntx8=
SHA256 (go_modules/google.golang.org/protobuf/@v/v0.0.0-20200109180630-ec00e32a8dfd.mod) = ojmQ77Z+4QuxbR0ZNhCc76TkJirj2o0HSO+2kWFNu3g=
@@ -257,7 +269,7 @@ SHA256 (hcloud-v1.30.3.zip) = U3E0I79PbIrDGn6wfFpiJi6/
SHA256 (go_modules/gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.mod) = IVeYYKIDBvz0OxvSNNH7oxlJnHdhG3HAX5vzupDauTk=
SHA256 (go_modules/gopkg.in/yaml.v3/@v/v3.0.1.mod) = IVeYYKIDBvz0OxvSNNH7oxlJnHdhG3HAX5vzupDauTk=
SHA256 (go_modules/gopkg.in/yaml.v3/@v/v3.0.1.zip) = qrj7xOYwDqCOav4crqGKIckMefSJ9SxT4vIEMfGpoBU=
-SHA256 (hcloud-v1.30.3.zip) = U3E0I79PbIrDGn6wfFpiJi6/IFrEs6jmaNriRdx9tVg=
+SHA256 (hcloud-v1.31.0.zip) = 1LwUu6YCNlNsyRG4jMN7+bD/4M18yxSzzLRC+A54wdM=
SIZE (go_modules/cloud.google.com/go/@v/v0.34.0.mod) = 27
SIZE (go_modules/cloud.google.com/go/@v/v0.34.0.zip) = 2792177
SIZE (go_modules/github.com/!vivid!cortex/ewma/@v/v1.1.1.mod) = 35
@@ -327,8 +339,8 @@ SIZE (go_modules/github.com/hetznercloud/hcloud-go/@v/
SIZE (go_modules/github.com/google/gofuzz/@v/v1.0.0.zip) = 16584
SIZE (go_modules/github.com/guptarohit/asciigraph/@v/v0.5.5.mod) = 49
SIZE (go_modules/github.com/guptarohit/asciigraph/@v/v0.5.5.zip) = 22544
-SIZE (go_modules/github.com/hetznercloud/hcloud-go/@v/v1.35.2.mod) = 924
-SIZE (go_modules/github.com/hetznercloud/hcloud-go/@v/v1.35.2.zip) = 160538
+SIZE (go_modules/github.com/hetznercloud/hcloud-go/@v/v1.37.0.mod) = 924
+SIZE (go_modules/github.com/hetznercloud/hcloud-go/@v/v1.37.0.zip) = 160743
SIZE (go_modules/github.com/inconshreveable/mousetrap/@v/v1.0.0.mod) = 44
SIZE (go_modules/github.com/inconshreveable/mousetrap/@v/v1.0.0.zip) = 3712
SIZE (go_modules/github.com/jpillora/backoff/@v/v1.0.0.mod) = 44
@@ -368,8 +380,8 @@ SIZE (go_modules/github.com/pelletier/go-toml/@v/v1.9.
SIZE (go_modules/github.com/mwitkow/go-conntrack/@v/v0.0.0-20161129095857-cc309e4a2223.mod) = 39
SIZE (go_modules/github.com/mwitkow/go-conntrack/@v/v0.0.0-20190716064945-2f068394615f.mod) = 39
SIZE (go_modules/github.com/mwitkow/go-conntrack/@v/v0.0.0-20190716064945-2f068394615f.zip) = 24595
-SIZE (go_modules/github.com/pelletier/go-toml/@v/v1.9.5.mod) = 45
-SIZE (go_modules/github.com/pelletier/go-toml/@v/v1.9.5.zip) = 127514
+SIZE (go_modules/github.com/pelletier/go-toml/v2/@v/v2.0.6.mod) = 92
+SIZE (go_modules/github.com/pelletier/go-toml/v2/@v/v2.0.6.zip) = 921034
SIZE (go_modules/github.com/pkg/errors/@v/v0.8.0.mod) = 29
SIZE (go_modules/github.com/pkg/errors/@v/v0.8.1.mod) = 29
SIZE (go_modules/github.com/pkg/errors/@v/v0.9.1.mod) = 29
@@ -397,8 +409,8 @@ SIZE (go_modules/github.com/rjeczalik/interfaces/@v/v0
SIZE (go_modules/github.com/rivo/uniseg/@v/v0.1.0.mod) = 39
SIZE (go_modules/github.com/rivo/uniseg/@v/v0.2.0.mod) = 39
SIZE (go_modules/github.com/rivo/uniseg/@v/v0.2.0.zip) = 45731
-SIZE (go_modules/github.com/rjeczalik/interfaces/@v/v0.1.1.mod) = 111
-SIZE (go_modules/github.com/rjeczalik/interfaces/@v/v0.1.1.zip) = 20358
+SIZE (go_modules/github.com/rjeczalik/interfaces/@v/v0.3.0.mod) = 111
+SIZE (go_modules/github.com/rjeczalik/interfaces/@v/v0.3.0.zip) = 20568
SIZE (go_modules/github.com/russross/blackfriday/v2/@v/v2.1.0.mod) = 42
SIZE (go_modules/github.com/russross/blackfriday/v2/@v/v2.1.0.zip) = 122358
SIZE (go_modules/github.com/sirupsen/logrus/@v/v1.2.0.mod) = 393
@@ -412,7 +424,8 @@ SIZE (go_modules/github.com/stretchr/objx/@v/v0.4.0.zi
SIZE (go_modules/github.com/stretchr/objx/@v/v0.1.0.mod) = 32
SIZE (go_modules/github.com/stretchr/objx/@v/v0.1.1.mod) = 32
SIZE (go_modules/github.com/stretchr/objx/@v/v0.4.0.mod) = 137
-SIZE (go_modules/github.com/stretchr/objx/@v/v0.4.0.zip) = 44330
+SIZE (go_modules/github.com/stretchr/objx/@v/v0.5.0.mod) = 85
+SIZE (go_modules/github.com/stretchr/objx/@v/v0.5.0.zip) = 44362
SIZE (go_modules/github.com/stretchr/testify/@v/v1.2.2.mod) = 35
SIZE (go_modules/github.com/stretchr/testify/@v/v1.3.0.mod) = 154
SIZE (go_modules/github.com/stretchr/testify/@v/v1.4.0.mod) = 179
@@ -420,10 +433,12 @@ SIZE (go_modules/github.com/stretchr/testify/@v/v1.8.0
SIZE (go_modules/github.com/stretchr/testify/@v/v1.7.0.mod) = 216
SIZE (go_modules/github.com/stretchr/testify/@v/v1.7.1.mod) = 216
SIZE (go_modules/github.com/stretchr/testify/@v/v1.8.0.mod) = 188
-SIZE (go_modules/github.com/stretchr/testify/@v/v1.8.0.zip) = 113507
+SIZE (go_modules/github.com/stretchr/testify/@v/v1.8.1.mod) = 188
+SIZE (go_modules/github.com/stretchr/testify/@v/v1.8.1.zip) = 113583
SIZE (go_modules/github.com/yuin/goldmark/@v/v1.1.27.mod) = 41
SIZE (go_modules/github.com/yuin/goldmark/@v/v1.3.5.mod) = 41
-SIZE (go_modules/github.com/yuin/goldmark/@v/v1.3.5.zip) = 268257
+SIZE (go_modules/github.com/yuin/goldmark/@v/v1.4.13.mod) = 41
+SIZE (go_modules/github.com/yuin/goldmark/@v/v1.4.13.zip) = 229017
SIZE (go_modules/golang.org/x/crypto/@v/v0.0.0-20180904163835-0709b304e793.mod) = 27
SIZE (go_modules/golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod) = 88
SIZE (go_modules/golang.org/x/crypto/@v/v0.0.0-20191011191535-87dc89f01550.mod) = 146
@@ -432,11 +447,12 @@ SIZE (go_modules/golang.org/x/mod/@v/v0.4.2.zip) = 141
SIZE (go_modules/golang.org/x/crypto/@v/v0.0.0-20220722155217-630584e8d5aa.zip) = 1778170
SIZE (go_modules/golang.org/x/mod/@v/v0.2.0.mod) = 214
SIZE (go_modules/golang.org/x/mod/@v/v0.4.2.mod) = 214
-SIZE (go_modules/golang.org/x/mod/@v/v0.4.2.zip) = 141789
+SIZE (go_modules/golang.org/x/mod/@v/v0.6.0-dev.0.20220419223038-86c51ed26bb4.mod) = 157
+SIZE (go_modules/golang.org/x/mod/@v/v0.7.0.mod) = 84
+SIZE (go_modules/golang.org/x/mod/@v/v0.7.0.zip) = 161744
SIZE (go_modules/golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod) = 24
SIZE (go_modules/golang.org/x/net/@v/v0.0.0-20181114220301-adae6a3d119a.mod) = 24
SIZE (go_modules/golang.org/x/net/@v/v0.0.0-20190108225652-1e06a53dbb7e.mod) = 24
-SIZE (go_modules/golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod) = 119
SIZE (go_modules/golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod) = 119
SIZE (go_modules/golang.org/x/net/@v/v0.0.0-20190613194153-d28f0bde5980.mod) = 181
SIZE (go_modules/golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod) = 181
@@ -444,7 +460,8 @@ SIZE (go_modules/golang.org/x/net/@v/v0.0.0-2021111220
SIZE (go_modules/golang.org/x/net/@v/v0.0.0-20200625001655-4c5254603344.mod) = 181
SIZE (go_modules/golang.org/x/net/@v/v0.0.0-20210405180319-a5a99cb37ef4.mod) = 179
SIZE (go_modules/golang.org/x/net/@v/v0.0.0-20211112202133-69e39bad7dc2.mod) = 179
-SIZE (go_modules/golang.org/x/net/@v/v0.0.0-20211112202133-69e39bad7dc2.zip) = 1579792
+SIZE (go_modules/golang.org/x/net/@v/v0.2.0.mod) = 123
+SIZE (go_modules/golang.org/x/net/@v/v0.2.0.zip) = 1565008
SIZE (go_modules/golang.org/x/oauth2/@v/v0.0.0-20190226205417-e64efc72b421.mod) = 233
SIZE (go_modules/golang.org/x/oauth2/@v/v0.0.0-20190226205417-e64efc72b421.zip) = 81372
SIZE (go_modules/golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod) = 25
@@ -453,7 +470,8 @@ SIZE (go_modules/golang.org/x/sync/@v/v0.0.0-202102200
SIZE (go_modules/golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.mod) = 25
SIZE (go_modules/golang.org/x/sync/@v/v0.0.0-20201207232520-09787c993a3a.mod) = 25
SIZE (go_modules/golang.org/x/sync/@v/v0.0.0-20210220032951-036812b2e83c.mod) = 25
-SIZE (go_modules/golang.org/x/sync/@v/v0.0.0-20210220032951-036812b2e83c.zip) = 28693
+SIZE (go_modules/golang.org/x/sync/@v/v0.1.0.mod) = 25
+SIZE (go_modules/golang.org/x/sync/@v/v0.1.0.zip) = 27781
SIZE (go_modules/golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod) = 24
SIZE (go_modules/golang.org/x/sys/@v/v0.0.0-20181116152217-5ac8a444bdc5.mod) = 24
SIZE (go_modules/golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod) = 24
@@ -468,30 +486,36 @@ SIZE (go_modules/golang.org/x/sys/@v/v0.0.0-2021042308
SIZE (go_modules/golang.org/x/sys/@v/v0.0.0-20201119102817-f84b799fce68.mod) = 33
SIZE (go_modules/golang.org/x/sys/@v/v0.0.0-20210124154548-22da62e12c0c.mod) = 33
SIZE (go_modules/golang.org/x/sys/@v/v0.0.0-20210330210617-4fbd30eecc44.mod) = 33
-SIZE (go_modules/golang.org/x/sys/@v/v0.0.0-20210423082822-04245dca01da.mod) = 33
SIZE (go_modules/golang.org/x/sys/@v/v0.0.0-20210510120138-977fb7262007.mod) = 33
SIZE (go_modules/golang.org/x/sys/@v/v0.0.0-20210603081109-ebe580a85c40.mod) = 33
SIZE (go_modules/golang.org/x/sys/@v/v0.0.0-20210615035016-665e8c7367d1.mod) = 33
SIZE (go_modules/golang.org/x/sys/@v/v0.0.0-20220503163025-988cb79eb6c6.mod) = 33
-SIZE (go_modules/golang.org/x/sys/@v/v0.0.0-20220503163025-988cb79eb6c6.zip) = 1762426
+SIZE (go_modules/golang.org/x/sys/@v/v0.0.0-20220722155257-8c9f86f7a55f.mod) = 33
+SIZE (go_modules/golang.org/x/sys/@v/v0.2.0.mod) = 33
+SIZE (go_modules/golang.org/x/sys/@v/v0.2.0.zip) = 1862113
SIZE (go_modules/golang.org/x/term/@v/v0.0.0-20201126162022-7de9c90e9dd1.mod) = 95
-SIZE (go_modules/golang.org/x/term/@v/v0.0.0-20201126162022-7de9c90e9dd1.zip) = 23281
+SIZE (go_modules/golang.org/x/term/@v/v0.2.0.mod) = 67
+SIZE (go_modules/golang.org/x/term/@v/v0.2.0.zip) = 19924
SIZE (go_modules/golang.org/x/text/@v/v0.3.0.mod) = 25
SIZE (go_modules/golang.org/x/text/@v/v0.3.2.mod) = 88
SIZE (go_modules/golang.org/x/text/@v/v0.3.3.mod) = 97
SIZE (go_modules/golang.org/x/text/@v/v0.3.6.mod) = 97
-SIZE (go_modules/golang.org/x/text/@v/v0.3.6.zip) = 8610726
+SIZE (go_modules/golang.org/x/text/@v/v0.4.0.mod) = 258
+SIZE (go_modules/golang.org/x/text/@v/v0.4.0.zip) = 8615035
SIZE (go_modules/golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod) = 26
SIZE (go_modules/golang.org/x/tools/@v/v0.0.0-20190501045030-23463209683d.mod) = 146
SIZE (go_modules/golang.org/x/tools/@v/v0.0.0-20191119224855-298f0cb1881e.mod) = 212
SIZE (go_modules/golang.org/x/tools/@v/v0.0.0-20200526224456-8b020aee10d2.mod) = 271
SIZE (go_modules/golang.org/x/tools/@v/v0.1.1.mod) = 323
-SIZE (go_modules/golang.org/x/tools/@v/v0.1.1.zip) = 3430655
+SIZE (go_modules/golang.org/x/tools/@v/v0.1.12.mod) = 327
+SIZE (go_modules/golang.org/x/tools/@v/v0.3.0.mod) = 211
+SIZE (go_modules/golang.org/x/tools/@v/v0.3.0.zip) = 2954411
SIZE (go_modules/golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod) = 37
SIZE (go_modules/golang.org/x/xerrors/@v/v0.0.0-20191011141410-1b5146add898.mod) = 37
SIZE (go_modules/golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod) = 37
SIZE (go_modules/golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.mod) = 37
-SIZE (go_modules/golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.zip) = 22295
+SIZE (go_modules/golang.org/x/xerrors/@v/v0.0.0-20220907171357-04be3eba64a2.mod) = 37
+SIZE (go_modules/golang.org/x/xerrors/@v/v0.0.0-20220907171357-04be3eba64a2.zip) = 22397
SIZE (go_modules/google.golang.org/appengine/@v/v1.4.0.mod) = 162
SIZE (go_modules/google.golang.org/appengine/@v/v1.4.0.zip) = 408151
SIZE (go_modules/google.golang.org/protobuf/@v/v0.0.0-20200109180630-ec00e32a8dfd.mod) = 83
@@ -517,4 +541,4 @@ SIZE (hcloud-v1.30.3.zip) = 297081
SIZE (go_modules/gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.mod) = 95
SIZE (go_modules/gopkg.in/yaml.v3/@v/v3.0.1.mod) = 95
SIZE (go_modules/gopkg.in/yaml.v3/@v/v3.0.1.zip) = 104623
-SIZE (hcloud-v1.30.3.zip) = 297081
+SIZE (hcloud-v1.31.0.zip) = 299117
blob - 9eeb1f271bdfdadc0de316755dad8df17a2290a8
file + sysutils/hcloud/modules.inc
--- sysutils/hcloud/modules.inc
+++ sysutils/hcloud/modules.inc
@@ -22,7 +22,7 @@ MODGO_MODULES = \
github.com/google/go-cmp v0.5.7 \
github.com/google/gofuzz v1.0.0 \
github.com/guptarohit/asciigraph v0.5.5 \
- github.com/hetznercloud/hcloud-go v1.35.2 \
+ github.com/hetznercloud/hcloud-go v1.37.0 \
github.com/inconshreveable/mousetrap v1.0.0 \
github.com/jpillora/backoff v1.0.0 \
github.com/json-iterator/go v1.1.11 \
@@ -39,7 +39,7 @@ MODGO_MODULES = \
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd \
github.com/modern-go/reflect2 v1.0.1 \
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f \
- github.com/pelletier/go-toml v1.9.5 \
+ github.com/pelletier/go-toml/v2 v2.0.6 \
github.com/pkg/errors v0.9.1 \
github.com/pmezard/go-difflib v1.0.0 \
github.com/prometheus/client_golang v1.11.0 \
@@ -47,24 +47,24 @@ MODGO_MODULES = \
github.com/prometheus/common v0.26.0 \
github.com/prometheus/procfs v0.6.0 \
github.com/rivo/uniseg v0.2.0 \
- github.com/rjeczalik/interfaces v0.1.1 \
+ github.com/rjeczalik/interfaces v0.3.0 \
github.com/russross/blackfriday/v2 v2.1.0 \
github.com/sirupsen/logrus v1.6.0 \
github.com/spf13/cobra v1.5.0 \
github.com/spf13/pflag v1.0.5 \
- github.com/stretchr/objx v0.4.0 \
- github.com/stretchr/testify v1.8.0 \
- github.com/yuin/goldmark v1.3.5 \
+ github.com/stretchr/objx v0.5.0 \
+ github.com/stretchr/testify v1.8.1 \
+ github.com/yuin/goldmark v1.4.13 \
golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa \
- golang.org/x/mod v0.4.2 \
- golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2 \
+ golang.org/x/mod v0.7.0 \
+ golang.org/x/net v0.2.0 \
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421 \
- golang.org/x/sync v0.0.0-20210220032951-036812b2e83c \
- golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6 \
- golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 \
- golang.org/x/text v0.3.6 \
- golang.org/x/tools v0.1.1 \
- golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 \
+ golang.org/x/sync v0.1.0 \
+ golang.org/x/sys v0.2.0 \
+ golang.org/x/term v0.2.0 \
+ golang.org/x/text v0.4.0 \
+ golang.org/x/tools v0.3.0 \
+ golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 \
google.golang.org/appengine v1.4.0 \
google.golang.org/protobuf v1.26.0-rc.1 \
gopkg.in/alecthomas/kingpin.v2 v2.2.6 \
@@ -120,33 +120,39 @@ MODGO_MODFILES = \
github.com/sirupsen/logrus v1.4.2 \
github.com/stretchr/objx v0.1.0 \
github.com/stretchr/objx v0.1.1 \
+ github.com/stretchr/objx v0.4.0 \
github.com/stretchr/testify v1.2.2 \
github.com/stretchr/testify v1.3.0 \
github.com/stretchr/testify v1.4.0 \
github.com/stretchr/testify v1.6.1 \
github.com/stretchr/testify v1.7.0 \
github.com/stretchr/testify v1.7.1 \
+ github.com/stretchr/testify v1.8.0 \
github.com/yuin/goldmark v1.1.27 \
+ github.com/yuin/goldmark v1.3.5 \
golang.org/x/crypto v0.0.0-20180904163835-0709b304e793 \
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 \
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550 \
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 \
golang.org/x/mod v0.2.0 \
+ golang.org/x/mod v0.4.2 \
+ golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 \
golang.org/x/net v0.0.0-20180724234803-3673e40ba225 \
golang.org/x/net v0.0.0-20181114220301-adae6a3d119a \
golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e \
- golang.org/x/net v0.0.0-20190311183353-d8887717615a \
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3 \
golang.org/x/net v0.0.0-20190613194153-d28f0bde5980 \
golang.org/x/net v0.0.0-20190620200207-3b0461eec859 \
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b \
golang.org/x/net v0.0.0-20200625001655-4c5254603344 \
golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4 \
+ golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2 \
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f \
golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4 \
golang.org/x/sync v0.0.0-20190423024810-112230192c58 \
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e \
golang.org/x/sync v0.0.0-20201207232520-09787c993a3a \
+ golang.org/x/sync v0.0.0-20210220032951-036812b2e83c \
golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33 \
golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5 \
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a \
@@ -161,20 +167,26 @@ MODGO_MODFILES = \
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68 \
golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c \
golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44 \
- golang.org/x/sys v0.0.0-20210423082822-04245dca01da \
golang.org/x/sys v0.0.0-20210510120138-977fb7262007 \
golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40 \
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1 \
+ golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6 \
+ golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f \
+ golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 \
golang.org/x/text v0.3.0 \
golang.org/x/text v0.3.2 \
golang.org/x/text v0.3.3 \
+ golang.org/x/text v0.3.6 \
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e \
golang.org/x/tools v0.0.0-20190501045030-23463209683d \
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e \
golang.org/x/tools v0.0.0-20200526224456-8b020aee10d2 \
+ golang.org/x/tools v0.1.1 \
+ golang.org/x/tools v0.1.12 \
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7 \
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898 \
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 \
+ golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 \
google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd \
google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64 \
google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60 \

102
hdmi.diff Normal file
View File

@ -0,0 +1,102 @@
Index: dev/pci/azalia.c
===================================================================
RCS file: /home/cvs/src/sys/dev/pci/azalia.c,v
retrieving revision 1.266
diff -u -p -r1.266 azalia.c
--- dev/pci/azalia.c 30 Oct 2021 03:24:59 -0000 1.266
+++ dev/pci/azalia.c 9 Nov 2021 21:37:03 -0000
@@ -279,6 +279,9 @@ int azalia_suspend(azalia_t *);
int azalia_resume(azalia_t *);
int azalia_resume_codec(codec_t *);
+/* sysctl */
+int audio_hdmi_enable = 0;
+
/* variables */
struct cfattach azalia_ca = {
sizeof(azalia_t), azalia_pci_match, azalia_pci_attach,
@@ -954,9 +957,10 @@ azalia_init_codecs(azalia_t *az)
c = -1;
for (i = 0; i < az->ncodecs; i++) {
codec = &az->codecs[i];
- if ((codec->audiofunc < 0) ||
- (codec->codec_type == AZ_CODEC_TYPE_HDMI))
- continue;
+ if(audio_hdmi_enable)
+ if ((codec->audiofunc < 0) ||
+ (codec->codec_type == AZ_CODEC_TYPE_HDMI))
+ continue;
if (codec->codec_type == AZ_CODEC_TYPE_DIGITAL) {
if (c < 0)
c = i;
Index: kern/init_sysent.c
===================================================================
RCS file: /home/cvs/src/sys/kern/init_sysent.c,v
retrieving revision 1.230
diff -u -p -r1.230 init_sysent.c
--- kern/init_sysent.c 27 Oct 2021 03:25:11 -0000 1.230
+++ kern/init_sysent.c 9 Nov 2021 22:05:42 -0000
@@ -1,4 +1,4 @@
-/* $OpenBSD: init_sysent.c,v 1.230 2021/10/27 03:25:11 visa Exp $ */
+/* $OpenBSD$ */
/*
* System call switch table.
Index: kern/kern_sysctl.c
===================================================================
RCS file: /home/cvs/src/sys/kern/kern_sysctl.c,v
retrieving revision 1.396
diff -u -p -r1.396 kern_sysctl.c
--- kern/kern_sysctl.c 30 Oct 2021 23:24:48 -0000 1.396
+++ kern/kern_sysctl.c 9 Nov 2021 21:23:30 -0000
@@ -126,6 +126,7 @@ extern fixpt_t ccpu;
extern long numvnodes;
extern int allowdt;
extern int audio_record_enable;
+extern int audio_hdmi_enable;
extern int video_record_enable;
int allowkmem;
@@ -2427,13 +2428,17 @@ int
sysctl_audio(int *name, u_int namelen, void *oldp, size_t *oldlenp,
void *newp, size_t newlen)
{
+ int error = 0;
if (namelen != 1)
return (ENOTDIR);
- if (name[0] != KERN_AUDIO_RECORD)
- return (ENOENT);
+ if (name[0] == KERN_AUDIO_RECORD)
+ error = sysctl_int(oldp, oldlenp, newp, newlen, &audio_record_enable);
- return (sysctl_int(oldp, oldlenp, newp, newlen, &audio_record_enable));
+ if (name[0] == KERN_AUDIO_HDMI)
+ error = sysctl_int(oldp, oldlenp, newp, newlen, &audio_hdmi_enable);
+
+ return (error);
}
#endif
Index: sys/sysctl.h
===================================================================
RCS file: /home/cvs/src/sys/sys/sysctl.h,v
retrieving revision 1.219
diff -u -p -r1.219 sysctl.h
--- sys/sysctl.h 30 Oct 2021 23:24:48 -0000 1.219
+++ sys/sysctl.h 7 Nov 2021 18:52:34 -0000
@@ -317,11 +317,13 @@ struct ctlname {
* KERN_AUDIO
*/
#define KERN_AUDIO_RECORD 1
-#define KERN_AUDIO_MAXID 2
+#define KERN_AUDIO_HDMI 2
+#define KERN_AUDIO_MAXID 3
#define CTL_KERN_AUDIO_NAMES { \
{ 0, 0 }, \
{ "record", CTLTYPE_INT }, \
+ { "hdmi", CTLTYPE_INT }, \
}
/*

102
honk.diff Normal file
View File

@ -0,0 +1,102 @@
Index: Makefile
===================================================================
RCS file: /cvs/ports/www/honk/Makefile,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile
--- Makefile 6 Nov 2021 10:11:05 -0000 1.17
+++ Makefile 13 Feb 2022 17:47:25 -0000
@@ -2,9 +2,8 @@
COMMENT = federated status conveyance
-DISTNAME = honk-0.9.6
+DISTNAME = honk-0.9.7
CATEGORIES = www
-REVISION = 0
HOMEPAGE = https://humungus.tedunangst.com/r/honk
@@ -31,10 +30,14 @@ DOCDIR ?= ${PREFIX}/share/doc/honk
EXAMPLESDIR = ${PREFIX}/share/examples/honk
post-build:
-.for toy in autobonker gettoken saytheday sprayandpray youvegothonks
+.for toy in autobonker saytheday sprayandpray youvegothonks
${MODGO_CMD} build ${MODGO_FLAGS} -o ${MODGO_WORKSPACE}/bin/${toy} \
${MODGO_WORKSPACE}/src/${ALL_TARGET}/toys/${toy}.go
.endfor
+.for toy2 in gettoken wonkawonk
+ ${MODGO_CMD} build ${MODGO_FLAGS} -o ${MODGO_WORKSPACE}/bin/${toy2} \
+ ${MODGO_WORKSPACE}/src/${ALL_TARGET}/toys/{${toy2}.go,fetch.go}
+.endfor
post-install:
.for p in 1 3 5 7 8
@@ -45,7 +48,7 @@ post-install:
${INSTALL_DATA_DIR} ${DOCDIR}/toys
${INSTALL_DATA} ${MODGO_WORKSPACE}/src/${ALL_TARGET}/toys/README \
${DOCDIR}/toys
- ${INSTALL_DATA} ${MODGO_WORKSPACE}/src/${ALL_TARGET}/{README,docs/*} \
+ ${INSTALL_DATA} ${MODGO_WORKSPACE}/src/${ALL_TARGET}/{LICENSE,README,docs/*} \
${DOCDIR}/
${INSTALL_DATA_DIR} ${EXAMPLESDIR}/views
${INSTALL_DATA} ${MODGO_WORKSPACE}/src/${ALL_TARGET}/views/* \
Index: distinfo
===================================================================
RCS file: /cvs/ports/www/honk/distinfo,v
retrieving revision 1.10
diff -u -p -r1.10 distinfo
--- distinfo 6 Apr 2021 14:35:14 -0000 1.10
+++ distinfo 13 Feb 2022 17:47:25 -0000
@@ -1,2 +1,2 @@
-SHA256 (honk-0.9.6.tgz) = qwMbuVknAefRPG5CroJzcSOoUXeuqWDrBT5aQ1Rn50c=
-SIZE (honk-0.9.6.tgz) = 518014
+SHA256 (honk-0.9.7.tgz) = t6EM5E98qvlnq6Y6vd21MvPBrWpkmo4qXdgNEUAeF7M=
+SIZE (honk-0.9.7.tgz) = 522993
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/honk/pkg/PLIST,v
retrieving revision 1.7
diff -u -p -r1.7 PLIST
--- pkg/PLIST 16 Jan 2021 23:42:57 -0000 1.7
+++ pkg/PLIST 13 Feb 2022 17:47:25 -0000
@@ -7,6 +7,7 @@
@bin bin/honk
@bin bin/saytheday
@bin bin/sprayandpray
+@bin bin/wonkawonk
@bin bin/youvegothonks
@man man/man1/hfcs.1
@man man/man1/honk.1
@@ -28,6 +29,7 @@
@owner
@group
share/doc/honk/
+share/doc/honk/LICENSE
share/doc/honk/README
share/doc/honk/activitypub.7.html
@sample ${VARBASE}/honk/docs/activitypub.7.html
@@ -98,5 +100,7 @@ share/examples/honk/views/pleroma.css
@sample ${VARBASE}/honk/views/pleroma.css
share/examples/honk/views/style.css
@sample ${VARBASE}/honk/views/style.css
+share/examples/honk/views/wonk.js
+@sample ${VARBASE}/honk/views/wonk.js
share/examples/honk/views/xzone.html
@sample ${VARBASE}/honk/views/xzone.html
Index: pkg/honk.rc
===================================================================
RCS file: /cvs/ports/www/honk/pkg/honk.rc,v
retrieving revision 1.6
diff -u -p -r1.6 honk.rc
--- pkg/honk.rc 6 Nov 2021 10:11:05 -0000 1.6
+++ pkg/honk.rc 13 Feb 2022 17:47:25 -0000
@@ -9,7 +9,7 @@ daemon_user="_honk"
. /etc/rc.d/rc.subr
-pexp="/usr/local/bin/honk .*"
+pexp="${TRUEPREFIX}/bin/honk .*"
rc_bg=YES
rc_reload=NO

49
jack-0.125.0p3.diff Normal file
View File

@ -0,0 +1,49 @@
Index: audio/jack/Makefile
===================================================================
RCS file: /home/cvs/ports/audio/jack/Makefile,v
retrieving revision 1.45
diff -u -p -u -p -r1.45 Makefile
--- audio/jack/Makefile 12 Jul 2019 20:43:34 -0000 1.45
+++ audio/jack/Makefile 29 Dec 2021 15:34:09 -0000
@@ -6,7 +6,7 @@ V = 0.125.0
DISTNAME = jack-audio-connection-kit-${V}
PKGNAME = jack-${V}
CATEGORIES = audio
-REVISION = 2
+REVISION = 3
SHARED_LIBS += jack 2.0 # 0.28
SHARED_LIBS += jackserver 2.0 # 0.28
Index: audio/jack/patches/patch-jack_types_h
===================================================================
RCS file: audio/jack/patches/patch-jack_types_h
diff -N audio/jack/patches/patch-jack_types_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ audio/jack/patches/patch-jack_types_h 29 Dec 2021 20:05:17 -0000
@@ -0,0 +1,26 @@
+$OpenBSD$
+
+Disable "register" variable name
+Picked from: https://github.com/jackaudio/headers/commit/ab27e5a59fe5294cf09d50ffa2414d1542cf245e
+
+Index: jack/types.h
+--- jack/types.h.orig
++++ jack/types.h
+@@ -386,7 +386,7 @@ typedef int (*JackSampleRateCallback)(jack_nframes_t
+ * @param register non-zero if the port is being registered,
+ * zero if the port is being unregistered
+ */
+-typedef void (*JackPortRegistrationCallback)(jack_port_id_t port, int register, void *arg);
++typedef void (*JackPortRegistrationCallback)(jack_port_id_t port, int /* register */, void *arg);
+
+ /**
+ * Prototype for the client supplied function that is called
+@@ -408,7 +408,7 @@ typedef void (*JackPortRenameCallback)(jack_port_id_t
+ * zero if the client is being unregistered
+ * @param arg pointer to a client supplied data
+ */
+-typedef void (*JackClientRegistrationCallback)(const char* name, int register, void *arg);
++typedef void (*JackClientRegistrationCallback)(const char* name, int /* register */, void *arg);
+
+ /**
+ * Prototype for the client supplied function that is called

622
jcs-hwp.diff Normal file
View File

@ -0,0 +1,622 @@
diff --git a/sbin/sysctl/sysctl.c b/sbin/sysctl/sysctl.c
index 5e9e562d308b..25a66b88c825 100644
--- a/sbin/sysctl/sysctl.c
+++ b/sbin/sysctl/sysctl.c
@@ -222,6 +222,7 @@ int sysctl_chipset(char *, char **, int *, int, int *);
int sysctl_audio(char *, char **, int *, int, int *);
int sysctl_video(char *, char **, int *, int, int *);
int sysctl_witness(char *, char **, int *, int, int *);
+int sysctl_hwp(char *, char **, int *, int, int *);
void vfsinit(void);
char *equ = "=";
@@ -763,6 +764,14 @@ parse(char *string, int flags)
return;
break;
}
+#endif
+#ifdef CPU_HWP
+ if (mib[1] == CPU_HWP) {
+ len = sysctl_hwp(string, &bufp, mib, flags, &type);
+ if (len < 0)
+ return;
+ break;
+ }
#endif
break;
@@ -2862,6 +2871,30 @@ sysctl_witness(char *string, char **bufpp, int mib[], int flags, int *typep)
return (3);
}
+#ifdef CPU_HWP
+/*
+ * handle machdep.hwp requests
+ */
+struct ctlname hwpname[] = CTL_HWP_NAMES;
+struct list hwplist = { hwpname, HWP_MAXID };
+
+int
+sysctl_hwp(char *string, char **bufpp, int mib[], int flags, int *typep)
+{
+ int indx;
+
+ if (*bufpp == NULL) {
+ listall(string, &hwplist);
+ return (-1);
+ }
+ if ((indx = findname(string, "third", bufpp, &hwplist)) == -1)
+ return (-1);
+ mib[2] = indx;
+ *typep = hwplist.list[indx].ctl_type;
+ return (3);
+}
+#endif
+
/*
* Scan a list of names searching for a particular name.
*/
diff --git a/sys/arch/amd64/amd64/identcpu.c b/sys/arch/amd64/amd64/identcpu.c
index 0ed9962bbfdb..2ab360bbc36a 100644
--- a/sys/arch/amd64/amd64/identcpu.c
+++ b/sys/arch/amd64/amd64/identcpu.c
@@ -213,7 +213,11 @@ const struct {
{ SEFF0EDX_SSBD, "SSBD" },
}, cpu_tpm_eaxfeatures[] = {
{ TPM_SENSOR, "SENSOR" },
+ { TPM_TURBO, "TURBO" },
{ TPM_ARAT, "ARAT" },
+ { TPM_HWP, "HWP" },
+}, cpu_tpm_ecxfeatures[] = {
+ { TPM_EPB, "EPB" },
}, cpu_cpuid_perf_eax[] = {
{ CPUIDEAX_VERID, "PERF" },
}, cpu_cpuid_apmi_edx[] = {
@@ -545,6 +549,8 @@ identifycpu(struct cpu_info *ci)
/* Check if it's an invariant TSC */
if (cpu_apmi_edx & CPUIDEDX_ITSC)
ci->ci_flags |= CPUF_INVAR_TSC;
+
+ tsc_timecounter_init(ci, freq);
}
freq = cpu_freq(ci);
@@ -605,14 +611,19 @@ identifycpu(struct cpu_info *ci)
}
if (!strcmp(cpu_vendor, "GenuineIntel") && cpuid_level >= 0x06) {
- CPUID(0x06, ci->ci_feature_tpmflags, dummy, dummy, dummy);
+ CPUID(0x06, ci->ci_feature_tpmflags_eax, dummy,
+ ci->ci_feature_tpmflags_ecx, dummy);
for (i = 0; i < nitems(cpu_tpm_eaxfeatures); i++)
- if (ci->ci_feature_tpmflags &
+ if (ci->ci_feature_tpmflags_eax &
cpu_tpm_eaxfeatures[i].bit)
printf(",%s", cpu_tpm_eaxfeatures[i].str);
+ for (i = 0; i < nitems(cpu_tpm_eaxfeatures); i++)
+ if (ci->ci_feature_tpmflags_ecx &
+ cpu_tpm_ecxfeatures[i].bit)
+ printf(",%s", cpu_tpm_ecxfeatures[i].str);
} else if (!strcmp(cpu_vendor, "AuthenticAMD")) {
if (ci->ci_family >= 0x12)
- ci->ci_feature_tpmflags |= TPM_ARAT;
+ ci->ci_feature_tpmflags_eax |= TPM_ARAT;
}
/* AMD speculation control features */
@@ -699,7 +710,9 @@ identifycpu(struct cpu_info *ci)
setperf_setup = k1x_init;
}
- if (cpu_ecxfeature & CPUIDECX_EST)
+ if (ci->ci_feature_tpmflags_eax & TPM_HWP)
+ setperf_setup = pstate_init;
+ else if (cpu_ecxfeature & CPUIDECX_EST)
setperf_setup = est_init;
#endif
@@ -722,7 +735,7 @@ identifycpu(struct cpu_info *ci)
}
#ifndef SMALL_KERNEL
- if (CPU_IS_PRIMARY(ci) && (ci->ci_feature_tpmflags & TPM_SENSOR)) {
+ if (CPU_IS_PRIMARY(ci) && (ci->ci_feature_tpmflags_eax & TPM_SENSOR)) {
strlcpy(ci->ci_sensordev.xname, ci->ci_dev->dv_xname,
sizeof(ci->ci_sensordev.xname));
ci->ci_sensor.type = SENSOR_TEMP;
@@ -757,8 +770,6 @@ identifycpu(struct cpu_info *ci)
#endif
}
- tsc_timecounter_init(ci, freq);
-
cpu_topology(ci);
#if NVMM > 0
cpu_check_vmm_cap(ci);
diff --git a/sys/arch/amd64/amd64/machdep.c b/sys/arch/amd64/amd64/machdep.c
index 1a49c56376ed..98863cbaafd1 100644
--- a/sys/arch/amd64/amd64/machdep.c
+++ b/sys/arch/amd64/amd64/machdep.c
@@ -548,6 +548,9 @@ cpu_sysctl(int *name, u_int namelen, void *oldp, size_t *oldlenp, void *newp,
#endif
case CPU_TSCFREQ:
return (sysctl_rdquad(oldp, oldlenp, newp, tsc_frequency));
+ case CPU_HWP:
+ return (pstate_hwp_sysctl(name + 1, namelen - 1, oldp, oldlenp,
+ newp, newlen, p));
default:
return (sysctl_bounded_arr(cpuctl_vars, nitems(cpuctl_vars),
name, namelen, oldp, oldlenp, newp, newlen));
diff --git a/sys/arch/amd64/amd64/pstate.c b/sys/arch/amd64/amd64/pstate.c
new file mode 100644
index 000000000000..cf211825d04e
--- /dev/null
+++ b/sys/arch/amd64/amd64/pstate.c
@@ -0,0 +1,303 @@
+/* $OpenBSD$ */
+/*
+ * Copyright (c) 2020 joshua stein <jcs@jcs.org>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+/*
+ * "The default HWP control field values are expected to be suitable for many
+ * applications. The OS can enable autonomous HWP for these common cases by:
+ *
+ * Setting IA32_HWP_REQUEST.Desired Performance = 0
+ * (hardware autonomous selection determines the performance target).
+ *
+ * Set IA32_HWP_REQUEST.Activity Window = 0 (enable HW dynamic selection of
+ * window size).
+ *
+ * To maximize HWP benefit for the common cases, the OS should set:
+ * IA32_HWP_REQUEST.Minimum_Performance =
+ * IA32_HWP_CAPABILITIES.Lowest_Performance and
+ * IA32_HWP_REQUEST.Maximum_Performance =
+ * IA32_HWP_CAPABILITIES.Highest_Performance."
+ */
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/sysctl.h>
+#include <sys/malloc.h>
+
+#include <machine/cpu.h>
+#include <machine/cpufunc.h>
+#include <machine/specialreg.h>
+#include <machine/bus.h>
+
+extern int setperf_prio;
+extern int perflevel;
+#ifdef MULTIPROCESSOR
+void mp_setperf(int);
+#endif
+
+static int pstate_hwp = 0;
+static int pstate_hwp_bias_style = -1;
+enum {
+ PSTATE_HWP_BIAS_EPP,
+ PSTATE_HWP_BIAS_EPB,
+};
+
+/* IA32_HWP_REQUEST */
+union hwp_request {
+ uint64_t msr;
+ struct {
+ uint8_t min_perf;
+ uint8_t max_perf;
+ uint8_t desired_perf;
+ uint8_t epp;
+ uint16_t act_win : 10;
+ uint8_t package : 1;
+ uint32_t reserved : 21;
+ } __packed fields;
+} pstate_hwp_req;
+
+uint64_t pstate_epb;
+
+/* IA32_HWP_CAPABILITIES */
+union hwp_capabilities {
+ uint64_t msr;
+ struct {
+ uint8_t highest_perf;
+ uint8_t guaranteed_perf;
+ uint8_t most_efficient;
+ uint8_t lowest_perf;
+ uint32_t reserved;
+ } __packed fields;
+} pstate_hwp_cap;
+
+static struct {
+ int epb_min;
+ int epb_max;
+ int epp;
+ char *label;
+} pstate_epp_labels[] = {
+ { 0x00, 0x03, 0x00, "performance" },
+ { 0x04, 0x07, 0x80, "balance_performance" },
+ { 0x08, 0x0b, 0xc0, "balance_powersave" },
+ { 0x0c, 0x0f, 0xff, "powersave" },
+};
+
+const char *pstate_hwp_bias_label(int);
+void pstate_commit(void);
+
+void
+pstate_init(struct cpu_info *ci)
+{
+ const char *cpu_device = ci->ci_dev->dv_xname;
+ union hwp_request hwp_req;
+ uint64_t msr;
+ int16_t eppepb;
+
+ if (rdmsr_safe(MSR_PLATFORM_INFO, &msr) != 0)
+ return;
+
+ /* power management must be enabled before reading capabilities */
+ wrmsr(IA32_PM_ENABLE, 1);
+ if (rdmsr(IA32_PM_ENABLE) != 1) {
+ printf("%s: enabling HWP failed\n", cpu_device);
+ return;
+ }
+
+ if (rdmsr_safe(IA32_HWP_CAPABILITIES, &pstate_hwp_cap.msr) != 0) {
+ printf("%s: no HWP capabilities\n", cpu_device);
+ /* XXX: what are we supposed to do now? */
+ return;
+ }
+
+ if (ci->ci_feature_tpmflags_eax & TPM_HWP_EPP) {
+ pstate_hwp_bias_style = PSTATE_HWP_BIAS_EPP;
+ pstate_hwp_req.msr = rdmsr(IA32_HWP_REQUEST);
+ eppepb = hwp_req.fields.epp;
+ } else if (ci->ci_feature_tpmflags_ecx & TPM_EPB) {
+ pstate_hwp_bias_style = PSTATE_HWP_BIAS_EPB;
+ eppepb = pstate_epb = rdmsr(IA32_ENERGY_PERF_BIAS) & 0x0f;
+ } else {
+ printf("%s: no energy bias control\n", cpu_device);
+ return;
+ }
+
+ /* XXX: should we force epb to performance by default? */
+
+ pstate_hwp = 1;
+ setperf_prio = 1;
+ cpu_setperf = pstate_setperf;
+
+ printf("%s: HWP enabled, bias %s, highest perf %d MHz, "
+ "guaranteed %d MHz, most efficient %d MHz, lowest perf %d MHz\n",
+ cpu_device, pstate_hwp_bias_label(eppepb),
+ pstate_hwp_cap.fields.highest_perf * 100,
+ pstate_hwp_cap.fields.guaranteed_perf * 100,
+ pstate_hwp_cap.fields.most_efficient * 100,
+ pstate_hwp_cap.fields.lowest_perf * 100);
+}
+
+const char *
+pstate_hwp_bias_label(int val)
+{
+ int i;
+
+ for (i = 0; i < (sizeof(pstate_epp_labels) /
+ sizeof(pstate_epp_labels[0])); i++) {
+ if (pstate_hwp_bias_style == PSTATE_HWP_BIAS_EPP) {
+ if (val == pstate_epp_labels[i].epp)
+ return pstate_epp_labels[i].label;
+ } else if (pstate_hwp_bias_style == PSTATE_HWP_BIAS_EPB) {
+ if (val >= pstate_epp_labels[i].epb_min &&
+ val <= pstate_epp_labels[i].epb_max)
+ return pstate_epp_labels[i].label;
+ }
+ }
+
+ return "unknown";
+}
+
+void
+pstate_setperf(int level)
+{
+ printf("%s: %s(%d)\n", curcpu()->ci_dev->dv_xname, __func__, level);
+
+ if (pstate_hwp_bias_style == PSTATE_HWP_BIAS_EPP)
+ wrmsr(IA32_HWP_REQUEST, pstate_hwp_req.msr);
+ else if (pstate_hwp_bias_style == PSTATE_HWP_BIAS_EPB)
+ wrmsr(IA32_ENERGY_PERF_BIAS, pstate_epb);
+}
+
+void
+pstate_commit(void)
+{
+#ifdef MULTIPROCESSOR
+ /*
+ * This will broadcast X86_IPI_SETPERF to call pstate_setperf on each
+ * CPU, so we can wrmsr on each
+ */
+ mp_setperf(perflevel);
+#else
+ setperf(perflevel);
+#endif
+}
+
+/* TODO: update cpuspeed in response to hwp notifications */
+
+int
+pstate_hwp_sysctl(int *name, u_int namelen, void *oldp, size_t *oldlenp,
+ void *newp, size_t newlen, struct proc *p)
+{
+ uint64_t epb;
+ const char *bias;
+ char newbias[64];
+ int newval, err, i, found = 0;
+
+ if (namelen != 1)
+ return ENOTDIR;
+
+ if (!pstate_hwp)
+ return EOPNOTSUPP;
+
+ if (name[0] < 1 || name[0] >= HWP_MAXID)
+ return EOPNOTSUPP;
+
+ pstate_hwp_req.msr = rdmsr(IA32_HWP_REQUEST);
+
+ switch (name[0]) {
+ case HWP_MIN_PERF:
+ case HWP_MAX_PERF:
+ case HWP_DESIRED_PERF:
+ switch (name[0]) {
+ case HWP_MIN_PERF:
+ newval = pstate_hwp_req.fields.min_perf;
+ break;
+ case HWP_MAX_PERF:
+ newval = pstate_hwp_req.fields.max_perf;
+ break;
+ case HWP_DESIRED_PERF:
+ newval = pstate_hwp_req.fields.desired_perf;
+ break;
+ }
+
+ if (newlen == 0)
+ return sysctl_rdint(oldp, oldlenp, newp, newval);
+
+ err = sysctl_int(oldp, oldlenp, newp, newlen, &newval);
+ if (err)
+ return err;
+
+ switch (name[0]) {
+ case HWP_MIN_PERF:
+ pstate_hwp_req.fields.min_perf = newval;
+ break;
+ case HWP_MAX_PERF:
+ pstate_hwp_req.fields.max_perf = newval;
+ break;
+ case HWP_DESIRED_PERF:
+ pstate_hwp_req.fields.desired_perf = newval;
+ break;
+ }
+
+ printf("%s: name[0] %d, newval %d [%zu], writing hwpreq 0x%llx\n",
+ curcpu()->ci_dev->dv_xname, name[0], newval, newlen,
+ pstate_hwp_req.msr);
+
+ pstate_commit();
+ return 0;
+
+ case HWP_EPP:
+ if (pstate_hwp_bias_style == PSTATE_HWP_BIAS_EPP)
+ epb = pstate_hwp_req.fields.epp;
+ else if (pstate_hwp_bias_style == PSTATE_HWP_BIAS_EPB)
+ pstate_epb = epb = rdmsr(IA32_ENERGY_PERF_BIAS) & 0x0f;
+
+ bias = pstate_hwp_bias_label(epb);
+
+ if (newlen == 0)
+ return sysctl_rdstring(oldp, oldlenp, newp, bias);
+
+ memcpy(newbias, bias, sizeof(newbias));
+ err = sysctl_string(oldp, oldlenp, newp, newlen, newbias,
+ sizeof(newbias));
+ if (err)
+ return err;
+
+ for (i = 0; i < (sizeof(pstate_epp_labels) /
+ sizeof(pstate_epp_labels[0])); i++) {
+ if (strcmp(pstate_epp_labels[i].label, newbias) != 0)
+ continue;
+
+ if (pstate_hwp_bias_style == PSTATE_HWP_BIAS_EPP)
+ pstate_hwp_req.fields.epp =
+ pstate_epp_labels[i].epp;
+ else if (pstate_hwp_bias_style == PSTATE_HWP_BIAS_EPB)
+ pstate_epb = pstate_epp_labels[i].epb_max;
+
+ found = 1;
+ }
+
+ if (!found)
+ return EINVAL;
+
+ printf("%s: changing epp/epb bias to \"%s\" (0x%llx)\n",
+ curcpu()->ci_dev->dv_xname, newbias, pstate_hwp_req.msr);
+
+ pstate_commit();
+ return 0;
+ }
+
+ return EOPNOTSUPP;
+}
diff --git a/sys/arch/amd64/conf/files.amd64 b/sys/arch/amd64/conf/files.amd64
index 7a5d40bf4cd6..b91b50804980 100644
--- a/sys/arch/amd64/conf/files.amd64
+++ b/sys/arch/amd64/conf/files.amd64
@@ -64,6 +64,7 @@ file arch/amd64/isa/clock.c
file arch/amd64/amd64/powernow-k8.c !small_kernel
file arch/amd64/amd64/est.c !small_kernel
file arch/amd64/amd64/k1x-pstate.c !small_kernel
+file arch/amd64/amd64/pstate.c !small_kernel
include "dev/rasops/files.rasops"
include "dev/wsfont/files.wsfont"
diff --git a/sys/arch/amd64/include/cpu.h b/sys/arch/amd64/include/cpu.h
index 5a76eb21e3cd..05ef1897dcbb 100644
--- a/sys/arch/amd64/include/cpu.h
+++ b/sys/arch/amd64/include/cpu.h
@@ -144,7 +144,8 @@ struct cpu_info {
u_int32_t ci_feature_sefflags_ecx;
u_int32_t ci_feature_sefflags_edx;
u_int32_t ci_feature_amdspec_ebx;
- u_int32_t ci_feature_tpmflags;
+ u_int32_t ci_feature_tpmflags_eax;
+ u_int32_t ci_feature_tpmflags_ecx;
u_int32_t ci_pnfeatset;
u_int32_t ci_efeature_eax;
u_int32_t ci_efeature_ecx;
@@ -430,9 +431,16 @@ void k8_powernow_setperf(int);
void k1x_init(struct cpu_info *);
void k1x_setperf(int);
+/* est.c */
void est_init(struct cpu_info *);
void est_setperf(int);
+/* pstate.c */
+void pstate_init(struct cpu_info *);
+void pstate_setperf(int);
+int pstate_hwp_sysctl(int *, u_int, void *, size_t *, void *, size_t,
+ struct proc *);
+
#ifdef MULTIPROCESSOR
/* mp_setperf.c */
void mp_setperf_init(void);
@@ -458,7 +466,8 @@ void mp_setperf_init(void);
#define CPU_TSCFREQ 16 /* TSC frequency */
#define CPU_INVARIANTTSC 17 /* has invariant TSC */
#define CPU_PWRACTION 18 /* action caused by power button */
-#define CPU_MAXID 19 /* number of valid machdep ids */
+#define CPU_HWP 19 /* hardware p-state knobs */
+#define CPU_MAXID 20 /* number of valid machdep ids */
#define CTL_MACHDEP_NAMES { \
{ 0, 0 }, \
@@ -480,6 +489,28 @@ void mp_setperf_init(void);
{ "tscfreq", CTLTYPE_QUAD }, \
{ "invarianttsc", CTLTYPE_INT }, \
{ "pwraction", CTLTYPE_INT }, \
+ { "hwp", CTLTYPE_INT }, \
+}
+
+/*
+ * CTL_HWP definitions.
+ */
+#define HWP_MIN_PERF 1
+#define HWP_MIN_PERF_NAME "min_perf"
+#define HWP_MAX_PERF 2
+#define HWP_MAX_PERF_NAME "max_perf"
+#define HWP_DESIRED_PERF 3
+#define HWP_DESIRED_PERF_NAME "desired_perf"
+#define HWP_EPP 4
+#define HWP_EPP_NAME "epp_bias"
+#define HWP_MAXID 5
+
+#define CTL_HWP_NAMES { \
+ { 0, 0 }, \
+ { HWP_MIN_PERF_NAME, CTLTYPE_INT }, \
+ { HWP_MAX_PERF_NAME, CTLTYPE_INT }, \
+ { HWP_DESIRED_PERF_NAME, CTLTYPE_INT }, \
+ { HWP_EPP_NAME, CTLTYPE_STRING }, \
}
#endif /* !_MACHINE_CPU_H_ */
diff --git a/sys/arch/amd64/include/specialreg.h b/sys/arch/amd64/include/specialreg.h
index e0232887ff69..ab2b30b50a45 100644
--- a/sys/arch/amd64/include/specialreg.h
+++ b/sys/arch/amd64/include/specialreg.h
@@ -234,7 +234,17 @@
* Thermal and Power Management (CPUID function 0x6) EAX bits
*/
#define TPM_SENSOR 0x00000001 /* Digital temp sensor */
+#define TPM_TURBO 0x00000002 /* Turbo Boost available */
#define TPM_ARAT 0x00000004 /* APIC Timer Always Running */
+#define TPM_HWP 0x00000080 /* Hardware P-States supported */
+#define TPM_HWP_NOTIFY 0x00000100 /* HWP Notification */
+#define TPM_HWP_ACT_WIN 0x00000200 /* HWP Activity Window */
+#define TPM_HWP_EPP 0x00000400 /* HWP Energy Perf. Preference */
+
+/*
+ * Thermal and Power Management (CPUID function 0x6) ECX bits
+ */
+#define TPM_EPB 0x00000008 /* IA32_ENERGY_PERF_BIAS supported */
/*
* "Architectural Performance Monitoring" bits (CPUID function 0x0a):
@@ -368,6 +378,7 @@
#define MSR_PERFCTR0 0x0c1
#define MSR_PERFCTR1 0x0c2
#define MSR_FSB_FREQ 0x0cd /* Core Duo/Solo only */
+#define MSR_PLATFORM_INFO 0x0ce
#define MSR_MTRRcap 0x0fe
#define MTRRcap_FIXED 0x100 /* bit 8 - fixed MTRRs supported */
#define MTRRcap_WC 0x400 /* bit 10 - WC type supported */
@@ -925,12 +936,29 @@
#define C3_CRYPT_CWLO_KEY192 0x0000040c /* 192bit, 12 rds */
#define C3_CRYPT_CWLO_KEY256 0x0000080e /* 256bit, 15 rds */
+/* Hardware-Controlled Performance States (HWP) */
+#define IA32_ENERGY_PERF_BIAS 0x1b0
+#define IA32_PM_ENABLE 0x770
+#define IA32_HWP_CAPABILITIES 0x771
+#define IA32_HWP_REQUEST_PKG 0x772
+#define IA32_HWP_INTERRUPT 0x773
+#define IA32_HWP_REQUEST 0x774
+#define IA32_HWP_STATUS 0x777
+#define MSR_PPERF 0x64e
+
/* Intel Silicon Debug */
#define IA32_DEBUG_INTERFACE 0xc80
#define IA32_DEBUG_INTERFACE_ENABLE 0x00000001
#define IA32_DEBUG_INTERFACE_LOCK 0x40000000
#define IA32_DEBUG_INTERFACE_MASK 0x80000000
+/* Config TDP MSRs */
+#define MSR_CONFIG_TDP_NOMINAL 0x00000648
+#define MSR_CONFIG_TDP_LEVEL_1 0x00000649
+#define MSR_CONFIG_TDP_LEVEL_2 0x0000064A
+#define MSR_CONFIG_TDP_CONTROL 0x0000064B
+#define MSR_TURBO_ACTIVATION_RATIO 0x0000064C
+
/*
* VMX
*/
diff --git a/sys/dev/acpi/acpicpu.c b/sys/dev/acpi/acpicpu.c
index 9e112d75872d..591094ee8d04 100644
--- a/sys/dev/acpi/acpicpu.c
+++ b/sys/dev/acpi/acpicpu.c
@@ -539,7 +539,7 @@ acpicpu_getcst(struct acpicpu_softc *sc)
use_nonmwait = 0;
while ((next_cx = SLIST_NEXT(cx, link)) != NULL) {
if (cx->state > 1 &&
- (sc->sc_ci->ci_feature_tpmflags & TPM_ARAT) == 0)
+ (sc->sc_ci->ci_feature_tpmflags_eax & TPM_ARAT) == 0)
cx->flags |= CST_FLAG_SKIP;
else if (cx->method != CST_METH_MWAIT)
use_nonmwait = 1;
@@ -573,7 +573,7 @@ acpicpu_getcst_from_fadt(struct acpicpu_softc *sc)
return;
/* skip these C2 and C3 states if the CPU doesn't have ARAT */
- flags = (sc->sc_ci->ci_feature_tpmflags & TPM_ARAT)
+ flags = (sc->sc_ci->ci_feature_tpmflags_eax & TPM_ARAT)
? 0 : CST_FLAG_SKIP;
/* Some systems don't export a full PBLK; reduce functionality */

41
k.diff Normal file
View File

@ -0,0 +1,41 @@
diff -rupN kakoune.o/Makefile kakoune/Makefile
--- kakoune.o/Makefile Mon Nov 1 10:42:22 2021
+++ kakoune/Makefile Mon Nov 1 10:44:22 2021
@@ -2,7 +2,7 @@
COMMENT = modal code editor with a focus on interactivity
-V = 2021.08.28
+V = 2021.10.28
DISTNAME = kakoune-${V}
CATEGORIES = editors
diff -rupN kakoune.o/distinfo kakoune/distinfo
--- kakoune.o/distinfo Mon Nov 1 10:42:22 2021
+++ kakoune/distinfo Mon Nov 1 11:15:46 2021
@@ -1,2 +1,2 @@
-SHA256 (kakoune-2021.08.28.tar.bz2) = b27X39jFcjIQ29hIcIrPA69LhHAW/T7elrKomtMidss=
-SIZE (kakoune-2021.08.28.tar.bz2) = 535791
+SHA256 (kakoune-2021.10.28.tar.bz2) = L0yThx3DH2KBcSKBpxGZKLHW1vMA3e2EstPOCrJ/ISY=
+SIZE (kakoune-2021.10.28.tar.bz2) = 537860
diff -rupN kakoune.o/pkg/PLIST kakoune/pkg/PLIST
--- kakoune.o/pkg/PLIST Mon Nov 1 10:42:22 2021
+++ kakoune/pkg/PLIST Mon Nov 1 11:50:33 2021
@@ -13,7 +13,8 @@ share/kak/colors/default.kak
share/kak/colors/desertex.kak
share/kak/colors/github.kak
share/kak/colors/greyscale.kak
-share/kak/colors/gruvbox.kak
+share/kak/colors/gruvbox-dark.kak
+share/kak/colors/gruvbox-light.kak
share/kak/colors/kaleidoscope-dark.kak
share/kak/colors/kaleidoscope-light.kak
share/kak/colors/lucius.kak
@@ -73,6 +74,7 @@ share/kak/rc/filetype/diff.kak
share/kak/rc/filetype/dockerfile.kak
share/kak/rc/filetype/elixir.kak
share/kak/rc/filetype/elm.kak
+share/kak/rc/filetype/erlang.kak
share/kak/rc/filetype/eruby.kak
share/kak/rc/filetype/etc.kak
share/kak/rc/filetype/exherbo.kak

View File

@ -0,0 +1,26 @@
Index: /usr/src/sys/arch/amd64/amd64/k1x-pstate.c
===================================================================
RCS file: /home/cvs/src/sys/arch/amd64/amd64/k1x-pstate.c,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 k1x-pstate.c
--- /usr/src/sys/arch/amd64/amd64/k1x-pstate.c 11 Aug 2021 18:31:48 -0000 1.11
+++ /usr/src/sys/arch/amd64/amd64/k1x-pstate.c 21 Apr 2022 19:15:24 -0000
@@ -40,6 +40,7 @@
#endif
extern int setperf_prio;
+extern int perflevel;
#define MSR_K1X_LIMIT 0xc0010061
#define MSR_K1X_CONTROL 0xc0010062
@@ -106,6 +107,10 @@ k1x_transition(struct k1x_cpu_state *cst
DELAY(100);
}
if (cfid == fid) {
+ if((perflevel == 100) && (cfid > 0)) {
+ printf("Request to set pstate %d ignored, due to perflevel 100.\n", cfid);
+ return;
+ }
cpuspeed = cstate->state_table[level].freq;
#if 0
(void)printf("Target: %d Current: %d Pstate: %d\n",

View File

@ -0,0 +1,26 @@
Index: /usr/src/sys/arch/amd64/amd64/k1x-pstate.c
===================================================================
RCS file: /home/cvs/src/sys/arch/amd64/amd64/k1x-pstate.c,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 k1x-pstate.c
--- /usr/src/sys/arch/amd64/amd64/k1x-pstate.c 11 Aug 2021 18:31:48 -0000 1.11
+++ /usr/src/sys/arch/amd64/amd64/k1x-pstate.c 21 Apr 2022 19:15:24 -0000
@@ -40,6 +40,7 @@
#endif
extern int setperf_prio;
+extern int perflevel;
#define MSR_K1X_LIMIT 0xc0010061
#define MSR_K1X_CONTROL 0xc0010062
@@ -106,6 +107,10 @@ k1x_transition(struct k1x_cpu_state *cst
DELAY(100);
}
if (cfid == fid) {
+ if((perflevel == 100) && (cfid > 0)) {
+ printf("Request to set pstate %d ignored, due to perflevel 100.\n", cfid);
+ return;
+ }
cpuspeed = cstate->state_table[level].freq;
#if 0
(void)printf("Target: %d Current: %d Pstate: %d\n",

View File

@ -0,0 +1,26 @@
Index: /usr/src/sys/arch/amd64/amd64/k1x-pstate.c
===================================================================
RCS file: /home/cvs/src/sys/arch/amd64/amd64/k1x-pstate.c,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 k1x-pstate.c
--- /usr/src/sys/arch/amd64/amd64/k1x-pstate.c 11 Aug 2021 18:31:48 -0000 1.11
+++ /usr/src/sys/arch/amd64/amd64/k1x-pstate.c 22 Apr 2022 06:50:32 -0000
@@ -40,6 +40,7 @@
#endif
extern int setperf_prio;
+extern int perflevel;
#define MSR_K1X_LIMIT 0xc0010061
#define MSR_K1X_CONTROL 0xc0010062
@@ -106,6 +107,10 @@ k1x_transition(struct k1x_cpu_state *cst
DELAY(100);
}
if (cfid == fid) {
+ if((perflevel == 100) && (cfid > 0)) {
+ printf("Request to set pstate %d ignored, due to perflevel 100.\n", cfid);
+ return;
+ }
cpuspeed = cstate->state_table[level].freq;
#if 0
(void)printf("Target: %d Current: %d Pstate: %d\n",

View File

@ -0,0 +1,34 @@
Index: /usr/src/sys/arch/amd64/amd64/k1x-pstate.c
===================================================================
RCS file: /home/cvs/src/sys/arch/amd64/amd64/k1x-pstate.c,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 k1x-pstate.c
--- /usr/src/sys/arch/amd64/amd64/k1x-pstate.c 11 Aug 2021 18:31:48 -0000 1.11
+++ /usr/src/sys/arch/amd64/amd64/k1x-pstate.c 22 Apr 2022 06:27:08 -0000
@@ -40,6 +40,7 @@
#endif
extern int setperf_prio;
+extern int perflevel;
#define MSR_K1X_LIMIT 0xc0010061
#define MSR_K1X_CONTROL 0xc0010062
@@ -106,6 +107,10 @@ k1x_transition(struct k1x_cpu_state *cst
DELAY(100);
}
if (cfid == fid) {
+ if((perflevel == 100) && (cfid > 0)) {
+ printf("Request to set pstate %d ignored, due to perflevel 100.\n", cfid);
+ return;
+ }
cpuspeed = cstate->state_table[level].freq;
#if 0
(void)printf("Target: %d Current: %d Pstate: %d\n",
@@ -160,6 +165,7 @@ k1x_acpi_init(struct k1x_cpu_state *csta
void
k1x_init(struct cpu_info *ci)
{
+ return;
struct k1x_cpu_state *cstate;
struct k1x_state *state;
u_int i;

View File

@ -0,0 +1,15 @@
Index: /usr/src/sys/arch/amd64/amd64/k1x-pstate.c
===================================================================
RCS file: /home/cvs/src/sys/arch/amd64/amd64/k1x-pstate.c,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 k1x-pstate.c
--- /usr/src/sys/arch/amd64/amd64/k1x-pstate.c 11 Aug 2021 18:31:48 -0000 1.11
+++ /usr/src/sys/arch/amd64/amd64/k1x-pstate.c 22 Apr 2022 06:33:51 -0000
@@ -160,6 +160,7 @@ k1x_acpi_init(struct k1x_cpu_state *csta
void
k1x_init(struct cpu_info *ci)
{
+ return;
struct k1x_cpu_state *cstate;
struct k1x_state *state;
u_int i;

16
k1x-pstate.diff Normal file
View File

@ -0,0 +1,16 @@
Index: sys/arch/amd64/amd64/k1x-pstate.c
===================================================================
RCS file: /home/cvs/src/sys/arch/amd64/amd64/k1x-pstate.c,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 k1x-pstate.c
--- sys/arch/amd64/amd64/k1x-pstate.c 11 Aug 2021 18:31:48 -0000 1.11
+++ sys/arch/amd64/amd64/k1x-pstate.c 1 Apr 2022 06:43:13 -0000
@@ -107,7 +107,7 @@ k1x_transition(struct k1x_cpu_state *cst
}
if (cfid == fid) {
cpuspeed = cstate->state_table[level].freq;
-#if 0
+#if 1
(void)printf("Target: %d Current: %d Pstate: %d\n",
cstate->state_table[level].freq,
cpuspeed, cfid);

436
kicad-6.0.9v0.diff Normal file
View File

@ -0,0 +1,436 @@
Index: kicad/Makefile
===================================================================
RCS file: /cvs/ports/cad/kicad/Makefile,v
retrieving revision 1.57
diff -u -p -u -p -r1.57 Makefile
--- kicad/Makefile 8 Oct 2022 21:35:52 -0000 1.57
+++ kicad/Makefile 4 Nov 2022 09:00:29 -0000
@@ -1,7 +1,7 @@
# Sync cad/kicad-share/Makefile.inc with archs where kicad is broken
BROKEN-powerpc = segfaults when trying to run the PCB editor
-V = 6.0.7
+V = 6.0.9
COMMENT = schematic and PCB editing software
DISTNAME = kicad-${V}
EPOCH = 0
Index: kicad/distinfo
===================================================================
RCS file: /cvs/ports/cad/kicad/distinfo,v
retrieving revision 1.16
diff -u -p -u -p -r1.16 distinfo
--- kicad/distinfo 12 Aug 2022 21:21:16 -0000 1.16
+++ kicad/distinfo 4 Nov 2022 09:00:29 -0000
@@ -1,2 +1,2 @@
-SHA256 (kicad-6.0.7.tar.gz) = py6IsV82DXbqdCeSOlBz2140tfjPxL44nPwksSpx5/k=
-SIZE (kicad-6.0.7.tar.gz) = 45143677
+SHA256 (kicad-6.0.9.tar.gz) = QMIYDE2gvlEWNW3UzlXeoJfWUGR6g4Q7ctpeKRqjiLA=
+SIZE (kicad-6.0.9.tar.gz) = 45166663
Index: kicad/patches/patch-pcbnew_CMakeLists_txt
===================================================================
RCS file: /cvs/ports/cad/kicad/patches/patch-pcbnew_CMakeLists_txt,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 patch-pcbnew_CMakeLists_txt
--- kicad/patches/patch-pcbnew_CMakeLists_txt 2 Nov 2022 16:39:51 -0000 1.9
+++ kicad/patches/patch-pcbnew_CMakeLists_txt 4 Nov 2022 09:00:29 -0000
@@ -4,15 +4,7 @@ from https://gitlab.com/kicad/code/kicad
Index: pcbnew/CMakeLists.txt
--- pcbnew/CMakeLists.txt.orig
+++ pcbnew/CMakeLists.txt
-@@ -487,15 +487,11 @@ add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}
- COMMAND ${SWIG_EXECUTABLE}
- ${SWIG_OPTS} -o ${CMAKE_CURRENT_BINARY_DIR}/pcbnew_wrap.cxx ${CMAKE_SOURCE_DIR}/pcbnew/python/swig/pcbnew.i
-
-- COMMAND ${PYTHON_EXECUTABLE}
-- ${CMAKE_SOURCE_DIR}/scripting/build_tools/fix_swig_imports.py
-- ${CMAKE_CURRENT_BINARY_DIR}/pcbnew.py
--
- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+@@ -501,7 +501,7 @@ add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}
)
if( UNIX AND NOT APPLE )
Index: kicad-share/Makefile.inc
===================================================================
RCS file: /cvs/ports/cad/kicad-share/Makefile.inc,v
retrieving revision 1.16
diff -u -p -u -p -r1.16 Makefile.inc
--- kicad-share/Makefile.inc 8 Oct 2022 21:35:52 -0000 1.16
+++ kicad-share/Makefile.inc 4 Nov 2022 09:00:29 -0000
@@ -5,7 +5,7 @@ NOT_FOR_ARCHS = powerpc
PKG_ARCH ?= *
-V ?= 6.0.7
+V ?= 6.0.9
EXTRACT_SUFX ?= .tar.bz2
DISTNAME= kicad-${KICAD_PROJECT}-$V
Index: kicad-share/footprints/distinfo
===================================================================
RCS file: /cvs/ports/cad/kicad-share/footprints/distinfo,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 distinfo
--- kicad-share/footprints/distinfo 12 Aug 2022 21:21:16 -0000 1.10
+++ kicad-share/footprints/distinfo 4 Nov 2022 09:00:29 -0000
@@ -1,2 +1,2 @@
-SHA256 (kicad-footprints-6.0.7.tar.bz2) = DqG7dKtBgvf84gYW/N+beRHlY7IJIwp6rztrOEHN6Ko=
-SIZE (kicad-footprints-6.0.7.tar.bz2) = 23625445
+SHA256 (kicad-footprints-6.0.9.tar.bz2) = IDKoCtcIatMjdZgZAJSXO6qRgHD3ySBLfMZNqgvYtyo=
+SIZE (kicad-footprints-6.0.9.tar.bz2) = 23657739
Index: kicad-share/footprints/pkg/PLIST
===================================================================
RCS file: /cvs/ports/cad/kicad-share/footprints/pkg/PLIST,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 PLIST
--- kicad-share/footprints/pkg/PLIST 12 Aug 2022 21:21:16 -0000 1.9
+++ kicad-share/footprints/pkg/PLIST 4 Nov 2022 09:00:33 -0000
@@ -10,6 +10,7 @@ share/kicad/footprints/Battery.pretty/Ba
share/kicad/footprints/Battery.pretty/BatteryHolder_Keystone_103_1x20mm.kicad_mod
share/kicad/footprints/Battery.pretty/BatteryHolder_Keystone_1042_1x18650.kicad_mod
share/kicad/footprints/Battery.pretty/BatteryHolder_Keystone_104_1x23mm.kicad_mod
+share/kicad/footprints/Battery.pretty/BatteryHolder_Keystone_1057_1x2032.kicad_mod
share/kicad/footprints/Battery.pretty/BatteryHolder_Keystone_1058_1x2032.kicad_mod
share/kicad/footprints/Battery.pretty/BatteryHolder_Keystone_105_1x2430.kicad_mod
share/kicad/footprints/Battery.pretty/BatteryHolder_Keystone_1060_1x2032.kicad_mod
@@ -948,6 +949,7 @@ share/kicad/footprints/Connector_Audio.p
share/kicad/footprints/Connector_Audio.pretty/Jack_3.5mm_CUI_SJ1-3533NG_Horizontal_CircularHoles.kicad_mod
share/kicad/footprints/Connector_Audio.pretty/Jack_3.5mm_CUI_SJ1-3535NG_Horizontal.kicad_mod
share/kicad/footprints/Connector_Audio.pretty/Jack_3.5mm_CUI_SJ1-3535NG_Horizontal_CircularHoles.kicad_mod
+share/kicad/footprints/Connector_Audio.pretty/Jack_3.5mm_CUI_SJ2-3593D-SMT_Horizontal.kicad_mod
share/kicad/footprints/Connector_Audio.pretty/Jack_3.5mm_Ledino_KB3SPRS_Horizontal.kicad_mod
share/kicad/footprints/Connector_Audio.pretty/Jack_3.5mm_Lumberg_1503_07_Horizontal.kicad_mod
share/kicad/footprints/Connector_Audio.pretty/Jack_3.5mm_PJ31060-I_Horizontal.kicad_mod
@@ -1154,6 +1156,7 @@ share/kicad/footprints/Connector_BarrelJ
share/kicad/footprints/Connector_BarrelJack.pretty/BarrelJack_CUI_PJ-102AH_Horizontal.kicad_mod
share/kicad/footprints/Connector_BarrelJack.pretty/BarrelJack_GCT_DCJ200-10-A_Horizontal.kicad_mod
share/kicad/footprints/Connector_BarrelJack.pretty/BarrelJack_Horizontal.kicad_mod
+share/kicad/footprints/Connector_BarrelJack.pretty/BarrelJack_Kycon_KLDX-0202-xC_Horizontal.kicad_mod
share/kicad/footprints/Connector_BarrelJack.pretty/BarrelJack_SwitchcraftConxall_RAPC10U_Horizontal.kicad_mod
share/kicad/footprints/Connector_BarrelJack.pretty/BarrelJack_Wuerth_6941xx301002.kicad_mod
share/kicad/footprints/Connector_Card.pretty/
@@ -1169,6 +1172,7 @@ share/kicad/footprints/Connector_Card.pr
share/kicad/footprints/Connector_Card.pretty/microSD_HC_Hirose_DM3BT-DSF-PEJS.kicad_mod
share/kicad/footprints/Connector_Card.pretty/microSD_HC_Hirose_DM3D-SF.kicad_mod
share/kicad/footprints/Connector_Card.pretty/microSD_HC_Molex_104031-0811.kicad_mod
+share/kicad/footprints/Connector_Card.pretty/microSD_HC_Molex_47219-2001.kicad_mod
share/kicad/footprints/Connector_Card.pretty/microSD_HC_Wuerth_693072010801.kicad_mod
share/kicad/footprints/Connector_Card.pretty/microSIM_JAE_SF53S006VCBR2000.kicad_mod
share/kicad/footprints/Connector_Coaxial.pretty/
@@ -1432,6 +1436,8 @@ share/kicad/footprints/Connector_FFC-FPC
share/kicad/footprints/Connector_FFC-FPC.pretty/JAE_FF0851SA1_2Rows-51Pins_P0.40mm_Horizontal.kicad_mod
share/kicad/footprints/Connector_FFC-FPC.pretty/JAE_FF0871SA1_2Rows-71Pins_P0.40mm_Horizontal.kicad_mod
share/kicad/footprints/Connector_FFC-FPC.pretty/JAE_FF0881SA1_2Rows-81Pins_P0.40mm_Horizontal.kicad_mod
+share/kicad/footprints/Connector_FFC-FPC.pretty/Jushuo_AFC07-S06FCA-00_1x6-1MP_P0.50_Horizontal.kicad_mod
+share/kicad/footprints/Connector_FFC-FPC.pretty/Jushuo_AFC07-S24FCA-00_1x24-1MP_P0.50_Horizontal.kicad_mod
share/kicad/footprints/Connector_FFC-FPC.pretty/Molex_200528-0040_1x04-1MP_P1.00mm_Horizontal.kicad_mod
share/kicad/footprints/Connector_FFC-FPC.pretty/Molex_200528-0050_1x05-1MP_P1.00mm_Horizontal.kicad_mod
share/kicad/footprints/Connector_FFC-FPC.pretty/Molex_200528-0060_1x06-1MP_P1.00mm_Horizontal.kicad_mod
@@ -1477,6 +1483,7 @@ share/kicad/footprints/Connector_FFC-FPC
share/kicad/footprints/Connector_FFC-FPC.pretty/Molex_52559-3652_2x18-1MP_P0.5mm_Vertical.kicad_mod
share/kicad/footprints/Connector_FFC-FPC.pretty/Molex_54132-5033_1x50-1MP_P0.5mm_Horizontal.kicad_mod
share/kicad/footprints/Connector_FFC-FPC.pretty/Molex_54548-1071_1x10-1MP_P0.5mm_Horizontal.kicad_mod
+share/kicad/footprints/Connector_FFC-FPC.pretty/Omron_XF2M-4015-1A_1x40-1MP_P0.5mm_Horizontal.kicad_mod
share/kicad/footprints/Connector_FFC-FPC.pretty/TE_0-1734839-5_1x05-1MP_P0.5mm_Horizontal.kicad_mod
share/kicad/footprints/Connector_FFC-FPC.pretty/TE_0-1734839-6_1x06-1MP_P0.5mm_Horizontal.kicad_mod
share/kicad/footprints/Connector_FFC-FPC.pretty/TE_0-1734839-7_1x07-1MP_P0.5mm_Horizontal.kicad_mod
@@ -6583,6 +6590,7 @@ share/kicad/footprints/Connector_TE-Conn
share/kicad/footprints/Connector_USB.pretty/
share/kicad/footprints/Connector_USB.pretty/USB3_A_Molex_48393-001.kicad_mod
share/kicad/footprints/Connector_USB.pretty/USB3_A_Plug_Wuerth_692112030100_Horizontal.kicad_mod
+share/kicad/footprints/Connector_USB.pretty/USB3_A_Receptacle_Wuerth_692122030100.kicad_mod
share/kicad/footprints/Connector_USB.pretty/USB3_Micro-B_Connfly_DS1104-01.kicad_mod
share/kicad/footprints/Connector_USB.pretty/USB_A_CNCTech_1001-011-01101_Horizontal.kicad_mod
share/kicad/footprints/Connector_USB.pretty/USB_A_CONNFLY_DS1095-WNR0.kicad_mod
@@ -6976,6 +6984,7 @@ share/kicad/footprints/Converter_ACDC.pr
share/kicad/footprints/Converter_ACDC.pretty/Converter_ACDC_MeanWell_IRM-10-xx_THT.kicad_mod
share/kicad/footprints/Converter_ACDC.pretty/Converter_ACDC_MeanWell_IRM-20-xx_THT.kicad_mod
share/kicad/footprints/Converter_ACDC.pretty/Converter_ACDC_MeanWell_IRM-60-xx_THT.kicad_mod
+share/kicad/footprints/Converter_ACDC.pretty/Converter_ACDC_Murata_BAC05SxxDC_THT.kicad_mod
share/kicad/footprints/Converter_ACDC.pretty/Converter_ACDC_RECOM_RAC01-xxSGB_THT.kicad_mod
share/kicad/footprints/Converter_ACDC.pretty/Converter_ACDC_RECOM_RAC04-xxSGx_THT.kicad_mod
share/kicad/footprints/Converter_ACDC.pretty/Converter_ACDC_RECOM_RAC05-xxSK_THT.kicad_mod
@@ -7022,6 +7031,8 @@ share/kicad/footprints/Converter_DCDC.pr
share/kicad/footprints/Converter_DCDC.pretty/Converter_DCDC_RECOM_R5xxxPA_THT.kicad_mod
share/kicad/footprints/Converter_DCDC.pretty/Converter_DCDC_RECOM_RPA60-xxxxSFW.kicad_mod
share/kicad/footprints/Converter_DCDC.pretty/Converter_DCDC_RECOM_RPMx.x-x.0.kicad_mod
+share/kicad/footprints/Converter_DCDC.pretty/Converter_DCDC_Silvertel_Ag54xx.kicad_mod
+share/kicad/footprints/Converter_DCDC.pretty/Converter_DCDC_Silvertel_Ag5810.kicad_mod
share/kicad/footprints/Converter_DCDC.pretty/Converter_DCDC_TRACO_TDN_5-xxxxWISM_SMD.kicad_mod
share/kicad/footprints/Converter_DCDC.pretty/Converter_DCDC_TRACO_TDN_5-xxxxWI_THT.kicad_mod
share/kicad/footprints/Converter_DCDC.pretty/Converter_DCDC_TRACO_TEL12-xxxx_THT.kicad_mod
@@ -7139,6 +7150,7 @@ share/kicad/footprints/Crystal.pretty/Cr
share/kicad/footprints/Crystal.pretty/Crystal_SMD_Abracon_ABM3B-4Pin_5.0x3.2mm.kicad_mod
share/kicad/footprints/Crystal.pretty/Crystal_SMD_Abracon_ABM3C-4Pin_5.0x3.2mm.kicad_mod
share/kicad/footprints/Crystal.pretty/Crystal_SMD_Abracon_ABM7-2Pin_6.0x3.5mm.kicad_mod
+share/kicad/footprints/Crystal.pretty/Crystal_SMD_Abracon_ABM8AIG-4Pin_3.2x2.5mm.kicad_mod
share/kicad/footprints/Crystal.pretty/Crystal_SMD_Abracon_ABM8G-4Pin_3.2x2.5mm.kicad_mod
share/kicad/footprints/Crystal.pretty/Crystal_SMD_Abracon_ABS25-4Pin_8.0x3.8mm.kicad_mod
share/kicad/footprints/Crystal.pretty/Crystal_SMD_ECS_CSM3X-2Pin_7.6x4.1mm.kicad_mod
@@ -7261,6 +7273,7 @@ share/kicad/footprints/Diode_SMD.pretty/
share/kicad/footprints/Diode_SMD.pretty/D_MELF_Handsoldering.kicad_mod
share/kicad/footprints/Diode_SMD.pretty/D_MicroMELF.kicad_mod
share/kicad/footprints/Diode_SMD.pretty/D_MicroMELF_Handsoldering.kicad_mod
+share/kicad/footprints/Diode_SMD.pretty/D_MicroSMP.kicad_mod
share/kicad/footprints/Diode_SMD.pretty/D_MiniMELF.kicad_mod
share/kicad/footprints/Diode_SMD.pretty/D_MiniMELF_Handsoldering.kicad_mod
share/kicad/footprints/Diode_SMD.pretty/D_PowerDI-123.kicad_mod
@@ -7400,8 +7413,11 @@ share/kicad/footprints/Diode_THT.pretty/
share/kicad/footprints/Diode_THT.pretty/Diode_Bridge_28.6x28.6x7.3mm_P18.0mm_P11.6mm.kicad_mod
share/kicad/footprints/Diode_THT.pretty/Diode_Bridge_32.0x5.6x17.0mm_P10.0mm_P7.5mm.kicad_mod
share/kicad/footprints/Diode_THT.pretty/Diode_Bridge_Comchip_SCVB-L.kicad_mod
+share/kicad/footprints/Diode_THT.pretty/Diode_Bridge_DIGITRON_KBPC_T.kicad_mod
share/kicad/footprints/Diode_THT.pretty/Diode_Bridge_DIP-4_W5.08mm_P2.54mm.kicad_mod
share/kicad/footprints/Diode_THT.pretty/Diode_Bridge_DIP-4_W7.62mm_P5.08mm.kicad_mod
+share/kicad/footprints/Diode_THT.pretty/Diode_Bridge_GeneSiC_KBPC_T.kicad_mod
+share/kicad/footprints/Diode_THT.pretty/Diode_Bridge_GeneSiC_KBPC_W.kicad_mod
share/kicad/footprints/Diode_THT.pretty/Diode_Bridge_IXYS_GUFP.kicad_mod
share/kicad/footprints/Diode_THT.pretty/Diode_Bridge_Round_D8.9mm.kicad_mod
share/kicad/footprints/Diode_THT.pretty/Diode_Bridge_Round_D9.0mm.kicad_mod
@@ -7598,6 +7614,7 @@ share/kicad/footprints/Fuse.pretty/Fuse_
share/kicad/footprints/Fuse.pretty/Fuse_Bourns_MF-RHT900.kicad_mod
share/kicad/footprints/Fuse.pretty/Fuse_Bourns_MF-SM_7.98x5.44mm.kicad_mod
share/kicad/footprints/Fuse.pretty/Fuse_Bourns_MF-SM_9.5x6.71mm.kicad_mod
+share/kicad/footprints/Fuse.pretty/Fuse_Bourns_TBU-CA.kicad_mod
share/kicad/footprints/Fuse.pretty/Fuse_Littelfuse-LVR100.kicad_mod
share/kicad/footprints/Fuse.pretty/Fuse_Littelfuse-LVR125.kicad_mod
share/kicad/footprints/Fuse.pretty/Fuse_Littelfuse-LVR200.kicad_mod
@@ -7609,6 +7626,25 @@ share/kicad/footprints/Fuse.pretty/Fuse_
share/kicad/footprints/Fuse.pretty/Fuse_SunFuse-6HP.kicad_mod
share/kicad/footprints/Fuse.pretty/Fuseholder_Blade_ATO_Littelfuse_Pudenz_2_Pin.kicad_mod
share/kicad/footprints/Fuse.pretty/Fuseholder_Blade_Mini_Keystone_3568.kicad_mod
+share/kicad/footprints/Fuse.pretty/Fuseholder_Clip-5x20mm_Bel_FC-203-22_Lateral_P17.80x5.00mm_D1.17mm_Horizontal.kicad_mod
+share/kicad/footprints/Fuse.pretty/Fuseholder_Clip-5x20mm_Eaton_1A5601-01_Inline_P20.80x6.76mm_D1.70mm_Horizontal.kicad_mod
+share/kicad/footprints/Fuse.pretty/Fuseholder_Clip-5x20mm_Keystone_3512P_Inline_P23.62x7.27mm_D1.02x2.41x1.02x1.57mm_Horizontal.kicad_mod
+share/kicad/footprints/Fuse.pretty/Fuseholder_Clip-5x20mm_Keystone_3512_Inline_P23.62x7.27mm_D1.02x1.57mm_Horizontal.kicad_mod
+share/kicad/footprints/Fuse.pretty/Fuseholder_Clip-5x20mm_Keystone_3517_Inline_P23.11x6.76mm_D1.70mm_Horizontal.kicad_mod
+share/kicad/footprints/Fuse.pretty/Fuseholder_Clip-5x20mm_Keystone_3518P_Inline_P23.11x6.76mm_D2.44x1.70mm_Horizontal.kicad_mod
+share/kicad/footprints/Fuse.pretty/Fuseholder_Clip-5x20mm_Littelfuse_100_Inline_P20.50x4.60mm_D1.30mm_Horizontal.kicad_mod
+share/kicad/footprints/Fuse.pretty/Fuseholder_Clip-5x20mm_Littelfuse_111_Inline_P20.00x5.00mm_D1.05mm_Horizontal.kicad_mod
+share/kicad/footprints/Fuse.pretty/Fuseholder_Clip-5x20mm_Littelfuse_111_Lateral_P18.80x5.00mm_D1.17mm_Horizontal.kicad_mod
+share/kicad/footprints/Fuse.pretty/Fuseholder_Clip-5x20mm_Littelfuse_445-030_Inline_P20.50x5.20mm_D1.30mm_Horizontal.kicad_mod
+share/kicad/footprints/Fuse.pretty/Fuseholder_Clip-5x20mm_Littelfuse_519_Inline_P20.60x5.00mm_D1.00mm_Horizontal.kicad_mod
+share/kicad/footprints/Fuse.pretty/Fuseholder_Clip-5x20mm_Littelfuse_520_Inline_P20.50x5.80mm_D1.30mm_Horizontal.kicad_mod
+share/kicad/footprints/Fuse.pretty/Fuseholder_Clip-5x20mm_Littelfuse_521_Lateral_P17.00x5.00mm_D1.30mm_Horizontal.kicad_mod
+share/kicad/footprints/Fuse.pretty/Fuseholder_Clip-5x20mm_Schurter_CQM_Inline_P20.60x5.00mm_D1.00mm_Horizontal.kicad_mod
+share/kicad/footprints/Fuse.pretty/Fuseholder_Clip-5x20mm_Schurter_OG_Lateral_P15.00x5.00mm_D1.3mm_Horizontal.kicad_mod
+share/kicad/footprints/Fuse.pretty/Fuseholder_Clip-6.3x32mm_Littelfuse_102071_Inline_P34.70x7.60mm_D2.00mm_Horizontal.kicad_mod
+share/kicad/footprints/Fuse.pretty/Fuseholder_Clip-6.3x32mm_Littelfuse_102_122_Inline_P34.21x7.62mm_D1.98mm_Horizontal.kicad_mod
+share/kicad/footprints/Fuse.pretty/Fuseholder_Clip-6.3x32mm_Littelfuse_102_Inline_P34.21x7.62mm_D2.54mm_Horizontal.kicad_mod
+share/kicad/footprints/Fuse.pretty/Fuseholder_Clip-6.3x32mm_Littelfuse_122_Inline_P34.21x7.62mm_D2.54mm_Horizontal.kicad_mod
share/kicad/footprints/Fuse.pretty/Fuseholder_Cylinder-5x20mm_Bulgin_FX0456_Vertical_Closed.kicad_mod
share/kicad/footprints/Fuse.pretty/Fuseholder_Cylinder-5x20mm_Bulgin_FX0457_Horizontal_Closed.kicad_mod
share/kicad/footprints/Fuse.pretty/Fuseholder_Cylinder-5x20mm_EATON_H15-V-1_Vertical_Closed.kicad_mod
@@ -7687,6 +7723,7 @@ share/kicad/footprints/Inductor_SMD.pret
share/kicad/footprints/Inductor_SMD.pretty/L_AVX_LMLP07A7.kicad_mod
share/kicad/footprints/Inductor_SMD.pretty/L_Abracon_ASPI-0630LR.kicad_mod
share/kicad/footprints/Inductor_SMD.pretty/L_Abracon_ASPI-3012S.kicad_mod
+share/kicad/footprints/Inductor_SMD.pretty/L_Abracon_ASPI-4030S.kicad_mod
share/kicad/footprints/Inductor_SMD.pretty/L_Bourns-SRN1060.kicad_mod
share/kicad/footprints/Inductor_SMD.pretty/L_Bourns-SRN4018.kicad_mod
share/kicad/footprints/Inductor_SMD.pretty/L_Bourns-SRN6028.kicad_mod
@@ -7707,6 +7744,8 @@ share/kicad/footprints/Inductor_SMD.pret
share/kicad/footprints/Inductor_SMD.pretty/L_Bourns_SRR1208_12.7x12.7mm.kicad_mod
share/kicad/footprints/Inductor_SMD.pretty/L_Bourns_SRR1210A.kicad_mod
share/kicad/footprints/Inductor_SMD.pretty/L_Bourns_SRR1260.kicad_mod
+share/kicad/footprints/Inductor_SMD.pretty/L_Coilcraft_LPS3010.kicad_mod
+share/kicad/footprints/Inductor_SMD.pretty/L_Coilcraft_LPS3314.kicad_mod
share/kicad/footprints/Inductor_SMD.pretty/L_Coilcraft_LPS4018.kicad_mod
share/kicad/footprints/Inductor_SMD.pretty/L_Coilcraft_LPS5030.kicad_mod
share/kicad/footprints/Inductor_SMD.pretty/L_Coilcraft_XAL5030.kicad_mod
@@ -7762,6 +7801,7 @@ share/kicad/footprints/Inductor_SMD.pret
share/kicad/footprints/Inductor_SMD.pretty/L_Neosid_SMs50.kicad_mod
share/kicad/footprints/Inductor_SMD.pretty/L_Neosid_SMs85.kicad_mod
share/kicad/footprints/Inductor_SMD.pretty/L_Neosid_SMs95_SMs95p.kicad_mod
+share/kicad/footprints/Inductor_SMD.pretty/L_Pulse_P059x.kicad_mod
share/kicad/footprints/Inductor_SMD.pretty/L_Pulse_PA4320.kicad_mod
share/kicad/footprints/Inductor_SMD.pretty/L_Pulse_PA4344.kicad_mod
share/kicad/footprints/Inductor_SMD.pretty/L_Sagami_CER1242B.kicad_mod
@@ -7789,6 +7829,7 @@ share/kicad/footprints/Inductor_SMD.pret
share/kicad/footprints/Inductor_SMD.pretty/L_TDK_SLF7055.kicad_mod
share/kicad/footprints/Inductor_SMD.pretty/L_TDK_VLF10040.kicad_mod
share/kicad/footprints/Inductor_SMD.pretty/L_TDK_VLP8040.kicad_mod
+share/kicad/footprints/Inductor_SMD.pretty/L_Taiyo-Yuden_BK_Array_1206_3216Metric.kicad_mod
share/kicad/footprints/Inductor_SMD.pretty/L_Taiyo-Yuden_MD-1616.kicad_mod
share/kicad/footprints/Inductor_SMD.pretty/L_Taiyo-Yuden_MD-2020.kicad_mod
share/kicad/footprints/Inductor_SMD.pretty/L_Taiyo-Yuden_MD-3030.kicad_mod
@@ -7973,6 +8014,12 @@ share/kicad/footprints/Inductor_THT.pret
share/kicad/footprints/Inductor_THT.pretty/L_Axial_L9.5mm_D4.0mm_P15.24mm_Horizontal_Fastron_SMCC.kicad_mod
share/kicad/footprints/Inductor_THT.pretty/L_Axial_L9.5mm_D4.0mm_P2.54mm_Vertical_Fastron_SMCC.kicad_mod
share/kicad/footprints/Inductor_THT.pretty/L_Axial_L9.5mm_D4.0mm_P5.08mm_Vertical_Fastron_SMCC.kicad_mod
+share/kicad/footprints/Inductor_THT.pretty/L_CommonMode_PulseElectronics_PH9455x105NL_1.kicad_mod
+share/kicad/footprints/Inductor_THT.pretty/L_CommonMode_PulseElectronics_PH9455x155NL_1.kicad_mod
+share/kicad/footprints/Inductor_THT.pretty/L_CommonMode_PulseElectronics_PH9455x205NL_1.kicad_mod
+share/kicad/footprints/Inductor_THT.pretty/L_CommonMode_PulseElectronics_PH9455x405NL_1.kicad_mod
+share/kicad/footprints/Inductor_THT.pretty/L_CommonMode_PulseElectronics_PH9455x705NL_1.kicad_mod
+share/kicad/footprints/Inductor_THT.pretty/L_CommonMode_PulseElectronics_PH9455xxx6NL_2.kicad_mod
share/kicad/footprints/Inductor_THT.pretty/L_CommonMode_Toroid_Vertical_L19.3mm_W10.8mm_Px6.35mm_Py15.24mm_Bourns_8100.kicad_mod
share/kicad/footprints/Inductor_THT.pretty/L_CommonMode_Toroid_Vertical_L21.0mm_W10.0mm_Px5.08mm_Py12.70mm_Murata_5100.kicad_mod
share/kicad/footprints/Inductor_THT.pretty/L_CommonMode_Toroid_Vertical_L24.0mm_W16.3mm_Px10.16mm_Py20.32mm_Murata_5200.kicad_mod
@@ -8196,6 +8243,7 @@ share/kicad/footprints/LED_SMD.pretty/LE
share/kicad/footprints/LED_SMD.pretty/LED_Dialight_591.kicad_mod
share/kicad/footprints/LED_SMD.pretty/LED_Inolux_IN-PI554FCH_PLCC4_5.0x5.0mm_P3.2mm.kicad_mod
share/kicad/footprints/LED_SMD.pretty/LED_Kingbright_AAA3528ESGCT.kicad_mod
+share/kicad/footprints/LED_SMD.pretty/LED_Kingbright_APDA3020VBCD.kicad_mod
share/kicad/footprints/LED_SMD.pretty/LED_Kingbright_APFA3010_3x1.5mm_Horizontal.kicad_mod
share/kicad/footprints/LED_SMD.pretty/LED_Kingbright_APHBM2012_2x1.25mm.kicad_mod
share/kicad/footprints/LED_SMD.pretty/LED_Kingbright_KPBD-3224.kicad_mod
@@ -8220,6 +8268,7 @@ share/kicad/footprints/LED_SMD.pretty/LE
share/kicad/footprints/LED_SMD.pretty/LED_SK6812MINI_PLCC4_3.5x3.5mm_P1.75mm.kicad_mod
share/kicad/footprints/LED_SMD.pretty/LED_SK6812_EC15_1.5x1.5mm.kicad_mod
share/kicad/footprints/LED_SMD.pretty/LED_SK6812_PLCC4_5.0x5.0mm_P3.2mm.kicad_mod
+share/kicad/footprints/LED_SMD.pretty/LED_WS2812B-2020_PLCC4_2.0x2.0mm.kicad_mod
share/kicad/footprints/LED_SMD.pretty/LED_WS2812B_PLCC4_5.0x5.0mm_P3.2mm.kicad_mod
share/kicad/footprints/LED_SMD.pretty/LED_WS2812_PLCC6_5.0x5.0mm_P1.6mm.kicad_mod
share/kicad/footprints/LED_SMD.pretty/LED_Yuji_5730.kicad_mod
@@ -8344,6 +8393,8 @@ share/kicad/footprints/Module.pretty/Tex
share/kicad/footprints/Module.pretty/Texas_EUS_R-PDSS-T5_THT.kicad_mod
share/kicad/footprints/Module.pretty/Texas_EUW_R-PDSS-T7_THT.kicad_mod
share/kicad/footprints/Module.pretty/WEMOS_D1_mini_light.kicad_mod
+share/kicad/footprints/Motors.pretty/
+share/kicad/footprints/Motors.pretty/Vybronics_VZ30C1T8219732L.kicad_mod
share/kicad/footprints/MountingEquipment.pretty/
share/kicad/footprints/MountingEquipment.pretty/DINRailAdapter_3xM3_PhoenixContact_1201578.kicad_mod
share/kicad/footprints/MountingHole.pretty/
@@ -8705,6 +8756,7 @@ share/kicad/footprints/OptoDevice.pretty
share/kicad/footprints/OptoDevice.pretty/Everlight_ITR8307.kicad_mod
share/kicad/footprints/OptoDevice.pretty/Everlight_ITR8307F43.kicad_mod
share/kicad/footprints/OptoDevice.pretty/Everlight_ITR8307_Reverse.kicad_mod
+share/kicad/footprints/OptoDevice.pretty/Everlight_ITR9608-F.kicad_mod
share/kicad/footprints/OptoDevice.pretty/Finder_34.81.kicad_mod
share/kicad/footprints/OptoDevice.pretty/Hamamatsu_C12880.kicad_mod
share/kicad/footprints/OptoDevice.pretty/Hamamatsu_S13360-30CS.kicad_mod
@@ -8722,6 +8774,7 @@ share/kicad/footprints/OptoDevice.pretty
share/kicad/footprints/OptoDevice.pretty/LaserDiode_TO38ICut-3.kicad_mod
share/kicad/footprints/OptoDevice.pretty/LaserDiode_TO5-D9-3.kicad_mod
share/kicad/footprints/OptoDevice.pretty/LaserDiode_TO56-3.kicad_mod
+share/kicad/footprints/OptoDevice.pretty/Lightpipe_Bivar_RLP1-400-650.kicad_mod
share/kicad/footprints/OptoDevice.pretty/Lightpipe_Dialight_515-1064F.kicad_mod
share/kicad/footprints/OptoDevice.pretty/Lightpipe_LPF-C012303S.kicad_mod
share/kicad/footprints/OptoDevice.pretty/Lightpipe_LPF-C013301S.kicad_mod
@@ -8734,13 +8787,16 @@ share/kicad/footprints/OptoDevice.pretty
share/kicad/footprints/OptoDevice.pretty/ONSemi_QSE15x.kicad_mod
share/kicad/footprints/OptoDevice.pretty/OnSemi_CASE100AQ.kicad_mod
share/kicad/footprints/OptoDevice.pretty/OnSemi_CASE100CY.kicad_mod
+share/kicad/footprints/OptoDevice.pretty/Osram_BP104-SMD.kicad_mod
+share/kicad/footprints/OptoDevice.pretty/Osram_BPW34S-SMD.kicad_mod
share/kicad/footprints/OptoDevice.pretty/Osram_BPW82.kicad_mod
share/kicad/footprints/OptoDevice.pretty/Osram_DIL2_4.3x4.65mm_P5.08mm.kicad_mod
share/kicad/footprints/OptoDevice.pretty/Osram_LPT80A.kicad_mod
share/kicad/footprints/OptoDevice.pretty/Osram_SFH205.kicad_mod
share/kicad/footprints/OptoDevice.pretty/Osram_SFH225.kicad_mod
+share/kicad/footprints/OptoDevice.pretty/Osram_SFH2430.kicad_mod
+share/kicad/footprints/OptoDevice.pretty/Osram_SFH2440.kicad_mod
share/kicad/footprints/OptoDevice.pretty/Osram_SFH9x0x.kicad_mod
-share/kicad/footprints/OptoDevice.pretty/Osram_SMD-DIL2_4.5x4.0mm.kicad_mod
share/kicad/footprints/OptoDevice.pretty/Osram_SMD-SmartDIL.kicad_mod
share/kicad/footprints/OptoDevice.pretty/Panasonic_APV-AQY_SSOP-4_4.45x2.65mm_P1.27mm.kicad_mod
share/kicad/footprints/OptoDevice.pretty/PerkinElmer_VTL5C.kicad_mod
@@ -9007,6 +9063,7 @@ share/kicad/footprints/Package_CSP.prett
share/kicad/footprints/Package_CSP.pretty/LFCSP-32-1EP_5x5mm_P0.5mm_EP3.6x3.6mm_ThermalVias.kicad_mod
share/kicad/footprints/Package_CSP.pretty/LFCSP-48-1EP_7x7mm_P0.5mm_EP4.1x4.1mm.kicad_mod
share/kicad/footprints/Package_CSP.pretty/LFCSP-48-1EP_7x7mm_P0.5mm_EP4.1x4.1mm_ThermalVias.kicad_mod
+share/kicad/footprints/Package_CSP.pretty/LFCSP-6-1EP_2x2mm_P0.65mm_EP1x1.6mm.kicad_mod
share/kicad/footprints/Package_CSP.pretty/LFCSP-64-1EP_9x9mm_P0.5mm_EP5.21x5.21mm.kicad_mod
share/kicad/footprints/Package_CSP.pretty/LFCSP-64-1EP_9x9mm_P0.5mm_EP5.21x5.21mm_ThermalVias.kicad_mod
share/kicad/footprints/Package_CSP.pretty/LFCSP-72-1EP_10x10mm_P0.5mm_EP5.3x5.3mm.kicad_mod
@@ -10467,6 +10524,7 @@ share/kicad/footprints/Package_TO_SOT_SM
share/kicad/footprints/Package_TO_SOT_SMD.pretty/Infineon_PG-HSOF-8-3.kicad_mod
share/kicad/footprints/Package_TO_SOT_SMD.pretty/Infineon_PG-HSOF-8-3_ThermalVias.kicad_mod
share/kicad/footprints/Package_TO_SOT_SMD.pretty/Infineon_PG-TO-220-7Lead_TabPin8.kicad_mod
+share/kicad/footprints/Package_TO_SOT_SMD.pretty/Infineon_PG-TSFP-3-1.kicad_mod
share/kicad/footprints/Package_TO_SOT_SMD.pretty/LFPAK33.kicad_mod
share/kicad/footprints/Package_TO_SOT_SMD.pretty/LFPAK56.kicad_mod
share/kicad/footprints/Package_TO_SOT_SMD.pretty/Nexperia_CFP15_SOT-1289.kicad_mod
@@ -12223,6 +12281,7 @@ share/kicad/footprints/Transformer_SMD.p
share/kicad/footprints/Transformer_SMD.pretty/Transformer_CurrentSense_8.4x7.2mm.kicad_mod
share/kicad/footprints/Transformer_SMD.pretty/Transformer_Ethernet_Bel_S558-5999-T7-F.kicad_mod
share/kicad/footprints/Transformer_SMD.pretty/Transformer_Ethernet_Bourns_PT61017PEL.kicad_mod
+share/kicad/footprints/Transformer_SMD.pretty/Transformer_Ethernet_Bourns_PT61020EL.kicad_mod
share/kicad/footprints/Transformer_SMD.pretty/Transformer_Ethernet_HALO_TG111-MSC13.kicad_mod
share/kicad/footprints/Transformer_SMD.pretty/Transformer_Ethernet_Halo_N2_SO-16_7.11x12.7mm.kicad_mod
share/kicad/footprints/Transformer_SMD.pretty/Transformer_Ethernet_Halo_N5_SO-16_7.11x12.7mm.kicad_mod
@@ -12300,6 +12359,7 @@ share/kicad/footprints/Transformer_THT.p
share/kicad/footprints/Transformer_THT.pretty/Transformer_Toroid_Tapped_Horizontal_D14.0mm_Amidon-T50.kicad_mod
share/kicad/footprints/Transformer_THT.pretty/Transformer_Toroid_Tapped_Horizontal_D9.0mm_Amidon-T30.kicad_mod
share/kicad/footprints/Transformer_THT.pretty/Transformer_Wuerth_750343373.kicad_mod
+share/kicad/footprints/Transformer_THT.pretty/Transformer_Wuerth_760871131.kicad_mod
share/kicad/footprints/Transistor_Power_Module.pretty/
share/kicad/footprints/Transistor_Power_Module.pretty/Infineon_AG-ECONO2.kicad_mod
share/kicad/footprints/Transistor_Power_Module.pretty/Infineon_EasyPIM-1B.kicad_mod
@@ -12423,5 +12483,6 @@ share/kicad/footprints/Varistor.pretty/R
share/kicad/footprints/Varistor.pretty/RV_Disc_D9mm_W5.5mm_P5mm.kicad_mod
share/kicad/footprints/Varistor.pretty/RV_Disc_D9mm_W5.7mm_P5mm.kicad_mod
share/kicad/footprints/Varistor.pretty/RV_Disc_D9mm_W6.1mm_P5mm.kicad_mod
+share/kicad/footprints/Varistor.pretty/RV_Rect_V25S440P_L26.5mm_W8.2mm_P12.7mm.kicad_mod
share/kicad/template/
share/kicad/template/fp-lib-table
Index: kicad-share/packages3D/distinfo
===================================================================
RCS file: /cvs/ports/cad/kicad-share/packages3D/distinfo,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 distinfo
--- kicad-share/packages3D/distinfo 12 Aug 2022 21:21:16 -0000 1.11
+++ kicad-share/packages3D/distinfo 4 Nov 2022 09:00:33 -0000
@@ -1,2 +1,2 @@
-SHA256 (kicad-packages3D-6.0.7.tar.bz2) = 8TAQA4htjq7K/oAsTWJKu5pbu9BWt8xHbQCqMbbPpoE=
-SIZE (kicad-packages3D-6.0.7.tar.bz2) = 736488867
+SHA256 (kicad-packages3D-6.0.9.tar.bz2) = NVqA6mCy6ov+0KmYT3+JnBBZvmqMcmgNfG8HjlCsXpY=
+SIZE (kicad-packages3D-6.0.9.tar.bz2) = 736776816
Index: kicad-share/packages3D/pkg/PLIST
===================================================================
RCS file: /cvs/ports/cad/kicad-share/packages3D/pkg/PLIST,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 PLIST
--- kicad-share/packages3D/pkg/PLIST 12 Aug 2022 21:21:16 -0000 1.10
+++ kicad-share/packages3D/pkg/PLIST 4 Nov 2022 09:00:35 -0000
@@ -8077,10 +8077,16 @@ share/kicad/3dmodels/Diode_THT.3dshapes/
share/kicad/3dmodels/Diode_THT.3dshapes/Diode_Bridge_28.6x28.6x7.3mm_P18.0mm_P11.6mm.wrl
share/kicad/3dmodels/Diode_THT.3dshapes/Diode_Bridge_32.0x5.6x17.0mm_P10.0mm_P7.5mm.step
share/kicad/3dmodels/Diode_THT.3dshapes/Diode_Bridge_32.0x5.6x17.0mm_P10.0mm_P7.5mm.wrl
+share/kicad/3dmodels/Diode_THT.3dshapes/Diode_Bridge_DIGITRON_KBPC_T.step
+share/kicad/3dmodels/Diode_THT.3dshapes/Diode_Bridge_DIGITRON_KBPC_T.wrl
share/kicad/3dmodels/Diode_THT.3dshapes/Diode_Bridge_DIP-4_W5.08mm_P2.54mm.step
share/kicad/3dmodels/Diode_THT.3dshapes/Diode_Bridge_DIP-4_W5.08mm_P2.54mm.wrl
share/kicad/3dmodels/Diode_THT.3dshapes/Diode_Bridge_DIP-4_W7.62mm_P5.08mm.step
share/kicad/3dmodels/Diode_THT.3dshapes/Diode_Bridge_DIP-4_W7.62mm_P5.08mm.wrl
+share/kicad/3dmodels/Diode_THT.3dshapes/Diode_Bridge_GeneSiC_KBPC_T.step
+share/kicad/3dmodels/Diode_THT.3dshapes/Diode_Bridge_GeneSiC_KBPC_T.wrl
+share/kicad/3dmodels/Diode_THT.3dshapes/Diode_Bridge_GeneSiC_KBPC_W.step
+share/kicad/3dmodels/Diode_THT.3dshapes/Diode_Bridge_GeneSiC_KBPC_W.wrl
share/kicad/3dmodels/Diode_THT.3dshapes/Diode_Bridge_IXYS_GUFP.step
share/kicad/3dmodels/Diode_THT.3dshapes/Diode_Bridge_IXYS_GUFP.wrl
share/kicad/3dmodels/Diode_THT.3dshapes/Diode_Bridge_Round_D8.9mm.step
@@ -10040,6 +10046,8 @@ share/kicad/3dmodels/Package_DFN_QFN.3ds
share/kicad/3dmodels/Package_DFN_QFN.3dshapes/VQFN-24-1EP_4x4mm_P0.5mm_EP2.45x2.45mm.wrl
share/kicad/3dmodels/Package_DFN_QFN.3dshapes/VQFN-28-1EP_4x5mm_P0.5mm_EP2.55x3.55mm.step
share/kicad/3dmodels/Package_DFN_QFN.3dshapes/VQFN-28-1EP_4x5mm_P0.5mm_EP2.55x3.55mm.wrl
+share/kicad/3dmodels/Package_DFN_QFN.3dshapes/Vishay_PowerPAK_MLP32_55G.step
+share/kicad/3dmodels/Package_DFN_QFN.3dshapes/Vishay_PowerPAK_MLP32_55G.wrl
share/kicad/3dmodels/Package_DFN_QFN.3dshapes/WDFN-12-1EP_3x3mm_P0.45mm_EP1.7x2.5mm.step
share/kicad/3dmodels/Package_DFN_QFN.3dshapes/WDFN-12-1EP_3x3mm_P0.45mm_EP1.7x2.5mm.wrl
share/kicad/3dmodels/Package_DFN_QFN.3dshapes/WDFN-8-1EP_3x2mm_P0.5mm_EP1.3x1.4mm.step
Index: kicad-share/symbols/distinfo
===================================================================
RCS file: /cvs/ports/cad/kicad-share/symbols/distinfo,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 distinfo
--- kicad-share/symbols/distinfo 12 Aug 2022 21:21:17 -0000 1.10
+++ kicad-share/symbols/distinfo 4 Nov 2022 09:00:35 -0000
@@ -1,2 +1,2 @@
-SHA256 (kicad-symbols-6.0.7.tar.bz2) = NYLTyIp5q6Mswy+SGlzYuVkKu4PLmy9OVL7yqeLUmlA=
-SIZE (kicad-symbols-6.0.7.tar.bz2) = 2268170
+SHA256 (kicad-symbols-6.0.9.tar.bz2) = g887HItWKC3MBXmKMqLGQIMbW+BxcLvlt9KVjC4N3QQ=
+SIZE (kicad-symbols-6.0.9.tar.bz2) = 2271982
Index: kicad-share/templates/distinfo
===================================================================
RCS file: /cvs/ports/cad/kicad-share/templates/distinfo,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 distinfo
--- kicad-share/templates/distinfo 12 Aug 2022 21:21:17 -0000 1.10
+++ kicad-share/templates/distinfo 4 Nov 2022 09:00:35 -0000
@@ -1,2 +1,2 @@
-SHA256 (kicad-templates-6.0.7.tar.bz2) = NRkqSB9oJUYyitjLyAuP3m9EqP8OvS36Ti92Aqghv+4=
-SIZE (kicad-templates-6.0.7.tar.bz2) = 934731
+SHA256 (kicad-templates-6.0.9.tar.bz2) = Mwbuwmy6L31vtmMNDNo4WMNkzMkxUT8s+OOHGTvlgLo=
+SIZE (kicad-templates-6.0.9.tar.bz2) = 934744

464
kicad-6.0.9v0.orig.diff Normal file
View File

@ -0,0 +1,464 @@
Date: Wed, 2 Nov 2022 13:47:25 -0600
From: Tracey Emery <tracey@traceyemery.net>
To: ports@openbsd.org
Subject: [Update] cad/kicad 6.0.7 -> 6.0.9
Sender: owner-ports@openbsd.org
List-Unsubscribe: <mailto:majordomo@openbsd.org?body=unsub%20ports>
Return-Path: <owner-ports+M131403@openbsd.org>
Delivered-To: sh+openbsd-ports@codevoid.de
Received: from mail.openbsd.org (mail.openbsd.org [199.185.178.25]) by
mail.codevoid.de (OpenSMTPD) with ESMTPS id 8a7d151a
(TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for <sh+openbsd-ports@codevoid.de>;
Wed, 2 Nov 2022 20:48:59 +0100 (CET)
Received: from openbsd.org (localhost [127.0.0.1]) by mail.openbsd.org
(OpenSMTPD) with ESMTP id 04385a30; Wed, 2 Nov 2022 13:48:56 -0600 (MDT)
Received: from traceyemery.net (traceyemery.net [46.23.89.21]) by
mail.openbsd.org (OpenSMTPD) with ESMTPS id 9e6ceecd
(TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for <ports@openbsd.org>; Wed, 2 Nov
2022 13:47:31 -0600 (MDT)
Received: from traceyemery.net (localhost [127.0.0.1]) by traceyemery.net
(OpenSMTPD) with ESMTP id d995709d for <ports@openbsd.org>; Wed, 2 Nov 2022
13:47:29 -0600 (MDT)
Received: from traceyemery.net (visnet.us [216.83.74.8]) by traceyemery.net
(OpenSMTPD) with ESMTPSA id 64b22ce6 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO)
for <ports@openbsd.org>; Wed, 2 Nov 2022 13:47:28 -0600 (MDT)
Message-ID: <20221102194725.fku5ves44d5xopyk@traceyemery.net>
Mail-Followup-To: ports@openbsd.org
Content-Disposition: inline
List-Help: <mailto:majordomo@openbsd.org?body=help>
List-ID: <ports.openbsd.org>
List-Owner: <mailto:owner-ports@openbsd.org>
List-Post: <mailto:ports@openbsd.org>
List-Subscribe: <mailto:majordomo@openbsd.org?body=sub%20ports>
X-Loop: ports@openbsd.org
Precedence: bulk
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset=utf-8
Hello ports,
Well, since no one cared about the 6.0.8 update, lets try the 6.0.9 one.
This brings kicad and friends from 6.0.7 to 6.0.9. Works fine on amd64.
Release notes: https://www.kicad.org/blog/2022/10/KiCad-6.0.9-Release/
Ok?
--
Tracey Emery
Index: kicad/Makefile
===================================================================
RCS file: /home/cvs/ports/cad/kicad/Makefile,v
retrieving revision 1.57
diff -u -p -r1.57 Makefile
--- kicad/Makefile 8 Oct 2022 21:35:52 -0000 1.57
+++ kicad/Makefile 2 Nov 2022 19:46:43 -0000
@@ -1,7 +1,7 @@
# Sync cad/kicad-share/Makefile.inc with archs where kicad is broken
BROKEN-powerpc = segfaults when trying to run the PCB editor
-V = 6.0.7
+V = 6.0.9
COMMENT = schematic and PCB editing software
DISTNAME = kicad-${V}
EPOCH = 0
Index: kicad/distinfo
===================================================================
RCS file: /home/cvs/ports/cad/kicad/distinfo,v
retrieving revision 1.16
diff -u -p -r1.16 distinfo
--- kicad/distinfo 12 Aug 2022 21:21:16 -0000 1.16
+++ kicad/distinfo 1 Nov 2022 16:07:00 -0000
@@ -1,2 +1,2 @@
-SHA256 (kicad-6.0.7.tar.gz) = py6IsV82DXbqdCeSOlBz2140tfjPxL44nPwksSpx5/k=
-SIZE (kicad-6.0.7.tar.gz) = 45143677
+SHA256 (kicad-6.0.9.tar.gz) = QMIYDE2gvlEWNW3UzlXeoJfWUGR6g4Q7ctpeKRqjiLA=
+SIZE (kicad-6.0.9.tar.gz) = 45166663
Index: kicad-share/Makefile.inc
===================================================================
RCS file: /home/cvs/ports/cad/kicad-share/Makefile.inc,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile.inc
--- kicad-share/Makefile.inc 8 Oct 2022 21:35:52 -0000 1.16
+++ kicad-share/Makefile.inc 1 Nov 2022 16:05:44 -0000
@@ -5,7 +5,7 @@ NOT_FOR_ARCHS = powerpc
PKG_ARCH ?= *
-V ?= 6.0.7
+V ?= 6.0.9
EXTRACT_SUFX ?= .tar.bz2
DISTNAME= kicad-${KICAD_PROJECT}-$V
Index: kicad-share/footprints/distinfo
===================================================================
RCS file: /home/cvs/ports/cad/kicad-share/footprints/distinfo,v
retrieving revision 1.10
diff -u -p -r1.10 distinfo
--- kicad-share/footprints/distinfo 12 Aug 2022 21:21:16 -0000 1.10
+++ kicad-share/footprints/distinfo 1 Nov 2022 16:07:09 -0000
@@ -1,2 +1,2 @@
-SHA256 (kicad-footprints-6.0.7.tar.bz2) = DqG7dKtBgvf84gYW/N+beRHlY7IJIwp6rztrOEHN6Ko=
-SIZE (kicad-footprints-6.0.7.tar.bz2) = 23625445
+SHA256 (kicad-footprints-6.0.9.tar.bz2) = IDKoCtcIatMjdZgZAJSXO6qRgHD3ySBLfMZNqgvYtyo=
+SIZE (kicad-footprints-6.0.9.tar.bz2) = 23657739
Index: kicad-share/footprints/pkg/PLIST
===================================================================
RCS file: /home/cvs/ports/cad/kicad-share/footprints/pkg/PLIST,v
retrieving revision 1.9
diff -u -p -r1.9 PLIST
--- kicad-share/footprints/pkg/PLIST 12 Aug 2022 21:21:16 -0000 1.9
+++ kicad-share/footprints/pkg/PLIST 2 Nov 2022 19:34:33 -0000
@@ -10,6 +10,7 @@ share/kicad/footprints/Battery.pretty/Ba
share/kicad/footprints/Battery.pretty/BatteryHolder_Keystone_103_1x20mm.kicad_mod
share/kicad/footprints/Battery.pretty/BatteryHolder_Keystone_1042_1x18650.kicad_mod
share/kicad/footprints/Battery.pretty/BatteryHolder_Keystone_104_1x23mm.kicad_mod
+share/kicad/footprints/Battery.pretty/BatteryHolder_Keystone_1057_1x2032.kicad_mod
share/kicad/footprints/Battery.pretty/BatteryHolder_Keystone_1058_1x2032.kicad_mod
share/kicad/footprints/Battery.pretty/BatteryHolder_Keystone_105_1x2430.kicad_mod
share/kicad/footprints/Battery.pretty/BatteryHolder_Keystone_1060_1x2032.kicad_mod
@@ -948,6 +949,7 @@ share/kicad/footprints/Connector_Audio.p
share/kicad/footprints/Connector_Audio.pretty/Jack_3.5mm_CUI_SJ1-3533NG_Horizontal_CircularHoles.kicad_mod
share/kicad/footprints/Connector_Audio.pretty/Jack_3.5mm_CUI_SJ1-3535NG_Horizontal.kicad_mod
share/kicad/footprints/Connector_Audio.pretty/Jack_3.5mm_CUI_SJ1-3535NG_Horizontal_CircularHoles.kicad_mod
+share/kicad/footprints/Connector_Audio.pretty/Jack_3.5mm_CUI_SJ2-3593D-SMT_Horizontal.kicad_mod
share/kicad/footprints/Connector_Audio.pretty/Jack_3.5mm_Ledino_KB3SPRS_Horizontal.kicad_mod
share/kicad/footprints/Connector_Audio.pretty/Jack_3.5mm_Lumberg_1503_07_Horizontal.kicad_mod
share/kicad/footprints/Connector_Audio.pretty/Jack_3.5mm_PJ31060-I_Horizontal.kicad_mod
@@ -1154,6 +1156,7 @@ share/kicad/footprints/Connector_BarrelJ
share/kicad/footprints/Connector_BarrelJack.pretty/BarrelJack_CUI_PJ-102AH_Horizontal.kicad_mod
share/kicad/footprints/Connector_BarrelJack.pretty/BarrelJack_GCT_DCJ200-10-A_Horizontal.kicad_mod
share/kicad/footprints/Connector_BarrelJack.pretty/BarrelJack_Horizontal.kicad_mod
+share/kicad/footprints/Connector_BarrelJack.pretty/BarrelJack_Kycon_KLDX-0202-xC_Horizontal.kicad_mod
share/kicad/footprints/Connector_BarrelJack.pretty/BarrelJack_SwitchcraftConxall_RAPC10U_Horizontal.kicad_mod
share/kicad/footprints/Connector_BarrelJack.pretty/BarrelJack_Wuerth_6941xx301002.kicad_mod
share/kicad/footprints/Connector_Card.pretty/
@@ -1169,6 +1172,7 @@ share/kicad/footprints/Connector_Card.pr
share/kicad/footprints/Connector_Card.pretty/microSD_HC_Hirose_DM3BT-DSF-PEJS.kicad_mod
share/kicad/footprints/Connector_Card.pretty/microSD_HC_Hirose_DM3D-SF.kicad_mod
share/kicad/footprints/Connector_Card.pretty/microSD_HC_Molex_104031-0811.kicad_mod
+share/kicad/footprints/Connector_Card.pretty/microSD_HC_Molex_47219-2001.kicad_mod
share/kicad/footprints/Connector_Card.pretty/microSD_HC_Wuerth_693072010801.kicad_mod
share/kicad/footprints/Connector_Card.pretty/microSIM_JAE_SF53S006VCBR2000.kicad_mod
share/kicad/footprints/Connector_Coaxial.pretty/
@@ -1432,6 +1436,8 @@ share/kicad/footprints/Connector_FFC-FPC
share/kicad/footprints/Connector_FFC-FPC.pretty/JAE_FF0851SA1_2Rows-51Pins_P0.40mm_Horizontal.kicad_mod
share/kicad/footprints/Connector_FFC-FPC.pretty/JAE_FF0871SA1_2Rows-71Pins_P0.40mm_Horizontal.kicad_mod
share/kicad/footprints/Connector_FFC-FPC.pretty/JAE_FF0881SA1_2Rows-81Pins_P0.40mm_Horizontal.kicad_mod
+share/kicad/footprints/Connector_FFC-FPC.pretty/Jushuo_AFC07-S06FCA-00_1x6-1MP_P0.50_Horizontal.kicad_mod
+share/kicad/footprints/Connector_FFC-FPC.pretty/Jushuo_AFC07-S24FCA-00_1x24-1MP_P0.50_Horizontal.kicad_mod
share/kicad/footprints/Connector_FFC-FPC.pretty/Molex_200528-0040_1x04-1MP_P1.00mm_Horizontal.kicad_mod
share/kicad/footprints/Connector_FFC-FPC.pretty/Molex_200528-0050_1x05-1MP_P1.00mm_Horizontal.kicad_mod
share/kicad/footprints/Connector_FFC-FPC.pretty/Molex_200528-0060_1x06-1MP_P1.00mm_Horizontal.kicad_mod
@@ -1477,6 +1483,7 @@ share/kicad/footprints/Connector_FFC-FPC
share/kicad/footprints/Connector_FFC-FPC.pretty/Molex_52559-3652_2x18-1MP_P0.5mm_Vertical.kicad_mod
share/kicad/footprints/Connector_FFC-FPC.pretty/Molex_54132-5033_1x50-1MP_P0.5mm_Horizontal.kicad_mod
share/kicad/footprints/Connector_FFC-FPC.pretty/Molex_54548-1071_1x10-1MP_P0.5mm_Horizontal.kicad_mod
+share/kicad/footprints/Connector_FFC-FPC.pretty/Omron_XF2M-4015-1A_1x40-1MP_P0.5mm_Horizontal.kicad_mod
share/kicad/footprints/Connector_FFC-FPC.pretty/TE_0-1734839-5_1x05-1MP_P0.5mm_Horizontal.kicad_mod
share/kicad/footprints/Connector_FFC-FPC.pretty/TE_0-1734839-6_1x06-1MP_P0.5mm_Horizontal.kicad_mod
share/kicad/footprints/Connector_FFC-FPC.pretty/TE_0-1734839-7_1x07-1MP_P0.5mm_Horizontal.kicad_mod
@@ -6583,6 +6590,7 @@ share/kicad/footprints/Connector_TE-Conn
share/kicad/footprints/Connector_USB.pretty/
share/kicad/footprints/Connector_USB.pretty/USB3_A_Molex_48393-001.kicad_mod
share/kicad/footprints/Connector_USB.pretty/USB3_A_Plug_Wuerth_692112030100_Horizontal.kicad_mod
+share/kicad/footprints/Connector_USB.pretty/USB3_A_Receptacle_Wuerth_692122030100.kicad_mod
share/kicad/footprints/Connector_USB.pretty/USB3_Micro-B_Connfly_DS1104-01.kicad_mod
share/kicad/footprints/Connector_USB.pretty/USB_A_CNCTech_1001-011-01101_Horizontal.kicad_mod
share/kicad/footprints/Connector_USB.pretty/USB_A_CONNFLY_DS1095-WNR0.kicad_mod
@@ -6976,6 +6984,7 @@ share/kicad/footprints/Converter_ACDC.pr
share/kicad/footprints/Converter_ACDC.pretty/Converter_ACDC_MeanWell_IRM-10-xx_THT.kicad_mod
share/kicad/footprints/Converter_ACDC.pretty/Converter_ACDC_MeanWell_IRM-20-xx_THT.kicad_mod
share/kicad/footprints/Converter_ACDC.pretty/Converter_ACDC_MeanWell_IRM-60-xx_THT.kicad_mod
+share/kicad/footprints/Converter_ACDC.pretty/Converter_ACDC_Murata_BAC05SxxDC_THT.kicad_mod
share/kicad/footprints/Converter_ACDC.pretty/Converter_ACDC_RECOM_RAC01-xxSGB_THT.kicad_mod
share/kicad/footprints/Converter_ACDC.pretty/Converter_ACDC_RECOM_RAC04-xxSGx_THT.kicad_mod
share/kicad/footprints/Converter_ACDC.pretty/Converter_ACDC_RECOM_RAC05-xxSK_THT.kicad_mod
@@ -7022,6 +7031,8 @@ share/kicad/footprints/Converter_DCDC.pr
share/kicad/footprints/Converter_DCDC.pretty/Converter_DCDC_RECOM_R5xxxPA_THT.kicad_mod
share/kicad/footprints/Converter_DCDC.pretty/Converter_DCDC_RECOM_RPA60-xxxxSFW.kicad_mod
share/kicad/footprints/Converter_DCDC.pretty/Converter_DCDC_RECOM_RPMx.x-x.0.kicad_mod
+share/kicad/footprints/Converter_DCDC.pretty/Converter_DCDC_Silvertel_Ag54xx.kicad_mod
+share/kicad/footprints/Converter_DCDC.pretty/Converter_DCDC_Silvertel_Ag5810.kicad_mod
share/kicad/footprints/Converter_DCDC.pretty/Converter_DCDC_TRACO_TDN_5-xxxxWISM_SMD.kicad_mod
share/kicad/footprints/Converter_DCDC.pretty/Converter_DCDC_TRACO_TDN_5-xxxxWI_THT.kicad_mod
share/kicad/footprints/Converter_DCDC.pretty/Converter_DCDC_TRACO_TEL12-xxxx_THT.kicad_mod
@@ -7139,6 +7150,7 @@ share/kicad/footprints/Crystal.pretty/Cr
share/kicad/footprints/Crystal.pretty/Crystal_SMD_Abracon_ABM3B-4Pin_5.0x3.2mm.kicad_mod
share/kicad/footprints/Crystal.pretty/Crystal_SMD_Abracon_ABM3C-4Pin_5.0x3.2mm.kicad_mod
share/kicad/footprints/Crystal.pretty/Crystal_SMD_Abracon_ABM7-2Pin_6.0x3.5mm.kicad_mod
+share/kicad/footprints/Crystal.pretty/Crystal_SMD_Abracon_ABM8AIG-4Pin_3.2x2.5mm.kicad_mod
share/kicad/footprints/Crystal.pretty/Crystal_SMD_Abracon_ABM8G-4Pin_3.2x2.5mm.kicad_mod
share/kicad/footprints/Crystal.pretty/Crystal_SMD_Abracon_ABS25-4Pin_8.0x3.8mm.kicad_mod
share/kicad/footprints/Crystal.pretty/Crystal_SMD_ECS_CSM3X-2Pin_7.6x4.1mm.kicad_mod
@@ -7261,6 +7273,7 @@ share/kicad/footprints/Diode_SMD.pretty/
share/kicad/footprints/Diode_SMD.pretty/D_MELF_Handsoldering.kicad_mod
share/kicad/footprints/Diode_SMD.pretty/D_MicroMELF.kicad_mod
share/kicad/footprints/Diode_SMD.pretty/D_MicroMELF_Handsoldering.kicad_mod
+share/kicad/footprints/Diode_SMD.pretty/D_MicroSMP.kicad_mod
share/kicad/footprints/Diode_SMD.pretty/D_MiniMELF.kicad_mod
share/kicad/footprints/Diode_SMD.pretty/D_MiniMELF_Handsoldering.kicad_mod
share/kicad/footprints/Diode_SMD.pretty/D_PowerDI-123.kicad_mod
@@ -7400,8 +7413,11 @@ share/kicad/footprints/Diode_THT.pretty/
share/kicad/footprints/Diode_THT.pretty/Diode_Bridge_28.6x28.6x7.3mm_P18.0mm_P11.6mm.kicad_mod
share/kicad/footprints/Diode_THT.pretty/Diode_Bridge_32.0x5.6x17.0mm_P10.0mm_P7.5mm.kicad_mod
share/kicad/footprints/Diode_THT.pretty/Diode_Bridge_Comchip_SCVB-L.kicad_mod
+share/kicad/footprints/Diode_THT.pretty/Diode_Bridge_DIGITRON_KBPC_T.kicad_mod
share/kicad/footprints/Diode_THT.pretty/Diode_Bridge_DIP-4_W5.08mm_P2.54mm.kicad_mod
share/kicad/footprints/Diode_THT.pretty/Diode_Bridge_DIP-4_W7.62mm_P5.08mm.kicad_mod
+share/kicad/footprints/Diode_THT.pretty/Diode_Bridge_GeneSiC_KBPC_T.kicad_mod
+share/kicad/footprints/Diode_THT.pretty/Diode_Bridge_GeneSiC_KBPC_W.kicad_mod
share/kicad/footprints/Diode_THT.pretty/Diode_Bridge_IXYS_GUFP.kicad_mod
share/kicad/footprints/Diode_THT.pretty/Diode_Bridge_Round_D8.9mm.kicad_mod
share/kicad/footprints/Diode_THT.pretty/Diode_Bridge_Round_D9.0mm.kicad_mod
@@ -7598,6 +7614,7 @@ share/kicad/footprints/Fuse.pretty/Fuse_
share/kicad/footprints/Fuse.pretty/Fuse_Bourns_MF-RHT900.kicad_mod
share/kicad/footprints/Fuse.pretty/Fuse_Bourns_MF-SM_7.98x5.44mm.kicad_mod
share/kicad/footprints/Fuse.pretty/Fuse_Bourns_MF-SM_9.5x6.71mm.kicad_mod
+share/kicad/footprints/Fuse.pretty/Fuse_Bourns_TBU-CA.kicad_mod
share/kicad/footprints/Fuse.pretty/Fuse_Littelfuse-LVR100.kicad_mod
share/kicad/footprints/Fuse.pretty/Fuse_Littelfuse-LVR125.kicad_mod
share/kicad/footprints/Fuse.pretty/Fuse_Littelfuse-LVR200.kicad_mod
@@ -7609,6 +7626,25 @@ share/kicad/footprints/Fuse.pretty/Fuse_
share/kicad/footprints/Fuse.pretty/Fuse_SunFuse-6HP.kicad_mod
share/kicad/footprints/Fuse.pretty/Fuseholder_Blade_ATO_Littelfuse_Pudenz_2_Pin.kicad_mod
share/kicad/footprints/Fuse.pretty/Fuseholder_Blade_Mini_Keystone_3568.kicad_mod
+share/kicad/footprints/Fuse.pretty/Fuseholder_Clip-5x20mm_Bel_FC-203-22_Lateral_P17.80x5.00mm_D1.17mm_Horizontal.kicad_mod
+share/kicad/footprints/Fuse.pretty/Fuseholder_Clip-5x20mm_Eaton_1A5601-01_Inline_P20.80x6.76mm_D1.70mm_Horizontal.kicad_mod
+share/kicad/footprints/Fuse.pretty/Fuseholder_Clip-5x20mm_Keystone_3512P_Inline_P23.62x7.27mm_D1.02x2.41x1.02x1.57mm_Horizontal.kicad_mod
+share/kicad/footprints/Fuse.pretty/Fuseholder_Clip-5x20mm_Keystone_3512_Inline_P23.62x7.27mm_D1.02x1.57mm_Horizontal.kicad_mod
+share/kicad/footprints/Fuse.pretty/Fuseholder_Clip-5x20mm_Keystone_3517_Inline_P23.11x6.76mm_D1.70mm_Horizontal.kicad_mod
+share/kicad/footprints/Fuse.pretty/Fuseholder_Clip-5x20mm_Keystone_3518P_Inline_P23.11x6.76mm_D2.44x1.70mm_Horizontal.kicad_mod
+share/kicad/footprints/Fuse.pretty/Fuseholder_Clip-5x20mm_Littelfuse_100_Inline_P20.50x4.60mm_D1.30mm_Horizontal.kicad_mod
+share/kicad/footprints/Fuse.pretty/Fuseholder_Clip-5x20mm_Littelfuse_111_Inline_P20.00x5.00mm_D1.05mm_Horizontal.kicad_mod
+share/kicad/footprints/Fuse.pretty/Fuseholder_Clip-5x20mm_Littelfuse_111_Lateral_P18.80x5.00mm_D1.17mm_Horizontal.kicad_mod
+share/kicad/footprints/Fuse.pretty/Fuseholder_Clip-5x20mm_Littelfuse_445-030_Inline_P20.50x5.20mm_D1.30mm_Horizontal.kicad_mod
+share/kicad/footprints/Fuse.pretty/Fuseholder_Clip-5x20mm_Littelfuse_519_Inline_P20.60x5.00mm_D1.00mm_Horizontal.kicad_mod
+share/kicad/footprints/Fuse.pretty/Fuseholder_Clip-5x20mm_Littelfuse_520_Inline_P20.50x5.80mm_D1.30mm_Horizontal.kicad_mod
+share/kicad/footprints/Fuse.pretty/Fuseholder_Clip-5x20mm_Littelfuse_521_Lateral_P17.00x5.00mm_D1.30mm_Horizontal.kicad_mod
+share/kicad/footprints/Fuse.pretty/Fuseholder_Clip-5x20mm_Schurter_CQM_Inline_P20.60x5.00mm_D1.00mm_Horizontal.kicad_mod
+share/kicad/footprints/Fuse.pretty/Fuseholder_Clip-5x20mm_Schurter_OG_Lateral_P15.00x5.00mm_D1.3mm_Horizontal.kicad_mod
+share/kicad/footprints/Fuse.pretty/Fuseholder_Clip-6.3x32mm_Littelfuse_102071_Inline_P34.70x7.60mm_D2.00mm_Horizontal.kicad_mod
+share/kicad/footprints/Fuse.pretty/Fuseholder_Clip-6.3x32mm_Littelfuse_102_122_Inline_P34.21x7.62mm_D1.98mm_Horizontal.kicad_mod
+share/kicad/footprints/Fuse.pretty/Fuseholder_Clip-6.3x32mm_Littelfuse_102_Inline_P34.21x7.62mm_D2.54mm_Horizontal.kicad_mod
+share/kicad/footprints/Fuse.pretty/Fuseholder_Clip-6.3x32mm_Littelfuse_122_Inline_P34.21x7.62mm_D2.54mm_Horizontal.kicad_mod
share/kicad/footprints/Fuse.pretty/Fuseholder_Cylinder-5x20mm_Bulgin_FX0456_Vertical_Closed.kicad_mod
share/kicad/footprints/Fuse.pretty/Fuseholder_Cylinder-5x20mm_Bulgin_FX0457_Horizontal_Closed.kicad_mod
share/kicad/footprints/Fuse.pretty/Fuseholder_Cylinder-5x20mm_EATON_H15-V-1_Vertical_Closed.kicad_mod
@@ -7687,6 +7723,7 @@ share/kicad/footprints/Inductor_SMD.pret
share/kicad/footprints/Inductor_SMD.pretty/L_AVX_LMLP07A7.kicad_mod
share/kicad/footprints/Inductor_SMD.pretty/L_Abracon_ASPI-0630LR.kicad_mod
share/kicad/footprints/Inductor_SMD.pretty/L_Abracon_ASPI-3012S.kicad_mod
+share/kicad/footprints/Inductor_SMD.pretty/L_Abracon_ASPI-4030S.kicad_mod
share/kicad/footprints/Inductor_SMD.pretty/L_Bourns-SRN1060.kicad_mod
share/kicad/footprints/Inductor_SMD.pretty/L_Bourns-SRN4018.kicad_mod
share/kicad/footprints/Inductor_SMD.pretty/L_Bourns-SRN6028.kicad_mod
@@ -7707,6 +7744,8 @@ share/kicad/footprints/Inductor_SMD.pret
share/kicad/footprints/Inductor_SMD.pretty/L_Bourns_SRR1208_12.7x12.7mm.kicad_mod
share/kicad/footprints/Inductor_SMD.pretty/L_Bourns_SRR1210A.kicad_mod
share/kicad/footprints/Inductor_SMD.pretty/L_Bourns_SRR1260.kicad_mod
+share/kicad/footprints/Inductor_SMD.pretty/L_Coilcraft_LPS3010.kicad_mod
+share/kicad/footprints/Inductor_SMD.pretty/L_Coilcraft_LPS3314.kicad_mod
share/kicad/footprints/Inductor_SMD.pretty/L_Coilcraft_LPS4018.kicad_mod
share/kicad/footprints/Inductor_SMD.pretty/L_Coilcraft_LPS5030.kicad_mod
share/kicad/footprints/Inductor_SMD.pretty/L_Coilcraft_XAL5030.kicad_mod
@@ -7762,6 +7801,7 @@ share/kicad/footprints/Inductor_SMD.pret
share/kicad/footprints/Inductor_SMD.pretty/L_Neosid_SMs50.kicad_mod
share/kicad/footprints/Inductor_SMD.pretty/L_Neosid_SMs85.kicad_mod
share/kicad/footprints/Inductor_SMD.pretty/L_Neosid_SMs95_SMs95p.kicad_mod
+share/kicad/footprints/Inductor_SMD.pretty/L_Pulse_P059x.kicad_mod
share/kicad/footprints/Inductor_SMD.pretty/L_Pulse_PA4320.kicad_mod
share/kicad/footprints/Inductor_SMD.pretty/L_Pulse_PA4344.kicad_mod
share/kicad/footprints/Inductor_SMD.pretty/L_Sagami_CER1242B.kicad_mod
@@ -7789,6 +7829,7 @@ share/kicad/footprints/Inductor_SMD.pret
share/kicad/footprints/Inductor_SMD.pretty/L_TDK_SLF7055.kicad_mod
share/kicad/footprints/Inductor_SMD.pretty/L_TDK_VLF10040.kicad_mod
share/kicad/footprints/Inductor_SMD.pretty/L_TDK_VLP8040.kicad_mod
+share/kicad/footprints/Inductor_SMD.pretty/L_Taiyo-Yuden_BK_Array_1206_3216Metric.kicad_mod
share/kicad/footprints/Inductor_SMD.pretty/L_Taiyo-Yuden_MD-1616.kicad_mod
share/kicad/footprints/Inductor_SMD.pretty/L_Taiyo-Yuden_MD-2020.kicad_mod
share/kicad/footprints/Inductor_SMD.pretty/L_Taiyo-Yuden_MD-3030.kicad_mod
@@ -7973,6 +8014,12 @@ share/kicad/footprints/Inductor_THT.pret
share/kicad/footprints/Inductor_THT.pretty/L_Axial_L9.5mm_D4.0mm_P15.24mm_Horizontal_Fastron_SMCC.kicad_mod
share/kicad/footprints/Inductor_THT.pretty/L_Axial_L9.5mm_D4.0mm_P2.54mm_Vertical_Fastron_SMCC.kicad_mod
share/kicad/footprints/Inductor_THT.pretty/L_Axial_L9.5mm_D4.0mm_P5.08mm_Vertical_Fastron_SMCC.kicad_mod
+share/kicad/footprints/Inductor_THT.pretty/L_CommonMode_PulseElectronics_PH9455x105NL_1.kicad_mod
+share/kicad/footprints/Inductor_THT.pretty/L_CommonMode_PulseElectronics_PH9455x155NL_1.kicad_mod
+share/kicad/footprints/Inductor_THT.pretty/L_CommonMode_PulseElectronics_PH9455x205NL_1.kicad_mod
+share/kicad/footprints/Inductor_THT.pretty/L_CommonMode_PulseElectronics_PH9455x405NL_1.kicad_mod
+share/kicad/footprints/Inductor_THT.pretty/L_CommonMode_PulseElectronics_PH9455x705NL_1.kicad_mod
+share/kicad/footprints/Inductor_THT.pretty/L_CommonMode_PulseElectronics_PH9455xxx6NL_2.kicad_mod
share/kicad/footprints/Inductor_THT.pretty/L_CommonMode_Toroid_Vertical_L19.3mm_W10.8mm_Px6.35mm_Py15.24mm_Bourns_8100.kicad_mod
share/kicad/footprints/Inductor_THT.pretty/L_CommonMode_Toroid_Vertical_L21.0mm_W10.0mm_Px5.08mm_Py12.70mm_Murata_5100.kicad_mod
share/kicad/footprints/Inductor_THT.pretty/L_CommonMode_Toroid_Vertical_L24.0mm_W16.3mm_Px10.16mm_Py20.32mm_Murata_5200.kicad_mod
@@ -8196,6 +8243,7 @@ share/kicad/footprints/LED_SMD.pretty/LE
share/kicad/footprints/LED_SMD.pretty/LED_Dialight_591.kicad_mod
share/kicad/footprints/LED_SMD.pretty/LED_Inolux_IN-PI554FCH_PLCC4_5.0x5.0mm_P3.2mm.kicad_mod
share/kicad/footprints/LED_SMD.pretty/LED_Kingbright_AAA3528ESGCT.kicad_mod
+share/kicad/footprints/LED_SMD.pretty/LED_Kingbright_APDA3020VBCD.kicad_mod
share/kicad/footprints/LED_SMD.pretty/LED_Kingbright_APFA3010_3x1.5mm_Horizontal.kicad_mod
share/kicad/footprints/LED_SMD.pretty/LED_Kingbright_APHBM2012_2x1.25mm.kicad_mod
share/kicad/footprints/LED_SMD.pretty/LED_Kingbright_KPBD-3224.kicad_mod
@@ -8220,6 +8268,7 @@ share/kicad/footprints/LED_SMD.pretty/LE
share/kicad/footprints/LED_SMD.pretty/LED_SK6812MINI_PLCC4_3.5x3.5mm_P1.75mm.kicad_mod
share/kicad/footprints/LED_SMD.pretty/LED_SK6812_EC15_1.5x1.5mm.kicad_mod
share/kicad/footprints/LED_SMD.pretty/LED_SK6812_PLCC4_5.0x5.0mm_P3.2mm.kicad_mod
+share/kicad/footprints/LED_SMD.pretty/LED_WS2812B-2020_PLCC4_2.0x2.0mm.kicad_mod
share/kicad/footprints/LED_SMD.pretty/LED_WS2812B_PLCC4_5.0x5.0mm_P3.2mm.kicad_mod
share/kicad/footprints/LED_SMD.pretty/LED_WS2812_PLCC6_5.0x5.0mm_P1.6mm.kicad_mod
share/kicad/footprints/LED_SMD.pretty/LED_Yuji_5730.kicad_mod
@@ -8344,6 +8393,8 @@ share/kicad/footprints/Module.pretty/Tex
share/kicad/footprints/Module.pretty/Texas_EUS_R-PDSS-T5_THT.kicad_mod
share/kicad/footprints/Module.pretty/Texas_EUW_R-PDSS-T7_THT.kicad_mod
share/kicad/footprints/Module.pretty/WEMOS_D1_mini_light.kicad_mod
+share/kicad/footprints/Motors.pretty/
+share/kicad/footprints/Motors.pretty/Vybronics_VZ30C1T8219732L.kicad_mod
share/kicad/footprints/MountingEquipment.pretty/
share/kicad/footprints/MountingEquipment.pretty/DINRailAdapter_3xM3_PhoenixContact_1201578.kicad_mod
share/kicad/footprints/MountingHole.pretty/
@@ -8705,6 +8756,7 @@ share/kicad/footprints/OptoDevice.pretty
share/kicad/footprints/OptoDevice.pretty/Everlight_ITR8307.kicad_mod
share/kicad/footprints/OptoDevice.pretty/Everlight_ITR8307F43.kicad_mod
share/kicad/footprints/OptoDevice.pretty/Everlight_ITR8307_Reverse.kicad_mod
+share/kicad/footprints/OptoDevice.pretty/Everlight_ITR9608-F.kicad_mod
share/kicad/footprints/OptoDevice.pretty/Finder_34.81.kicad_mod
share/kicad/footprints/OptoDevice.pretty/Hamamatsu_C12880.kicad_mod
share/kicad/footprints/OptoDevice.pretty/Hamamatsu_S13360-30CS.kicad_mod
@@ -8722,6 +8774,7 @@ share/kicad/footprints/OptoDevice.pretty
share/kicad/footprints/OptoDevice.pretty/LaserDiode_TO38ICut-3.kicad_mod
share/kicad/footprints/OptoDevice.pretty/LaserDiode_TO5-D9-3.kicad_mod
share/kicad/footprints/OptoDevice.pretty/LaserDiode_TO56-3.kicad_mod
+share/kicad/footprints/OptoDevice.pretty/Lightpipe_Bivar_RLP1-400-650.kicad_mod
share/kicad/footprints/OptoDevice.pretty/Lightpipe_Dialight_515-1064F.kicad_mod
share/kicad/footprints/OptoDevice.pretty/Lightpipe_LPF-C012303S.kicad_mod
share/kicad/footprints/OptoDevice.pretty/Lightpipe_LPF-C013301S.kicad_mod
@@ -8734,13 +8787,16 @@ share/kicad/footprints/OptoDevice.pretty
share/kicad/footprints/OptoDevice.pretty/ONSemi_QSE15x.kicad_mod
share/kicad/footprints/OptoDevice.pretty/OnSemi_CASE100AQ.kicad_mod
share/kicad/footprints/OptoDevice.pretty/OnSemi_CASE100CY.kicad_mod
+share/kicad/footprints/OptoDevice.pretty/Osram_BP104-SMD.kicad_mod
+share/kicad/footprints/OptoDevice.pretty/Osram_BPW34S-SMD.kicad_mod
share/kicad/footprints/OptoDevice.pretty/Osram_BPW82.kicad_mod
share/kicad/footprints/OptoDevice.pretty/Osram_DIL2_4.3x4.65mm_P5.08mm.kicad_mod
share/kicad/footprints/OptoDevice.pretty/Osram_LPT80A.kicad_mod
share/kicad/footprints/OptoDevice.pretty/Osram_SFH205.kicad_mod
share/kicad/footprints/OptoDevice.pretty/Osram_SFH225.kicad_mod
+share/kicad/footprints/OptoDevice.pretty/Osram_SFH2430.kicad_mod
+share/kicad/footprints/OptoDevice.pretty/Osram_SFH2440.kicad_mod
share/kicad/footprints/OptoDevice.pretty/Osram_SFH9x0x.kicad_mod
-share/kicad/footprints/OptoDevice.pretty/Osram_SMD-DIL2_4.5x4.0mm.kicad_mod
share/kicad/footprints/OptoDevice.pretty/Osram_SMD-SmartDIL.kicad_mod
share/kicad/footprints/OptoDevice.pretty/Panasonic_APV-AQY_SSOP-4_4.45x2.65mm_P1.27mm.kicad_mod
share/kicad/footprints/OptoDevice.pretty/PerkinElmer_VTL5C.kicad_mod
@@ -9007,6 +9063,7 @@ share/kicad/footprints/Package_CSP.prett
share/kicad/footprints/Package_CSP.pretty/LFCSP-32-1EP_5x5mm_P0.5mm_EP3.6x3.6mm_ThermalVias.kicad_mod
share/kicad/footprints/Package_CSP.pretty/LFCSP-48-1EP_7x7mm_P0.5mm_EP4.1x4.1mm.kicad_mod
share/kicad/footprints/Package_CSP.pretty/LFCSP-48-1EP_7x7mm_P0.5mm_EP4.1x4.1mm_ThermalVias.kicad_mod
+share/kicad/footprints/Package_CSP.pretty/LFCSP-6-1EP_2x2mm_P0.65mm_EP1x1.6mm.kicad_mod
share/kicad/footprints/Package_CSP.pretty/LFCSP-64-1EP_9x9mm_P0.5mm_EP5.21x5.21mm.kicad_mod
share/kicad/footprints/Package_CSP.pretty/LFCSP-64-1EP_9x9mm_P0.5mm_EP5.21x5.21mm_ThermalVias.kicad_mod
share/kicad/footprints/Package_CSP.pretty/LFCSP-72-1EP_10x10mm_P0.5mm_EP5.3x5.3mm.kicad_mod
@@ -10467,6 +10524,7 @@ share/kicad/footprints/Package_TO_SOT_SM
share/kicad/footprints/Package_TO_SOT_SMD.pretty/Infineon_PG-HSOF-8-3.kicad_mod
share/kicad/footprints/Package_TO_SOT_SMD.pretty/Infineon_PG-HSOF-8-3_ThermalVias.kicad_mod
share/kicad/footprints/Package_TO_SOT_SMD.pretty/Infineon_PG-TO-220-7Lead_TabPin8.kicad_mod
+share/kicad/footprints/Package_TO_SOT_SMD.pretty/Infineon_PG-TSFP-3-1.kicad_mod
share/kicad/footprints/Package_TO_SOT_SMD.pretty/LFPAK33.kicad_mod
share/kicad/footprints/Package_TO_SOT_SMD.pretty/LFPAK56.kicad_mod
share/kicad/footprints/Package_TO_SOT_SMD.pretty/Nexperia_CFP15_SOT-1289.kicad_mod
@@ -12223,6 +12281,7 @@ share/kicad/footprints/Transformer_SMD.p
share/kicad/footprints/Transformer_SMD.pretty/Transformer_CurrentSense_8.4x7.2mm.kicad_mod
share/kicad/footprints/Transformer_SMD.pretty/Transformer_Ethernet_Bel_S558-5999-T7-F.kicad_mod
share/kicad/footprints/Transformer_SMD.pretty/Transformer_Ethernet_Bourns_PT61017PEL.kicad_mod
+share/kicad/footprints/Transformer_SMD.pretty/Transformer_Ethernet_Bourns_PT61020EL.kicad_mod
share/kicad/footprints/Transformer_SMD.pretty/Transformer_Ethernet_HALO_TG111-MSC13.kicad_mod
share/kicad/footprints/Transformer_SMD.pretty/Transformer_Ethernet_Halo_N2_SO-16_7.11x12.7mm.kicad_mod
share/kicad/footprints/Transformer_SMD.pretty/Transformer_Ethernet_Halo_N5_SO-16_7.11x12.7mm.kicad_mod
@@ -12300,6 +12359,7 @@ share/kicad/footprints/Transformer_THT.p
share/kicad/footprints/Transformer_THT.pretty/Transformer_Toroid_Tapped_Horizontal_D14.0mm_Amidon-T50.kicad_mod
share/kicad/footprints/Transformer_THT.pretty/Transformer_Toroid_Tapped_Horizontal_D9.0mm_Amidon-T30.kicad_mod
share/kicad/footprints/Transformer_THT.pretty/Transformer_Wuerth_750343373.kicad_mod
+share/kicad/footprints/Transformer_THT.pretty/Transformer_Wuerth_760871131.kicad_mod
share/kicad/footprints/Transistor_Power_Module.pretty/
share/kicad/footprints/Transistor_Power_Module.pretty/Infineon_AG-ECONO2.kicad_mod
share/kicad/footprints/Transistor_Power_Module.pretty/Infineon_EasyPIM-1B.kicad_mod
@@ -12423,5 +12483,6 @@ share/kicad/footprints/Varistor.pretty/R
share/kicad/footprints/Varistor.pretty/RV_Disc_D9mm_W5.5mm_P5mm.kicad_mod
share/kicad/footprints/Varistor.pretty/RV_Disc_D9mm_W5.7mm_P5mm.kicad_mod
share/kicad/footprints/Varistor.pretty/RV_Disc_D9mm_W6.1mm_P5mm.kicad_mod
+share/kicad/footprints/Varistor.pretty/RV_Rect_V25S440P_L26.5mm_W8.2mm_P12.7mm.kicad_mod
share/kicad/template/
share/kicad/template/fp-lib-table
Index: kicad-share/packages3D/distinfo
===================================================================
RCS file: /home/cvs/ports/cad/kicad-share/packages3D/distinfo,v
retrieving revision 1.11
diff -u -p -r1.11 distinfo
--- kicad-share/packages3D/distinfo 12 Aug 2022 21:21:16 -0000 1.11
+++ kicad-share/packages3D/distinfo 1 Nov 2022 16:21:15 -0000
@@ -1,2 +1,2 @@
-SHA256 (kicad-packages3D-6.0.7.tar.bz2) = 8TAQA4htjq7K/oAsTWJKu5pbu9BWt8xHbQCqMbbPpoE=
-SIZE (kicad-packages3D-6.0.7.tar.bz2) = 736488867
+SHA256 (kicad-packages3D-6.0.9.tar.bz2) = NVqA6mCy6ov+0KmYT3+JnBBZvmqMcmgNfG8HjlCsXpY=
+SIZE (kicad-packages3D-6.0.9.tar.bz2) = 736776816
Index: kicad-share/packages3D/pkg/PLIST
===================================================================
RCS file: /home/cvs/ports/cad/kicad-share/packages3D/pkg/PLIST,v
retrieving revision 1.10
diff -u -p -r1.10 PLIST
--- kicad-share/packages3D/pkg/PLIST 12 Aug 2022 21:21:16 -0000 1.10
+++ kicad-share/packages3D/pkg/PLIST 2 Nov 2022 19:34:43 -0000
@@ -8077,10 +8077,16 @@ share/kicad/3dmodels/Diode_THT.3dshapes/
share/kicad/3dmodels/Diode_THT.3dshapes/Diode_Bridge_28.6x28.6x7.3mm_P18.0mm_P11.6mm.wrl
share/kicad/3dmodels/Diode_THT.3dshapes/Diode_Bridge_32.0x5.6x17.0mm_P10.0mm_P7.5mm.step
share/kicad/3dmodels/Diode_THT.3dshapes/Diode_Bridge_32.0x5.6x17.0mm_P10.0mm_P7.5mm.wrl
+share/kicad/3dmodels/Diode_THT.3dshapes/Diode_Bridge_DIGITRON_KBPC_T.step
+share/kicad/3dmodels/Diode_THT.3dshapes/Diode_Bridge_DIGITRON_KBPC_T.wrl
share/kicad/3dmodels/Diode_THT.3dshapes/Diode_Bridge_DIP-4_W5.08mm_P2.54mm.step
share/kicad/3dmodels/Diode_THT.3dshapes/Diode_Bridge_DIP-4_W5.08mm_P2.54mm.wrl
share/kicad/3dmodels/Diode_THT.3dshapes/Diode_Bridge_DIP-4_W7.62mm_P5.08mm.step
share/kicad/3dmodels/Diode_THT.3dshapes/Diode_Bridge_DIP-4_W7.62mm_P5.08mm.wrl
+share/kicad/3dmodels/Diode_THT.3dshapes/Diode_Bridge_GeneSiC_KBPC_T.step
+share/kicad/3dmodels/Diode_THT.3dshapes/Diode_Bridge_GeneSiC_KBPC_T.wrl
+share/kicad/3dmodels/Diode_THT.3dshapes/Diode_Bridge_GeneSiC_KBPC_W.step
+share/kicad/3dmodels/Diode_THT.3dshapes/Diode_Bridge_GeneSiC_KBPC_W.wrl
share/kicad/3dmodels/Diode_THT.3dshapes/Diode_Bridge_IXYS_GUFP.step
share/kicad/3dmodels/Diode_THT.3dshapes/Diode_Bridge_IXYS_GUFP.wrl
share/kicad/3dmodels/Diode_THT.3dshapes/Diode_Bridge_Round_D8.9mm.step
@@ -10040,6 +10046,8 @@ share/kicad/3dmodels/Package_DFN_QFN.3ds
share/kicad/3dmodels/Package_DFN_QFN.3dshapes/VQFN-24-1EP_4x4mm_P0.5mm_EP2.45x2.45mm.wrl
share/kicad/3dmodels/Package_DFN_QFN.3dshapes/VQFN-28-1EP_4x5mm_P0.5mm_EP2.55x3.55mm.step
share/kicad/3dmodels/Package_DFN_QFN.3dshapes/VQFN-28-1EP_4x5mm_P0.5mm_EP2.55x3.55mm.wrl
+share/kicad/3dmodels/Package_DFN_QFN.3dshapes/Vishay_PowerPAK_MLP32_55G.step
+share/kicad/3dmodels/Package_DFN_QFN.3dshapes/Vishay_PowerPAK_MLP32_55G.wrl
share/kicad/3dmodels/Package_DFN_QFN.3dshapes/WDFN-12-1EP_3x3mm_P0.45mm_EP1.7x2.5mm.step
share/kicad/3dmodels/Package_DFN_QFN.3dshapes/WDFN-12-1EP_3x3mm_P0.45mm_EP1.7x2.5mm.wrl
share/kicad/3dmodels/Package_DFN_QFN.3dshapes/WDFN-8-1EP_3x2mm_P0.5mm_EP1.3x1.4mm.step
Index: kicad-share/symbols/distinfo
===================================================================
RCS file: /home/cvs/ports/cad/kicad-share/symbols/distinfo,v
retrieving revision 1.10
diff -u -p -r1.10 distinfo
--- kicad-share/symbols/distinfo 12 Aug 2022 21:21:17 -0000 1.10
+++ kicad-share/symbols/distinfo 1 Nov 2022 16:21:37 -0000
@@ -1,2 +1,2 @@
-SHA256 (kicad-symbols-6.0.7.tar.bz2) = NYLTyIp5q6Mswy+SGlzYuVkKu4PLmy9OVL7yqeLUmlA=
-SIZE (kicad-symbols-6.0.7.tar.bz2) = 2268170
+SHA256 (kicad-symbols-6.0.9.tar.bz2) = g887HItWKC3MBXmKMqLGQIMbW+BxcLvlt9KVjC4N3QQ=
+SIZE (kicad-symbols-6.0.9.tar.bz2) = 2271982
Index: kicad-share/templates/distinfo
===================================================================
RCS file: /home/cvs/ports/cad/kicad-share/templates/distinfo,v
retrieving revision 1.10
diff -u -p -r1.10 distinfo
--- kicad-share/templates/distinfo 12 Aug 2022 21:21:17 -0000 1.10
+++ kicad-share/templates/distinfo 1 Nov 2022 16:21:40 -0000
@@ -1,2 +1,2 @@
-SHA256 (kicad-templates-6.0.7.tar.bz2) = NRkqSB9oJUYyitjLyAuP3m9EqP8OvS36Ti92Aqghv+4=
-SIZE (kicad-templates-6.0.7.tar.bz2) = 934731
+SHA256 (kicad-templates-6.0.9.tar.bz2) = Mwbuwmy6L31vtmMNDNo4WMNkzMkxUT8s+OOHGTvlgLo=
+SIZE (kicad-templates-6.0.9.tar.bz2) = 934744

2226
kopia-0.9.8.diff Normal file

File diff suppressed because it is too large Load Diff

123
krita-5.0.2p0.diff Normal file
View File

@ -0,0 +1,123 @@
Index: graphics/krita/Makefile
===================================================================
RCS file: /home/cvs/ports/graphics/krita/Makefile,v
retrieving revision 1.57
diff -u -p -u -p -r1.57 Makefile
--- graphics/krita/Makefile 11 Mar 2022 19:22:38 -0000 1.57
+++ graphics/krita/Makefile 20 Mar 2022 21:05:07 -0000
@@ -2,6 +2,9 @@ COMMENT = advanced drawing and image man
VERSION = 5.0.2
DISTNAME = krita-${VERSION}
+REVISION = 0
+
+GMIC_VERSION = 3.0.0.1
SHARED_LIBS += kritabasicflakes 4.0 # 16.0
SHARED_LIBS += kritacolord 2.0 # 16.0
@@ -45,15 +48,17 @@ WANTLIB += ${COMPILER_LIBCXX} ICE Iex-3_
WANTLIB += KF5Completion KF5ConfigCore KF5ConfigGui KF5CoreAddons
WANTLIB += KF5Crash KF5GuiAddons KF5I18n KF5ItemViews KF5WidgetsAddons
WANTLIB += KF5WindowSystem OpenColorIO OpenEXR-3_1 Qt5Concurrent
-WANTLIB += Qt5Core Qt5DBus Qt5Gui Qt5Multimedia Qt5Network Qt5PrintSupport
-WANTLIB += Qt5Qml Qt5QmlModels Qt5Quick Qt5QuickWidgets Qt5Sql
-WANTLIB += Qt5Svg Qt5Widgets Qt5X11Extras Qt5Xml SM X11 Xext Xi
-WANTLIB += boost_system-mt c exiv2 fftw3 gif gsl gslcblas heif
-WANTLIB += jpeg lcms2 m openjp2 png poppler poppler-qt5 quazip5
-WANTLIB += raw tiff webp z
+WANTLIB += Qt5Core Qt5DBus Qt5Gui Qt5Multimedia Qt5Network
+WANTLIB += Qt5PrintSupport Qt5Qml Qt5QmlModels Qt5Quick Qt5QuickWidgets
+WANTLIB += Qt5Sql Qt5Svg Qt5Widgets Qt5X11Extras Qt5Xml SM X11 Xext Xi
+WANTLIB += boost_system-mt c curl exiv2 fftw3 fftw3_threads gif gsl
+WANTLIB += gslcblas heif jpeg lcms2 m openjp2 png poppler poppler-qt5
+WANTLIB += quazip5 raw tiff webp z
MASTER_SITES = ${MASTER_SITE_KDE:=stable/krita/${VERSION}/}
+MASTER_SITES0 = https://files.kde.org/krita/build/dependencies/
EXTRACT_SUFX = .tar.gz
+DISTFILES = ${DISTNAME}${EXTRACT_SUFX} gmic-${GMIC_VERSION}-patched.tar.gz:0
MODULES = devel/kf5 \
lang/python
@@ -61,15 +66,13 @@ MODULES = devel/kf5 \
MODPY_RUNDEP= No
RUN_DEPENDS = devel/desktop-file-utils \
- net/curl \
x11/gtk+3,-guic \
x11/qt5/qtquickcontrols
BUILD_DEPENDS = devel/gettext,-tools \
devel/kf5/kdoctools \
devel/kf5/kitemmodels \
- math/eigen3 \
- net/curl
+ math/eigen3
LIB_DEPENDS = archivers/quazip \
devel/boost \
@@ -96,6 +99,7 @@ LIB_DEPENDS = archivers/quazip \
graphics/tiff \
math/fftw3 \
multimedia/libheif \
+ net/curl \
print/poppler \
print/poppler,-qt5 \
x11/qt5/qtdeclarative \
@@ -115,5 +119,29 @@ CONFIGURE_ARGS += -DENABLE_UPDATERS=OFF
CXXFLAGS += -I${LOCALBASE}/include/Imath
TEST_IS_INTERACTIVE = X11
+
+QMIC_PATH = ${WRKSRC}/gmic-patched
+
+post-extract:
+ mv ${WRKDIR}/gmic-${GMIC_VERSION}-patched ${WRKSRC}/gmic-patched
+
+post-build:
+ mkdir -p ${QMIC_PATH}/build
+ CC="${CC}" CFLAGS="${CFLAGS}" \
+ CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" \
+ ${CONFIGURE_ENV} ${LOCALBASE}/bin/cmake \
+ -S ${QMIC_PATH} \
+ -B ${QMIC_PATH}/build \
+ -DCMAKE_SUPPRESS_REGENERATION=ON \
+ -DCMAKE_INSTALL_PREFIX="${LOCALBASE}" \
+ -DCMAKE_PREFIX_PATH="${LOCALBASE}/lib/qt5/cmake" \
+ -DENABLE_SYSTEM_GMIC=false \
+ -DGMIC_QT_HOST=krita-plugin
+ ${MAKE_ENV} ${LOCALBASE}/bin/cmake \
+ --build ${QMIC_PATH}/build
+
+post-install:
+ ${INSTALL_DATA} ${QMIC_PATH}/build/krita_gmic_qt.so \
+ ${PREFIX}/lib/kritaplugins/krita_gmic_qt.so
.include <bsd.port.mk>
Index: graphics/krita/distinfo
===================================================================
RCS file: /home/cvs/ports/graphics/krita/distinfo,v
retrieving revision 1.35
diff -u -p -u -p -r1.35 distinfo
--- graphics/krita/distinfo 7 Jan 2022 12:16:21 -0000 1.35
+++ graphics/krita/distinfo 14 Mar 2022 20:42:17 -0000
@@ -1,2 +1,4 @@
+SHA256 (gmic-3.0.0.1-patched.tar.gz) = BeJTZ68BA5qXxS1IaU8A2vNu4YD6aCIPclIqryRaeCs=
SHA256 (krita-5.0.2.tar.gz) = 5nUfx+tQSXekiAo3brvTmVyH2tFUSGCE6COX5l1JnL8=
+SIZE (gmic-3.0.0.1-patched.tar.gz) = 10212684
SIZE (krita-5.0.2.tar.gz) = 262287610
Index: graphics/krita/pkg/PLIST
===================================================================
RCS file: /home/cvs/ports/graphics/krita/pkg/PLIST,v
retrieving revision 1.23
diff -u -p -u -p -r1.23 PLIST
--- graphics/krita/pkg/PLIST 11 Mar 2022 19:22:38 -0000 1.23
+++ graphics/krita/pkg/PLIST 14 Mar 2022 20:44:05 -0000
@@ -7,6 +7,7 @@ include/kritaqmicinterface_export.h
lib/kritaplugins/
@so lib/kritaplugins/krita_colorspaces_extensions.so
@so lib/kritaplugins/krita_flaketools.so
+@so lib/kritaplugins/krita_gmic_qt.so
@so lib/kritaplugins/krita_karbontools.so
@so lib/kritaplugins/krita_raw_import.so
@so lib/kritaplugins/krita_shape_image.so

View File

View File

@ -0,0 +1,27 @@
Index: graphics/krita-gmic-plugin/Makefile
===================================================================
RCS file: /home/cvs/ports/graphics/krita-gmic-plugin/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 Makefile
--- graphics/krita-gmic-plugin/Makefile 26 Mar 2022 20:33:50 -0000 1.1.1.1
+++ graphics/krita-gmic-plugin/Makefile 29 Mar 2022 18:41:08 -0000
@@ -1,6 +1,6 @@
COMMENT = krita gmic plugin
-V = 3.0.0.1
+V = 3.0.2.1
DISTNAME = krita-gmic-plugin-${V}
CATEGORIES = graphics
Index: graphics/krita-gmic-plugin/distinfo
===================================================================
RCS file: /home/cvs/ports/graphics/krita-gmic-plugin/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 distinfo
--- graphics/krita-gmic-plugin/distinfo 26 Mar 2022 20:33:50 -0000 1.1.1.1
+++ graphics/krita-gmic-plugin/distinfo 29 Mar 2022 18:41:19 -0000
@@ -1,2 +1,2 @@
-SHA256 (gmic-3.0.0.1-patched.tar.gz) = BeJTZ68BA5qXxS1IaU8A2vNu4YD6aCIPclIqryRaeCs=
-SIZE (gmic-3.0.0.1-patched.tar.gz) = 10212684
+SHA256 (gmic-3.0.2.1-patched.tar.gz) = fAkURYOrBxsLztvUKS7iK6Wzpz6S1E91UfHuA8P+oF0=
+SIZE (gmic-3.0.2.1-patched.tar.gz) = 10451871

View File

@ -0,0 +1,41 @@
Index: graphics/krita-gmic-plugin/Makefile
===================================================================
RCS file: /home/cvs/ports/graphics/krita-gmic-plugin/Makefile,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 Makefile
--- graphics/krita-gmic-plugin/Makefile 29 Mar 2022 20:46:53 -0000 1.2
+++ graphics/krita-gmic-plugin/Makefile 1 May 2022 10:58:27 -0000
@@ -1,6 +1,6 @@
COMMENT = krita gmic plugin
-V = 3.0.2.1
+V = 3.0.2.2
DISTNAME = krita-gmic-plugin-${V}
CATEGORIES = graphics
Index: graphics/krita-gmic-plugin/distinfo
===================================================================
RCS file: /home/cvs/ports/graphics/krita-gmic-plugin/distinfo,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 distinfo
--- graphics/krita-gmic-plugin/distinfo 29 Mar 2022 20:46:53 -0000 1.2
+++ graphics/krita-gmic-plugin/distinfo 1 May 2022 10:58:34 -0000
@@ -1,2 +1,2 @@
-SHA256 (gmic-3.0.2.1-patched.tar.gz) = fAkURYOrBxsLztvUKS7iK6Wzpz6S1E91UfHuA8P+oF0=
-SIZE (gmic-3.0.2.1-patched.tar.gz) = 10451871
+SHA256 (gmic-3.0.2.2-patched.tar.gz) = EX8EaehpcnH4gIMY2SgBPcUDb+fca+GAqjB1e2VESq4=
+SIZE (gmic-3.0.2.2-patched.tar.gz) = 10452771
Index: graphics/krita-gmic-plugin/pkg/PLIST
===================================================================
RCS file: /home/cvs/ports/graphics/krita-gmic-plugin/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 PLIST
--- graphics/krita-gmic-plugin/pkg/PLIST 29 Mar 2022 18:31:13 -0000 1.2
+++ graphics/krita-gmic-plugin/pkg/PLIST 1 May 2022 11:23:15 -0000
@@ -1,3 +1,6 @@
@conflict gmic-qt-krita-<=3.0.2
@pkgpath graphics/gmic-qt/krita
@so lib/kritaplugins/krita_gmic_qt.so
+share/gmic/
+share/gmic/gmic_cluts.gmz
+share/gmic/gmic_denoise_cnn.gmz

View File

@ -0,0 +1,76 @@
Index: graphics/krita-gmic-plugin/Makefile
===================================================================
RCS file: /home/cvs/ports/graphics/krita-gmic-plugin/Makefile,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 Makefile
--- graphics/krita-gmic-plugin/Makefile 6 May 2022 05:35:23 -0000 1.3
+++ graphics/krita-gmic-plugin/Makefile 26 May 2022 20:36:54 -0000
@@ -1,6 +1,6 @@
COMMENT = krita gmic plugin
-V = 3.0.2.2
+V = 3.1.2.1
DISTNAME = krita-gmic-plugin-${V}
CATEGORIES = graphics
Index: graphics/krita-gmic-plugin/distinfo
===================================================================
RCS file: /home/cvs/ports/graphics/krita-gmic-plugin/distinfo,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 distinfo
--- graphics/krita-gmic-plugin/distinfo 6 May 2022 05:35:23 -0000 1.3
+++ graphics/krita-gmic-plugin/distinfo 26 May 2022 20:37:03 -0000
@@ -1,2 +1,2 @@
-SHA256 (gmic-3.0.2.2-patched.tar.gz) = EX8EaehpcnH4gIMY2SgBPcUDb+fca+GAqjB1e2VESq4=
-SIZE (gmic-3.0.2.2-patched.tar.gz) = 10452771
+SHA256 (gmic-3.1.2.1-patched.tar.gz) = V4HLiPutQ1MSPg4d8ifz212p6h7GcAA1xe/j9OQpIIs=
+SIZE (gmic-3.1.2.1-patched.tar.gz) = 10687680
Index: graphics/krita-gmic-plugin/patches/patch-gmic-qt_CMakeLists_txt
===================================================================
RCS file: graphics/krita-gmic-plugin/patches/patch-gmic-qt_CMakeLists_txt
diff -N graphics/krita-gmic-plugin/patches/patch-gmic-qt_CMakeLists_txt
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ graphics/krita-gmic-plugin/patches/patch-gmic-qt_CMakeLists_txt 29 May 2022 05:58:31 -0000
@@ -0,0 +1,17 @@
+We don't support --stack
+Index: gmic-qt/CMakeLists.txt
+--- gmic-qt/CMakeLists.txt.orig
++++ gmic-qt/CMakeLists.txt
+@@ -272,9 +272,9 @@ if (MSVC)
+ add_link_options(/GUARD:CF)
+ endif()
+ else()
+- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--stack,16777216")
+- set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--stack,16777216")
+- set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--stack,16777216")
++ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl")
++ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl")
++ set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl")
+ endif()
+
+ #
Index: graphics/krita-gmic-plugin/patches/patch-src_gmic_cpp
===================================================================
RCS file: /home/cvs/ports/graphics/krita-gmic-plugin/patches/patch-src_gmic_cpp,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-src_gmic_cpp
--- graphics/krita-gmic-plugin/patches/patch-src_gmic_cpp 26 Mar 2022 20:33:50 -0000 1.1.1.1
+++ graphics/krita-gmic-plugin/patches/patch-src_gmic_cpp 29 May 2022 05:58:18 -0000
@@ -1,7 +1,7 @@
Index: src/gmic.cpp
--- src/gmic.cpp.orig
+++ src/gmic.cpp
-@@ -2473,6 +2473,8 @@ CImgList<void*> gmic::list_p_is_abort = CImgList<void*
+@@ -2518,6 +2518,8 @@ CImgList<void*> gmic::list_p_is_abort = CImgList<void*
bool *gmic::abort_ptr(bool *const p_is_abort) {
#if defined(__MACOSX__) || defined(__APPLE__)
void* tid = (void*)(cimg_ulong)getpid();
@@ -10,7 +10,7 @@ Index: src/gmic.cpp
#elif cimg_OS==1
void* tid = (void*)(cimg_ulong)syscall(SYS_gettid);
#elif cimg_OS==2
-@@ -2815,6 +2817,8 @@ gmic::~gmic() {
+@@ -2860,6 +2862,8 @@ gmic::~gmic() {
cimg::mutex(21);
#if defined(__MACOSX__) || defined(__APPLE__)
void* tid = (void*)(cimg_ulong)getpid();

View File

@ -0,0 +1,51 @@
Index: graphics/krita-gmic-plugin/Makefile
===================================================================
RCS file: /home/cvs/ports/graphics/krita-gmic-plugin/Makefile,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 Makefile
--- graphics/krita-gmic-plugin/Makefile 29 May 2022 07:41:37 -0000 1.4
+++ graphics/krita-gmic-plugin/Makefile 16 Jun 2022 15:40:39 -0000
@@ -1,6 +1,6 @@
COMMENT = krita gmic plugin
-V = 3.1.2.1
+V = 3.1.2.2
DISTNAME = krita-gmic-plugin-${V}
CATEGORIES = graphics
Index: graphics/krita-gmic-plugin/distinfo
===================================================================
RCS file: /home/cvs/ports/graphics/krita-gmic-plugin/distinfo,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 distinfo
--- graphics/krita-gmic-plugin/distinfo 29 May 2022 07:41:37 -0000 1.4
+++ graphics/krita-gmic-plugin/distinfo 16 Jun 2022 15:40:51 -0000
@@ -1,2 +1,2 @@
-SHA256 (gmic-3.1.2.1-patched.tar.gz) = V4HLiPutQ1MSPg4d8ifz212p6h7GcAA1xe/j9OQpIIs=
-SIZE (gmic-3.1.2.1-patched.tar.gz) = 10687680
+SHA256 (gmic-3.1.2.2-patched.tar.gz) = uKcGRF8mE4rQZ/J/7KVzE+2ZF+x/3nwuwRdVvkG0kfY=
+SIZE (gmic-3.1.2.2-patched.tar.gz) = 10687867
Index: graphics/krita-gmic-plugin/patches/patch-gmic-qt_CMakeLists_txt
===================================================================
RCS file: graphics/krita-gmic-plugin/patches/patch-gmic-qt_CMakeLists_txt
diff -N graphics/krita-gmic-plugin/patches/patch-gmic-qt_CMakeLists_txt
--- graphics/krita-gmic-plugin/patches/patch-gmic-qt_CMakeLists_txt 29 May 2022 07:41:37 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-We don't support --stack
-Index: gmic-qt/CMakeLists.txt
---- gmic-qt/CMakeLists.txt.orig
-+++ gmic-qt/CMakeLists.txt
-@@ -272,9 +272,9 @@ if (MSVC)
- add_link_options(/GUARD:CF)
- endif()
- else()
-- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--stack,16777216")
-- set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--stack,16777216")
-- set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--stack,16777216")
-+ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl")
-+ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl")
-+ set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl")
- endif()
-
- #

View File

@ -0,0 +1,27 @@
Index: graphics/krita-gmic-plugin/Makefile
===================================================================
RCS file: /home/cvs/ports/graphics/krita-gmic-plugin/Makefile,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 Makefile
--- graphics/krita-gmic-plugin/Makefile 16 Jun 2022 17:09:25 -0000 1.5
+++ graphics/krita-gmic-plugin/Makefile 25 Jun 2022 15:24:01 -0000
@@ -1,6 +1,6 @@
COMMENT = krita gmic plugin
-V = 3.1.2.2
+V = 3.1.4.1
DISTNAME = krita-gmic-plugin-${V}
CATEGORIES = graphics
Index: graphics/krita-gmic-plugin/distinfo
===================================================================
RCS file: /home/cvs/ports/graphics/krita-gmic-plugin/distinfo,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 distinfo
--- graphics/krita-gmic-plugin/distinfo 16 Jun 2022 17:09:25 -0000 1.5
+++ graphics/krita-gmic-plugin/distinfo 25 Jun 2022 15:24:08 -0000
@@ -1,2 +1,2 @@
-SHA256 (gmic-3.1.2.2-patched.tar.gz) = uKcGRF8mE4rQZ/J/7KVzE+2ZF+x/3nwuwRdVvkG0kfY=
-SIZE (gmic-3.1.2.2-patched.tar.gz) = 10687867
+SHA256 (gmic-3.1.4.1-patched.tar.gz) = +MBh/vlVJaIOfRaazCJPfBFUbHhIXgkdk1VRdVDbqfs=
+SIZE (gmic-3.1.4.1-patched.tar.gz) = 11962005

View File

@ -0,0 +1,27 @@
Index: graphics/krita-gmic-plugin/Makefile
===================================================================
RCS file: /home/cvs/ports/graphics/krita-gmic-plugin/Makefile,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 Makefile
--- graphics/krita-gmic-plugin/Makefile 16 Jun 2022 17:09:25 -0000 1.5
+++ graphics/krita-gmic-plugin/Makefile 24 Jul 2022 09:33:30 -0000
@@ -1,6 +1,6 @@
COMMENT = krita gmic plugin
-V = 3.1.2.2
+V = 3.1.4.3
DISTNAME = krita-gmic-plugin-${V}
CATEGORIES = graphics
Index: graphics/krita-gmic-plugin/distinfo
===================================================================
RCS file: /home/cvs/ports/graphics/krita-gmic-plugin/distinfo,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 distinfo
--- graphics/krita-gmic-plugin/distinfo 16 Jun 2022 17:09:25 -0000 1.5
+++ graphics/krita-gmic-plugin/distinfo 24 Jul 2022 09:33:36 -0000
@@ -1,2 +1,2 @@
-SHA256 (gmic-3.1.2.2-patched.tar.gz) = uKcGRF8mE4rQZ/J/7KVzE+2ZF+x/3nwuwRdVvkG0kfY=
-SIZE (gmic-3.1.2.2-patched.tar.gz) = 10687867
+SHA256 (gmic-3.1.4.3-patched.tar.gz) = XSe2l8ry9lAXPSXeFPnupENKXwqrOnCnn7jfby0hzsg=
+SIZE (gmic-3.1.4.3-patched.tar.gz) = 11962129

42
libavif-0.9.3.diff Normal file
View File

@ -0,0 +1,42 @@
Index: graphics/libavif/Makefile
===================================================================
RCS file: /home/cvs/ports/graphics/libavif/Makefile,v
retrieving revision 1.16
diff -u -p -u -p -r1.16 Makefile
--- graphics/libavif/Makefile 28 Jun 2021 17:15:06 -0000 1.16
+++ graphics/libavif/Makefile 2 Feb 2022 07:22:08 -0000
@@ -4,10 +4,10 @@ COMMENT= library for encoding and decodi
GH_ACCOUNT= AOMediaCodec
GH_PROJECT= libavif
-GH_TAGNAME= v0.9.2
+GH_TAGNAME= v0.9.3
CATEGORIES= graphics
-SHARED_LIBS= avif 4.1
+SHARED_LIBS= avif 4.2
HOMEPAGE= https://github.com/AOMediaCodec/libavif
@@ -33,7 +33,8 @@ CONFIGURE_ARGS+=-DAVIF_BUILD_APPS=ON \
-DAVIF_CODEC_AOM_DECODE=OFF \
-DAVIF_CODEC_DAV1D=ON
+# https://github.com/AOMediaCodec/libavif/commit/11d6725af628b116066f4bd2e5b810498c584438
do-test:
- ${WRKBUILD}/aviftest ${WRKSRC}/tests/data
+ ${WRKBUILD}/aviftest ${WRKSRC}/tests/data --io-only
.include <bsd.port.mk>
Index: graphics/libavif/distinfo
===================================================================
RCS file: /home/cvs/ports/graphics/libavif/distinfo,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 distinfo
--- graphics/libavif/distinfo 28 Jun 2021 17:15:06 -0000 1.12
+++ graphics/libavif/distinfo 2 Feb 2022 07:22:08 -0000
@@ -1,2 +1,2 @@
-SHA256 (libavif-0.9.2.tar.gz) = 1mB9ZUrcQKOS2oPapypP+ALNdQwEWmgTHJMFY5wQ/Fw=
-SIZE (libavif-0.9.2.tar.gz) = 1987058
+SHA256 (libavif-0.9.3.tar.gz) = vNmh9X+YKpYV634vr4cjbciOsdDIhvNHHHRA6tYFBg0=
+SIZE (libavif-0.9.3.tar.gz) = 2000521

86
libsmb2-4.0.0.diff Normal file
View File

@ -0,0 +1,86 @@
Index: devel/libsmb2/Makefile
===================================================================
RCS file: /home/cvs/ports/devel/libsmb2/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 Makefile
--- devel/libsmb2/Makefile 31 Dec 2019 11:35:55 -0000 1.1.1.1
+++ devel/libsmb2/Makefile 28 Jan 2022 19:28:21 -0000
@@ -4,11 +4,11 @@ COMMENT= userspace client library for ac
GH_ACCOUNT= sahlberg
GH_PROJECT= libsmb2
-GH_TAGNAME= v3.0.0
+GH_TAGNAME= v4.0.0
CATEGORIES= devel
-SHARED_LIBS= smb2 0.0
+SHARED_LIBS= smb2 1.0
MAINTAINER= Brad Smith <brad@comstyle.com>
Index: devel/libsmb2/distinfo
===================================================================
RCS file: /home/cvs/ports/devel/libsmb2/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 distinfo
--- devel/libsmb2/distinfo 31 Dec 2019 11:35:55 -0000 1.1.1.1
+++ devel/libsmb2/distinfo 28 Jan 2022 19:28:21 -0000
@@ -1,2 +1,2 @@
-SHA256 (libsmb2-3.0.0.tar.gz) = NtENFiitNNVmRr+ecAWoq+jOa2e6OpSdU3rj5fCPcB8=
-SIZE (libsmb2-3.0.0.tar.gz) = 129442
+SHA256 (libsmb2-4.0.0.tar.gz) = tNGxO8B63Gg3mnL3I7kDKpUK/WL+1/KqPlfzQhQG2hE=
+SIZE (libsmb2-4.0.0.tar.gz) = 171678
Index: devel/libsmb2/patches/patch-include_smb2_libsmb2_h
===================================================================
RCS file: devel/libsmb2/patches/patch-include_smb2_libsmb2_h
diff -N devel/libsmb2/patches/patch-include_smb2_libsmb2_h
--- devel/libsmb2/patches/patch-include_smb2_libsmb2_h 31 Dec 2019 11:35:55 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$OpenBSD: patch-include_smb2_libsmb2_h,v 1.1.1.1 2019/12/31 11:35:55 ajacoutot Exp $
-
-smb2_connect_share_async: don't return ENOMEM if connect fails.
-
-Index: include/smb2/libsmb2.h
---- include/smb2/libsmb2.h.orig
-+++ include/smb2/libsmb2.h
-@@ -176,7 +176,7 @@ const char *smb2_get_client_guid(struct smb2_context *
- * status can be either of :
- * 0 : Connection was successful. Command_data is NULL.
- *
-- * <0 : Failed to establish the connection. Command_data is NULL.
-+ * -errno : Failed to establish the connection. Command_data is NULL.
- */
- int smb2_connect_async(struct smb2_context *smb2, const char *server,
- smb2_command_cb cb, void *cb_data);
Index: devel/libsmb2/patches/patch-lib_errors_c
===================================================================
RCS file: /home/cvs/ports/devel/libsmb2/patches/patch-lib_errors_c,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-lib_errors_c
--- devel/libsmb2/patches/patch-lib_errors_c 31 Dec 2019 11:35:55 -0000 1.1.1.1
+++ devel/libsmb2/patches/patch-lib_errors_c 28 Jan 2022 19:28:21 -0000
@@ -3,7 +3,7 @@ $OpenBSD: patch-lib_errors_c,v 1.1.1.1 2
Index: lib/errors.c
--- lib/errors.c.orig
+++ lib/errors.c
-@@ -204,7 +204,7 @@ int nterror_to_errno(uint32_t status) {
+@@ -1108,7 +1108,7 @@ int nterror_to_errno(uint32_t status) {
case SMB2_STATUS_FILE_DELETED:
return EPERM;
case SMB2_STATUS_NO_MORE_FILES:
Index: devel/libsmb2/pkg/PLIST
===================================================================
RCS file: /home/cvs/ports/devel/libsmb2/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 PLIST
--- devel/libsmb2/pkg/PLIST 31 Dec 2019 11:35:55 -0000 1.1.1.1
+++ devel/libsmb2/pkg/PLIST 28 Jan 2022 19:28:21 -0000
@@ -1,5 +1,6 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2019/12/31 11:35:55 ajacoutot Exp $
include/smb2/
+include/smb2/libsmb2-dcerpc-lsa.h
include/smb2/libsmb2-dcerpc-srvsvc.h
include/smb2/libsmb2-dcerpc.h
include/smb2/libsmb2-raw.h

16
libv8-3.16.14.11v0p3.diff Normal file
View File

@ -0,0 +1,16 @@
Index: lang/libv8/Makefile
===================================================================
RCS file: /home/cvs/ports/lang/libv8/Makefile,v
retrieving revision 1.23
diff -u -p -u -p -r1.23 Makefile
--- lang/libv8/Makefile 9 Jun 2021 19:50:08 -0000 1.23
+++ lang/libv8/Makefile 31 Dec 2021 13:12:51 -0000
@@ -48,7 +48,7 @@ SUBST_VARS+= WRKDIR
SUBST_VARS+= V8_ARCH
MAKE_FLAGS+= library=shared ARCHES=${V8_ARCH} MODES=${V8_RELEASE} \
- DEFAULT_ARCHES=${V8_ARCH}
+ DEFAULT_ARCHES=${V8_ARCH} snapshot=off
MAKE_ENV+= V=1 \
CXX="${CXX}" \

25
libv8-3.16.14.11v0p4.diff Normal file
View File

@ -0,0 +1,25 @@
Index: lang/libv8/Makefile
===================================================================
RCS file: /home/cvs/ports/lang/libv8/Makefile,v
retrieving revision 1.23
diff -u -p -u -p -r1.23 Makefile
--- lang/libv8/Makefile 9 Jun 2021 19:50:08 -0000 1.23
+++ lang/libv8/Makefile 31 Dec 2021 15:04:53 -0000
@@ -12,7 +12,7 @@ COMMENT= V8 JavaScript for clients and s
V8_VERSION= 3.16.14.11
EPOCH= 0
-REVISION= 3
+REVISION= 4
V8_ARCH= ${MACHINE_ARCH:S/amd64/x64/:S/i386/ia32/}
V8_RELEASE= release
@@ -48,7 +48,7 @@ SUBST_VARS+= WRKDIR
SUBST_VARS+= V8_ARCH
MAKE_FLAGS+= library=shared ARCHES=${V8_ARCH} MODES=${V8_RELEASE} \
- DEFAULT_ARCHES=${V8_ARCH}
+ DEFAULT_ARCHES=${V8_ARCH} snapshot=off
MAKE_ENV+= V=1 \
CXX="${CXX}" \

109
libvips-8.12.2.diff Normal file
View File

@ -0,0 +1,109 @@
Index: graphics/libvips/Makefile
===================================================================
RCS file: /cvs/ports/graphics/libvips/Makefile,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 Makefile
--- graphics/libvips/Makefile 11 Mar 2022 19:22:46 -0000 1.2
+++ graphics/libvips/Makefile 31 Oct 2022 10:34:33 -0000
@@ -1,6 +1,6 @@
COMMENT = fast image processing library with low memory needs
-VERSION = 8.9.2
+VERSION = 8.12.2
DISTNAME = vips-${VERSION}
PKGNAME = lib${DISTNAME}
Index: graphics/libvips/distinfo
===================================================================
RCS file: /cvs/ports/graphics/libvips/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 distinfo
--- graphics/libvips/distinfo 15 May 2020 07:58:41 -0000 1.1.1.1
+++ graphics/libvips/distinfo 31 Oct 2022 10:34:33 -0000
@@ -1,2 +1,2 @@
-SHA256 (vips-8.9.2.tar.gz) = roSRsRVs0uucu6ov1sqh3J7T3tC3BEPSjNf+p5irKic=
-SIZE (vips-8.9.2.tar.gz) = 17238831
+SHA256 (vips-8.12.2.tar.gz) = VlJSmSr/LHzRDIZseljNV7xTbgOSS94prg8MueB0AQs=
+SIZE (vips-8.12.2.tar.gz) = 17821667
Index: graphics/libvips/pkg/PLIST
===================================================================
RCS file: /cvs/ports/graphics/libvips/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 PLIST
--- graphics/libvips/pkg/PLIST 11 Mar 2022 19:22:46 -0000 1.2
+++ graphics/libvips/pkg/PLIST 31 Oct 2022 10:34:33 -0000
@@ -4,7 +4,7 @@ bin/batch_rubber_sheet
bin/light_correct
bin/shrink_width
@bin bin/vips
-bin/vips-8.9
+bin/vips-8.12
@bin bin/vipsedit
@bin bin/vipsheader
bin/vipsprofile
@@ -18,7 +18,6 @@ include/vips/almostdeprecated.h
include/vips/arithmetic.h
include/vips/basic.h
include/vips/buf.h
-include/vips/cimg_funcs.h
include/vips/colour.h
include/vips/connection.h
include/vips/conversion.h
@@ -62,7 +61,6 @@ include/vips/util.h
include/vips/vector.h
include/vips/version.h
include/vips/video.h
-include/vips/vips-operators.h
include/vips/vips.h
include/vips/vips7compat.h
include/vips/vips8
@@ -113,18 +111,9 @@ share/gtk-doc/html/libvips/ch01.html
share/gtk-doc/html/libvips/ch02.html
share/gtk-doc/html/libvips/ch03.html
share/gtk-doc/html/libvips/ch04.html
-share/gtk-doc/html/libvips/colour-management.html
-share/gtk-doc/html/libvips/compiled-language-which-can-call-c.html
-share/gtk-doc/html/libvips/cropping.html
-share/gtk-doc/html/libvips/documentation.html
-share/gtk-doc/html/libvips/dynamic-langauge-without-ffi.html
-share/gtk-doc/html/libvips/dynamic-language-with-ffi.html
share/gtk-doc/html/libvips/extending.html
share/gtk-doc/html/libvips/file-format.html
-share/gtk-doc/html/libvips/final-suggestion.html
-share/gtk-doc/html/libvips/full-decompression.html
share/gtk-doc/html/libvips/func-list.html
-share/gtk-doc/html/libvips/gobject-introspection.html
share/gtk-doc/html/libvips/home.png
share/gtk-doc/html/libvips/index.html
share/gtk-doc/html/libvips/interconvert.png
@@ -140,6 +129,7 @@ share/gtk-doc/html/libvips/libvips-creat
share/gtk-doc/html/libvips/libvips-draw.html
share/gtk-doc/html/libvips/libvips-error.html
share/gtk-doc/html/libvips/libvips-freqfilt.html
+share/gtk-doc/html/libvips/libvips-from-C++.md.html
share/gtk-doc/html/libvips/libvips-generate.html
share/gtk-doc/html/libvips/libvips-header.html
share/gtk-doc/html/libvips/libvips-histogram.html
@@ -155,22 +145,14 @@ share/gtk-doc/html/libvips/libvips-util.
share/gtk-doc/html/libvips/libvips-version.html
share/gtk-doc/html/libvips/libvips-vips.html
share/gtk-doc/html/libvips/libvips.devhelp2
-share/gtk-doc/html/libvips/linear-light.html
-share/gtk-doc/html/libvips/looping.html
share/gtk-doc/html/libvips/object-tree.html
-share/gtk-doc/html/libvips/output-directory.html
-share/gtk-doc/html/libvips/output-format-and-options.html
share/gtk-doc/html/libvips/owl.jpg
-share/gtk-doc/html/libvips/random-access-via-load-library.html
share/gtk-doc/html/libvips/right-insensitive.png
share/gtk-doc/html/libvips/right.png
-share/gtk-doc/html/libvips/sequential-access.html
share/gtk-doc/html/libvips/style.css
-share/gtk-doc/html/libvips/thumbnail-size.html
share/gtk-doc/html/libvips/tn_owl.jpg
share/gtk-doc/html/libvips/up-insensitive.png
share/gtk-doc/html/libvips/up.png
share/gtk-doc/html/libvips/using-cli.html
share/gtk-doc/html/libvips/using-from-c.html
-share/gtk-doc/html/libvips/using-from-cpp.html
share/gtk-doc/html/libvips/using-threads.html

119
luafs.diff Normal file
View File

@ -0,0 +1,119 @@
Hi,
I've attached an update for devel/luafs to 1.8.0, all tests are passing.
diff --git a/devel/luafs/Makefile b/devel/luafs/Makefile
index cd6a2a2559c..adebaaff7ef 100644
--- a/devel/luafs/Makefile
+++ b/devel/luafs/Makefile
@@ -2,9 +2,8 @@ COMMENT = file system library for the lua language
GH_ACCOUNT = keplerproject
GH_PROJECT = luafilesystem
-GH_TAGNAME = v_1_6_3
-PKGNAME = luafs-1.6.3
-REVISION = 1
+GH_TAGNAME = v1_8_0
+PKGNAME = luafs-1.8.0
CATEGORIES = devel
@@ -18,7 +17,8 @@ MODULES = lang/lua
FLAVORS = lua52 lua53
FLAVOR ?=
-MAKE_ENV += LUA_LIBDIR=${MODLUA_LIBDIR} LUA_INC=${MODLUA_INCL_DIR}
+CFLAGS += -I${MODLUA_INCL_DIR} -I${LOCALBASE}/include
+LDFLAGS += -L${MODLUA_LIBDIR} -L${LOCALBASE}/lib
ALL_TARGET = lib
diff --git a/devel/luafs/distinfo b/devel/luafs/distinfo
index f7f578c05f9..a933c9bb8d5 100644
--- a/devel/luafs/distinfo
+++ b/devel/luafs/distinfo
@@ -1,2 +1,2 @@
-SHA256 (luafilesystem-1_6_3.tar.gz) = VSXSuOx3dIZWKaainC+Uyw9+Z4eYe/VM034BG/tkIGg=
-SIZE (luafilesystem-1_6_3.tar.gz) = 30379
+SHA256 (luafilesystem-1_8_0.tar.gz) = FtF8eIuAk/IEcyU0P16bdMzLHqlgAeRZFKWLuuiTJJU=
+SIZE (luafilesystem-1_8_0.tar.gz) = 30374
diff --git a/devel/luafs/patches/patch-Makefile b/devel/luafs/patches/patch-Makefile
index c4fb73ee739..33a6481036d 100644
--- a/devel/luafs/patches/patch-Makefile
+++ b/devel/luafs/patches/patch-Makefile
@@ -1,14 +1,14 @@
---- Makefile.orig Thu Jan 15 19:58:20 2015
-+++ Makefile Tue Feb 10 21:14:38 2015
-@@ -12,7 +12,10 @@ OBJS= src/$T.o
+Index: Makefile
+--- Makefile.orig
++++ Makefile
+@@ -11,8 +11,8 @@ OBJS= src/$T.o
+
lib: src/lfs.so
- src/lfs.so: $(OBJS)
-- MACOSX_DEPLOYMENT_TARGET="10.3"; export MACOSX_DEPLOYMENT_TARGET; $(CC) $(CFLAGS) $(LIB_OPTION) -o src/lfs.so $(OBJS)
-+ MACOSX_DEPLOYMENT_TARGET="10.3"; export MACOSX_DEPLOYMENT_TARGET; $(CC) $(CFLAGS) $(LIB_OPTION) lfs.o -o $(LIBNAME)
-+
-+$(OBJS): $(SRCS)
-+ $(CC) $(CFLAGS) $(INCS) -c src/lfs.c
+-src/lfs.so: $(OBJS)
+- MACOSX_DEPLOYMENT_TARGET=$(MACOSX_DEPLOYMENT_TARGET); export MACOSX_DEPLOYMENT_TARGET; $(CC) $(LIB_OPTION) -o src/lfs.so $(OBJS)
++src/lfs.so: $(SRCS)
++ MACOSX_DEPLOYMENT_TARGET=$(MACOSX_DEPLOYMENT_TARGET); export MACOSX_DEPLOYMENT_TARGET; $(CC) -fPIC -shared $(CFLAGS) -o lfs.so src/lfs.c $(LDFLAGS)
test: lib
LUA_CPATH=./src/?.so lua tests/test.lua
diff --git a/devel/luafs/patches/patch-config b/devel/luafs/patches/patch-config
index 2ecdf6cad02..d61a89f71e6 100644
--- a/devel/luafs/patches/patch-config
+++ b/devel/luafs/patches/patch-config
@@ -1,29 +1,14 @@
---- config.orig Thu Jan 15 19:58:20 2015
-+++ config Tue Feb 10 21:14:38 2015
-@@ -3,9 +3,9 @@
- # Default installation prefix
--PREFIX=/usr/local
-+#PREFIX=/usr/local
-
- # System's libraries directory (where binary libraries are installed)
--LUA_LIBDIR= $(PREFIX)/lib/lua/5.1
-+LUA_LIBDIR?= $(LOCALBASE)/lib/lua/5.1
-
- # Lua includes directory
--LUA_INC= $(PREFIX)/include
-+LUA_INC?= $(LOCALBASE)/include
-
-@@ -15,9 +15,9 @@
-
--LIBNAME= $T.so.$V
-+LIBNAME= $T.so
-
+Index: config
+--- config.orig
++++ config
+@@ -20,7 +20,7 @@ LIB_OPTION= -shared #for Linux
+ MACOSX_DEPLOYMENT_TARGET= 10.5
+
# Compilation directives
-WARN= -O2 -Wall -fPIC -W -Waggregate-return -Wcast-align -Wmissing-prototypes -Wnested-externs -Wshadow -Wwrite-strings -pedantic
+#WARN= -O2 -Wall -fPIC -W -Waggregate-return -Wcast-align -Wmissing-prototypes -Wnested-externs -Wshadow -Wwrite-strings -pedantic
- INCS= -I$(LUA_INC)
+ INCS= $(LUA_INC)
-CFLAGS= $(WARN) $(INCS)
-CC= gcc
-+CFLAGS+= -fPIC $(INCS)
++#CFLAGS+= -fPIC $(INCS)
+#CC= gcc
-
diff --git a/devel/luafs/pkg/PLIST b/devel/luafs/pkg/PLIST
index 3239f999e45..46185a8816e 100644
--- a/devel/luafs/pkg/PLIST
+++ b/devel/luafs/pkg/PLIST
@@ -1,4 +1,4 @@
-lib/lua/${MODLUA_VERSION}/lfs.so
+@so lib/lua/${MODLUA_VERSION}/lfs.so
share/doc/${FULLPKGNAME}/
share/doc/${FULLPKGNAME}/examples.html
share/doc/${FULLPKGNAME}/index.html

148
luakit-2.3.1v1.diff Normal file
View File

@ -0,0 +1,148 @@
Index: www/luakit/Makefile
===================================================================
RCS file: /cvs/ports/www/luakit/Makefile,v
retrieving revision 1.34
diff -u -p -u -p -r1.34 Makefile
--- www/luakit/Makefile 31 Mar 2022 16:29:49 -0000 1.34
+++ www/luakit/Makefile 30 Aug 2022 18:07:30 -0000
@@ -3,8 +3,7 @@ COMMENT = fast, small, webkit based brow
GH_ACCOUNT = luakit
GH_PROJECT = luakit
# used in MAKE_FLAGS
-GH_TAGNAME = 2.3
-REVISION = 3
+GH_TAGNAME = 2.3.1
EPOCH = 1
Index: www/luakit/distinfo
===================================================================
RCS file: /cvs/ports/www/luakit/distinfo,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 distinfo
--- www/luakit/distinfo 21 Mar 2021 14:16:21 -0000 1.12
+++ www/luakit/distinfo 30 Aug 2022 18:07:30 -0000
@@ -1,2 +1,2 @@
-SHA256 (luakit-2.3.tar.gz) = xwJrTwvfpE9DeYuA+HVI0+etVvW5I/xDuccSvxhJYJU=
-SIZE (luakit-2.3.tar.gz) = 497471
+SHA256 (luakit-2.3.1.tar.gz) = E4/tHqzKuAH66MMv8r7Gy82GSp9SfFx3rR3kAs4aEw4=
+SIZE (luakit-2.3.1.tar.gz) = 506988
Index: www/luakit/patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/www/luakit/patches/patch-Makefile,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 patch-Makefile
--- www/luakit/patches/patch-Makefile 11 Mar 2022 20:10:05 -0000 1.5
+++ www/luakit/patches/patch-Makefile 30 Aug 2022 18:07:30 -0000
@@ -1,38 +1,12 @@
Index: Makefile
--- Makefile.orig
+++ Makefile
-@@ -56,21 +56,21 @@ buildopts.h: buildopts.h.in
- $(filter-out $(EXT_OBJS),$(OBJS)) $(EXT_OBJS): $(HEADS) config.mk
-
- $(filter-out $(EXT_OBJS),$(OBJS)) : %.o : %.c
-- @echo $(CC) -c $< -o $@
-+ @echo $(CC) -c $(CFLAGS) $(CPPFLAGS) $< -o $@
- @$(CC) -c $(CFLAGS) $(CPPFLAGS) $< -o $@
-
- $(EXT_OBJS) : %.o : %.c
-- @echo $(CC) -c $< -o $@
-+ @echo $(CC) -c $(CFLAGS) -DLUAKIT_WEB_EXTENSION -fpic $(CPPFLAGS) $< -o $@
- @$(CC) -c $(CFLAGS) -DLUAKIT_WEB_EXTENSION -fpic $(CPPFLAGS) $< -o $@
-
- widgets/webview.o: $(wildcard widgets/webview/*.c)
-
- luakit: $(OBJS)
-- @echo $(CC) -o $@ $(OBJS)
-+ @echo $(CC) -o $@ $(OBJS) $(LDFLAGS)
- @$(CC) -o $@ $(OBJS) $(LDFLAGS)
-
- luakit.so: $(EXT_OBJS)
-- @echo $(CC) -o $@ $(EXT_OBJS)
-+ @echo $(CC) -o $@ $(EXT_OBJS) -shared $(LDFLAGS)
- @$(CC) -o $@ $(EXT_OBJS) -shared $(LDFLAGS)
-
- luakit.1: luakit.1.in
-@@ -115,7 +115,7 @@ install: all
+@@ -118,7 +118,7 @@ install: all
install -d $(DESTDIR)$(APPDIR)
install -m644 extras/luakit.desktop $(DESTDIR)$(APPDIR)
install -d $(DESTDIR)$(MANPREFIX)/man1/
- install -m644 luakit.1.gz $(DESTDIR)$(MANPREFIX)/man1/
+ install -m644 luakit.1 $(DESTDIR)$(MANPREFIX)/man1/
- mkdir -p resources
- find resources -type d -exec install -d $(DESTDIR)$(PREFIX)/share/luakit/'{}' \;
- find resources -type f -exec sh -c 'f="{}"; install -m644 "$$f" "$(DESTDIR)$(PREFIX)/share/luakit/$$(dirname $$f)"' \;
+ install -d $(DESTDIR)$(PREFIX)/share/luakit/resources/icons
+ for i in resources/icons/*; do install -m644 "$$i" "$(DESTDIR)$(PREFIX)/share/luakit/resources/icons"; done
+
Index: www/luakit/patches/patch-common_luautil_c
===================================================================
RCS file: www/luakit/patches/patch-common_luautil_c
diff -N www/luakit/patches/patch-common_luautil_c
--- www/luakit/patches/patch-common_luautil_c 11 Mar 2022 20:10:05 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-Don't use printf %n.
-
-Index: common/luautil.c
---- common/luautil.c.orig
-+++ common/luautil.c
-@@ -72,7 +72,10 @@ luaH_traceback(lua_State *L, lua_State *T, gint min_le
- } else {
- const char *src = AR_SRC(ar);
- int n;
-- g_string_append_printf(tb, "%s:%d%n", src, ar.currentline, &n);
-+ char tmp[10] = "";
-+ snprintf(tmp, sizeof(tmp), "%d", ar.currentline);
-+ n = strlen(src) + strlen(tmp) + 1;
-+ g_string_append_printf(tb, "%s:%d", src, ar.currentline);
- g_string_append_printf(tb, "%*.*s", loc_pad-n, loc_pad-n, "");
- }
-
Index: www/luakit/pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/luakit/pkg/PLIST,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 PLIST
--- www/luakit/pkg/PLIST 11 Mar 2022 20:10:05 -0000 1.10
+++ www/luakit/pkg/PLIST 30 Aug 2022 18:07:30 -0000
@@ -83,6 +83,7 @@ share/doc/luakit/modules/lousy.widget.ss
share/doc/luakit/modules/lousy.widget.tab.html
share/doc/luakit/modules/lousy.widget.tabi.html
share/doc/luakit/modules/lousy.widget.tablist.html
+share/doc/luakit/modules/lousy.widget.tgname.html
share/doc/luakit/modules/lousy.widget.uri.html
share/doc/luakit/modules/lousy.widget.zoom.html
share/doc/luakit/modules/luakit.html
@@ -105,6 +106,7 @@ share/doc/luakit/modules/settings_chrome
share/doc/luakit/modules/soup.html
share/doc/luakit/modules/styles.html
share/doc/luakit/modules/tab_favicons.html
+share/doc/luakit/modules/tabgroups.html
share/doc/luakit/modules/tabhistory.html
share/doc/luakit/modules/tabmenu.html
share/doc/luakit/modules/taborder.html
@@ -195,6 +197,7 @@ share/luakit/lib/lousy/widget/ssl.lua
share/luakit/lib/lousy/widget/tab.lua
share/luakit/lib/lousy/widget/tabi.lua
share/luakit/lib/lousy/widget/tablist.lua
+share/luakit/lib/lousy/widget/tgname.lua
share/luakit/lib/lousy/widget/uri.lua
share/luakit/lib/lousy/widget/zoom.lua
share/luakit/lib/markdown.lua
@@ -214,6 +217,7 @@ share/luakit/lib/settings.lua
share/luakit/lib/settings_chrome.lua
share/luakit/lib/styles.lua
share/luakit/lib/tab_favicons.lua
+share/luakit/lib/tabgroups.lua
share/luakit/lib/tabhistory.lua
share/luakit/lib/tabmenu.lua
share/luakit/lib/taborder.lua
@@ -244,4 +248,5 @@ share/luakit/resources/icons/tab-icon-se
share/luakit/resources/icons/tab-icon-security-error@2x.png
share/pixmaps/
share/pixmaps/luakit.png
+share/pixmaps/luakit.svg
@tag update-desktop-database

88
luakit-2.3.1v1p0.diff Normal file
View File

@ -0,0 +1,88 @@
Index: www/luakit/Makefile
===================================================================
RCS file: /cvs/ports/www/luakit/Makefile,v
retrieving revision 1.35
diff -u -p -u -p -r1.35 Makefile
--- www/luakit/Makefile 30 Aug 2022 20:13:10 -0000 1.35
+++ www/luakit/Makefile 31 Aug 2022 13:50:33 -0000
@@ -4,6 +4,7 @@ GH_ACCOUNT = luakit
GH_PROJECT = luakit
# used in MAKE_FLAGS
GH_TAGNAME = 2.3.1
+REVISION = 0
EPOCH = 1
@@ -20,14 +21,29 @@ USE_GMAKE = Yes
COMPILER = base-clang ports-gcc
-WANTLIB += atk-1.0 c cairo cairo-gobject gdk-3 gdk_pixbuf-2.0
-WANTLIB += gio-2.0 glib-2.0 gobject-2.0 gthread-2.0 gtk-3 harfbuzz
-WANTLIB += intl javascriptcoregtk-4.0 luajit-5.1 pango-1.0
-WANTLIB += pangocairo-1.0 pthread soup-2.4 sqlite3 webkit2gtk-4.0
-WANTLIB += gmodule-2.0
+WANTLIB += atk-1.0 c cairo cairo-gobject gdk-3 gdk_pixbuf-2.0 gio-2.0
+WANTLIB += glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0 gtk-3 harfbuzz
+WANTLIB += intl javascriptcoregtk-4.0 pango-1.0 pangocairo-1.0 pthread
+WANTLIB += soup-2.4 sqlite3 webkit2gtk-4.0
+
+# luajit archs
+.if ${MACHINE_ARCH} == "arm" \
+ || ${MACHINE_ARCH} == "aarch64" \
+ || ${MACHINE_ARCH} == "amd64" \
+ || ${MACHINE_ARCH} == "i386" \
+ || ${MACHINE_ARCH} == "powerpc"
+LUAJIT = 1
+WANTLIB += luajit-5.1
+LIB_DEPENDS += lang/luajit
+.else
+LUAJIT = 0
+WANTLIB += ${MODLLUA_WANTLIB}
+.endif
MODULES = lang/lua
+MODLUA_VERSION = 5.1
+
BUILD_DEPENDS = devel/help2man \
devel/luafs
@@ -36,8 +52,7 @@ RUN_DEPENDS = devel/desktop-file-utils \
net/luasocket \
textproc/lua-markdown
-LIB_DEPENDS = lang/luajit \
- www/webkitgtk4
+LIB_DEPENDS += www/webkitgtk4
TEST_DEPENDS = devel/luassert \
devel/luacheck
@@ -55,6 +70,7 @@ MAKE_FLAGS += LUA_BIN_NAME=${MODLUA_BIN}
PIXMAPDIR=${PREFIX}/share/pixmaps/ \
APPDIR=${PREFIX}/share/applications/ \
PREFIX=${PREFIX} \
+ USE_LUAJIT=${LUAJIT} \
DEVELOPMENT_PATHS=0 \
VERSION=${GH_TAGNAME}
Index: www/luakit/patches/patch-tests_async_test_undoclose_lua
===================================================================
RCS file: www/luakit/patches/patch-tests_async_test_undoclose_lua
diff -N www/luakit/patches/patch-tests_async_test_undoclose_lua
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ www/luakit/patches/patch-tests_async_test_undoclose_lua 31 Aug 2022 13:50:33 -0000
@@ -0,0 +1,13 @@
+Fix undoclose unit test
+
+Index: tests/async/test_undoclose.lua
+--- tests/async/test_undoclose.lua.orig
++++ tests/async/test_undoclose.lua
+@@ -42,6 +42,7 @@ T.test_undo_close_works = function ()
+ w:undo_close_tab(1)
+ assert(w.tabs:current() == 2)
+ test.wait_for_view(w.view)
++ test.wait_for_signal(w.view, "property::title", 2000)
+
+ assert(w.view.uri == uri)
+ assert(w.view.title == "undoclose_page")

49
luakit-2.3.2v1.diff Normal file
View File

@ -0,0 +1,49 @@
Index: www/luakit/Makefile
===================================================================
RCS file: /cvs/ports/www/luakit/Makefile,v
retrieving revision 1.37
diff -u -p -u -p -r1.37 Makefile
--- www/luakit/Makefile 3 Sep 2022 07:53:09 -0000 1.37
+++ www/luakit/Makefile 9 Nov 2022 12:48:58 -0000
@@ -3,8 +3,7 @@ COMMENT = fast, small, webkit based brow
GH_ACCOUNT = luakit
GH_PROJECT = luakit
# used in MAKE_FLAGS
-GH_TAGNAME = 2.3.1
-REVISION = 1
+GH_TAGNAME = 2.3.2
EPOCH = 1
Index: www/luakit/distinfo
===================================================================
RCS file: /cvs/ports/www/luakit/distinfo,v
retrieving revision 1.13
diff -u -p -u -p -r1.13 distinfo
--- www/luakit/distinfo 30 Aug 2022 20:13:10 -0000 1.13
+++ www/luakit/distinfo 9 Nov 2022 12:48:58 -0000
@@ -1,2 +1,2 @@
-SHA256 (luakit-2.3.1.tar.gz) = E4/tHqzKuAH66MMv8r7Gy82GSp9SfFx3rR3kAs4aEw4=
-SIZE (luakit-2.3.1.tar.gz) = 506988
+SHA256 (luakit-2.3.2.tar.gz) = 3FruKdOfzNbp4Jrq+x/96CRh75aydoVLLIZu94QezEY=
+SIZE (luakit-2.3.2.tar.gz) = 507310
Index: www/luakit/patches/patch-tests_async_test_undoclose_lua
===================================================================
RCS file: www/luakit/patches/patch-tests_async_test_undoclose_lua
diff -N www/luakit/patches/patch-tests_async_test_undoclose_lua
--- www/luakit/patches/patch-tests_async_test_undoclose_lua 31 Aug 2022 16:10:49 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-Fix undoclose unit test
-
-Index: tests/async/test_undoclose.lua
---- tests/async/test_undoclose.lua.orig
-+++ tests/async/test_undoclose.lua
-@@ -42,6 +42,7 @@ T.test_undo_close_works = function ()
- w:undo_close_tab(1)
- assert(w.tabs:current() == 2)
- test.wait_for_view(w.view)
-+ test.wait_for_signal(w.view, "property::title", 2000)
-
- assert(w.view.uri == uri)
- assert(w.view.title == "undoclose_page")

50
luakit-2.3.3v1.diff Normal file
View File

@ -0,0 +1,50 @@
? www/luakit/codechecker_web
Index: www/luakit/Makefile
===================================================================
RCS file: /cvs/ports/www/luakit/Makefile,v
retrieving revision 1.37
diff -u -p -u -p -r1.37 Makefile
--- www/luakit/Makefile 3 Sep 2022 07:53:09 -0000 1.37
+++ www/luakit/Makefile 9 Nov 2022 15:25:52 -0000
@@ -3,8 +3,7 @@ COMMENT = fast, small, webkit based brow
GH_ACCOUNT = luakit
GH_PROJECT = luakit
# used in MAKE_FLAGS
-GH_TAGNAME = 2.3.1
-REVISION = 1
+GH_TAGNAME = 2.3.3
EPOCH = 1
Index: www/luakit/distinfo
===================================================================
RCS file: /cvs/ports/www/luakit/distinfo,v
retrieving revision 1.13
diff -u -p -u -p -r1.13 distinfo
--- www/luakit/distinfo 30 Aug 2022 20:13:10 -0000 1.13
+++ www/luakit/distinfo 9 Nov 2022 15:25:52 -0000
@@ -1,2 +1,2 @@
-SHA256 (luakit-2.3.1.tar.gz) = E4/tHqzKuAH66MMv8r7Gy82GSp9SfFx3rR3kAs4aEw4=
-SIZE (luakit-2.3.1.tar.gz) = 506988
+SHA256 (luakit-2.3.3.tar.gz) = jmVx8REZsx56ND23sD9o2CPx/Rdf3/SHDUCir9nnMtU=
+SIZE (luakit-2.3.3.tar.gz) = 507343
Index: www/luakit/patches/patch-tests_async_test_undoclose_lua
===================================================================
RCS file: www/luakit/patches/patch-tests_async_test_undoclose_lua
diff -N www/luakit/patches/patch-tests_async_test_undoclose_lua
--- www/luakit/patches/patch-tests_async_test_undoclose_lua 31 Aug 2022 16:10:49 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-Fix undoclose unit test
-
-Index: tests/async/test_undoclose.lua
---- tests/async/test_undoclose.lua.orig
-+++ tests/async/test_undoclose.lua
-@@ -42,6 +42,7 @@ T.test_undo_close_works = function ()
- w:undo_close_tab(1)
- assert(w.tabs:current() == 2)
- test.wait_for_view(w.view)
-+ test.wait_for_signal(w.view, "property::title", 2000)
-
- assert(w.view.uri == uri)
- assert(w.view.title == "undoclose_page")

44
luassert-1.9.0.diff Normal file
View File

@ -0,0 +1,44 @@
Index: devel/luassert/Makefile
===================================================================
RCS file: /cvs/ports/devel/luassert/Makefile,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 Makefile
--- devel/luassert/Makefile 11 Mar 2022 18:50:46 -0000 1.4
+++ devel/luassert/Makefile 30 Aug 2022 14:47:13 -0000
@@ -3,8 +3,7 @@ CATEGORIES= devel
GH_ACCOUNT= Olivine-Labs
GH_PROJECT= luassert
-GH_TAGNAME= v1.7.11
-REVISION= 1
+GH_TAGNAME= v1.9.0
MAINTAINER= Stefan Hagen <sh+ports@codevoid.de>
Index: devel/luassert/distinfo
===================================================================
RCS file: /cvs/ports/devel/luassert/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 distinfo
--- devel/luassert/distinfo 12 Nov 2020 09:35:32 -0000 1.1.1.1
+++ devel/luassert/distinfo 30 Aug 2022 14:47:13 -0000
@@ -1,2 +1,2 @@
-SHA256 (luassert-1.7.11.tar.gz) = ao7Vtq+XbRRNAsmODQgUmT52oUfDBmdp+l6yJDEfmO8=
-SIZE (luassert-1.7.11.tar.gz) = 38556
+SHA256 (luassert-1.9.0.tar.gz) = HbD6vxvYc5KGA3W4moo30XtocyXJiL4N+MQufpbn7XM=
+SIZE (luassert-1.9.0.tar.gz) = 42645
Index: devel/luassert/pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/luassert/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 PLIST
--- devel/luassert/pkg/PLIST 11 Mar 2022 18:50:46 -0000 1.3
+++ devel/luassert/pkg/PLIST 30 Aug 2022 14:47:13 -0000
@@ -14,6 +14,7 @@ share/lua/${MODLUA_VERSION}/luassert/lan
share/lua/${MODLUA_VERSION}/luassert/languages/de.lua
share/lua/${MODLUA_VERSION}/luassert/languages/en.lua
share/lua/${MODLUA_VERSION}/luassert/languages/fr.lua
+share/lua/${MODLUA_VERSION}/luassert/languages/is.lua
share/lua/${MODLUA_VERSION}/luassert/languages/ja.lua
share/lua/${MODLUA_VERSION}/luassert/languages/nl.lua
share/lua/${MODLUA_VERSION}/luassert/languages/ru.lua

43
magic-heic.diff Normal file
View File

@ -0,0 +1,43 @@
Index: usr.bin/file/magdir/animation
===================================================================
RCS file: /cvs/src/usr.bin/file/magdir/animation,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 animation
--- usr.bin/file/magdir/animation 2 Jan 2016 13:25:33 -0000 1.6
+++ usr.bin/file/magdir/animation 25 Dec 2022 13:50:52 -0000
@@ -65,6 +65,35 @@
!:mime video/mp4
>8 string/W qt \b, Apple QuickTime movie
!:mime video/quicktime
+# HEIF image format
+# see https://nokiatech.github.io/heif/technical.html
+>8 string mif1 \b, HEIF Image
+!:mime image/heif
+>8 string msf1 \b, HEIF Image Sequence
+!:mime image/heif-sequence
+>8 string heic \b, HEIF Image HEVC Main or Main Still Picture Profile
+!:mime image/heic
+>8 string heix \b, HEIF Image HEVC Main 10 Profile
+!:mime image/heic
+>8 string hevc \b, HEIF Image Sequenz HEVC Main or Main Still Picture Profile
+!:mime image/heic-sequence
+>8 string hevx \b, HEIF Image Sequence HEVC Main 10 Profile
+!:mime image/heic-sequence
+# following HEIF brands are not mentioned in the heif technical info currently (Oct 2017)
+# but used in the reference implementation:
+# https://github.com/nokiatech/heif/blob/d5e9a21c8ba8df712bdf643021dd9f6518134776/Srcs/reader/hevcimagefilereader.cpp
+>8 string heim \b, HEIF Image L-HEVC
+!:mime image/heif
+>8 string heis \b, HEIF Image L-HEVC
+!:mime image/heif
+>8 string avic \b, HEIF Image AVC
+!:mime image/heif
+>8 string hevm \b, HEIF Image Sequence L-HEVC
+!:mime image/heif-sequence
+>8 string hevs \b, HEIF Image Sequence L-HEVC
+!:mime image/heif-sequence
+>8 string avcs \b, HEIF Image Sequence AVC
+!:mime image/heif-sequence
>8 string CAEP \b, Canon Digital Camera
>8 string caqv \b, Casio Digital Camera
>8 string CDes \b, Convergent Design

30
menumaker-0.99.14.diff Normal file
View File

@ -0,0 +1,30 @@
Index: x11/menumaker/Makefile
===================================================================
RCS file: /home/cvs/ports/x11/menumaker/Makefile,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 Makefile
--- x11/menumaker/Makefile 2 Nov 2021 00:02:59 -0000 1.9
+++ x11/menumaker/Makefile 25 Nov 2021 19:55:36 -0000
@@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.9 2021/11/02 00:02:59 sthen Exp $
COMMENT = menu generation utility for X window managers
-DISTNAME = menumaker-0.99.12
+DISTNAME = menumaker-0.99.14
CATEGORIES = x11
-REVISION = 0
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=menumaker/}
Index: x11/menumaker/distinfo
===================================================================
RCS file: /home/cvs/ports/x11/menumaker/distinfo,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 distinfo
--- x11/menumaker/distinfo 14 Nov 2020 19:42:41 -0000 1.3
+++ x11/menumaker/distinfo 25 Nov 2021 19:55:36 -0000
@@ -1,2 +1,2 @@
-SHA256 (menumaker-0.99.12.tar.gz) = 46NWYYalqe1Nchwed4ilryQ8jIpFuW/m//PpRYAomww=
-SIZE (menumaker-0.99.12.tar.gz) = 206208
+SHA256 (menumaker-0.99.14.tar.gz) = EeldDnajuFD1ffgbxVYCIr1gFBxXUbbpvQXDzVVg1lo=
+SIZE (menumaker-0.99.14.tar.gz) = 205664

30
menumaker.diff Normal file
View File

@ -0,0 +1,30 @@
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/menumaker/Makefile,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 Makefile
--- Makefile 2 Nov 2021 00:02:59 -0000 1.9
+++ Makefile 21 Nov 2021 10:29:17 -0000
@@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.9 2021/11/02 00:02:59 sthen Exp $
COMMENT = menu generation utility for X window managers
-DISTNAME = menumaker-0.99.12
+DISTNAME = menumaker-0.99.14
CATEGORIES = x11
-REVISION = 0
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=menumaker/}
Index: distinfo
===================================================================
RCS file: /cvs/ports/x11/menumaker/distinfo,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 distinfo
--- distinfo 14 Nov 2020 19:42:41 -0000 1.3
+++ distinfo 21 Nov 2021 10:29:17 -0000
@@ -1,2 +1,2 @@
-SHA256 (menumaker-0.99.12.tar.gz) = 46NWYYalqe1Nchwed4ilryQ8jIpFuW/m//PpRYAomww=
-SIZE (menumaker-0.99.12.tar.gz) = 206208
+SHA256 (menumaker-0.99.14.tar.gz) = EeldDnajuFD1ffgbxVYCIr1gFBxXUbbpvQXDzVVg1lo=
+SIZE (menumaker-0.99.14.tar.gz) = 205664

28
minitube-3.9.3.diff Normal file
View File

@ -0,0 +1,28 @@
Index: www/minitube/Makefile
===================================================================
RCS file: /home/cvs/ports/www/minitube/Makefile,v
retrieving revision 1.69
diff -u -p -u -p -r1.69 Makefile
--- www/minitube/Makefile 23 Jun 2021 17:04:50 -0000 1.69
+++ www/minitube/Makefile 25 Feb 2022 13:14:51 -0000
@@ -2,7 +2,7 @@
COMMENT = standalone YouTube.com video browser/player
-V = 3.9
+V = 3.9.3
DISTNAME = minitube-$V
EXTRACT_SUFX = .tar.bz2
Index: www/minitube/distinfo
===================================================================
RCS file: /home/cvs/ports/www/minitube/distinfo,v
retrieving revision 1.31
diff -u -p -u -p -r1.31 distinfo
--- www/minitube/distinfo 23 Jun 2021 17:04:50 -0000 1.31
+++ www/minitube/distinfo 25 Feb 2022 13:14:56 -0000
@@ -1,2 +1,2 @@
-SHA256 (minitube-3.9.tar.bz2) = 0JSqwVDaav2WtfX8TChoWtAqcmn7kPkLGRtCR0+2b8o=
-SIZE (minitube-3.9.tar.bz2) = 1140355
+SHA256 (minitube-3.9.3.tar.bz2) = Di5w/zZiGDU/FFpI+xzGXe9UCkcIJIXckY+Nq5BKZIw=
+SIZE (minitube-3.9.3.tar.bz2) = 1142905

37
mu-1.6.10.diff Normal file
View File

@ -0,0 +1,37 @@
Index: mail/mu/Makefile
===================================================================
RCS file: /home/cvs/ports/mail/mu/Makefile,v
retrieving revision 1.31
diff -u -p -u -p -r1.31 Makefile
--- mail/mu/Makefile 26 Oct 2021 10:37:27 -0000 1.31
+++ mail/mu/Makefile 15 Nov 2021 19:58:50 -0000
@@ -2,7 +2,7 @@
COMMENT= maildir indexer and searcher with emacs frontend
-V= 1.6.9
+V= 1.6.10
GUILE_V= 2.2
DISTNAME= mu-$V
@@ -24,7 +24,7 @@ WANTLIB += ${COMPILER_LIBCXX} assuan c c
WANTLIB += gmime-3.0 gmodule-2.0 gobject-2.0 gpg-error gpgme gthread-2.0
WANTLIB += iconv idn2 intl m pcre readline unistring xapian z
-MASTER_SITES= https://github.com/djcb/mu/releases/download/${V}-signed/
+MASTER_SITES= https://github.com/djcb/mu/releases/download/${V}/
EXTRACT_SUFX= .tar.xz
BUILD_DEPENDS= emacs->=24:editors/emacs
Index: mail/mu/distinfo
===================================================================
RCS file: /home/cvs/ports/mail/mu/distinfo,v
retrieving revision 1.18
diff -u -p -u -p -r1.18 distinfo
--- mail/mu/distinfo 26 Oct 2021 10:37:27 -0000 1.18
+++ mail/mu/distinfo 15 Nov 2021 19:59:01 -0000
@@ -1,2 +1,2 @@
-SHA256 (mu-1.6.9.tar.xz) = jZlDCk9pQusxIgCLuJfESAzaZLMP9FdcMt7YbX7br1g=
-SIZE (mu-1.6.9.tar.xz) = 867188
+SHA256 (mu-1.6.10.tar.xz) = C8IkqrK/5AtSCa8U4JguY3eJKSt5eYcmWNRJiynpALY=
+SIZE (mu-1.6.10.tar.xz) = 867008

37
mu-1.6.9.diff Normal file
View File

@ -0,0 +1,37 @@
Index: mail/mu/Makefile
===================================================================
RCS file: /home/cvs/ports/mail/mu/Makefile,v
retrieving revision 1.30
diff -u -p -u -p -r1.30 Makefile
--- mail/mu/Makefile 19 Oct 2021 18:26:53 -0000 1.30
+++ mail/mu/Makefile 26 Oct 2021 07:50:23 -0000
@@ -2,7 +2,7 @@
COMMENT= maildir indexer and searcher with emacs frontend
-V= 1.6.7
+V= 1.6.9
GUILE_V= 2.2
DISTNAME= mu-$V
@@ -24,7 +24,7 @@ WANTLIB += ${COMPILER_LIBCXX} assuan c c
WANTLIB += gmime-3.0 gmodule-2.0 gobject-2.0 gpg-error gpgme gthread-2.0
WANTLIB += iconv idn2 intl m pcre readline unistring xapian z
-MASTER_SITES= https://github.com/djcb/mu/releases/download/${V}/
+MASTER_SITES= https://github.com/djcb/mu/releases/download/${V}-signed/
EXTRACT_SUFX= .tar.xz
BUILD_DEPENDS= emacs->=24:editors/emacs
Index: mail/mu/distinfo
===================================================================
RCS file: /home/cvs/ports/mail/mu/distinfo,v
retrieving revision 1.17
diff -u -p -u -p -r1.17 distinfo
--- mail/mu/distinfo 19 Oct 2021 18:26:53 -0000 1.17
+++ mail/mu/distinfo 26 Oct 2021 07:50:26 -0000
@@ -1,2 +1,2 @@
-SHA256 (mu-1.6.7.tar.xz) = EF3xbfX9b1TVM0z2jYEI+LBZPjcCCy+oSHwuJRzp2aI=
-SIZE (mu-1.6.7.tar.xz) = 867136
+SHA256 (mu-1.6.9.tar.xz) = jZlDCk9pQusxIgCLuJfESAzaZLMP9FdcMt7YbX7br1g=
+SIZE (mu-1.6.9.tar.xz) = 867188

36
mu-1.8.1.diff Normal file
View File

@ -0,0 +1,36 @@
Index: mail/mu/Makefile
===================================================================
RCS file: /home/cvs/ports/mail/mu/Makefile,v
retrieving revision 1.34
diff -u -p -u -p -r1.34 Makefile
--- mail/mu/Makefile 16 Jun 2022 15:39:44 -0000 1.34
+++ mail/mu/Makefile 28 Jun 2022 20:02:03 -0000
@@ -1,6 +1,6 @@
COMMENT= maildir indexer and searcher with emacs frontend
-V= 1.6.11
+V= 1.8.1
GUILE_V= 2.2
DISTNAME= mu-$V
@@ -22,7 +22,7 @@ WANTLIB += ${COMPILER_LIBCXX} assuan c c
WANTLIB += gmime-3.0 gmodule-2.0 gobject-2.0 gpg-error gpgme gthread-2.0
WANTLIB += iconv idn2 intl m pcre readline unistring xapian z
-MASTER_SITES= https://github.com/djcb/mu/releases/download/${V}/
+MASTER_SITES= https://github.com/djcb/mu/releases/download/v${V}/
EXTRACT_SUFX= .tar.xz
BUILD_DEPENDS= emacs->=24:editors/emacs
Index: mail/mu/distinfo
===================================================================
RCS file: /home/cvs/ports/mail/mu/distinfo,v
retrieving revision 1.20
diff -u -p -u -p -r1.20 distinfo
--- mail/mu/distinfo 16 Jun 2022 15:39:44 -0000 1.20
+++ mail/mu/distinfo 28 Jun 2022 20:02:06 -0000
@@ -1,2 +1,2 @@
-SHA256 (mu-1.6.11.tar.xz) = YOqyQNwQjypBn0fWp1wWhBB43NGT8sC7Atzbn/SE7I0=
-SIZE (mu-1.6.11.tar.xz) = 870188
+SHA256 (mu-1.8.1.tar.xz) = RBK2X9oHvSRhuDV3Eekg/Cbe1+xI9HFzulGMy3/Kw/o=
+SIZE (mu-1.8.1.tar.xz) = 537892

27
mu-1.8.11.diff Normal file
View File

@ -0,0 +1,27 @@
Index: mail/mu/Makefile
===================================================================
RCS file: /cvs/ports/mail/mu/Makefile,v
retrieving revision 1.37
diff -u -p -u -p -r1.37 Makefile
--- mail/mu/Makefile 26 Sep 2022 10:48:34 -0000 1.37
+++ mail/mu/Makefile 27 Oct 2022 22:19:43 -0000
@@ -1,6 +1,6 @@
COMMENT= maildir indexer and searcher with emacs frontend
-V= 1.8.10
+V= 1.8.11
GUILE_V= 3.0
DISTNAME= mu-$V
Index: mail/mu/distinfo
===================================================================
RCS file: /cvs/ports/mail/mu/distinfo,v
retrieving revision 1.23
diff -u -p -u -p -r1.23 distinfo
--- mail/mu/distinfo 26 Sep 2022 10:48:34 -0000 1.23
+++ mail/mu/distinfo 27 Oct 2022 22:19:43 -0000
@@ -1,2 +1,2 @@
-SHA256 (mu-1.8.10.tar.xz) = pgszDoo2AlUTSx+h2fZyNj6/MY1cvktLC+4en5SuFck=
-SIZE (mu-1.8.10.tar.xz) = 541408
+SHA256 (mu-1.8.11.tar.xz) = 1MHPbddsl9zVPhRo2f+C3B4QIDvmB60ySbp6xBdgNDk=
+SIZE (mu-1.8.11.tar.xz) = 543168

63
mu-1.8.13.diff Normal file
View File

@ -0,0 +1,63 @@
Index: mail/mu/Makefile
===================================================================
RCS file: /cvs/ports/mail/mu/Makefile,v
retrieving revision 1.39
diff -u -p -u -p -r1.39 Makefile
--- mail/mu/Makefile 5 Nov 2022 17:06:29 -0000 1.39
+++ mail/mu/Makefile 18 Dec 2022 18:26:15 -0000
@@ -1,10 +1,9 @@
COMMENT= maildir indexer and searcher with emacs frontend
-V= 1.8.11
+V= 1.8.13
GUILE_V= 3.0
DISTNAME= mu-$V
-REVISION= 0
FLAVORS= guile
FLAVOR ?=
Index: mail/mu/distinfo
===================================================================
RCS file: /cvs/ports/mail/mu/distinfo,v
retrieving revision 1.24
diff -u -p -u -p -r1.24 distinfo
--- mail/mu/distinfo 27 Oct 2022 22:29:58 -0000 1.24
+++ mail/mu/distinfo 18 Dec 2022 18:26:15 -0000
@@ -1,2 +1,2 @@
-SHA256 (mu-1.8.11.tar.xz) = 1MHPbddsl9zVPhRo2f+C3B4QIDvmB60ySbp6xBdgNDk=
-SIZE (mu-1.8.11.tar.xz) = 543168
+SHA256 (mu-1.8.13.tar.xz) = INacGpGMHkjm2/U3XYfvPtNYu2s7fQoSDpOoixbVoCY=
+SIZE (mu-1.8.13.tar.xz) = 543696
Index: mail/mu/patches/patch-lib_mu-store_cc
===================================================================
RCS file: /cvs/ports/mail/mu/patches/patch-lib_mu-store_cc,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-lib_mu-store_cc
--- mail/mu/patches/patch-lib_mu-store_cc 31 Jul 2022 11:43:48 -0000 1.1
+++ mail/mu/patches/patch-lib_mu-store_cc 18 Dec 2022 18:26:15 -0000
@@ -3,7 +3,7 @@ fix time_t format specifier
Index: lib/mu-store.cc
--- lib/mu-store.cc.orig
+++ lib/mu-store.cc
-@@ -599,7 +599,7 @@ Store::set_dirstamp(const std::string& path, time_t ts
+@@ -603,7 +603,7 @@ Store::set_dirstamp(const std::string& path, time_t ts
{
std::array<char, 2 * sizeof(tstamp) + 1> data{};
const auto len = static_cast<size_t>(
Index: mail/mu/patches/patch-lib_utils_mu-utils-format_hh
===================================================================
RCS file: /cvs/ports/mail/mu/patches/patch-lib_utils_mu-utils-format_hh,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-lib_utils_mu-utils-format_hh
--- mail/mu/patches/patch-lib_utils_mu-utils-format_hh 31 Jul 2022 11:43:48 -0000 1.1
+++ mail/mu/patches/patch-lib_utils_mu-utils-format_hh 18 Dec 2022 18:26:15 -0000
@@ -1,7 +1,7 @@
Index: lib/utils/mu-utils-format.hh
--- lib/utils/mu-utils-format.hh.orig
+++ lib/utils/mu-utils-format.hh
-@@ -49,7 +49,7 @@ std::string format(const char* frm, ...) __attribute__
+@@ -52,7 +52,7 @@ std::string format(const char* frm, ...) __attribute__
*
* @return a formatted string
*/

256
mu-1.8.6.diff Normal file
View File

@ -0,0 +1,256 @@
Index: mail/mu/Makefile
===================================================================
RCS file: /home/cvs/ports/mail/mu/Makefile,v
retrieving revision 1.34
diff -u -p -u -p -r1.34 Makefile
--- mail/mu/Makefile 16 Jun 2022 15:39:44 -0000 1.34
+++ mail/mu/Makefile 29 Jul 2022 05:31:01 -0000
@@ -1,6 +1,6 @@
COMMENT= maildir indexer and searcher with emacs frontend
-V= 1.6.11
+V= 1.8.6
GUILE_V= 2.2
DISTNAME= mu-$V
@@ -22,7 +22,7 @@ WANTLIB += ${COMPILER_LIBCXX} assuan c c
WANTLIB += gmime-3.0 gmodule-2.0 gobject-2.0 gpg-error gpgme gthread-2.0
WANTLIB += iconv idn2 intl m pcre readline unistring xapian z
-MASTER_SITES= https://github.com/djcb/mu/releases/download/${V}/
+MASTER_SITES= https://github.com/djcb/mu/releases/download/v${V}/
EXTRACT_SUFX= .tar.xz
BUILD_DEPENDS= emacs->=24:editors/emacs
@@ -32,15 +32,12 @@ LIB_DEPENDS= databases/xapian-core \
mail/gmime30 \
security/gpgme
-# C++14
+# C++17
COMPILER= base-clang ports-gcc
AUTOCONF_VERSION= 2.69
AUTOMAKE_VERSION= 1.15
CONFIGURE_STYLE= autoreconf
-
-CONFIGURE_ARGS= --disable-gtk \
- --disable-webkit
.if ${FLAVOR} == "guile"
WANTLIB += guile-${GUILE_V} gc ltdl gmp
Index: mail/mu/distinfo
===================================================================
RCS file: /home/cvs/ports/mail/mu/distinfo,v
retrieving revision 1.20
diff -u -p -u -p -r1.20 distinfo
--- mail/mu/distinfo 16 Jun 2022 15:39:44 -0000 1.20
+++ mail/mu/distinfo 16 Jul 2022 11:53:07 -0000
@@ -1,2 +1,2 @@
-SHA256 (mu-1.6.11.tar.xz) = YOqyQNwQjypBn0fWp1wWhBB43NGT8sC7Atzbn/SE7I0=
-SIZE (mu-1.6.11.tar.xz) = 870188
+SHA256 (mu-1.8.6.tar.xz) = rWgHKGVTbDFOfCUfu2XHvwx5CP/MKqAkcg6yr3UpRPE=
+SIZE (mu-1.8.6.tar.xz) = 539684
Index: mail/mu/patches/patch-configure_ac
===================================================================
RCS file: mail/mu/patches/patch-configure_ac
diff -N mail/mu/patches/patch-configure_ac
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ mail/mu/patches/patch-configure_ac 29 Jul 2022 05:32:40 -0000
@@ -0,0 +1,22 @@
+Index: configure.ac
+--- configure.ac.orig
++++ configure.ac
+@@ -38,7 +38,6 @@ AC_PROG_CXX
+ AC_PROG_CC
+ AC_PROG_CPP
+ AC_PROG_INSTALL
+-AC_CHECK_INCLUDES_DEFAULT
+ AC_PROG_EGREP
+
+
+@@ -212,8 +211,8 @@ AS_IF([test "x$enable_guile" != "xno"],[
+ GUILE_PROGS
+ GUILE_FLAGS
+ AC_DEFINE_UNQUOTED([GUILE_BINARY],"$GUILE",[guile binary])
+- vsnarf=guile-snarf${GUILE_EFFECTIVE_VERSION}
+- AC_CHECK_PROGS(GUILE_SNARF,[${vsnarf} guile-snarf], [no])
++ vsnarf=guile-snarf2.2${GUILE_EFFECTIVE_VERSION}
++ AC_CHECK_PROGS(GUILE_SNARF,[${vsnarf} guile-snarf2.2], [no])
+ guile_version=$($PKG_CONFIG guile-$GUILE_EFFECTIVE_VERSION --modversion)
+ ])
+ ])
Index: mail/mu/patches/patch-lib_utils_mu-readline_cc
===================================================================
RCS file: /home/cvs/ports/mail/mu/patches/patch-lib_utils_mu-readline_cc,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-lib_utils_mu-readline_cc
--- mail/mu/patches/patch-lib_utils_mu-readline_cc 11 Mar 2022 19:34:42 -0000 1.2
+++ mail/mu/patches/patch-lib_utils_mu-readline_cc 28 Jun 2022 20:30:21 -0000
@@ -3,12 +3,12 @@
Index: lib/utils/mu-readline.cc
--- lib/utils/mu-readline.cc.orig
+++ lib/utils/mu-readline.cc
-@@ -68,7 +68,7 @@ static size_t max_lines{};
+@@ -74,7 +74,7 @@ Mu::have_readline()
void
- Mu::setup_readline (const std::string& histpath, size_t maxlines)
+ Mu::setup_readline(const std::string& histpath, size_t maxlines)
{
-- is_a_tty = !!::isatty(::fileno(stdout));
-+ is_a_tty = !!::isatty(fileno(stdout));
- hist_path = histpath;
- max_lines = maxlines;
+- is_a_tty = !!::isatty(::fileno(stdout));
++ is_a_tty = !!::isatty(fileno(stdout));
+ hist_path = histpath;
+ max_lines = maxlines;
Index: mail/mu/patches/patch-lib_utils_mu-utils-format_hh
===================================================================
RCS file: mail/mu/patches/patch-lib_utils_mu-utils-format_hh
diff -N mail/mu/patches/patch-lib_utils_mu-utils-format_hh
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ mail/mu/patches/patch-lib_utils_mu-utils-format_hh 28 Jun 2022 20:30:21 -0000
@@ -0,0 +1,12 @@
+Index: lib/utils/mu-utils-format.hh
+--- lib/utils/mu-utils-format.hh.orig
++++ lib/utils/mu-utils-format.hh
+@@ -49,7 +49,7 @@ std::string format(const char* frm, ...) __attribute__
+ *
+ * @return a formatted string
+ */
+-std::string vformat(const char* frm, va_list args) __attribute__((format(printf, 1, 0)));
++std::string vformat(const char* frm, __va_list args) __attribute__((format(printf, 1, 0)));
+
+
+ } // namepace Mu
Index: mail/mu/patches/patch-lib_utils_mu-utils_cc
===================================================================
RCS file: /home/cvs/ports/mail/mu/patches/patch-lib_utils_mu-utils_cc,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-lib_utils_mu-utils_cc
--- mail/mu/patches/patch-lib_utils_mu-utils_cc 11 Mar 2022 19:34:42 -0000 1.3
+++ mail/mu/patches/patch-lib_utils_mu-utils_cc 28 Jun 2022 20:30:21 -0000
@@ -1,13 +1,14 @@
-Bring vasprintf into scope
-
Index: lib/utils/mu-utils.cc
--- lib/utils/mu-utils.cc.orig
+++ lib/utils/mu-utils.cc
-@@ -18,7 +18,6 @@
+@@ -17,10 +17,7 @@
+ ** 02110-1301, USA.
*/
-
+-#ifndef _XOPEN_SOURCE
-#define _XOPEN_SOURCE
- #include <time.h>
+ #include <stdexcept>
+-#endif /*_XOPEN_SOURCE*/
+
+ #include <array>
- #define GNU_SOURCE
Index: mail/mu/patches/patch-mu_mu-cmd-server_cc
===================================================================
RCS file: /home/cvs/ports/mail/mu/patches/patch-mu_mu-cmd-server_cc,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-mu_mu-cmd-server_cc
--- mail/mu/patches/patch-mu_mu-cmd-server_cc 11 Mar 2022 19:34:42 -0000 1.2
+++ mail/mu/patches/patch-mu_mu-cmd-server_cc 28 Jun 2022 20:30:21 -0000
@@ -3,12 +3,12 @@
Index: mu/mu-cmd-server.cc
--- mu/mu-cmd-server.cc.orig
+++ mu/mu-cmd-server.cc
-@@ -109,7 +109,7 @@ Mu::mu_cmd_server (const MuConfig *opts, GError **err)
- store.metadata().root_maildir.c_str(),
- opts->debug ? "yes" : "no");
+@@ -130,7 +130,7 @@ Mu::mu_cmd_server(const MuConfig* opts) try {
+ opts->debug ? "yes" : "no",
+ have_readline() ? "yes" : "no");
-- tty = ::isatty(::fileno(stdout));
-+ tty = ::isatty(fileno(stdout));
-
- const auto eval = std::string {
- opts->commands ? "(help :full t)" : opts->eval ? opts->eval : ""};
+- tty = ::isatty(::fileno(stdout));
++ tty = ::isatty(fileno(stdout));
+ const auto eval = std::string{opts->commands ? "(help :full t)"
+ : opts->eval ? opts->eval
+ : ""};
Index: mail/mu/pkg/PLIST
===================================================================
RCS file: /home/cvs/ports/mail/mu/pkg/PLIST,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 PLIST
--- mail/mu/pkg/PLIST 11 Mar 2022 19:34:42 -0000 1.9
+++ mail/mu/pkg/PLIST 28 Jun 2022 20:30:21 -0000
@@ -4,6 +4,7 @@
@man man/man1/mu-cfind.1
@man man/man1/mu-easy.1
@man man/man1/mu-extract.1
+@man man/man1/mu-fields.1
@man man/man1/mu-find.1
@man man/man1/mu-help.1
@man man/man1/mu-index.1
@@ -27,16 +28,26 @@ share/emacs/site-lisp/
share/emacs/site-lisp/mu4e/
share/emacs/site-lisp/mu4e/mu4e-actions.el
share/emacs/site-lisp/mu4e/mu4e-actions.elc
+share/emacs/site-lisp/mu4e/mu4e-bookmarks.el
+share/emacs/site-lisp/mu4e/mu4e-bookmarks.elc
share/emacs/site-lisp/mu4e/mu4e-compose.el
share/emacs/site-lisp/mu4e/mu4e-compose.elc
+share/emacs/site-lisp/mu4e/mu4e-config.el
+share/emacs/site-lisp/mu4e/mu4e-config.elc
+share/emacs/site-lisp/mu4e/mu4e-contacts.el
+share/emacs/site-lisp/mu4e/mu4e-contacts.elc
share/emacs/site-lisp/mu4e/mu4e-context.el
share/emacs/site-lisp/mu4e/mu4e-context.elc
share/emacs/site-lisp/mu4e/mu4e-contrib.el
share/emacs/site-lisp/mu4e/mu4e-contrib.elc
share/emacs/site-lisp/mu4e/mu4e-draft.el
share/emacs/site-lisp/mu4e/mu4e-draft.elc
+share/emacs/site-lisp/mu4e/mu4e-folders.el
+share/emacs/site-lisp/mu4e/mu4e-folders.elc
share/emacs/site-lisp/mu4e/mu4e-headers.el
share/emacs/site-lisp/mu4e/mu4e-headers.elc
+share/emacs/site-lisp/mu4e/mu4e-helpers.el
+share/emacs/site-lisp/mu4e/mu4e-helpers.elc
share/emacs/site-lisp/mu4e/mu4e-icalendar.el
share/emacs/site-lisp/mu4e/mu4e-icalendar.elc
share/emacs/site-lisp/mu4e/mu4e-lists.el
@@ -47,24 +58,18 @@ share/emacs/site-lisp/mu4e/mu4e-mark.el
share/emacs/site-lisp/mu4e/mu4e-mark.elc
share/emacs/site-lisp/mu4e/mu4e-message.el
share/emacs/site-lisp/mu4e/mu4e-message.elc
-share/emacs/site-lisp/mu4e/mu4e-meta.el
-share/emacs/site-lisp/mu4e/mu4e-meta.elc
share/emacs/site-lisp/mu4e/mu4e-org.el
share/emacs/site-lisp/mu4e/mu4e-org.elc
-share/emacs/site-lisp/mu4e/mu4e-proc.el
-share/emacs/site-lisp/mu4e/mu4e-proc.elc
+share/emacs/site-lisp/mu4e/mu4e-search.el
+share/emacs/site-lisp/mu4e/mu4e-search.elc
+share/emacs/site-lisp/mu4e/mu4e-server.el
+share/emacs/site-lisp/mu4e/mu4e-server.elc
share/emacs/site-lisp/mu4e/mu4e-speedbar.el
share/emacs/site-lisp/mu4e/mu4e-speedbar.elc
-share/emacs/site-lisp/mu4e/mu4e-utils.el
-share/emacs/site-lisp/mu4e/mu4e-utils.elc
+share/emacs/site-lisp/mu4e/mu4e-update.el
+share/emacs/site-lisp/mu4e/mu4e-update.elc
share/emacs/site-lisp/mu4e/mu4e-vars.el
share/emacs/site-lisp/mu4e/mu4e-vars.elc
-share/emacs/site-lisp/mu4e/mu4e-view-common.el
-share/emacs/site-lisp/mu4e/mu4e-view-common.elc
-share/emacs/site-lisp/mu4e/mu4e-view-gnus.el
-share/emacs/site-lisp/mu4e/mu4e-view-gnus.elc
-share/emacs/site-lisp/mu4e/mu4e-view-old.el
-share/emacs/site-lisp/mu4e/mu4e-view-old.elc
share/emacs/site-lisp/mu4e/mu4e-view.el
share/emacs/site-lisp/mu4e/mu4e-view.elc
share/emacs/site-lisp/mu4e/mu4e.el

302
mu-1.8.7-guile.diff Normal file
View File

@ -0,0 +1,302 @@
Index: mail/mu/Makefile
===================================================================
RCS file: /home/cvs/ports/mail/mu/Makefile,v
retrieving revision 1.34
diff -u -p -u -p -r1.34 Makefile
--- mail/mu/Makefile 16 Jun 2022 15:39:44 -0000 1.34
+++ mail/mu/Makefile 31 Jul 2022 11:32:12 -0000
@@ -1,7 +1,7 @@
COMMENT= maildir indexer and searcher with emacs frontend
-V= 1.6.11
-GUILE_V= 2.2
+V= 1.8.7
+GUILE_V= 3.0
DISTNAME= mu-$V
@@ -22,7 +22,7 @@ WANTLIB += ${COMPILER_LIBCXX} assuan c c
WANTLIB += gmime-3.0 gmodule-2.0 gobject-2.0 gpg-error gpgme gthread-2.0
WANTLIB += iconv idn2 intl m pcre readline unistring xapian z
-MASTER_SITES= https://github.com/djcb/mu/releases/download/${V}/
+MASTER_SITES= https://github.com/djcb/mu/releases/download/v${V}/
EXTRACT_SUFX= .tar.xz
BUILD_DEPENDS= emacs->=24:editors/emacs
@@ -32,19 +32,17 @@ LIB_DEPENDS= databases/xapian-core \
mail/gmime30 \
security/gpgme
-# C++14
+# C++17
COMPILER= base-clang ports-gcc
AUTOCONF_VERSION= 2.69
AUTOMAKE_VERSION= 1.15
CONFIGURE_STYLE= autoreconf
-CONFIGURE_ARGS= --disable-gtk \
- --disable-webkit
-
.if ${FLAVOR} == "guile"
WANTLIB += guile-${GUILE_V} gc ltdl gmp
-LIB_DEPENDS += lang/guile2
+LIB_DEPENDS += devel/libtool,-ltdl \
+ lang/guile3
.else
CONFIGURE_ARGS += --disable-guile
.endif
Index: mail/mu/distinfo
===================================================================
RCS file: /home/cvs/ports/mail/mu/distinfo,v
retrieving revision 1.20
diff -u -p -u -p -r1.20 distinfo
--- mail/mu/distinfo 16 Jun 2022 15:39:44 -0000 1.20
+++ mail/mu/distinfo 31 Jul 2022 08:40:07 -0000
@@ -1,2 +1,2 @@
-SHA256 (mu-1.6.11.tar.xz) = YOqyQNwQjypBn0fWp1wWhBB43NGT8sC7Atzbn/SE7I0=
-SIZE (mu-1.6.11.tar.xz) = 870188
+SHA256 (mu-1.8.7.tar.xz) = WgckpiX0PgHXP/5/flNY8LQ9ygaWVZ1wdXtiRp9imm8=
+SIZE (mu-1.8.7.tar.xz) = 539664
Index: mail/mu/patches/patch-configure_ac
===================================================================
RCS file: mail/mu/patches/patch-configure_ac
diff -N mail/mu/patches/patch-configure_ac
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ mail/mu/patches/patch-configure_ac 31 Jul 2022 10:50:33 -0000
@@ -0,0 +1,11 @@
+Index: configure.ac
+--- configure.ac.orig
++++ configure.ac
+@@ -38,7 +38,6 @@ AC_PROG_CXX
+ AC_PROG_CC
+ AC_PROG_CPP
+ AC_PROG_INSTALL
+-AC_CHECK_INCLUDES_DEFAULT
+ AC_PROG_EGREP
+
+
Index: mail/mu/patches/patch-lib_mu-store_cc
===================================================================
RCS file: mail/mu/patches/patch-lib_mu-store_cc
diff -N mail/mu/patches/patch-lib_mu-store_cc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ mail/mu/patches/patch-lib_mu-store_cc 29 Jul 2022 05:33:57 -0000
@@ -0,0 +1,14 @@
+fix time_t format specifier
+
+Index: lib/mu-store.cc
+--- lib/mu-store.cc.orig
++++ lib/mu-store.cc
+@@ -599,7 +599,7 @@ Store::set_dirstamp(const std::string& path, time_t ts
+ {
+ std::array<char, 2 * sizeof(tstamp) + 1> data{};
+ const auto len = static_cast<size_t>(
+- g_snprintf(data.data(), data.size(), "%zx", tstamp));
++ g_snprintf(data.data(), data.size(), "%lld", (long long)tstamp));
+
+ set_metadata(path, std::string{data.data(), len});
+ }
Index: mail/mu/patches/patch-lib_utils_mu-readline_cc
===================================================================
RCS file: /home/cvs/ports/mail/mu/patches/patch-lib_utils_mu-readline_cc,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-lib_utils_mu-readline_cc
--- mail/mu/patches/patch-lib_utils_mu-readline_cc 11 Mar 2022 19:34:42 -0000 1.2
+++ mail/mu/patches/patch-lib_utils_mu-readline_cc 28 Jun 2022 20:30:21 -0000
@@ -3,12 +3,12 @@
Index: lib/utils/mu-readline.cc
--- lib/utils/mu-readline.cc.orig
+++ lib/utils/mu-readline.cc
-@@ -68,7 +68,7 @@ static size_t max_lines{};
+@@ -74,7 +74,7 @@ Mu::have_readline()
void
- Mu::setup_readline (const std::string& histpath, size_t maxlines)
+ Mu::setup_readline(const std::string& histpath, size_t maxlines)
{
-- is_a_tty = !!::isatty(::fileno(stdout));
-+ is_a_tty = !!::isatty(fileno(stdout));
- hist_path = histpath;
- max_lines = maxlines;
+- is_a_tty = !!::isatty(::fileno(stdout));
++ is_a_tty = !!::isatty(fileno(stdout));
+ hist_path = histpath;
+ max_lines = maxlines;
Index: mail/mu/patches/patch-lib_utils_mu-utils-format_hh
===================================================================
RCS file: mail/mu/patches/patch-lib_utils_mu-utils-format_hh
diff -N mail/mu/patches/patch-lib_utils_mu-utils-format_hh
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ mail/mu/patches/patch-lib_utils_mu-utils-format_hh 28 Jun 2022 20:30:21 -0000
@@ -0,0 +1,12 @@
+Index: lib/utils/mu-utils-format.hh
+--- lib/utils/mu-utils-format.hh.orig
++++ lib/utils/mu-utils-format.hh
+@@ -49,7 +49,7 @@ std::string format(const char* frm, ...) __attribute__
+ *
+ * @return a formatted string
+ */
+-std::string vformat(const char* frm, va_list args) __attribute__((format(printf, 1, 0)));
++std::string vformat(const char* frm, __va_list args) __attribute__((format(printf, 1, 0)));
+
+
+ } // namepace Mu
Index: mail/mu/patches/patch-lib_utils_mu-utils_cc
===================================================================
RCS file: /home/cvs/ports/mail/mu/patches/patch-lib_utils_mu-utils_cc,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-lib_utils_mu-utils_cc
--- mail/mu/patches/patch-lib_utils_mu-utils_cc 11 Mar 2022 19:34:42 -0000 1.3
+++ mail/mu/patches/patch-lib_utils_mu-utils_cc 28 Jun 2022 20:30:21 -0000
@@ -1,13 +1,14 @@
-Bring vasprintf into scope
-
Index: lib/utils/mu-utils.cc
--- lib/utils/mu-utils.cc.orig
+++ lib/utils/mu-utils.cc
-@@ -18,7 +18,6 @@
+@@ -17,10 +17,7 @@
+ ** 02110-1301, USA.
*/
-
+-#ifndef _XOPEN_SOURCE
-#define _XOPEN_SOURCE
- #include <time.h>
+ #include <stdexcept>
+-#endif /*_XOPEN_SOURCE*/
+
+ #include <array>
- #define GNU_SOURCE
Index: mail/mu/patches/patch-mu_mu-cmd-server_cc
===================================================================
RCS file: /home/cvs/ports/mail/mu/patches/patch-mu_mu-cmd-server_cc,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-mu_mu-cmd-server_cc
--- mail/mu/patches/patch-mu_mu-cmd-server_cc 11 Mar 2022 19:34:42 -0000 1.2
+++ mail/mu/patches/patch-mu_mu-cmd-server_cc 28 Jun 2022 20:30:21 -0000
@@ -3,12 +3,12 @@
Index: mu/mu-cmd-server.cc
--- mu/mu-cmd-server.cc.orig
+++ mu/mu-cmd-server.cc
-@@ -109,7 +109,7 @@ Mu::mu_cmd_server (const MuConfig *opts, GError **err)
- store.metadata().root_maildir.c_str(),
- opts->debug ? "yes" : "no");
+@@ -130,7 +130,7 @@ Mu::mu_cmd_server(const MuConfig* opts) try {
+ opts->debug ? "yes" : "no",
+ have_readline() ? "yes" : "no");
-- tty = ::isatty(::fileno(stdout));
-+ tty = ::isatty(fileno(stdout));
-
- const auto eval = std::string {
- opts->commands ? "(help :full t)" : opts->eval ? opts->eval : ""};
+- tty = ::isatty(::fileno(stdout));
++ tty = ::isatty(fileno(stdout));
+ const auto eval = std::string{opts->commands ? "(help :full t)"
+ : opts->eval ? opts->eval
+ : ""};
Index: mail/mu/pkg/PFRAG.guile
===================================================================
RCS file: /home/cvs/ports/mail/mu/pkg/PFRAG.guile,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 PFRAG.guile
--- mail/mu/pkg/PFRAG.guile 11 Mar 2022 19:34:42 -0000 1.2
+++ mail/mu/pkg/PFRAG.guile 31 Jul 2022 09:58:59 -0000
@@ -2,11 +2,6 @@
@static-lib lib/libguile-mu.a
lib/libguile-mu.la
@lib lib/libguile-mu.so.${LIBguile-mu_VERSION}
-share/guile/site/2.2/mu/
-share/guile/site/2.2/mu.scm
-share/guile/site/2.2/mu/plot.scm
-share/guile/site/2.2/mu/script.scm
-share/guile/site/2.2/mu/stats.scm
share/mu/
share/mu/scripts/
share/mu/scripts/find-dups.scm
@@ -16,3 +11,8 @@ share/mu/scripts/msgs-per-hour.scm
share/mu/scripts/msgs-per-month.scm
share/mu/scripts/msgs-per-year-month.scm
share/mu/scripts/msgs-per-year.scm
+share/guile/site/3.0/mu/
+share/guile/site/3.0/mu.scm
+share/guile/site/3.0/mu/plot.scm
+share/guile/site/3.0/mu/script.scm
+share/guile/site/3.0/mu/stats.scm
Index: mail/mu/pkg/PLIST
===================================================================
RCS file: /home/cvs/ports/mail/mu/pkg/PLIST,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 PLIST
--- mail/mu/pkg/PLIST 11 Mar 2022 19:34:42 -0000 1.9
+++ mail/mu/pkg/PLIST 31 Jul 2022 09:58:51 -0000
@@ -4,6 +4,7 @@
@man man/man1/mu-cfind.1
@man man/man1/mu-easy.1
@man man/man1/mu-extract.1
+@man man/man1/mu-fields.1
@man man/man1/mu-find.1
@man man/man1/mu-help.1
@man man/man1/mu-index.1
@@ -27,16 +28,26 @@ share/emacs/site-lisp/
share/emacs/site-lisp/mu4e/
share/emacs/site-lisp/mu4e/mu4e-actions.el
share/emacs/site-lisp/mu4e/mu4e-actions.elc
+share/emacs/site-lisp/mu4e/mu4e-bookmarks.el
+share/emacs/site-lisp/mu4e/mu4e-bookmarks.elc
share/emacs/site-lisp/mu4e/mu4e-compose.el
share/emacs/site-lisp/mu4e/mu4e-compose.elc
+share/emacs/site-lisp/mu4e/mu4e-config.el
+share/emacs/site-lisp/mu4e/mu4e-config.elc
+share/emacs/site-lisp/mu4e/mu4e-contacts.el
+share/emacs/site-lisp/mu4e/mu4e-contacts.elc
share/emacs/site-lisp/mu4e/mu4e-context.el
share/emacs/site-lisp/mu4e/mu4e-context.elc
share/emacs/site-lisp/mu4e/mu4e-contrib.el
share/emacs/site-lisp/mu4e/mu4e-contrib.elc
share/emacs/site-lisp/mu4e/mu4e-draft.el
share/emacs/site-lisp/mu4e/mu4e-draft.elc
+share/emacs/site-lisp/mu4e/mu4e-folders.el
+share/emacs/site-lisp/mu4e/mu4e-folders.elc
share/emacs/site-lisp/mu4e/mu4e-headers.el
share/emacs/site-lisp/mu4e/mu4e-headers.elc
+share/emacs/site-lisp/mu4e/mu4e-helpers.el
+share/emacs/site-lisp/mu4e/mu4e-helpers.elc
share/emacs/site-lisp/mu4e/mu4e-icalendar.el
share/emacs/site-lisp/mu4e/mu4e-icalendar.elc
share/emacs/site-lisp/mu4e/mu4e-lists.el
@@ -47,24 +58,18 @@ share/emacs/site-lisp/mu4e/mu4e-mark.el
share/emacs/site-lisp/mu4e/mu4e-mark.elc
share/emacs/site-lisp/mu4e/mu4e-message.el
share/emacs/site-lisp/mu4e/mu4e-message.elc
-share/emacs/site-lisp/mu4e/mu4e-meta.el
-share/emacs/site-lisp/mu4e/mu4e-meta.elc
share/emacs/site-lisp/mu4e/mu4e-org.el
share/emacs/site-lisp/mu4e/mu4e-org.elc
-share/emacs/site-lisp/mu4e/mu4e-proc.el
-share/emacs/site-lisp/mu4e/mu4e-proc.elc
+share/emacs/site-lisp/mu4e/mu4e-search.el
+share/emacs/site-lisp/mu4e/mu4e-search.elc
+share/emacs/site-lisp/mu4e/mu4e-server.el
+share/emacs/site-lisp/mu4e/mu4e-server.elc
share/emacs/site-lisp/mu4e/mu4e-speedbar.el
share/emacs/site-lisp/mu4e/mu4e-speedbar.elc
-share/emacs/site-lisp/mu4e/mu4e-utils.el
-share/emacs/site-lisp/mu4e/mu4e-utils.elc
+share/emacs/site-lisp/mu4e/mu4e-update.el
+share/emacs/site-lisp/mu4e/mu4e-update.elc
share/emacs/site-lisp/mu4e/mu4e-vars.el
share/emacs/site-lisp/mu4e/mu4e-vars.elc
-share/emacs/site-lisp/mu4e/mu4e-view-common.el
-share/emacs/site-lisp/mu4e/mu4e-view-common.elc
-share/emacs/site-lisp/mu4e/mu4e-view-gnus.el
-share/emacs/site-lisp/mu4e/mu4e-view-gnus.elc
-share/emacs/site-lisp/mu4e/mu4e-view-old.el
-share/emacs/site-lisp/mu4e/mu4e-view-old.elc
share/emacs/site-lisp/mu4e/mu4e-view.el
share/emacs/site-lisp/mu4e/mu4e-view.elc
share/emacs/site-lisp/mu4e/mu4e.el

27
mu-1.8.9.diff Normal file
View File

@ -0,0 +1,27 @@
Index: mail/mu/Makefile
===================================================================
RCS file: /cvs/ports/mail/mu/Makefile,v
retrieving revision 1.35
diff -u -p -u -p -r1.35 Makefile
--- mail/mu/Makefile 31 Jul 2022 11:43:48 -0000 1.35
+++ mail/mu/Makefile 30 Aug 2022 14:38:38 -0000
@@ -1,6 +1,6 @@
COMMENT= maildir indexer and searcher with emacs frontend
-V= 1.8.7
+V= 1.8.9
GUILE_V= 3.0
DISTNAME= mu-$V
Index: mail/mu/distinfo
===================================================================
RCS file: /cvs/ports/mail/mu/distinfo,v
retrieving revision 1.21
diff -u -p -u -p -r1.21 distinfo
--- mail/mu/distinfo 31 Jul 2022 11:43:48 -0000 1.21
+++ mail/mu/distinfo 30 Aug 2022 14:38:38 -0000
@@ -1,2 +1,2 @@
-SHA256 (mu-1.8.7.tar.xz) = WgckpiX0PgHXP/5/flNY8LQ9ygaWVZ1wdXtiRp9imm8=
-SIZE (mu-1.8.7.tar.xz) = 539664
+SHA256 (mu-1.8.9.tar.xz) = uG0qaAj9DulBvXCE+vy8gpkuM9zbinru4cNKfMuo3bM=
+SIZE (mu-1.8.9.tar.xz) = 541308

1607
ncspot-0.9.7.diff Normal file

File diff suppressed because it is too large Load Diff

80
nnn-4.4.diff Normal file
View File

@ -0,0 +1,80 @@
Index: sysutils/nnn/Makefile
===================================================================
RCS file: /home/cvs/ports/sysutils/nnn/Makefile,v
retrieving revision 1.17
diff -u -p -u -p -r1.17 Makefile
--- sysutils/nnn/Makefile 4 Oct 2021 14:16:52 -0000 1.17
+++ sysutils/nnn/Makefile 25 Nov 2021 06:49:20 -0000
@@ -2,7 +2,7 @@
COMMENT = the missing terminal file browser for X
-V = 4.3
+V = 4.4
DISTNAME = nnn-v${V}
PKGNAME = nnn-${V}
@@ -22,6 +22,8 @@ MASTER_SITES = https://github.com/jarun
# Uses -std=c11 so cannot use base-gcc
COMPILER = base-clang ports-gcc
COMPILER_LANGS = c
+
+RUN_DEPENDS = textproc/gsed
MAKE_FLAGS = CFLAGS_OPTIMIZATION=
FAKE_FLAGS = MANPREFIX="$(PREFIX)/man" \
Index: sysutils/nnn/distinfo
===================================================================
RCS file: /home/cvs/ports/sysutils/nnn/distinfo,v
retrieving revision 1.14
diff -u -p -u -p -r1.14 distinfo
--- sysutils/nnn/distinfo 4 Oct 2021 14:16:52 -0000 1.14
+++ sysutils/nnn/distinfo 25 Nov 2021 06:49:20 -0000
@@ -1,2 +1,2 @@
-SHA256 (nnn-v4.3.tar.gz) = tt+OJi5WE90ZK6xhCm2nETBmJ9Vlc/GncKFz7weJU7s=
-SIZE (nnn-v4.3.tar.gz) = 236606
+SHA256 (nnn-v4.4.tar.gz) = 4Eo/Dwwq8eGMtvAF0YJnx3A2RCdNIbuT8Dsw5P09FlM=
+SIZE (nnn-v4.4.tar.gz) = 239005
Index: sysutils/nnn/patches/patch-src_nnn_c
===================================================================
RCS file: sysutils/nnn/patches/patch-src_nnn_c
diff -N sysutils/nnn/patches/patch-src_nnn_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ sysutils/nnn/patches/patch-src_nnn_c 25 Nov 2021 06:53:01 -0000
@@ -0,0 +1,36 @@
+$OpenBSD$
+
+Cherry pick patch to make file renames more reliable.
+https://patch-diff.githubusercontent.com/raw/jarun/nnn/pull/1243.diff
+
+Index: src/nnn.c
+--- src/nnn.c.orig
++++ src/nnn.c
+@@ -202,12 +202,14 @@
+ #define CTX_MAX 8
+ #endif
+
++#ifndef SED
+ /* BSDs or Solaris or SunOS */
+ #if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__APPLE__) || defined(sun) || defined(__sun)
+ #define SED "gsed"
+ #else
+ #define SED "sed"
+ #endif
++#endif
+
+ /* Large selection threshold */
+ #ifndef LARGESEL
+@@ -2729,12 +2731,7 @@ static void archive_selection(const char *cmd, const c
+ }
+
+ snprintf(buf, CMD_LEN_MAX,
+-#ifdef __linux__
+ SED" -ze 's|^%s/||' '%s' | xargs -0 %s %s", curpath, selpath, cmd, archive
+-#else
+- "tr '\\0' '\n' < '%s' | "SED" -e 's|^%s/||' | tr '\n' '\\0' | xargs -0 %s %s",
+- selpath, curpath, cmd, archive
+-#endif
+ );
+ spawn(utils[UTIL_SH_EXEC], buf, NULL, NULL, F_CLI | F_CONFIRM);
+ free(buf);

56
nono-0.2.6.diff Normal file
View File

@ -0,0 +1,56 @@
Index: emulators/nono/Makefile
===================================================================
RCS file: /home/cvs/ports/emulators/nono/Makefile,v
retrieving revision 1.20
diff -u -p -u -p -r1.20 Makefile
--- emulators/nono/Makefile 11 Mar 2022 18:59:40 -0000 1.20
+++ emulators/nono/Makefile 14 Mar 2022 20:23:57 -0000
@@ -1,10 +1,8 @@
-# Big endian support is not complete as of 0.1.0
-NOT_FOR_ARCHS= ${BE_ARCHS}
BROKEN-i386= requires __m128i and similar types; may work if SSE is disabled
COMMENT= OMRON LUNA-I and LUNA-88K emulator
-DISTNAME= nono-0.2.5
+DISTNAME= nono-0.2.6
CATEGORIES= emulators
MAINTAINER= Gonzalo L. R. <gonzalo@openbsd.org>
@@ -14,6 +12,8 @@ HOMEPAGE= http://www.pastel-flower.jp/~
# see doc/nono-license.txt
PERMIT_DISTFILES = Yes
PERMIT_PACKAGE = binaries cannot be distributed
+
+COMPILER= base-clang ports-gcc
WANTLIB += ${COMPILER_LIBCXX} c curses edit m wx_baseu-3.0 wx_baseu_net-3.0
WANTLIB += wx_baseu_xml-3.0 wx_gtk3u_adv-3.0 wx_gtk3u_core-3.0
Index: emulators/nono/distinfo
===================================================================
RCS file: /home/cvs/ports/emulators/nono/distinfo,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 distinfo
--- emulators/nono/distinfo 31 Jan 2022 11:02:17 -0000 1.12
+++ emulators/nono/distinfo 14 Mar 2022 20:22:13 -0000
@@ -1,2 +1,2 @@
-SHA256 (nono-0.2.5.tar.gz) = MUDNpNwzyS7/IqjHpFGgsG/r73EHjztN1RJWVHCJcro=
-SIZE (nono-0.2.5.tar.gz) = 2668954
+SHA256 (nono-0.2.6.tar.gz) = 78PYjkqTZzoUGuQiJmRM/0QqRd/yNXXpR8uXF+yNzlQ=
+SIZE (nono-0.2.6.tar.gz) = 2688271
Index: emulators/nono/pkg/README
===================================================================
RCS file: /home/cvs/ports/emulators/nono/pkg/README,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 README
--- emulators/nono/pkg/README 11 Mar 2022 18:59:40 -0000 1.6
+++ emulators/nono/pkg/README 14 Mar 2022 20:22:13 -0000
@@ -53,7 +53,7 @@ hostnet-driver = none
To turn it on:
-$ nono -c ~/nono -s 0.5 -C
+$ nono -c ~/nono -s 0.5 -C
Now inside the console you should follow these instructions:

39
notion-4.0.2p0.diff Normal file
View File

@ -0,0 +1,39 @@
Index: x11/notion/Makefile
===================================================================
RCS file: /home/cvs/ports/x11/notion/Makefile,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 Makefile
--- x11/notion/Makefile 11 Mar 2022 20:16:49 -0000 1.2
+++ x11/notion/Makefile 17 Apr 2022 18:18:39 -0000
@@ -3,6 +3,7 @@ COMMENT= light, keyboard friendly static
GH_ACCOUNT= raboof
GH_PROJECT= notion
GH_TAGNAME= 4.0.2
+REVISION= 0
CATEGORIES= x11
Index: x11/notion/patches/patch-libmainloop_signal_c
===================================================================
RCS file: x11/notion/patches/patch-libmainloop_signal_c
diff -N x11/notion/patches/patch-libmainloop_signal_c
Index: x11/notion/patches/patch-system-autodetect_mk
===================================================================
RCS file: /home/cvs/ports/x11/notion/patches/patch-system-autodetect_mk,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-system-autodetect_mk
--- x11/notion/patches/patch-system-autodetect_mk 11 Mar 2022 20:16:49 -0000 1.2
+++ x11/notion/patches/patch-system-autodetect_mk 18 Apr 2022 05:46:48 -0000
@@ -30,3 +30,12 @@ Index: system-autodetect.mk
# Cygwin needs this. Also when you disable _BSD_SOURCE you may need it.
#DEFINES += -DCF_NO_GETLOADAVG
+@@ -205,7 +205,7 @@ POSIX_SOURCE?=-D_POSIX_C_SOURCE=200112L
+ BSD_SOURCE?=-D_BSD_SOURCE
+
+ # Most systems
+-XOPEN_SOURCE=-D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED
++#XOPEN_SOURCE=-D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED
+ # SunOS, (Irix)
+ #XOPEN_SOURCE=-D__EXTENSIONS__
+

93
notmuch-0.33.2.diff Normal file
View File

@ -0,0 +1,93 @@
Index: Makefile.inc
===================================================================
RCS file: /home/cvs/ports/mail/notmuch/Makefile.inc,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 Makefile.inc
--- Makefile.inc 14 Mar 2021 19:50:49 -0000 1.5
+++ Makefile.inc 13 Oct 2021 05:46:30 -0000
@@ -1,6 +1,6 @@
# $OpenBSD: Makefile.inc,v 1.5 2021/03/14 19:50:49 bket Exp $
-V = 0.31.4
+V = 0.33.2
DISTNAME = notmuch-$V
EXTRACT_SUFX = .tar.xz
Index: notmuch/Makefile
===================================================================
RCS file: /home/cvs/ports/mail/notmuch/notmuch/Makefile,v
retrieving revision 1.13
diff -u -p -u -p -r1.13 Makefile
--- notmuch/Makefile 4 Jul 2021 19:02:09 -0000 1.13
+++ notmuch/Makefile 13 Oct 2021 05:46:30 -0000
@@ -6,9 +6,7 @@ COMMENT-emacs = Emacs bindings for notm
PKGNAME-main = notmuch-${V}
PKGNAME-emacs = notmuch-emacs-${V}
-REVISION = 0
-
-SHARED_LIBS += notmuch 1.0
+SHARED_LIBS += notmuch 1.1
MULTI_PACKAGES = -main -emacs
DEBUG_PACKAGES = -main
Index: notmuch/distinfo
===================================================================
RCS file: /home/cvs/ports/mail/notmuch/notmuch/distinfo,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 distinfo
--- notmuch/distinfo 14 Mar 2021 19:50:49 -0000 1.5
+++ notmuch/distinfo 13 Oct 2021 05:46:30 -0000
@@ -1,2 +1,2 @@
-SHA256 (notmuch-0.31.4.tar.xz) = hmG2ZWdmD9YwrxDEZHwwMn/dGzSpiMq4DWFDKKW3T1U=
-SIZE (notmuch-0.31.4.tar.xz) = 713888
+SHA256 (notmuch-0.33.2.tar.xz) = JEiS9qtSqE9rATs4fNZlLUYe/9NrFO+eV2YEtYULLK4=
+SIZE (notmuch-0.33.2.tar.xz) = 733228
Index: notmuch/patches/patch-lib_Makefile_local
===================================================================
RCS file: /home/cvs/ports/mail/notmuch/notmuch/patches/patch-lib_Makefile_local,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-lib_Makefile_local
--- notmuch/patches/patch-lib_Makefile_local 13 Aug 2020 18:21:19 -0000 1.2
+++ notmuch/patches/patch-lib_Makefile_local 13 Oct 2021 05:46:30 -0000
@@ -26,7 +26,7 @@ Index: lib/Makefile.local
endif
ifeq ($(LIBDIR_IN_LDCONFIG),1)
ifeq ($(DESTDIR),)
-@@ -69,19 +73,23 @@ $(dir)/libnotmuch.a: $(libnotmuch_modules)
+@@ -73,19 +77,23 @@ $(dir)/libnotmuch.a: $(libnotmuch_modules)
$(dir)/$(LIBNAME): $(libnotmuch_modules) util/libnotmuch_util.a parse-time-string/libparse-time-string.a
$(call quiet,CXX $(CXXFLAGS)) $(libnotmuch_modules) $(FINAL_LIBNOTMUCH_LDFLAGS) $(LIBRARY_LINK_FLAG) -o $@ util/libnotmuch_util.a parse-time-string/libparse-time-string.a
Index: notmuch/patches/patch-test_test-lib_sh
===================================================================
RCS file: /home/cvs/ports/mail/notmuch/notmuch/patches/patch-test_test-lib_sh,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-test_test-lib_sh
--- notmuch/patches/patch-test_test-lib_sh 5 Oct 2020 19:46:17 -0000 1.3
+++ notmuch/patches/patch-test_test-lib_sh 13 Oct 2021 06:23:36 -0000
@@ -13,3 +13,12 @@ Index: test/test-lib.sh
# Protect ourselves from common misconfiguration to export
# CDPATH into the environment
+@@ -939,7 +938,7 @@ notmuch_with_shim () {
+ base_name="$1"
+ shift
+ shim_file="${base_name}.so"
+- LD_PRELOAD=${LD_PRELOAD:+:$LD_PRELOAD}:./${shim_file} notmuch-shared "$@"
++ LD_PRELOAD=./${shim_file} notmuch-shared "$@"
+ }
+
+ # Creates a script that counts how much time it is executed and calls
Index: py-notmuch/distinfo
===================================================================
RCS file: /home/cvs/ports/mail/notmuch/py-notmuch/distinfo,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 distinfo
--- py-notmuch/distinfo 14 Mar 2021 19:50:49 -0000 1.5
+++ py-notmuch/distinfo 13 Oct 2021 05:46:30 -0000
@@ -1,2 +1,2 @@
-SHA256 (notmuch-0.31.4.tar.xz) = hmG2ZWdmD9YwrxDEZHwwMn/dGzSpiMq4DWFDKKW3T1U=
-SIZE (notmuch-0.31.4.tar.xz) = 713888
+SHA256 (notmuch-0.33.2.tar.xz) = JEiS9qtSqE9rATs4fNZlLUYe/9NrFO+eV2YEtYULLK4=
+SIZE (notmuch-0.33.2.tar.xz) = 733228

Some files were not shown because too many files have changed in this diff Show More