Attachment #239118 for bug #268528

View | Details | Raw Unified | Return to bug 268528
Collapse All | Expand All




PORTNAME=	nasm
PORTVERSION=	2.16.01
PORTEPOCH=	2
CATEGORIES=	devel lang
MASTER_SITES=	https://www.nasm.us/pub/nasm/releasebuilds/${PORTVERSION}/ \

CONFIGURE_ENV=	ac_cv_func_strspn=yes

MAKE_ARGS+=	INSTALLROOT=${STAGEDIR}
INSTALL_TARGET=	install #needed for RDOFF_INSTALL_TARGET

PLIST_FILES=	bin/nasm \
		bin/ndisasm \
		man/man1/nasm.1.gz \
		man/man1/ndisasm.1.gz
PORTDOCS=	*

OPTIONS_DEFINE=	DOCS
OPTIONS_SUB=	yes

RDOFF_DESC=	Install tools to handle RDOFF object files

DOCS_DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
		${DISTNAME}-xdoc${EXTRACT_SUFX}

RDOFF_INSTALL_TARGET=	install_rdf

post-install-DOCS-on:
	@${MKDIR} ${STAGEDIR}${DOCSDIR}
	(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} html ${STAGEDIR}${DOCSDIR})

Lines 1-5 Link Here

(-)b/devel/nasm/distinfo (-5 / +5 lines)
1	TIMESTAMP = 1600344380	1	TIMESTAMP = 1672310881
2	SHA256 (nasm-2.15.05.tar.xz) = 3caf6729c1073bf96629b57cee31eeb54f4f8129b01902c73428836550b30a3f	2	SHA256 (nasm-2.16.01.tar.xz) = c77745f4802375efeee2ec5c0ad6b7f037ea9c87c92b149a9637ff099f162558
3	SIZE (nasm-2.15.05.tar.xz) = 995732	3	SIZE (nasm-2.16.01.tar.xz) = 1017732
4	SHA256 (nasm-2.15.05-xdoc.tar.xz) = 02a260cabb649bf55a06e3dc5abb1413746704156c80afc742b8fc1510262ed1	4	SHA256 (nasm-2.16.01-xdoc.tar.xz) = 801867a71f4c3d513a927ba09b3fa12ef9c7c5c98c0aaafc59c7f342faeab2c9
5	SIZE (nasm-2.15.05-xdoc.tar.xz) = 823612	5	SIZE (nasm-2.16.01-xdoc.tar.xz) = 867484




--- Makefile.in.orig	2022-12-29 10:56:49 UTC
+++ Makefile.in
@@ -280,26 +280,26 @@ asm/warnings.time: $(ALLOBJ_NW:.$(O)=.c)
 	$(MAKE) asm/warnings.time
 
 asm/warnings.time: $(ALLOBJ_NW:.$(O)=.c)
-	: > asm/warnings.time
+	touch asm/warnings.time
 	$(MAKE) $(WARNFILES:=.time)
 
 asm/warnings.c.time: asm/warnings.pl asm/warnings.time
 	$(RUNPERL) $(srcdir)/asm/warnings.pl c asm/warnings.c $(srcdir)
-	: > asm/warnings.c.time
+	touch asm/warnings.c.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
+	touch include/warnings.h.time
 
 include/warnings.h: include/warnings.h.time
 	@: Side effect
 
 doc/warnings.src.time: asm/warnings.pl asm/warnings.time
 	$(RUNPERL) $(srcdir)/asm/warnings.pl doc doc/warnings.src $(srcdir)
-	: > doc/warnings.src.time
+	touch doc/warnings.src.time
 
 doc/warnings.src : doc/warnings.src.time
 	@: Side effect




--- Makefile.in.orig	2020-08-28 16:04:43 UTC
+++ Makefile.in
@@ -75,7 +75,7 @@ endif
 endif
 
 .SUFFIXES:
-.SUFFIXES: $(X) .$(O) .$(A) .xml .1 .c .i .s .txt
+.SUFFIXES: $(X) .$(O) .$(A) .xml .1 .c .i .s .txt .time
 
 .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 @@ NDISASM = disasm/ndisasm.$(O)
 NASM    = asm/nasm.$(O)
 NDISASM = disasm/ndisasm.$(O)
 
-LIBOBJ = stdlib/snprintf.$(O) stdlib/vsnprintf.$(O) stdlib/strlcpy.$(O) \
+PROGOBJ = $(NASM) $(NDISASM)
+PROGS   = nasm$(X) ndisasm$(X)
+
+LIBOBJ_NW = stdlib/snprintf.$(O) stdlib/vsnprintf.$(O) stdlib/strlcpy.$(O) \
 	stdlib/strnlen.$(O) stdlib/strrchrnul.$(O) \
 	\
 	nasmlib/ver.$(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) \
 	\
-	asm/error.$(O) asm/warnings.$(O) \
+	asm/error.$(O) \
 	asm/floats.$(O) \
 	asm/directiv.$(O) asm/directbl.$(O) \
 	asm/pragma.$(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
 DEPDIRS  = . include config x86 rdoff $(SUBDIRS)
 #-- End File Lists --#
 
 all: dirs
-	$(MAKE) nasm$(X) ndisasm$(X) rdf
+	$(MAKE) $(PROGS) rdf
 
 NASMLIB = libnasm.$(A)
 
@@ -271,19 +279,31 @@ warnings:
 	$(RM_F) $(WARNFILES)
 	$(MAKE) asm/warnings.time
 
-asm/warnings.time: $(ALLOBJ:.@OBJEXT@=.c)
+asm/warnings.time: $(ALLOBJ_NW:.$(O)=.c)
 	: > asm/warnings.time
-	$(MAKE) $(WARNFILES)
+	$(MAKE) $(WARNFILES:=.time)
 
-asm/warnings.c: asm/warnings.pl asm/warnings.time
+asm/warnings.c.time: asm/warnings.pl asm/warnings.time
 	$(RUNPERL) $(srcdir)/asm/warnings.pl c asm/warnings.c $(srcdir)
+	: > asm/warnings.c.time
 
-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
 
-doc/warnings.src: asm/warnings.pl asm/warnings.time
+include/warnings.h: include/warnings.h.time
+	@: Side effect
+
+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 \
 	perllib/phash.ph
@@ -385,10 +405,9 @@ manpages: nasm.1 ndisasm.1
 # Generated manpages, also pregenerated for distribution
 manpages: nasm.1 ndisasm.1
 
-install: nasm$(X) ndisasm$(X)
+install: $(PROGS)
 	$(MKDIR_P) $(DESTDIR)$(bindir)
-	$(INSTALL_PROGRAM) nasm$(X) $(DESTDIR)$(bindir)/nasm$(X)
-	$(INSTALL_PROGRAM) ndisasm$(X) $(DESTDIR)$(bindir)/ndisasm$(X)
+	$(INSTALL_PROGRAM) $(PROGS) $(DESTDIR)$(bindir)/
 	$(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
@@ -397,7 +416,7 @@ clean:
 	for d in . $(SUBDIRS) $(XSUBDIRS); do \
 		$(RM_F) "$$d"/*.$(O) "$$d"/*.s "$$d"/*.i "$$d"/*.$(A) ; \
 	done
-	$(RM_F) nasm$(X) ndisasm$(X)
+	$(RM_F) $(PROGS)
 	$(RM_F) nasm-*-installer-*.exe
 	$(RM_F) tags TAGS
 	$(RM_F) nsis/arch.nsh
@@ -412,18 +431,18 @@ distclean: clean
 	done
 	$(RM_F) test/*.$(O)
 	$(RM_RF) autom4te*.cache
-	$(RM_F) Makefile *.dep asm/warnings.time
+	$(RM_F) Makefile *.dep
 
 cleaner: clean
 	$(RM_F) $(PERLREQ) *.1 nasm.spec
 	$(MAKE) -C doc clean
-	$(RM_F) *.dep asm/warnings.time
+	$(RM_F) *.dep */*.time
 
 spotless: distclean cleaner
 	$(RM_F) doc/Makefile
 
 strip:
-	$(STRIP) --strip-unneeded nasm$(X) ndisasm$(X)
+	$(STRIP) --strip-unneeded $(PROGS)
 
 TAGS:
 	$(RM_F) TAGS
@@ -496,13 +515,13 @@ splint:
 splint:
 	splint -weak *.c
 
-test: nasm$(X)
+test: $(PROGS)
 	cd test && $(RUNPERL) performtest.pl --nasm=../nasm *.asm
 
-golden: nasm$(X)
+golden: $(PROGS)
 	cd test && $(RUNPERL) performtest.pl --golden --nasm=../nasm *.asm
 
-travis: nasm$(X)
+travis: $(PROGS)
 	$(PYTHON3) travis/nasm-t.py run
 
 #
--- Mkfiles/msvc.mak.orig	2020-08-28 16:04:43 UTC
+++ Mkfiles/msvc.mak
@@ -64,7 +64,10 @@ NDISASM = disasm\ndisasm.$(O)
 NASM    = asm\nasm.$(O)
 NDISASM = disasm\ndisasm.$(O)
 
-LIBOBJ = stdlib\snprintf.$(O) stdlib\vsnprintf.$(O) stdlib\strlcpy.$(O) \
+PROGOBJ = $(NASM) $(NDISASM)
+PROGS   = nasm$(X) ndisasm$(X)
+
+LIBOBJ_NW = stdlib\snprintf.$(O) stdlib\vsnprintf.$(O) stdlib\strlcpy.$(O) \
 	stdlib\strnlen.$(O) stdlib\strrchrnul.$(O) \
 	\
 	nasmlib\ver.$(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) \
 	\
-	asm\error.$(O) asm\warnings.$(O) \
+	asm\error.$(O) \
 	asm\floats.$(O) \
 	asm\directiv.$(O) asm\directbl.$(O) \
 	asm\pragma.$(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
 
-asm\warnings.time: $(ALLOBJ:.@OBJEXT@=.c)
+asm\warnings.time: $(ALLOBJ_NW:.$(O)=.c)
 	: > asm\warnings.time
-	$(MAKE) $(WARNFILES)
+	$(MAKE) $(WARNFILES:=.time)
 
-asm\warnings.c: asm\warnings.pl asm\warnings.time
+asm\warnings.c.time: asm\warnings.pl asm\warnings.time
 	$(RUNPERL) $(srcdir)\asm\warnings.pl c asm\warnings.c $(srcdir)
+	: > asm\warnings.c.time
 
-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
 
-doc\warnings.src: asm\warnings.pl asm\warnings.time
+include\warnings.h: include\warnings.h.time
+	@: Side effect
+
+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 \
--- Mkfiles/openwcom.mak.orig	2020-08-28 16:04:44 UTC
+++ Mkfiles/openwcom.mak
@@ -53,7 +53,10 @@ NDISASM = disasm\ndisasm.$(O)
 NASM    = asm\nasm.$(O)
 NDISASM = disasm\ndisasm.$(O)
 
-LIBOBJ = stdlib\snprintf.$(O) stdlib\vsnprintf.$(O) stdlib\strlcpy.$(O) &
+PROGOBJ = $(NASM) $(NDISASM)
+PROGS   = nasm$(X) ndisasm$(X)
+
+LIBOBJ_NW = stdlib\snprintf.$(O) stdlib\vsnprintf.$(O) stdlib\strlcpy.$(O) &
 	stdlib\strnlen.$(O) stdlib\strrchrnul.$(O) &
 	&
 	nasmlib\ver.$(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) &
 	&
-	asm\error.$(O) asm\warnings.$(O) &
+	asm\error.$(O) &
 	asm\floats.$(O) &
 	asm\directiv.$(O) asm\directbl.$(O) &
 	asm\pragma.$(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
 
-asm\warnings.time: $(ALLOBJ:.@OBJEXT@=.c)
+asm\warnings.time: $(ALLOBJ_NW:.$(O)=.c)
 	: > asm\warnings.time
-	$(MAKE) $(WARNFILES)
+	$(MAKE) $(WARNFILES:=.time)
 
-asm\warnings.c: asm\warnings.pl asm\warnings.time
+asm\warnings.c.time: asm\warnings.pl asm\warnings.time
 	$(RUNPERL) $(srcdir)\asm\warnings.pl c asm\warnings.c $(srcdir)
+	: > asm\warnings.c.time
 
-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
 
-doc\warnings.src: asm\warnings.pl asm\warnings.time
+include\warnings.h: include\warnings.h.time
+	@: Side effect
+
+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 &




bin/nasm
bin/ndisasm
man/man1/nasm.1.gz
man/man1/ndisasm.1.gz
%%RDOFF%%bin/ldrdf
%%RDOFF%%bin/rdf2bin
%%RDOFF%%bin/rdf2com
%%RDOFF%%bin/rdf2ihx
%%RDOFF%%bin/rdf2ith
%%RDOFF%%bin/rdf2srec
%%RDOFF%%bin/rdfdump
%%RDOFF%%bin/rdflib
%%RDOFF%%bin/rdx
%%RDOFF%%man/man1/ldrdf.1.gz
%%RDOFF%%man/man1/rdf2bin.1.gz
%%RDOFF%%man/man1/rdf2com.1.gz
%%RDOFF%%man/man1/rdf2ihx.1.gz
%%RDOFF%%man/man1/rdf2ith.1.gz
%%RDOFF%%man/man1/rdf2srec.1.gz
%%RDOFF%%man/man1/rdfdump.1.gz
%%RDOFF%%man/man1/rdflib.1.gz
%%RDOFF%%man/man1/rdx.1.gz
- 

Return to bug 268528

Lines 1-5 Link Here

(-)b/devel/nasm/Makefile (-7 / +6 lines)
1	PORTNAME= nasm	1	PORTNAME= nasm
2	PORTVERSION= 2.15.05	2	PORTVERSION= 2.16.01
3	PORTEPOCH= 2	3	PORTEPOCH= 2
4	CATEGORIES= devel lang	4	CATEGORIES= devel lang
5	MASTER_SITES= https://www.nasm.us/pub/nasm/releasebuilds/${PORTVERSION}/ \	5	MASTER_SITES= https://www.nasm.us/pub/nasm/releasebuilds/${PORTVERSION}/ \
Lines 21-40 GNU_CONFIGURE= yes Link Here
21	CONFIGURE_ENV= ac_cv_func_strspn=yes	21	CONFIGURE_ENV= ac_cv_func_strspn=yes
22		22
23	MAKE_ARGS+= INSTALLROOT=${STAGEDIR}	23	MAKE_ARGS+= INSTALLROOT=${STAGEDIR}
24	INSTALL_TARGET= install #needed for RDOFF_INSTALL_TARGET
25		24
		25	PLIST_FILES= bin/nasm \
		26	bin/ndisasm \
		27	man/man1/nasm.1.gz \
		28	man/man1/ndisasm.1.gz
26	PORTDOCS= *	29	PORTDOCS= *
27		30
28	OPTIONS_DEFINE= DOCS RDOFF	31	OPTIONS_DEFINE= DOCS
29	OPTIONS_SUB= yes	32	OPTIONS_SUB= yes
30		33
31	RDOFF_DESC= Install tools to handle RDOFF object files
32
33	DOCS_DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \	34	DOCS_DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
34	${DISTNAME}-xdoc${EXTRACT_SUFX}	35	${DISTNAME}-xdoc${EXTRACT_SUFX}
35		36
36	RDOFF_INSTALL_TARGET= install_rdf
37
38	post-install-DOCS-on:	37	post-install-DOCS-on:
39	@${MKDIR} ${STAGEDIR}${DOCSDIR}	38	@${MKDIR} ${STAGEDIR}${DOCSDIR}
40	(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} html ${STAGEDIR}${DOCSDIR})	39	(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} html ${STAGEDIR}${DOCSDIR})

Added Link Here

(-)b/devel/nasm/files/patch-Makefile.in (+33 lines)
1	--- Makefile.in.orig 2022-12-29 10:56:49 UTC
2	+++ Makefile.in
3	@@ -280,26 +280,26 @@ asm/warnings.time: $(ALLOBJ_NW:.$(O)=.c)
4	$(MAKE) asm/warnings.time
5
6	asm/warnings.time: $(ALLOBJ_NW:.$(O)=.c)
7	- : > asm/warnings.time
8	+ touch asm/warnings.time
9	$(MAKE) $(WARNFILES:=.time)
10
11	asm/warnings.c.time: asm/warnings.pl asm/warnings.time
12	$(RUNPERL) $(srcdir)/asm/warnings.pl c asm/warnings.c $(srcdir)
13	- : > asm/warnings.c.time
14	+ touch asm/warnings.c.time
15
16	asm/warnings.c: asm/warnings.c.time
17	@: Side effect
18
19	include/warnings.h.time: asm/warnings.pl asm/warnings.time
20	$(RUNPERL) $(srcdir)/asm/warnings.pl h include/warnings.h $(srcdir)
21	- : > include/warnings.h.time
22	+ touch include/warnings.h.time
23
24	include/warnings.h: include/warnings.h.time
25	@: Side effect
26
27	doc/warnings.src.time: asm/warnings.pl asm/warnings.time
28	$(RUNPERL) $(srcdir)/asm/warnings.pl doc doc/warnings.src $(srcdir)
29	- : > doc/warnings.src.time
30	+ touch doc/warnings.src.time
31
32	doc/warnings.src : doc/warnings.src.time
33	@: Side effect

Removed Link Here

(-)a/devel/nasm/files/patch-d85890aa.c (-301 lines)
1	--- Makefile.in.orig 2020-08-28 16:04:43 UTC
2	+++ Makefile.in
3	@@ -75,7 +75,7 @@ endif
4	endif
5
6	.SUFFIXES:
7	-.SUFFIXES: $(X) .$(O) .$(A) .xml .1 .c .i .s .txt
8	+.SUFFIXES: $(X) .$(O) .$(A) .xml .1 .c .i .s .txt .time
9
10	.PHONY: all doc rdf install clean distclean cleaner spotless install_rdf test
11	.PHONY: install_doc everything install_everything strip perlreq dist tags TAGS
12	@@ -100,7 +100,10 @@ NDISASM = disasm/ndisasm.$(O)
13	NASM = asm/nasm.$(O)
14	NDISASM = disasm/ndisasm.$(O)
15
16	-LIBOBJ = stdlib/snprintf.$(O) stdlib/vsnprintf.$(O) stdlib/strlcpy.$(O) \
17	+PROGOBJ = $(NASM) $(NDISASM)
18	+PROGS = nasm$(X) ndisasm$(X)
19	+
20	+LIBOBJ_NW = stdlib/snprintf.$(O) stdlib/vsnprintf.$(O) stdlib/strlcpy.$(O) \
21	stdlib/strnlen.$(O) stdlib/strrchrnul.$(O) \
22	\
23	nasmlib/ver.$(O) \
24	@@ -122,7 +125,7 @@ LIBOBJ = stdlib/snprintf.$(O) stdlib/vsnprintf.$(O) st
25	x86/regs.$(O) x86/regvals.$(O) x86/regflags.$(O) x86/regdis.$(O) \
26	x86/disp8.$(O) x86/iflag.$(O) \
27	\
28	- asm/error.$(O) asm/warnings.$(O) \
29	+ asm/error.$(O) \
30	asm/floats.$(O) \
31	asm/directiv.$(O) asm/directbl.$(O) \
32	asm/pragma.$(O) \
33	@@ -147,15 +150,20 @@ LIBOBJ = stdlib/snprintf.$(O) stdlib/vsnprintf.$(O) st
34	\
35	disasm/disasm.$(O) disasm/sync.$(O)
36
37	-ALLOBJ = $(NASM) $(NDISASM) $(LIBOBJ)
38	+# Warnings depend on all source files, so handle them separately
39	+WARNOBJ = asm/warnings.$(O)
40
41	+LIBOBJ = $(LIBOBJ_NW) $(WARNOBJ)
42	+ALLOBJ_NW = $(PROGOBJ) $(LIBOBJ_NW)
43	+ALLOBJ = $(PROGOBJ) $(LIBOBJ)
44	+
45	SUBDIRS = stdlib nasmlib output asm disasm x86 common macros
46	XSUBDIRS = test doc nsis rdoff
47	DEPDIRS = . include config x86 rdoff $(SUBDIRS)
48	#-- End File Lists --#
49
50	all: dirs
51	- $(MAKE) nasm$(X) ndisasm$(X) rdf
52	+ $(MAKE) $(PROGS) rdf
53
54	NASMLIB = libnasm.$(A)
55
56	@@ -271,19 +279,31 @@ warnings:
57	$(RM_F) $(WARNFILES)
58	$(MAKE) asm/warnings.time
59
60	-asm/warnings.time: $(ALLOBJ:.@OBJEXT@=.c)
61	+asm/warnings.time: $(ALLOBJ_NW:.$(O)=.c)
62	: > asm/warnings.time
63	- $(MAKE) $(WARNFILES)
64	+ $(MAKE) $(WARNFILES:=.time)
65
66	-asm/warnings.c: asm/warnings.pl asm/warnings.time
67	+asm/warnings.c.time: asm/warnings.pl asm/warnings.time
68	$(RUNPERL) $(srcdir)/asm/warnings.pl c asm/warnings.c $(srcdir)
69	+ : > asm/warnings.c.time
70
71	-include/warnings.h: asm/warnings.pl asm/warnings.time
72	+asm/warnings.c: asm/warnings.c.time
73	+ @: Side effect
74	+
75	+include/warnings.h.time: asm/warnings.pl asm/warnings.time
76	$(RUNPERL) $(srcdir)/asm/warnings.pl h include/warnings.h $(srcdir)
77	+ : > include/warnings.h.time
78
79	-doc/warnings.src: asm/warnings.pl asm/warnings.time
80	+include/warnings.h: include/warnings.h.time
81	+ @: Side effect
82	+
83	+doc/warnings.src.time: asm/warnings.pl asm/warnings.time
84	$(RUNPERL) $(srcdir)/asm/warnings.pl doc doc/warnings.src $(srcdir)
85	+ : > doc/warnings.src.time
86
87	+doc/warnings.src : doc/warnings.src.time
88	+ @: Side effect
89	+
90	# Assembler token hash
91	asm/tokhash.c: x86/insns.dat x86/regs.dat asm/tokens.dat asm/tokhash.pl \
92	perllib/phash.ph
93	@@ -385,10 +405,9 @@ manpages: nasm.1 ndisasm.1
94	# Generated manpages, also pregenerated for distribution
95	manpages: nasm.1 ndisasm.1
96
97	-install: nasm$(X) ndisasm$(X)
98	+install: $(PROGS)
99	$(MKDIR_P) $(DESTDIR)$(bindir)
100	- $(INSTALL_PROGRAM) nasm$(X) $(DESTDIR)$(bindir)/nasm$(X)
101	- $(INSTALL_PROGRAM) ndisasm$(X) $(DESTDIR)$(bindir)/ndisasm$(X)
102	+ $(INSTALL_PROGRAM) $(PROGS) $(DESTDIR)$(bindir)/
103	$(MKDIR_P) $(DESTDIR)$(mandir)/man1
104	$(INSTALL_DATA) $(srcdir)/nasm.1 $(DESTDIR)$(mandir)/man1/nasm.1
105	$(INSTALL_DATA) $(srcdir)/ndisasm.1 $(DESTDIR)$(mandir)/man1/ndisasm.1
106	@@ -397,7 +416,7 @@ clean:
107	for d in . $(SUBDIRS) $(XSUBDIRS); do \
108	$(RM_F) "$$d"/.$(O) "$$d"/.s "$$d"/.i "$$d"/.$(A) ; \
109	done
110	- $(RM_F) nasm$(X) ndisasm$(X)
111	+ $(RM_F) $(PROGS)
112	$(RM_F) nasm--installer-.exe
113	$(RM_F) tags TAGS
114	$(RM_F) nsis/arch.nsh
115	@@ -412,18 +431,18 @@ distclean: clean
116	done
117	$(RM_F) test/*.$(O)
118	$(RM_RF) autom4te*.cache
119	- $(RM_F) Makefile *.dep asm/warnings.time
120	+ $(RM_F) Makefile *.dep
121
122	cleaner: clean
123	$(RM_F) $(PERLREQ) *.1 nasm.spec
124	$(MAKE) -C doc clean
125	- $(RM_F) *.dep asm/warnings.time
126	+ $(RM_F) .dep /*.time
127
128	spotless: distclean cleaner
129	$(RM_F) doc/Makefile
130
131	strip:
132	- $(STRIP) --strip-unneeded nasm$(X) ndisasm$(X)
133	+ $(STRIP) --strip-unneeded $(PROGS)
134
135	TAGS:
136	$(RM_F) TAGS
137	@@ -496,13 +515,13 @@ splint:
138	splint:
139	splint -weak *.c
140
141	-test: nasm$(X)
142	+test: $(PROGS)
143	cd test && $(RUNPERL) performtest.pl --nasm=../nasm *.asm
144
145	-golden: nasm$(X)
146	+golden: $(PROGS)
147	cd test && $(RUNPERL) performtest.pl --golden --nasm=../nasm *.asm
148
149	-travis: nasm$(X)
150	+travis: $(PROGS)
151	$(PYTHON3) travis/nasm-t.py run
152
153	#
154	--- Mkfiles/msvc.mak.orig 2020-08-28 16:04:43 UTC
155	+++ Mkfiles/msvc.mak
156	@@ -64,7 +64,10 @@ NDISASM = disasm\ndisasm.$(O)
157	NASM = asm\nasm.$(O)
158	NDISASM = disasm\ndisasm.$(O)
159
160	-LIBOBJ = stdlib\snprintf.$(O) stdlib\vsnprintf.$(O) stdlib\strlcpy.$(O) \
161	+PROGOBJ = $(NASM) $(NDISASM)
162	+PROGS = nasm$(X) ndisasm$(X)
163	+
164	+LIBOBJ_NW = stdlib\snprintf.$(O) stdlib\vsnprintf.$(O) stdlib\strlcpy.$(O) \
165	stdlib\strnlen.$(O) stdlib\strrchrnul.$(O) \
166	\
167	nasmlib\ver.$(O) \
168	@@ -86,7 +89,7 @@ LIBOBJ = stdlib\snprintf.$(O) stdlib\vsnprintf.$(O) st
169	x86\regs.$(O) x86\regvals.$(O) x86\regflags.$(O) x86\regdis.$(O) \
170	x86\disp8.$(O) x86\iflag.$(O) \
171	\
172	- asm\error.$(O) asm\warnings.$(O) \
173	+ asm\error.$(O) \
174	asm\floats.$(O) \
175	asm\directiv.$(O) asm\directbl.$(O) \
176	asm\pragma.$(O) \
177	@@ -111,8 +114,13 @@ LIBOBJ = stdlib\snprintf.$(O) stdlib\vsnprintf.$(O) st
178	\
179	disasm\disasm.$(O) disasm\sync.$(O)
180
181	-ALLOBJ = $(NASM) $(NDISASM) $(LIBOBJ)
182	+# Warnings depend on all source files, so handle them separately
183	+WARNOBJ = asm\warnings.$(O)
184
185	+LIBOBJ = $(LIBOBJ_NW) $(WARNOBJ)
186	+ALLOBJ_NW = $(PROGOBJ) $(LIBOBJ_NW)
187	+ALLOBJ = $(PROGOBJ) $(LIBOBJ)
188	+
189	SUBDIRS = stdlib nasmlib output asm disasm x86 common macros
190	XSUBDIRS = test doc nsis rdoff
191	DEPDIRS = . include config x86 rdoff $(SUBDIRS)
192	@@ -230,18 +238,30 @@ warnings:
193	$(RM_F) $(WARNFILES)
194	$(MAKE) asm\warnings.time
195
196	-asm\warnings.time: $(ALLOBJ:.@OBJEXT@=.c)
197	+asm\warnings.time: $(ALLOBJ_NW:.$(O)=.c)
198	: > asm\warnings.time
199	- $(MAKE) $(WARNFILES)
200	+ $(MAKE) $(WARNFILES:=.time)
201
202	-asm\warnings.c: asm\warnings.pl asm\warnings.time
203	+asm\warnings.c.time: asm\warnings.pl asm\warnings.time
204	$(RUNPERL) $(srcdir)\asm\warnings.pl c asm\warnings.c $(srcdir)
205	+ : > asm\warnings.c.time
206
207	-include\warnings.h: asm\warnings.pl asm\warnings.time
208	+asm\warnings.c: asm\warnings.c.time
209	+ @: Side effect
210	+
211	+include\warnings.h.time: asm\warnings.pl asm\warnings.time
212	$(RUNPERL) $(srcdir)\asm\warnings.pl h include\warnings.h $(srcdir)
213	+ : > include\warnings.h.time
214
215	-doc\warnings.src: asm\warnings.pl asm\warnings.time
216	+include\warnings.h: include\warnings.h.time
217	+ @: Side effect
218	+
219	+doc\warnings.src.time: asm\warnings.pl asm\warnings.time
220	$(RUNPERL) $(srcdir)\asm\warnings.pl doc doc\warnings.src $(srcdir)
221	+ : > doc\warnings.src.time
222	+
223	+doc\warnings.src : doc\warnings.src.time
224	+ @: Side effect
225
226	# Assembler token hash
227	asm\tokhash.c: x86\insns.dat x86\regs.dat asm\tokens.dat asm\tokhash.pl \
228	--- Mkfiles/openwcom.mak.orig 2020-08-28 16:04:44 UTC
229	+++ Mkfiles/openwcom.mak
230	@@ -53,7 +53,10 @@ NDISASM = disasm\ndisasm.$(O)
231	NASM = asm\nasm.$(O)
232	NDISASM = disasm\ndisasm.$(O)
233
234	-LIBOBJ = stdlib\snprintf.$(O) stdlib\vsnprintf.$(O) stdlib\strlcpy.$(O) &
235	+PROGOBJ = $(NASM) $(NDISASM)
236	+PROGS = nasm$(X) ndisasm$(X)
237	+
238	+LIBOBJ_NW = stdlib\snprintf.$(O) stdlib\vsnprintf.$(O) stdlib\strlcpy.$(O) &
239	stdlib\strnlen.$(O) stdlib\strrchrnul.$(O) &
240	&
241	nasmlib\ver.$(O) &
242	@@ -75,7 +78,7 @@ LIBOBJ = stdlib\snprintf.$(O) stdlib\vsnprintf.$(O) st
243	x86\regs.$(O) x86\regvals.$(O) x86\regflags.$(O) x86\regdis.$(O) &
244	x86\disp8.$(O) x86\iflag.$(O) &
245	&
246	- asm\error.$(O) asm\warnings.$(O) &
247	+ asm\error.$(O) &
248	asm\floats.$(O) &
249	asm\directiv.$(O) asm\directbl.$(O) &
250	asm\pragma.$(O) &
251	@@ -100,8 +103,13 @@ LIBOBJ = stdlib\snprintf.$(O) stdlib\vsnprintf.$(O) st
252	&
253	disasm\disasm.$(O) disasm\sync.$(O)
254
255	-ALLOBJ = $(NASM) $(NDISASM) $(LIBOBJ)
256	+# Warnings depend on all source files, so handle them separately
257	+WARNOBJ = asm\warnings.$(O)
258
259	+LIBOBJ = $(LIBOBJ_NW) $(WARNOBJ)
260	+ALLOBJ_NW = $(PROGOBJ) $(LIBOBJ_NW)
261	+ALLOBJ = $(PROGOBJ) $(LIBOBJ)
262	+
263	SUBDIRS = stdlib nasmlib output asm disasm x86 common macros
264	XSUBDIRS = test doc nsis rdoff
265	DEPDIRS = . include config x86 rdoff $(SUBDIRS)
266	@@ -243,18 +251,30 @@ warnings:
267	$(RM_F) $(WARNFILES)
268	$(MAKE) asm\warnings.time
269
270	-asm\warnings.time: $(ALLOBJ:.@OBJEXT@=.c)
271	+asm\warnings.time: $(ALLOBJ_NW:.$(O)=.c)
272	: > asm\warnings.time
273	- $(MAKE) $(WARNFILES)
274	+ $(MAKE) $(WARNFILES:=.time)
275
276	-asm\warnings.c: asm\warnings.pl asm\warnings.time
277	+asm\warnings.c.time: asm\warnings.pl asm\warnings.time
278	$(RUNPERL) $(srcdir)\asm\warnings.pl c asm\warnings.c $(srcdir)
279	+ : > asm\warnings.c.time
280
281	-include\warnings.h: asm\warnings.pl asm\warnings.time
282	+asm\warnings.c: asm\warnings.c.time
283	+ @: Side effect
284	+
285	+include\warnings.h.time: asm\warnings.pl asm\warnings.time
286	$(RUNPERL) $(srcdir)\asm\warnings.pl h include\warnings.h $(srcdir)
287	+ : > include\warnings.h.time
288
289	-doc\warnings.src: asm\warnings.pl asm\warnings.time
290	+include\warnings.h: include\warnings.h.time
291	+ @: Side effect
292	+
293	+doc\warnings.src.time: asm\warnings.pl asm\warnings.time
294	$(RUNPERL) $(srcdir)\asm\warnings.pl doc doc\warnings.src $(srcdir)
295	+ : > doc\warnings.src.time
296	+
297	+doc\warnings.src : doc\warnings.src.time
298	+ @: Side effect
299
300	# Assembler token hash
301	asm\tokhash.c: x86\insns.dat x86\regs.dat asm\tokens.dat asm\tokhash.pl &

Removed Link Here

(-)a/devel/nasm/pkg-plist (-23 lines)
1	bin/nasm
2	bin/ndisasm
3	man/man1/nasm.1.gz
4	man/man1/ndisasm.1.gz
5	%%RDOFF%%bin/ldrdf
6	%%RDOFF%%bin/rdf2bin
7	%%RDOFF%%bin/rdf2com
8	%%RDOFF%%bin/rdf2ihx
9	%%RDOFF%%bin/rdf2ith
10	%%RDOFF%%bin/rdf2srec
11	%%RDOFF%%bin/rdfdump
12	%%RDOFF%%bin/rdflib
13	%%RDOFF%%bin/rdx
14	%%RDOFF%%man/man1/ldrdf.1.gz
15	%%RDOFF%%man/man1/rdf2bin.1.gz
16	%%RDOFF%%man/man1/rdf2com.1.gz
17	%%RDOFF%%man/man1/rdf2ihx.1.gz
18	%%RDOFF%%man/man1/rdf2ith.1.gz
19	%%RDOFF%%man/man1/rdf2srec.1.gz
20	%%RDOFF%%man/man1/rdfdump.1.gz
21	%%RDOFF%%man/man1/rdflib.1.gz
22	%%RDOFF%%man/man1/rdx.1.gz
23	-