From e6aa160df42f4722a14c2b11ac73a43f9dfb104d Mon Sep 17 00:00:00 2001
From: Jonas 'Sortie' Termansen <sortie@maxsi.org>
Date: Sun, 28 Jan 2024 18:11:19 +0100
Subject: [PATCH] Update to nasm-2.16.01.

---
 ports/nasm/nasm.patch   | 70 ++++++++++++++++++++++++-----------------
 ports/nasm/nasm.port    |  4 +--
 ports/nasm/nasm.rmpatch |  1 -
 3 files changed, 44 insertions(+), 31 deletions(-)
 delete mode 100644 ports/nasm/nasm.rmpatch

diff --git a/ports/nasm/nasm.patch b/ports/nasm/nasm.patch
index 4eb15dd4..9c7c97d0 100644
--- a/ports/nasm/nasm.patch
+++ b/ports/nasm/nasm.patch
@@ -1,31 +1,45 @@
-diff -Paur --no-dereference -- nasm.upstream/Makefile.in nasm/Makefile.in
---- nasm.upstream/Makefile.in
-+++ nasm/Makefile.in
-@@ -201,12 +201,12 @@
- manpages: nasm.1 ndisasm.1
+diff -Paur --no-dereference -- nasm.upstream/doc/Makefile nasm/doc/Makefile
+--- nasm.upstream/doc/Makefile
++++ nasm/doc/Makefile
+@@ -7,8 +7,8 @@
+ top_srcdir	= ..
+ srcdir		= .
  
- install: nasm$(X) ndisasm$(X)
--	$(MKDIR) -p $(INSTALLROOT)$(bindir)
--	$(INSTALL_PROGRAM) nasm$(X) $(INSTALLROOT)$(bindir)/nasm$(X)
--	$(INSTALL_PROGRAM) ndisasm$(X) $(INSTALLROOT)$(bindir)/ndisasm$(X)
--	$(MKDIR) -p $(INSTALLROOT)$(mandir)/man1
--	$(INSTALL_DATA) $(srcdir)/nasm.1 $(INSTALLROOT)$(mandir)/man1/nasm.1
--	$(INSTALL_DATA) $(srcdir)/ndisasm.1 $(INSTALLROOT)$(mandir)/man1/ndisasm.1
-+	$(MKDIR) -p $(DESTDIR)$(bindir)
-+	$(INSTALL_PROGRAM) nasm$(X) $(DESTDIR)$(bindir)/nasm$(X)
-+	$(INSTALL_PROGRAM) ndisasm$(X) $(DESTDIR)$(bindir)/ndisasm$(X)
-+	$(MKDIR) -p $(DESTDIR)$(mandir)/man1
-+	$(INSTALL_DATA) $(srcdir)/nasm.1 $(DESTDIR)$(mandir)/man1/nasm.1
-+	$(INSTALL_DATA) $(srcdir)/ndisasm.1 $(DESTDIR)$(mandir)/man1/ndisasm.1
+-prefix		= /usr/local
+-exec_prefix	= ${prefix}
++prefix		= 
++exec_prefix	= 
+ bindir		= ${exec_prefix}/bin
+ mandir		= ${datarootdir}/man
+ docdir		= ${datarootdir}/doc/${PACKAGE}
+@@ -16,7 +16,7 @@
+ infodir		= ${datarootdir}/info
+ datarootdir	= ${prefix}/share
  
- clean:
- 	$(RM) -f *.$(O) *.s *.i
-@@ -218,7 +218,7 @@
+-INSTALL		= /bin/install -c
++INSTALL		= /usr/bin/install -c
+ INSTALL_PROGRAM	= ${INSTALL}
+ INSTALL_DATA	= ${INSTALL} -m 644
  
- distclean: clean
- 	$(RM) -f config.h config.log config.status
--	$(RM) -f Makefile *~ *.bak *.lst *.bin
-+	$(RM) -f Makefile doc/Makefile *~ *.bak *.lst *.bin
- 	$(RM) -f output/*~ output/*.bak
- 	$(RM) -f test/*.lst test/*.bin test/*.$(O) test/*.bin
- 	$(RM) -rf autom4te*.cache
+@@ -24,7 +24,7 @@
+ 
+ PDFOPT		= 
+ 
+-MKDIR_P		= /bin/mkdir -p
++MKDIR_P		= /usr/bin/mkdir -p
+ RM_F		= rm -f
+ RM_RF		= rm -rf
+ CP_F		= cp -f
+diff -Paur --no-dereference -- nasm.upstream/include/compiler.h nasm/include/compiler.h
+--- nasm.upstream/include/compiler.h
++++ nasm/include/compiler.h
+@@ -412,4 +412,9 @@
+ # define default case BOGUS_CASE: default
+ #endif
+ 
++/* PATCH: Sortix doesn't have FILENAME_MAX at this time. */
++#if !defined(FILENAME_MAX) && defined(__sortix__)
++#define FILENAME_MAX 256
++#endif
++
+ #endif	/* NASM_COMPILER_H */
diff --git a/ports/nasm/nasm.port b/ports/nasm/nasm.port
index 124a0ede..0be2f34a 100644
--- a/ports/nasm/nasm.port
+++ b/ports/nasm/nasm.port
@@ -1,10 +1,10 @@
 NAME=nasm
 BUILD_LIBRARIES=
-VERSION=2.11.02
+VERSION=2.16.01
 DISTNAME=$NAME-$VERSION
 COMPRESSION=tar.xz
 ARCHIVE=$DISTNAME.$COMPRESSION
-SHA256SUM=233c574f2c068c0256f9b3653220ceb247c72b671085595259529156c6cfa55d
+SHA256SUM=c77745f4802375efeee2ec5c0ad6b7f037ea9c87c92b149a9637ff099f162558
 UPSTREAM_SITE=https://www.nasm.us/pub/nasm/releasebuilds/$VERSION
 UPSTREAM_ARCHIVE=$ARCHIVE
 BUILD_SYSTEM=configure
diff --git a/ports/nasm/nasm.rmpatch b/ports/nasm/nasm.rmpatch
deleted file mode 100644
index 8bdc5612..00000000
--- a/ports/nasm/nasm.rmpatch
+++ /dev/null
@@ -1 +0,0 @@
-rm -rf -- 'doc/Makefile'