From a06204699cdcc88f8526db1d454747c04e78d48a Mon Sep 17 00:00:00 2001 From: tempcracks Date: Wed, 31 Jul 2024 07:16:59 +0300 Subject: [PATCH 1/2] nasm: updated to 2.16.03 --- devel/nasm/Makefile | 4 ++-- devel/nasm/distinfo | 12 ++++++------ devel/nasm/patches/patch-Makefile.in | 13 +++++++------ devel/nasm/patches/patch-doc_Makefile.in | 22 ++++++++++------------ 4 files changed, 25 insertions(+), 26 deletions(-) diff --git a/devel/nasm/Makefile b/devel/nasm/Makefile index 73e11af990d2..61fa12782e20 100644 --- a/devel/nasm/Makefile +++ b/devel/nasm/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.70 2023/02/01 12:40:16 adam Exp $ +# $NetBSD: Makefile,v 1.71 2024/07/30 07:19:00 tempcracks Exp $ -DISTNAME= nasm-2.16.01 +DISTNAME= nasm-2.16.03 CATEGORIES= devel lang MASTER_SITES= http://www.nasm.us/pub/nasm/releasebuilds/${PKGVERSION_NOREV}/ EXTRACT_SUFX= .tar.xz diff --git a/devel/nasm/distinfo b/devel/nasm/distinfo index 93b64cedf86c..502a3ac69366 100644 --- a/devel/nasm/distinfo +++ b/devel/nasm/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.37 2023/02/01 12:40:16 adam Exp $ +$NetBSD: distinfo,v 1.38 2024/07/30 07:19:00 tempcracks Exp $ -BLAKE2s (nasm-2.16.01.tar.xz) = 4340eea2e650fa4e03f9286c1c91cf3aa9bff8d9156637b4e66130ed39beeffc -SHA512 (nasm-2.16.01.tar.xz) = 51fccb5639ce019d9c423c0f279750ffbd74c64cd41dd3b185d1aa1a1aaed79c5d3cd8d4bebbc13ee249a375ed27457ea2abde1a4dbb24d354598fffd1254833 -Size (nasm-2.16.01.tar.xz) = 1017732 bytes -SHA1 (patch-Makefile.in) = 30f8292c622e86e870427be0ca530ccb8dc3feaa -SHA1 (patch-doc_Makefile.in) = 0baf4cb8ce01403fbe93b3168d7bc00472cbcb61 +BLAKE2s (nasm-2.16.03.tar.xz) = 8604ebb1d0cc486d97731ba6083821ce5e8922dd0810d16cc4b1ab13d3f01da6 +SHA512 (nasm-2.16.03.tar.xz) = 0c706e41a9c33e1ac3bad5056e8bf8cbcd51785b551a6e34ce7d0d723df8eaab8603a033e89b3dcda1004b558f9e9ef3196691500f10d8201bf47a323a516f84 +Size (nasm-2.16.03.tar.xz) = 1032388 bytes +SHA1 (patch-Makefile.in) = 1dd25a3d89ec20f4c3528cab8a0ef33064d64bd0 +SHA1 (patch-doc_Makefile.in) = cb024d9922424a2a1f4776756f9ccecde7c301f0 diff --git a/devel/nasm/patches/patch-Makefile.in b/devel/nasm/patches/patch-Makefile.in index 037574621a95..0891e9f29896 100644 --- a/devel/nasm/patches/patch-Makefile.in +++ b/devel/nasm/patches/patch-Makefile.in @@ -1,15 +1,16 @@ -$NetBSD: patch-Makefile.in,v 1.4 2020/08/08 18:35:10 nia Exp $ +$NetBSD: patch-Makefile.in,v 1.5 2024/07/30 07:19:00 tempcracks Exp $ Use correct tools. ---- Makefile.in.orig 2020-07-18 01:04:39.000000000 +0000 +--- Makefile.in.orig 2024-07-30 07:19:39.000000000 +0000 +++ Makefile.in @@ -37,7 +37,7 @@ AR = @AR@ RANLIB = @RANLIB@ STRIP = @STRIP@ - + + tools = $(top_srcdir)/tools + -PERL = perl +PERL = ${PERL5} - PERLFLAGS = -I$(srcdir)/perllib -I$(srcdir) - RUNPERL = $(PERL) $(PERLFLAGS) - + PERLFLAGS = -I$(top_srcdir)/perllib -I$(srcdir) + RUNPERL = $(PERL) $(PERLFLAGS) diff --git a/devel/nasm/patches/patch-doc_Makefile.in b/devel/nasm/patches/patch-doc_Makefile.in index 9030b7b73342..e32fc2879dd3 100644 --- a/devel/nasm/patches/patch-doc_Makefile.in +++ b/devel/nasm/patches/patch-doc_Makefile.in @@ -1,21 +1,20 @@ -$NetBSD: patch-doc_Makefile.in,v 1.4 2020/08/08 18:35:10 nia Exp $ +$NetBSD: patch-doc_Makefile.in,v 1.5 2024/07/30 07:19:00 tempcracks Exp $ Use correct paths and tools. Do not build nasmdoc.pdf. Avoid cp -u, it is not portable. ---- doc/Makefile.in.orig 2020-07-18 01:04:07.000000000 +0000 +--- doc/Makefile.in.orig 2020-07-30 07:19:07.000000000 +0000 +++ doc/Makefile.in -@@ -20,7 +20,7 @@ INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -21,6 +21,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ --PERL = perl -I$(srcdir) -+PERL = ${PERL5} -I$(srcdir) +-PERL = perl -I$(top_srcdir)/perllib -I$(srcdir) ++PERL = ${PERL5} -I$(top_srcdir)/perllib -I$(srcdir) PDFOPT = @PDFOPT@ -@@ -40,8 +40,8 @@ XZFILES = @XZFILES@ +@@ -40,6 +40,6 @@ XZFILES = @XZFILES@ HTMLAUX = nasmdoc.css local.css nasmlogw.png SRCS = nasmdoc.src inslist.src changes.src warnings.src version.src @@ -24,10 +23,9 @@ Avoid cp -u, it is not portable. +OUT = html nasmdoc.txt $(XZFILES) +XZOUT = - .SUFFIXES: - .SUFFIXES: .pfa .ph -@@ -57,7 +57,7 @@ inslist.src: inslist.pl ../x86/insns.dat - +@@ -61,8 +61,8 @@ inslist.src: inslist.pl ../x86/insns.dat + $(PERL) $(srcdir)/inslist.pl $(srcdir)/../x86/insns.dat + html: $(HTMLAUX) $(MKDIR_P) html - for f in $(HTMLAUX); do $(CP_UF) "$(srcdir)/$$f" html/; done @@ -35,7 +33,7 @@ Avoid cp -u, it is not portable. $(MAKE) html/nasmdoc0.html RDSRC = $(PERL) $(srcdir)/rdsrc.pl -I$(srcdir)/ -@@ -116,7 +116,7 @@ install: all +@@ -121,6 +121,6 @@ install: all $(MKDIR_P) $(DESTDIR)$(htmldir) $(INSTALL_DATA) html/* $(DESTDIR)$(htmldir) $(MKDIR_P) $(DESTDIR)$(docdir) From 82133256ab683ac43c9dad96da733968445dbd6a Mon Sep 17 00:00:00 2001 From: tempcracks Date: Fri, 23 Aug 2024 16:35:30 +0000 Subject: [PATCH 2/2] Update patch-doc_Makefile.in --- devel/nasm/patches/patch-doc_Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devel/nasm/patches/patch-doc_Makefile.in b/devel/nasm/patches/patch-doc_Makefile.in index e32fc2879dd3..107307c2d38b 100644 --- a/devel/nasm/patches/patch-doc_Makefile.in +++ b/devel/nasm/patches/patch-doc_Makefile.in @@ -4,7 +4,7 @@ Use correct paths and tools. Do not build nasmdoc.pdf. Avoid cp -u, it is not portable. ---- doc/Makefile.in.orig 2020-07-30 07:19:07.000000000 +0000 +--- doc/Makefile.in.orig 2024-07-30 07:19:07.000000000 +0000 +++ doc/Makefile.in @@ -21,6 +21,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@