Attachment #183166 for bug #219741

Lines 2-13 Link Here

(-)Makefile (-15 / +21 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= vasm	4	PORTNAME= vasm
5	PORTVERSION= 1.7g	5	PORTVERSION= 1.8
6	PORTREVISION= 1
7	CATEGORIES= devel	6	CATEGORIES= devel
8	MASTER_SITES= http://server.owl.de/%SUBDIR%/	7	MASTER_SITES= http://server.owl.de/~frank/tags/
9	MASTER_SITE_SUBDIR= ~frank/tags/	8	DISTNAME= vasm1_8
10	DISTNAME= vasm1_7g
11		9
12	MAINTAINER= cs@innolan.dk	10	MAINTAINER= cs@innolan.dk
13	COMMENT= Portable 6502 6800 arm c16x jagrisc m68k ppc vidcore x86 z80 assembler	11	COMMENT= Portable 6502 6800 arm c16x jagrisc m68k ppc vidcore x86 z80 assembler
Lines 17-30 Link Here
17	USES= gmake pathfix	15	USES= gmake pathfix
18	WRKSRC= ${WRKDIR}/vasm	16	WRKSRC= ${WRKDIR}/vasm
19		17
20	CPU_LIST= 6502 6800 arm c16x jagrisc m68k ppc test tr3200 vidcore x86 z80	18	OPTIONS_DEFINE= DOCS
		19	OPTIONS_DEFAULT= DOCS
		20	DOCS_USES= makeinfo
		21
		22	CPU_LIST= 6502 6800 arm c16x jagrisc m68k ppc qnice tr3200 vidcore x86 z80
21	SYNTAX_LIST= std madmac mot oldstyle test	23	SYNTAX_LIST= std madmac mot oldstyle test
22	OUTPUT_LIST= aout bin elf hunk test tos vobj	24	OUTPUT_LIST= aout bin elf hunk test tos vobj
23		25
		26	.include <bsd.port.options.mk>
		27
24	do-build:	28	do-build:
25	.for CPU in ${CPU_LIST}	29	.for CPU in ${CPU_LIST}
26	.for SYNTAX in ${SYNTAX_LIST}	30	.for SYNTAX in ${SYNTAX_LIST}
27	${GMAKE} -C ${WRKSRC} CC=${CC} CPU=${CPU} SYNTAX=${SYNTAX} >/dev/null 2>&1	31	${GMAKE} -C ${WRKSRC} CC=${CC} CPU=${CPU} SYNTAX=${SYNTAX}
28	.endfor	32	.endfor
29	.endfor	33	.endfor
30		34
Lines 35-52 Link Here
35	${INSTALL_PROGRAM} ${WRKSRC}/vasm${CPU}_${SYNTAX} ${STAGEDIR}${PREFIX}/bin	39	${INSTALL_PROGRAM} ${WRKSRC}/vasm${CPU}_${SYNTAX} ${STAGEDIR}${PREFIX}/bin
36	.endfor	40	.endfor
37	.endfor	41	.endfor
		42
		43	do-install-DOCS-on:
38	${MKDIR} ${STAGEDIR}${DOCSDIR}	44	${MKDIR} ${STAGEDIR}${DOCSDIR}
39	.for CPU in ${CPU_LIST}	45	.for CPU in ${CPU_LIST}
		46	-test -f ${WRKSRC}/doc/cpu_${CPU}.texi && makeinfo --no-headers -o ${WRKSRC}/doc/cpu_${CPU} ${WRKSRC}/doc/cpu_${CPU}.texi && ${INSTALL_MAN} ${WRKSRC}/doc/cpu_${CPU} ${STAGEDIR}${DOCSDIR}
		47	.endfor
40	.for SYNTAX in ${SYNTAX_LIST}	48	.for SYNTAX in ${SYNTAX_LIST}
41	-test -f ${WRKSRC}/doc/cpu_${CPU}.texi && ${INSTALL_MAN} ${WRKSRC}/doc/cpu_${CPU}.texi ${STAGEDIR}${DOCSDIR}	49	-test -f ${WRKSRC}/doc/syntax_${SYNTAX}.texi && makeinfo --no-headers -o ${WRKSRC}/doc/syntax_${SYNTAX} ${WRKSRC}/doc/syntax_${SYNTAX}.texi && ${INSTALL_MAN} ${WRKSRC}/doc/syntax_${SYNTAX} ${STAGEDIR}${DOCSDIR}
42	-test -f ${WRKSRC}/doc/syntax_${SYNTAX}.texi && ${INSTALL_MAN} ${WRKSRC}/doc/syntax_${SYNTAX}.texi ${STAGEDIR}${DOCSDIR}	50	.endfor
43	.for OUTPUT in ${OUTPUT_LIST}	51	.for OUTPUT in ${OUTPUT_LIST}
44	-test -f ${WRKSRC}/doc/output_${OUTPUT}.texi && ${INSTALL_MAN} ${WRKSRC}/doc/output_${OUTPUT}.texi ${STAGEDIR}${DOCSDIR}	52	-test -f ${WRKSRC}/doc/output_${OUTPUT}.texi && makeinfo --no-headers -o ${WRKSRC}/doc/output_${OUTPUT} ${WRKSRC}/doc/output_${OUTPUT}.texi && ${INSTALL_MAN} ${WRKSRC}/doc/output_${OUTPUT} ${STAGEDIR}${DOCSDIR}
45	.endfor	53	.endfor
46	.endfor	54	makeinfo --no-headers -o ${WRKSRC}/doc/vasm ${WRKSRC}/doc/vasm.texi && ${INSTALL_MAN} ${WRKSRC}/doc/vasm ${STAGEDIR}${DOCSDIR}
47	.endfor	55	makeinfo --no-headers -o ${WRKSRC}/doc/vasm_main ${WRKSRC}/doc/vasm_main.texi && ${INSTALL_MAN} ${WRKSRC}/doc/vasm_main ${STAGEDIR}${DOCSDIR}
48	${INSTALL_MAN} ${WRKSRC}/doc/vasm.texi ${STAGEDIR}${DOCSDIR}	56	makeinfo --no-headers -o ${WRKSRC}/doc/interface ${WRKSRC}/doc/interface.texi && ${INSTALL_MAN} ${WRKSRC}/doc/interface ${STAGEDIR}${DOCSDIR}
49	${INSTALL_MAN} ${WRKSRC}/doc/vasm_main.texi ${STAGEDIR}${DOCSDIR}
50	${INSTALL_MAN} ${WRKSRC}/doc/interface.texi ${STAGEDIR}${DOCSDIR}
51		57
52	.include <bsd.port.mk>	58	.include <bsd.port.mk>

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1480238303	1	TIMESTAMP = 1496435956
2	SHA256 (vasm1_7g.tar.gz) = 9cfca33c348fe10419cb2ef59a7ff25c262cd6cf1d353bb51d4468f1f1535c55	2	SHA256 (vasm1_8.tar.gz) = 0d106ee05b13c62c8423f7a6f310b43ff038eae1d93774dc3130c1a407e07db3
3	SIZE (vasm1_7g.tar.gz) = 393623	3	SIZE (vasm1_8.tar.gz) = 405385

Line 0 Link Here

(-)files/patch-Makefile (+11 lines)
	1	--- Makefile.orig 2017-06-02 21:05:38 UTC
	2	+++ Makefile
	3	@@ -5,7 +5,7 @@ TARGETEXTENSION =
	4	OUTFMTS = -DOUTAOUT -DOUTBIN -DOUTELF -DOUTHUNK -DOUTSREC -DOUTTOS -DOUTVOBJ
	5
	6	CCOUT = -o
	7	-COPTS = -c -O2 $(OUTFMTS)
	8	+COPTS = -c -O2 $(OUTFMTS) -Wno-parentheses -Wno-return-type
	9
	10	LD = $(CC)
	11	LDOUT = $(CCOUT)

Lines 14-24 Link Here

(-)pkg-descr (+4 lines)
14	C16x/ST10	14	C16x/ST10
15	6502 family	15	6502 family
16	6800 family (6800, 6801, 6803, 68HC11)	16	6800 family (6800, 6801, 6803, 68HC11)
		17	QNICE (elegant 16-bit FPGA CPU)
		18	TR3200 (virtual CPU from 0x10c)
		19	Raspberry-Pi VideoCore IV
17		20
18	These syntax flavours are supported:	21	These syntax flavours are supported:
19		22
20	Standard MIT (GNU-as style) syntax	23	Standard MIT (GNU-as style) syntax
21	Motorola/Freescale 68k syntax (Devpac compatible)	24	Motorola/Freescale 68k syntax (Devpac compatible)
		25	Atari MadMac syntax (6502, 68k, Jaguar)
22	Old 8-bit style syntax	26	Old 8-bit style syntax
23		27
24	WWW: http://sun.hasenbraten.de/vasm/	28	WWW: http://sun.hasenbraten.de/vasm/




bin/vasmppc_oldstyle
bin/vasmppc_std
bin/vasmppc_test
bin/vasmqnice_madmac
bin/vasmqnice_mot
bin/vasmqnice_oldstyle
bin/vasmqnice_std
bin/vasmqnice_test
bin/vasmtr3200_madmac
bin/vasmtr3200_mot
bin/vasmtr3200_oldstyle

bin/vasmz80_std
bin/vasmz80_test
bin/vobjdump
%%PORTDOCS%%%%DOCSDIR%%/cpu_6502
%%PORTDOCS%%%%DOCSDIR%%/cpu_6800
%%PORTDOCS%%%%DOCSDIR%%/cpu_arm
%%PORTDOCS%%%%DOCSDIR%%/cpu_c16x
%%PORTDOCS%%%%DOCSDIR%%/cpu_jagrisc
%%PORTDOCS%%%%DOCSDIR%%/cpu_m68k
%%PORTDOCS%%%%DOCSDIR%%/cpu_ppc
%%PORTDOCS%%%%DOCSDIR%%/cpu_tr3200
%%PORTDOCS%%%%DOCSDIR%%/cpu_x86
%%PORTDOCS%%%%DOCSDIR%%/cpu_z80
%%PORTDOCS%%%%DOCSDIR%%/interface
%%PORTDOCS%%%%DOCSDIR%%/output_aout
%%PORTDOCS%%%%DOCSDIR%%/output_bin
%%PORTDOCS%%%%DOCSDIR%%/output_elf
%%PORTDOCS%%%%DOCSDIR%%/output_hunk
%%PORTDOCS%%%%DOCSDIR%%/output_test
%%PORTDOCS%%%%DOCSDIR%%/output_tos
%%PORTDOCS%%%%DOCSDIR%%/output_vobj
%%PORTDOCS%%%%DOCSDIR%%/syntax_madmac
%%PORTDOCS%%%%DOCSDIR%%/syntax_mot
%%PORTDOCS%%%%DOCSDIR%%/syntax_oldstyle
%%PORTDOCS%%%%DOCSDIR%%/syntax_std
%%PORTDOCS%%%%DOCSDIR%%/vasm
%%PORTDOCS%%%%DOCSDIR%%/vasm_main

Return to bug 219741

Lines 33-43 Link Here

(-)pkg-plist (-29 / +29 lines)
33	bin/vasmppc_oldstyle	33	bin/vasmppc_oldstyle
34	bin/vasmppc_std	34	bin/vasmppc_std
35	bin/vasmppc_test	35	bin/vasmppc_test
36	bin/vasmtest_madmac	36	bin/vasmqnice_madmac
37	bin/vasmtest_mot	37	bin/vasmqnice_mot
38	bin/vasmtest_oldstyle	38	bin/vasmqnice_oldstyle
39	bin/vasmtest_std	39	bin/vasmqnice_std
40	bin/vasmtest_test	40	bin/vasmqnice_test
41	bin/vasmtr3200_madmac	41	bin/vasmtr3200_madmac
42	bin/vasmtr3200_mot	42	bin/vasmtr3200_mot
43	bin/vasmtr3200_oldstyle	43	bin/vasmtr3200_oldstyle
Lines 59-85 Link Here
59	bin/vasmz80_std	59	bin/vasmz80_std
60	bin/vasmz80_test	60	bin/vasmz80_test
61	bin/vobjdump	61	bin/vobjdump
62	%%PORTDOCS%%%%DOCSDIR%%/cpu_6502.texi	62	%%PORTDOCS%%%%DOCSDIR%%/cpu_6502
63	%%PORTDOCS%%%%DOCSDIR%%/cpu_6800.texi	63	%%PORTDOCS%%%%DOCSDIR%%/cpu_6800
64	%%PORTDOCS%%%%DOCSDIR%%/cpu_arm.texi	64	%%PORTDOCS%%%%DOCSDIR%%/cpu_arm
65	%%PORTDOCS%%%%DOCSDIR%%/cpu_c16x.texi	65	%%PORTDOCS%%%%DOCSDIR%%/cpu_c16x
66	%%PORTDOCS%%%%DOCSDIR%%/cpu_jagrisc.texi	66	%%PORTDOCS%%%%DOCSDIR%%/cpu_jagrisc
67	%%PORTDOCS%%%%DOCSDIR%%/cpu_m68k.texi	67	%%PORTDOCS%%%%DOCSDIR%%/cpu_m68k
68	%%PORTDOCS%%%%DOCSDIR%%/cpu_ppc.texi	68	%%PORTDOCS%%%%DOCSDIR%%/cpu_ppc
69	%%PORTDOCS%%%%DOCSDIR%%/cpu_tr3200.texi	69	%%PORTDOCS%%%%DOCSDIR%%/cpu_tr3200
70	%%PORTDOCS%%%%DOCSDIR%%/cpu_x86.texi	70	%%PORTDOCS%%%%DOCSDIR%%/cpu_x86
71	%%PORTDOCS%%%%DOCSDIR%%/cpu_z80.texi	71	%%PORTDOCS%%%%DOCSDIR%%/cpu_z80
72	%%PORTDOCS%%%%DOCSDIR%%/interface.texi	72	%%PORTDOCS%%%%DOCSDIR%%/interface
73	%%PORTDOCS%%%%DOCSDIR%%/output_aout.texi	73	%%PORTDOCS%%%%DOCSDIR%%/output_aout
74	%%PORTDOCS%%%%DOCSDIR%%/output_bin.texi	74	%%PORTDOCS%%%%DOCSDIR%%/output_bin
75	%%PORTDOCS%%%%DOCSDIR%%/output_elf.texi	75	%%PORTDOCS%%%%DOCSDIR%%/output_elf
76	%%PORTDOCS%%%%DOCSDIR%%/output_hunk.texi	76	%%PORTDOCS%%%%DOCSDIR%%/output_hunk
77	%%PORTDOCS%%%%DOCSDIR%%/output_test.texi	77	%%PORTDOCS%%%%DOCSDIR%%/output_test
78	%%PORTDOCS%%%%DOCSDIR%%/output_tos.texi	78	%%PORTDOCS%%%%DOCSDIR%%/output_tos
79	%%PORTDOCS%%%%DOCSDIR%%/output_vobj.texi	79	%%PORTDOCS%%%%DOCSDIR%%/output_vobj
80	%%PORTDOCS%%%%DOCSDIR%%/syntax_madmac.texi	80	%%PORTDOCS%%%%DOCSDIR%%/syntax_madmac
81	%%PORTDOCS%%%%DOCSDIR%%/syntax_mot.texi	81	%%PORTDOCS%%%%DOCSDIR%%/syntax_mot
82	%%PORTDOCS%%%%DOCSDIR%%/syntax_oldstyle.texi	82	%%PORTDOCS%%%%DOCSDIR%%/syntax_oldstyle
83	%%PORTDOCS%%%%DOCSDIR%%/syntax_std.texi	83	%%PORTDOCS%%%%DOCSDIR%%/syntax_std
84	%%PORTDOCS%%%%DOCSDIR%%/vasm.texi	84	%%PORTDOCS%%%%DOCSDIR%%/vasm
85	%%PORTDOCS%%%%DOCSDIR%%/vasm_main.texi	85	%%PORTDOCS%%%%DOCSDIR%%/vasm_main