View | Details | Raw Unified | Return to bug 219741 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-19 / +30 lines)
Lines 2-33 Link Here
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
14
12
15
LEGAL_TEXT=	This archive may be redistributed without modifications and used for non-commercial purposes.
13
LICENSE=	VASMBSD
14
LICENSE_NAME=	vasm license for FreeBSD
15
LICENSE_TEXT=	vasm comes with its own license. The source archive may be redistributed \
16
		without modifications and used for non-commercial purposes. \
17
		Binary packages are distributed with permission of the author by FreeBSD
18
LICENSE_PERMS=	dist-mirror no-dist-sell pkg-mirror no-pkg-sell auto-accept
16
19
17
USES=		gmake pathfix
20
USES=		gmake pathfix
18
WRKSRC=		${WRKDIR}/vasm
21
WRKSRC=		${WRKDIR}/vasm
19
22
20
CPU_LIST=	6502 6800 arm c16x jagrisc m68k ppc test tr3200 vidcore x86 z80
23
OPTIONS_DEFINE=	DOCS
24
OPTIONS_DEFAULT=	DOCS
25
DOCS_USES=	makeinfo
26
27
CPU_LIST=	6502 6800 arm c16x jagrisc m68k ppc qnice tr3200 vidcore x86 z80
21
SYNTAX_LIST=	std madmac mot oldstyle test
28
SYNTAX_LIST=	std madmac mot oldstyle test
22
OUTPUT_LIST=	aout bin elf hunk test tos vobj
29
OUTPUT_LIST=	aout bin elf hunk test tos vobj
30
DOC_LIST=	cpu_6502 cpu_jagrisc cpu_x86 output_bin output_test syntax_mot vasm_main \
31
		cpu_6800 cpu_m68k cpu_z80 output_elf output_tos syntax_oldstyle cpu_arm \
32
		cpu_ppc interface output_hunk output_vobj syntax_std cpu_c16x cpu_tr3200 \
33
		output_aout output_srec syntax_madmac vasm
23
34
35
.include <bsd.port.options.mk>
36
24
do-build:
37
do-build:
25
.for CPU in ${CPU_LIST}
38
.for CPU in ${CPU_LIST}
26
.for SYNTAX in ${SYNTAX_LIST}
39
.for SYNTAX in ${SYNTAX_LIST}
27
	${GMAKE} -C ${WRKSRC} CC=${CC} CPU=${CPU} SYNTAX=${SYNTAX} >/dev/null 2>&1
40
	${GMAKE} -C ${WRKSRC} CC=${CC} CPU=${CPU} SYNTAX=${SYNTAX}
28
.endfor
41
.endfor
29
.endfor
42
.endfor
30
43
44
do-build-DOCS-on:
45
.for DOC in ${DOC_LIST}
46
	makeinfo --plaintext --force --no-validate ${WRKSRC}/doc/${DOC}.texi -o ${WRKSRC}/doc/${DOC}
47
.endfor
48
31
do-install:
49
do-install:
32
	${INSTALL_PROGRAM} ${WRKSRC}/vobjdump ${STAGEDIR}${PREFIX}/bin
50
	${INSTALL_PROGRAM} ${WRKSRC}/vobjdump ${STAGEDIR}${PREFIX}/bin
33
.for CPU in ${CPU_LIST}
51
.for CPU in ${CPU_LIST}
Lines 35-52 Link Here
35
	${INSTALL_PROGRAM} ${WRKSRC}/vasm${CPU}_${SYNTAX} ${STAGEDIR}${PREFIX}/bin
53
	${INSTALL_PROGRAM} ${WRKSRC}/vasm${CPU}_${SYNTAX} ${STAGEDIR}${PREFIX}/bin
36
.endfor
54
.endfor
37
.endfor
55
.endfor
56
57
do-install-DOCS-on:
38
	${MKDIR} ${STAGEDIR}${DOCSDIR}
58
	${MKDIR} ${STAGEDIR}${DOCSDIR}
39
.for CPU in ${CPU_LIST}
59
.for DOC in ${DOC_LIST}
40
.for SYNTAX in ${SYNTAX_LIST}
60
	${INSTALL_MAN} ${WRKSRC}/doc/${DOC} ${STAGEDIR}${DOCSDIR}
41
	-test -f ${WRKSRC}/doc/cpu_${CPU}.texi && ${INSTALL_MAN} ${WRKSRC}/doc/cpu_${CPU}.texi ${STAGEDIR}${DOCSDIR}
42
	-test -f ${WRKSRC}/doc/syntax_${SYNTAX}.texi && ${INSTALL_MAN} ${WRKSRC}/doc/syntax_${SYNTAX}.texi ${STAGEDIR}${DOCSDIR}
43
.for OUTPUT in ${OUTPUT_LIST}
44
	-test -f ${WRKSRC}/doc/output_${OUTPUT}.texi && ${INSTALL_MAN} ${WRKSRC}/doc/output_${OUTPUT}.texi ${STAGEDIR}${DOCSDIR}
45
.endfor
61
.endfor
46
.endfor
47
.endfor
48
	${INSTALL_MAN} ${WRKSRC}/doc/vasm.texi ${STAGEDIR}${DOCSDIR}
49
	${INSTALL_MAN} ${WRKSRC}/doc/vasm_main.texi ${STAGEDIR}${DOCSDIR}
50
	${INSTALL_MAN} ${WRKSRC}/doc/interface.texi ${STAGEDIR}${DOCSDIR}
51
62
52
.include <bsd.port.mk>
63
.include <bsd.port.mk>
(-)distinfo (-3 / +3 lines)
Lines 1-3 Link Here
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
(-)files/patch-Makefile (+11 lines)
Line 0 Link Here
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)
(-)pkg-descr (-8 / +8 lines)
Lines 1-9 Link Here
1
vasm is a portable and retargetable assembler to create linkable
1
vasm is a portable and retargetable assembler to create linkable objects in
2
objects in various formats or absolute code.
2
various formats or absolute code.
3
Multiple CPU-, syntax and output-modules can be selected.
4
3
5
Currently the following CPUs are officially supported by vasm:
4
Currently the following CPUs are officially supported:
6
7
    M680x0 family (including M6888x, M68851 and CPU32)
5
    M680x0 family (including M6888x, M68851 and CPU32)
8
    ColdFire family (all models of V2, V3, V4, V4e)
6
    ColdFire family (all models of V2, V3, V4, V4e)
9
    80x86 family (IA32 8/16/32 bit, using MIT-syntax)
7
    80x86 family (IA32 8/16/32 bit, using MIT-syntax)
Lines 12-24 Link Here
12
    Jaguar RISC (GPU and DSP instruction sets)
10
    Jaguar RISC (GPU and DSP instruction sets)
13
    Z80 family (Z80, 8080, GBZ80, 64180, RCM2/3/4k)
11
    Z80 family (Z80, 8080, GBZ80, 64180, RCM2/3/4k)
14
    C16x/ST10
12
    C16x/ST10
15
    6502 family
13
    6502 & 6800 family (6800, 6801, 6803, 68HC11)
16
    6800 family (6800, 6801, 6803, 68HC11)
14
    QNICE (elegant 16-bit FPGA CPU)
15
    TR3200 (virtual CPU from 0x10c)
16
    Raspberry-Pi VideoCore IV
17
17
18
These syntax flavours are supported:
18
These syntax flavours are supported:
19
20
    Standard MIT (GNU-as style) syntax
19
    Standard MIT (GNU-as style) syntax
21
    Motorola/Freescale 68k syntax (Devpac compatible)
20
    Motorola/Freescale 68k syntax (Devpac compatible)
21
    Atari MadMac syntax (6502, 68k, Jaguar)
22
    Old 8-bit style syntax
22
    Old 8-bit style syntax
23
23
24
WWW: http://sun.hasenbraten.de/vasm/
24
WWW: http://sun.hasenbraten.de/vasm/
(-)pkg-plist (-29 / +30 lines)
Lines 33-43 Link Here
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_srec
78
%%PORTDOCS%%%%DOCSDIR%%/output_tos.texi
78
%%PORTDOCS%%%%DOCSDIR%%/output_test
79
%%PORTDOCS%%%%DOCSDIR%%/output_vobj.texi
79
%%PORTDOCS%%%%DOCSDIR%%/output_tos
80
%%PORTDOCS%%%%DOCSDIR%%/syntax_madmac.texi
80
%%PORTDOCS%%%%DOCSDIR%%/output_vobj
81
%%PORTDOCS%%%%DOCSDIR%%/syntax_mot.texi
81
%%PORTDOCS%%%%DOCSDIR%%/syntax_madmac
82
%%PORTDOCS%%%%DOCSDIR%%/syntax_oldstyle.texi
82
%%PORTDOCS%%%%DOCSDIR%%/syntax_mot
83
%%PORTDOCS%%%%DOCSDIR%%/syntax_std.texi
83
%%PORTDOCS%%%%DOCSDIR%%/syntax_oldstyle
84
%%PORTDOCS%%%%DOCSDIR%%/vasm.texi
84
%%PORTDOCS%%%%DOCSDIR%%/syntax_std
85
%%PORTDOCS%%%%DOCSDIR%%/vasm_main.texi
85
%%PORTDOCS%%%%DOCSDIR%%/vasm
86
%%PORTDOCS%%%%DOCSDIR%%/vasm_main

Return to bug 219741