patch(1) will likely stop honoring file paths that move up the
directory tree (../foo), so we need to fix the two patches in the
ports tree that use this.
sysutils/firmware/vmm
Extracts two distfiles, but since we already mv(1) one resulting
directory around, let's just move it under WRKSRC.
telephony/spandsp
Long obsolete workaround, just drop it.
ok?
diff /usr/ports
commit - beb3931b6617dcdd82b284805cf8ff3041e7129f
path + /usr/ports
blob - 8be804d74aba39926c7e8194e7f1ce8ec10d100e
file + sysutils/firmware/vmm/Makefile
--- sysutils/firmware/vmm/Makefile
+++ sysutils/firmware/vmm/Makefile
@@ -51,22 +51,22 @@ post-extract:
PYTHON="${MODPY_BIN}"
post-extract:
- mv ${WRKDIR}/sgabios-* ${WRKDIR}/sgabios
+ mv ${WRKDIR}/sgabios-* ${WRKSRC}/sgabios
cp ${FILESDIR}/config ${WRKSRC}/.config
post-build:
sed -i 's,^#define BUILD_CL.*,#define BUILD_CL "${SB_VER}",' \
- ${WRKDIR}/sgabios/sgabios.S
- cd ${WRKDIR}/sgabios; env ${MAKE_ENV} ${MAKE_PROGRAM} \
+ ${WRKSRC}/sgabios/sgabios.S
+ cd ${WRKSRC}/sgabios; env ${MAKE_ENV} ${MAKE_PROGRAM} \
BUILD_USER='\"_<vmm\"' BUILD_HOST='\"OpenBSD>\"' LD="ld.bfd"
dd if=/dev/zero of=${WRKDIR}/space bs=1 count=196608
- cat ${WRKDIR}/sgabios/sgabios.bin ${WRKDIR}/space \
+ cat ${WRKSRC}/sgabios/sgabios.bin ${WRKDIR}/space \
${WRKSRC}/out/bios.bin > ${WRKDIR}/vmm-bios
printf 'vmm-bios includes SeaBIOS (LGPLv3) and ' >
${WRKDIR}/vmm-bios-license
printf 'SGABIOS (Apache License 2.0\\n-----\\n' >>
${WRKDIR}/vmm-bios-license
cat ${WRKSRC}/COPYING.LESSER >> ${WRKDIR}/vmm-bios-license
printf '-----\\n' >> ${WRKDIR}/vmm-bios-license
- cat ${WRKDIR}/sgabios/COPYING >> ${WRKDIR}/vmm-bios-license
+ cat ${WRKSRC}/sgabios/COPYING >> ${WRKDIR}/vmm-bios-license
printf '-----\\n' >> ${WRKDIR}/vmm-bios-license
post-build:
blob - ee1310de929c68da3129424c97828182dce322f0
file + sysutils/firmware/vmm/patches/patch-sgabios_sgabios_S
--- sysutils/firmware/vmm/patches/patch-sgabios_sgabios_S
+++ sysutils/firmware/vmm/patches/patch-sgabios_sgabios_S
@@ -1,7 +1,7 @@
-Index: ../sgabios/sgabios.S
---- ../sgabios/sgabios.S.orig Wed Apr 21 20:03:40 2010
-+++ ../sgabios/sgabios.S Sun May 16 20:29:58 2021
-@@ -2360,6 +2360,7 @@ resize_end:
+Index: sgabios/sgabios.S
+--- sgabios/sgabios.S.orig
++++ sgabios/sgabios.S
+@@ -2362,6 +2362,7 @@ resize_end:
popw %ds /* ds = cs */
call get_byte /* flush any remaining "wrong" input */
jnz resize_end
@@ -9,7 +9,7 @@ Index: ../sgabios/sgabios.S
call send_crlf /* place cursor on start of last line
*/
movw $mfg_string, %si
call send_asciz_out
-@@ -2370,27 +2371,34 @@ resize_end:
+@@ -2372,27 +2373,34 @@ resize_end:
movw $long_version, %si
call send_asciz_out
call send_crlf
@@ -44,7 +44,7 @@ Index: ../sgabios/sgabios.S
movb $3, BDA_MODE_NUM
movb $0x29, BDA_MODE_SEL
movw $VGA_IO_BASE, BDA_6845_ADDR
-@@ -2418,6 +2426,7 @@ post_bda_init_tail:
+@@ -2420,6 +2428,7 @@ post_bda_init_tail:
movw $ebda_info, %si
call send_asciz_out
movw %cs:sgabios_ebda_logbuf_offset, %ax
@@ -52,7 +52,7 @@ Index: ../sgabios/sgabios.S
xchgb %ah, %al
call send_number
movb $0x20, %al
-@@ -2425,6 +2434,7 @@ post_bda_init_tail:
+@@ -2427,6 +2436,7 @@ post_bda_init_tail:
movb %ah, %al
call send_number
call send_crlf
blob - e7cd6a29e4c994275b773548806d5834be7b287a
file + telephony/spandsp/Makefile
--- telephony/spandsp/Makefile
+++ telephony/spandsp/Makefile
@@ -16,8 +16,6 @@ WRKDIST= ${WRKDIR}/spandsp-0.0.6
WANTLIB= c jpeg lzma m pthread tiff z zstd
-WRKDIST= ${WRKDIR}/spandsp-0.0.6
-
LIB_DEPENDS+= graphics/tiff
CONFIGURE_STYLE= gnu
blob - aa08ca145fd9df9d9f92b943d29213056203ad68
file + telephony/spandsp/patches/patch-configure
--- telephony/spandsp/patches/patch-configure
+++ telephony/spandsp/patches/patch-configure
@@ -1,8 +1,9 @@
our gnu C has not this option!
---- ../spandsp-0.0.6a/configure Mon May 4 21:05:00 2015
-+++ configure Mon May 4 21:04:00 2015
-@@ -19658,7 +19658,7 @@
+Index: configure
+--- configure.orig
++++ configure
+@@ -19658,7 +19658,7 @@ fi
case "${ax_cv_c_compiler_vendor}" in
gnu)
--
Christian "naddy" Weisgerber na...@mips.inka.de
