From nobody Mon May 02 11:09:02 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 9827D1ABF520; Mon, 2 May 2022 11:09:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KsL263s5Sz57Zq; Mon, 2 May 2022 11:09:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651489742; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SjoomunvwQ3hc8dzMRzmvAkGD0zTl70isx24VTQ1np8=; b=dsx3PCUlicvwIl3Fm2UvIjSufnNA3jrgIZ/1X77gNnb+AkqGX+Iw80jUGDTHzDvVxTSUwG VuQltk3askrI4U4KdGNknlKb33e9XMjQLBSPrE+2aDwJoAG2EFIcJfuG+G+erFQ0hVnGgL gdMniVUOn9e5EhhJf0EAlkXo8O+j80TmSNWM3BzHB2n9ZHPcf1vlIGmQOX7+1iWD1ws1aF XFEmArRy5/LHwDjiNsXJFfEUisX1Woe4vzwyTjhuQJ3//p0isLRiWqhHohE0uXIJwz9Ggo ZUTwTtqzDONgtHzOcEcyOfTESzTJMFAND0R9DiB18sLjoVyzUjBKWxPH0SBTng== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 607A698E; Mon, 2 May 2022 11:09:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 242B92GI092820; Mon, 2 May 2022 11:09:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 242B92cl092819; Mon, 2 May 2022 11:09:02 GMT (envelope-from git) Date: Mon, 2 May 2022 11:09:02 GMT Message-Id: <202205021109.242B92cl092819@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Lorenzo Salvadore Subject: git: 6c674bdff67d - main - devel/nasm: Style improvement, take maintainership List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: salvadore X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6c674bdff67d109a1b2d65c0df9a272423d357c1 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651489742; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SjoomunvwQ3hc8dzMRzmvAkGD0zTl70isx24VTQ1np8=; b=dAoKHDDUBE96Dcr7Cq4+2kgdDF0KeiZNBbI/pdHtjgCXnfY37a0zTPtyd5hbEhW6tCA7vO U/VlOxcgmwInV+mFYSuusYPwTzu/yV+0faHbl1GfsBl0aIhJSUz7CCc2t7UgkUlk4PHGPR 5sGs3bBTGEZCaOYw4anCsXUYO7Qkt1N5WlIIT/TOXYAAAXgRtXMZ5De7Cgd/bkDY3Ig3ke hTayFaDgHXyFqPyOHb97HBxXsSJ3POqn1FXBatoib0eeIkyXXkTxFD8TrwlO7fPhYOa+Lc 9ajheouAYYJFKCb2oT7Y86odaQAJBiNTzHe39DBxX+0nFEEOIjVJRYaZUSHqBg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651489742; a=rsa-sha256; cv=none; b=XM0EpAvv9gDGu9i4EQI6t4wrTDzgjGCSJoMFHtEjIul0OpMbeXUED/97N3outz+eWSyiva gnzbI/W81WSQNnJC0MHBOyO4RlbAMeqBbNRaaf6Gnud1PZcGiOe4ycnYZboVkIU0RzpVUU 8MPKgrp0BhsRNwvsy1QePD/bovrfcgUcof3UrtNSaAt0Sl3C72D1qFUhTgMIjWxL9VhXAf v8CgeSlrwqW7fprpdxL/Cea9cUhQJh4yOOI1vJULs3DtmzBTAWAW+2cywrRm+bTlSn9JGa OlxlMHhcSMCoDQKRlsbzQxRW2b3Ib02eLdC/UyKaYD3ygaI5oTL6fzs6ay+d3A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by salvadore: URL: https://cgit.FreeBSD.org/ports/commit/?id=6c674bdff67d109a1b2d65c0df9a272423d357c1 commit 6c674bdff67d109a1b2d65c0df9a272423d357c1 Author: Lorenzo Salvadore AuthorDate: 2022-05-02 11:01:05 +0000 Commit: Lorenzo Salvadore CommitDate: 2022-05-02 11:08:23 +0000 devel/nasm: Style improvement, take maintainership - Improve style according to portclippy and portfmt. - Regenerate patch using 'make makepatch' as suggested by portlint. Approved by: gerald (mentor) --- devel/nasm/Makefile | 25 ++++++++----- devel/nasm/files/patch-d85890aa.c | 77 +++++++++++++++++++-------------------- 2 files changed, 52 insertions(+), 50 deletions(-) diff --git a/devel/nasm/Makefile b/devel/nasm/Makefile index 3ac82151cb18..67a9c4f150e0 100644 --- a/devel/nasm/Makefile +++ b/devel/nasm/Makefile @@ -7,29 +7,34 @@ CATEGORIES= devel lang MASTER_SITES= https://www.nasm.us/pub/nasm/releasebuilds/${PORTVERSION}/ \ https://mirror.sobukus.de/files/src/nasm/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= salvadore@FreeBSD.org COMMENT= General-purpose multi-platform x86 and amd64 assembler LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE +USES= compiler:c11 cpe gmake perl5 tar:xz +CPE_VENDOR= nasm +CPE_PRODUCT= netwide_assembler +USE_PERL5= build + GNU_CONFIGURE= yes CONFIGURE_ENV= ac_cv_func_strspn=yes -USES= compiler:c11 cpe tar:xz gmake perl5 -USE_PERL5= build + MAKE_ARGS+= INSTALLROOT=${STAGEDIR} INSTALL_TARGET= install #needed for RDOFF_INSTALL_TARGET -CPE_VENDOR= nasm -CPE_PRODUCT= netwide_assembler -OPTIONS_DEFINE= RDOFF DOCS +PORTDOCS= * + +OPTIONS_DEFINE= DOCS RDOFF OPTIONS_SUB= yes -RDOFF_DESC= Install tools to handle RDOFF object files -RDOFF_INSTALL_TARGET= install_rdf +RDOFF_DESC= Install tools to handle RDOFF object files -DOCS_DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}-xdoc${EXTRACT_SUFX} -PORTDOCS= * +DOCS_DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ + ${DISTNAME}-xdoc${EXTRACT_SUFX} + +RDOFF_INSTALL_TARGET= install_rdf post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} diff --git a/devel/nasm/files/patch-d85890aa.c b/devel/nasm/files/patch-d85890aa.c index 228eec58bd7d..fb198aa1467c 100644 --- a/devel/nasm/files/patch-d85890aa.c +++ b/devel/nasm/files/patch-d85890aa.c @@ -1,8 +1,6 @@ -diff --git a/Makefile.in b/Makefile.in -index baca4396..924ba9d6 100644 ---- Makefile.in +--- Makefile.in.orig 2020-08-28 16:04:43 UTC +++ Makefile.in -@@ -75,7 +75,7 @@ ifeq ($(TRACE),1) +@@ -75,7 +75,7 @@ endif endif .SUFFIXES: @@ -11,7 +9,7 @@ index baca4396..924ba9d6 100644 .PHONY: all doc rdf install clean distclean cleaner spotless install_rdf test .PHONY: install_doc everything install_everything strip perlreq dist tags TAGS -@@ -100,7 +100,10 @@ endif +@@ -100,7 +100,10 @@ NDISASM = disasm/ndisasm.$(O) NASM = asm/nasm.$(O) NDISASM = disasm/ndisasm.$(O) @@ -23,7 +21,7 @@ index baca4396..924ba9d6 100644 stdlib/strnlen.$(O) stdlib/strrchrnul.$(O) \ \ nasmlib/ver.$(O) \ -@@ -122,7 +125,7 @@ LIBOBJ = stdlib/snprintf.$(O) stdlib/vsnprintf.$(O) stdlib/strlcpy.$(O) \ +@@ -122,7 +125,7 @@ LIBOBJ = stdlib/snprintf.$(O) stdlib/vsnprintf.$(O) st x86/regs.$(O) x86/regvals.$(O) x86/regflags.$(O) x86/regdis.$(O) \ x86/disp8.$(O) x86/iflag.$(O) \ \ @@ -32,21 +30,21 @@ index baca4396..924ba9d6 100644 asm/floats.$(O) \ asm/directiv.$(O) asm/directbl.$(O) \ asm/pragma.$(O) \ -@@ -147,7 +150,12 @@ LIBOBJ = stdlib/snprintf.$(O) stdlib/vsnprintf.$(O) stdlib/strlcpy.$(O) \ +@@ -147,15 +150,20 @@ LIBOBJ = stdlib/snprintf.$(O) stdlib/vsnprintf.$(O) st \ disasm/disasm.$(O) disasm/sync.$(O) -ALLOBJ = $(NASM) $(NDISASM) $(LIBOBJ) +# Warnings depend on all source files, so handle them separately +WARNOBJ = asm/warnings.$(O) -+ + +LIBOBJ = $(LIBOBJ_NW) $(WARNOBJ) +ALLOBJ_NW = $(PROGOBJ) $(LIBOBJ_NW) +ALLOBJ = $(PROGOBJ) $(LIBOBJ) - ++ SUBDIRS = stdlib nasmlib output asm disasm x86 common macros XSUBDIRS = test doc nsis rdoff -@@ -155,7 +163,7 @@ DEPDIRS = . include config x86 rdoff $(SUBDIRS) + DEPDIRS = . include config x86 rdoff $(SUBDIRS) #-- End File Lists --# all: dirs @@ -55,7 +53,7 @@ index baca4396..924ba9d6 100644 NASMLIB = libnasm.$(A) -@@ -271,18 +279,30 @@ warnings: +@@ -271,19 +279,31 @@ warnings: $(RM_F) $(WARNFILES) $(MAKE) asm/warnings.time @@ -69,11 +67,11 @@ index baca4396..924ba9d6 100644 +asm/warnings.c.time: asm/warnings.pl asm/warnings.time $(RUNPERL) $(srcdir)/asm/warnings.pl c asm/warnings.c $(srcdir) + : > asm/warnings.c.time -+ -+asm/warnings.c: asm/warnings.c.time -+ @: Side effect -include/warnings.h: asm/warnings.pl asm/warnings.time ++asm/warnings.c: asm/warnings.c.time ++ @: Side effect ++ +include/warnings.h.time: asm/warnings.pl asm/warnings.time $(RUNPERL) $(srcdir)/asm/warnings.pl h include/warnings.h $(srcdir) + : > include/warnings.h.time @@ -85,13 +83,14 @@ index baca4396..924ba9d6 100644 +doc/warnings.src.time: asm/warnings.pl asm/warnings.time $(RUNPERL) $(srcdir)/asm/warnings.pl doc doc/warnings.src $(srcdir) + : > doc/warnings.src.time -+ + +doc/warnings.src : doc/warnings.src.time + @: Side effect - ++ # Assembler token hash asm/tokhash.c: x86/insns.dat x86/regs.dat asm/tokens.dat asm/tokhash.pl \ -@@ -385,10 +405,9 @@ nsis: nsis/nasm.nsi nsis/arch.nsh nsis/version.nsh + perllib/phash.ph +@@ -385,10 +405,9 @@ manpages: nasm.1 ndisasm.1 # Generated manpages, also pregenerated for distribution manpages: nasm.1 ndisasm.1 @@ -135,7 +134,7 @@ index baca4396..924ba9d6 100644 TAGS: $(RM_F) TAGS -@@ -496,13 +515,13 @@ nasm.spec: nasm.spec.in nasm.spec.sed version.sed perlbreq.si +@@ -496,13 +515,13 @@ splint: splint: splint -weak *.c @@ -152,11 +151,9 @@ index baca4396..924ba9d6 100644 $(PYTHON3) travis/nasm-t.py run # -diff --git a/Mkfiles/msvc.mak b/Mkfiles/msvc.mak -index ee2022d3..f0b3944b 100644 ---- Mkfiles/msvc.mak +--- Mkfiles/msvc.mak.orig 2020-08-28 16:04:43 UTC +++ Mkfiles/msvc.mak -@@ -64,7 +64,10 @@ X = .exe +@@ -64,7 +64,10 @@ NDISASM = disasm\ndisasm.$(O) NASM = asm\nasm.$(O) NDISASM = disasm\ndisasm.$(O) @@ -168,7 +165,7 @@ index ee2022d3..f0b3944b 100644 stdlib\strnlen.$(O) stdlib\strrchrnul.$(O) \ \ nasmlib\ver.$(O) \ -@@ -86,7 +89,7 @@ LIBOBJ = stdlib\snprintf.$(O) stdlib\vsnprintf.$(O) stdlib\strlcpy.$(O) \ +@@ -86,7 +89,7 @@ LIBOBJ = stdlib\snprintf.$(O) stdlib\vsnprintf.$(O) st x86\regs.$(O) x86\regvals.$(O) x86\regflags.$(O) x86\regdis.$(O) \ x86\disp8.$(O) x86\iflag.$(O) \ \ @@ -177,20 +174,21 @@ index ee2022d3..f0b3944b 100644 asm\floats.$(O) \ asm\directiv.$(O) asm\directbl.$(O) \ asm\pragma.$(O) \ -@@ -111,7 +114,12 @@ LIBOBJ = stdlib\snprintf.$(O) stdlib\vsnprintf.$(O) stdlib\strlcpy.$(O) \ +@@ -111,8 +114,13 @@ LIBOBJ = stdlib\snprintf.$(O) stdlib\vsnprintf.$(O) st \ disasm\disasm.$(O) disasm\sync.$(O) -ALLOBJ = $(NASM) $(NDISASM) $(LIBOBJ) +# Warnings depend on all source files, so handle them separately +WARNOBJ = asm\warnings.$(O) -+ + +LIBOBJ = $(LIBOBJ_NW) $(WARNOBJ) +ALLOBJ_NW = $(PROGOBJ) $(LIBOBJ_NW) +ALLOBJ = $(PROGOBJ) $(LIBOBJ) - ++ SUBDIRS = stdlib nasmlib output asm disasm x86 common macros XSUBDIRS = test doc nsis rdoff + DEPDIRS = . include config x86 rdoff $(SUBDIRS) @@ -230,18 +238,30 @@ warnings: $(RM_F) $(WARNFILES) $(MAKE) asm\warnings.time @@ -205,11 +203,11 @@ index ee2022d3..f0b3944b 100644 +asm\warnings.c.time: asm\warnings.pl asm\warnings.time $(RUNPERL) $(srcdir)\asm\warnings.pl c asm\warnings.c $(srcdir) + : > asm\warnings.c.time -+ -+asm\warnings.c: asm\warnings.c.time -+ @: Side effect -include\warnings.h: asm\warnings.pl asm\warnings.time ++asm\warnings.c: asm\warnings.c.time ++ @: Side effect ++ +include\warnings.h.time: asm\warnings.pl asm\warnings.time $(RUNPERL) $(srcdir)\asm\warnings.pl h include\warnings.h $(srcdir) + : > include\warnings.h.time @@ -227,11 +225,9 @@ index ee2022d3..f0b3944b 100644 # Assembler token hash asm\tokhash.c: x86\insns.dat x86\regs.dat asm\tokens.dat asm\tokhash.pl \ -diff --git a/Mkfiles/openwcom.mak b/Mkfiles/openwcom.mak -index 9d080290..ab49a3a5 100644 ---- Mkfiles/openwcom.mak +--- Mkfiles/openwcom.mak.orig 2020-08-28 16:04:44 UTC +++ Mkfiles/openwcom.mak -@@ -53,7 +53,10 @@ X = .exe +@@ -53,7 +53,10 @@ NDISASM = disasm\ndisasm.$(O) NASM = asm\nasm.$(O) NDISASM = disasm\ndisasm.$(O) @@ -243,7 +239,7 @@ index 9d080290..ab49a3a5 100644 stdlib\strnlen.$(O) stdlib\strrchrnul.$(O) & & nasmlib\ver.$(O) & -@@ -75,7 +78,7 @@ LIBOBJ = stdlib\snprintf.$(O) stdlib\vsnprintf.$(O) stdlib\strlcpy.$(O) & +@@ -75,7 +78,7 @@ LIBOBJ = stdlib\snprintf.$(O) stdlib\vsnprintf.$(O) st x86\regs.$(O) x86\regvals.$(O) x86\regflags.$(O) x86\regdis.$(O) & x86\disp8.$(O) x86\iflag.$(O) & & @@ -252,20 +248,21 @@ index 9d080290..ab49a3a5 100644 asm\floats.$(O) & asm\directiv.$(O) asm\directbl.$(O) & asm\pragma.$(O) & -@@ -100,7 +103,12 @@ LIBOBJ = stdlib\snprintf.$(O) stdlib\vsnprintf.$(O) stdlib\strlcpy.$(O) & +@@ -100,8 +103,13 @@ LIBOBJ = stdlib\snprintf.$(O) stdlib\vsnprintf.$(O) st & disasm\disasm.$(O) disasm\sync.$(O) -ALLOBJ = $(NASM) $(NDISASM) $(LIBOBJ) +# Warnings depend on all source files, so handle them separately +WARNOBJ = asm\warnings.$(O) -+ + +LIBOBJ = $(LIBOBJ_NW) $(WARNOBJ) +ALLOBJ_NW = $(PROGOBJ) $(LIBOBJ_NW) +ALLOBJ = $(PROGOBJ) $(LIBOBJ) - ++ SUBDIRS = stdlib nasmlib output asm disasm x86 common macros XSUBDIRS = test doc nsis rdoff + DEPDIRS = . include config x86 rdoff $(SUBDIRS) @@ -243,18 +251,30 @@ warnings: $(RM_F) $(WARNFILES) $(MAKE) asm\warnings.time @@ -280,11 +277,11 @@ index 9d080290..ab49a3a5 100644 +asm\warnings.c.time: asm\warnings.pl asm\warnings.time $(RUNPERL) $(srcdir)\asm\warnings.pl c asm\warnings.c $(srcdir) + : > asm\warnings.c.time -+ -+asm\warnings.c: asm\warnings.c.time -+ @: Side effect -include\warnings.h: asm\warnings.pl asm\warnings.time ++asm\warnings.c: asm\warnings.c.time ++ @: Side effect ++ +include\warnings.h.time: asm\warnings.pl asm\warnings.time $(RUNPERL) $(srcdir)\asm\warnings.pl h include\warnings.h $(srcdir) + : > include\warnings.h.time