Sat Mar 19 16:53:28 2022 UTC ()
devel/acme: update ancient version to 0.97 plus recent commits

Changes in the installed share/doc/acme/Changes.txt file but no dates are
mentioned.
There are now more assembly library files.
Original MASTER_SITE no longer available, so rely on a SourceForge snapshot
file.


(rhialto)
diff -r1.17 -r1.18 pkgsrc/devel/acme/Makefile
diff -r1.3 -r1.4 pkgsrc/devel/acme/PLIST
diff -r1.7 -r1.8 pkgsrc/devel/acme/distinfo
diff -r1.2 -r1.3 pkgsrc/devel/acme/patches/patch-aa
diff -r1.2 -r1.3 pkgsrc/devel/acme/patches/patch-ab
cvs diff -r1.17 -r1.18 pkgsrc/devel/acme/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/acme/Makefile 2020/04/12 19:52:40 1.17
+++ pkgsrc/devel/acme/Makefile 2022/03/19 16:53:28 1.18
@@ -1,45 +1,39 @@ @@ -1,45 +1,39 @@
1# $NetBSD: Makefile,v 1.17 2020/04/12 19:52:40 joerg Exp $ 1# $NetBSD: Makefile,v 1.18 2022/03/19 16:53:28 rhialto Exp $
2# 2#
3 3
4DISTNAME= acme091src 4DISTNAME= acme-crossass-code-0-r323-trunk
5PKGNAME= acme-0.91 5PKGNAME= acme-0.97.0.0.323
6CATEGORIES= devel 6CATEGORIES= devel
7MASTER_SITES= http://www.esw-heim.tu-clausthal.de/~marco/smorbrod/acme/current/ 7MASTER_SITES= https://sourceforge.net/code-snapshots/svn/a/ac/acme-crossass/code-0/
8DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${LIBDIST} 8EXTRACT_SUFX= .zip
9EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} 
10SITES.${LIBDIST}= http://www.esw-heim.tu-clausthal.de/~marco/smorbrod/acme/ 
11 9
12MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
13HOMEPAGE= https://sourceforge.net/projects/acme-crossass/ 11HOMEPAGE= https://sourceforge.net/projects/acme-crossass/
14COMMENT= Cross assembler for 6502, 65c02, and 65816 12COMMENT= Cross assembler for 6502, 65c02, and 65816
15LICENSE= gnu-gpl-v2 13LICENSE= gnu-gpl-v2
16 14
17USE_TOOLS+= pax unzip 15USE_TOOLS+= pax unzip
18 16
19LIBDIST= ACME_Lib2.zip 17WRKSRC= ${WRKDIR}/${DISTNAME}
20WRKSRC= ${WRKDIR}/acme091 
21BUILD_DIRS= src 18BUILD_DIRS= src
22 19
23ACME_LIB= ${PREFIX}/share/acme 20ACME_LIB= ${PREFIX}/share/acme
24MAKE_ENV+= ACME_LIB=${ACME_LIB:Q} 21MAKE_ENV+= ACME_LIB=${ACME_LIB:Q}
25 22
26INSTALLATION_DIRS= bin 23INSTALLATION_DIRS= bin
27INSTALLATION_DIRS+= share/acme 24INSTALLATION_DIRS+= share/acme
28INSTALLATION_DIRS+= share/doc/acme 25INSTALLATION_DIRS+= share/doc/acme
29 26
30post-extract: 
31 cd ${WRKDIR} && unzip -qa ${_DISTDIR}/${LIBDIST} 
32 
33do-install: 27do-install:
34 ${INSTALL_PROGRAM} ${WRKSRC}/src/acme ${DESTDIR}${PREFIX}/bin/acme 28 ${INSTALL_PROGRAM} ${WRKSRC}/src/acme ${DESTDIR}${PREFIX}/bin/acme
35 ${INSTALL_DATA} ${WRKSRC}/docs/* ${DESTDIR}${PREFIX}/share/doc/acme 29 cd ${WRKSRC}/docs && pax -rw . ${DESTDIR}${PREFIX}/share/doc/acme
36 cd ${WRKDIR}/ACME_Lib && pax -rw . ${DESTDIR}${ACME_LIB} 30 cd ${WRKSRC}/ACME_Lib && pax -rw . ${DESTDIR}${ACME_LIB}
37 31
38.include "../../mk/bsd.prefs.mk" 32.include "../../mk/bsd.prefs.mk"
39 33
40.if ${OPSYS} == "NetBSD" 34.if ${OPSYS} == "NetBSD"
41# Extra data overflow: Need 24 bytes but only found 20 bytes 35# Extra data overflow: Need 24 bytes but only found 20 bytes
42TOOLS_PLATFORM.unzip= 36TOOLS_PLATFORM.unzip=
43.endif 37.endif
44 38
45.include "../../mk/bsd.pkg.mk" 39.include "../../mk/bsd.pkg.mk"
cvs diff -r1.3 -r1.4 pkgsrc/devel/acme/PLIST (expand / switch to unified diff)

--- pkgsrc/devel/acme/PLIST 2012/12/12 10:12:16 1.3
+++ pkgsrc/devel/acme/PLIST 2022/03/19 16:53:28 1.4
@@ -1,37 +1,73 @@ @@ -1,37 +1,73 @@
1@comment $NetBSD: PLIST,v 1.3 2012/12/12 10:12:16 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.4 2022/03/19 16:53:28 rhialto Exp $
2bin/acme 2bin/acme
3share/acme/6502/Help.txt 3share/acme/6502/opcodes.a
 4share/acme/6502/rc4.a
 5share/acme/6502/split.a
4share/acme/6502/std.a 6share/acme/6502/std.a
5share/acme/65816/Help.txt 
6share/acme/65816/scpu.a 
7share/acme/65816/std.a 7share/acme/65816/std.a
8share/acme/Acorn/Help.txt 8share/acme/apple ii/convtab.bin
9share/acme/Atari/Help.txt 9share/acme/cbm/264/basic.a
10share/acme/C128/BASIC7.a 10share/acme/cbm/264/petscii.a
11share/acme/C128/Help.txt 11share/acme/cbm/264/ted.a
12share/acme/C128/kernel.a 12share/acme/cbm/baserror.a
13share/acme/C128/mmu.a 13share/acme/cbm/basic1.a
14share/acme/C128/petscii.a 14share/acme/cbm/basic10.a
15share/acme/C128/vdc.a 15share/acme/cbm/basic2.a
16share/acme/C128/zeropage.a 16share/acme/cbm/basic3.5.a
17share/acme/C64/BASIC2.a 17share/acme/cbm/basic4.a
18share/acme/C64/Help.txt 18share/acme/cbm/basic7.a
19share/acme/C64/cia1.a 19share/acme/cbm/c128/basic.a
20share/acme/C64/cia2.a 20share/acme/cbm/c128/kernal.a
21share/acme/C64/kernel.a 21share/acme/cbm/c128/kernel.a
22share/acme/C64/petscii.a 22share/acme/cbm/c128/mmu.a
23share/acme/C64/vic.a 23share/acme/cbm/c128/petscii.a
24share/acme/Own/Help.txt 24share/acme/cbm/c128/vdc.a
 25share/acme/cbm/c128/vic.a
 26share/acme/cbm/c128/zeropage.a
 27share/acme/cbm/c64/basic.a
 28share/acme/cbm/c64/cia1.a
 29share/acme/cbm/c64/cia2.a
 30share/acme/cbm/c64/float.a
 31share/acme/cbm/c64/georam.a
 32share/acme/cbm/c64/kernal.a
 33share/acme/cbm/c64/kernel.a
 34share/acme/cbm/c64/memcopy.a
 35share/acme/cbm/c64/petscii.a
 36share/acme/cbm/c64/reu.a
 37share/acme/cbm/c64/sid.a
 38share/acme/cbm/c64/vic.a
 39share/acme/cbm/c65/basic.a
 40share/acme/cbm/cia.a
 41share/acme/cbm/flpt.a
 42share/acme/cbm/ioerror.a
 43share/acme/cbm/kernal.a
 44share/acme/cbm/kernel.a
 45share/acme/cbm/mflpt.a
 46share/acme/cbm/msbstring.a
 47share/acme/cbm/multicolor.a
 48share/acme/cbm/petscii.a
 49share/acme/m65/std.a
25share/doc/acme/65816.txt 50share/doc/acme/65816.txt
26share/doc/acme/AddrModes.txt 51share/doc/acme/AddrModes.txt
27share/doc/acme/AllPOs.txt 52share/doc/acme/AllPOs.txt
28share/doc/acme/COPYING 53share/doc/acme/COPYING
29share/doc/acme/Changes.txt 54share/doc/acme/Changes.txt
30share/doc/acme/Errors.txt 55share/doc/acme/Errors.txt
31share/doc/acme/Example.txt 56share/doc/acme/Example.txt
 57share/doc/acme/Floats.txt
32share/doc/acme/Help.txt 58share/doc/acme/Help.txt
33share/doc/acme/Illegals.txt 59share/doc/acme/Illegals.txt
34share/doc/acme/Lib.txt 60share/doc/acme/Lib.txt
35share/doc/acme/QuickRef.txt 61share/doc/acme/QuickRef.txt
36share/doc/acme/Source.txt 62share/doc/acme/Source.txt
37share/doc/acme/Upgrade.txt 63share/doc/acme/Upgrade.txt
 64share/doc/acme/cputypes/all.txt
 65share/doc/acme/cputypes/cpu 4502.txt
 66share/doc/acme/cputypes/cpu 6502.txt
 67share/doc/acme/cputypes/cpu 65816.txt
 68share/doc/acme/cputypes/cpu 65c02.txt
 69share/doc/acme/cputypes/cpu 65ce02.txt
 70share/doc/acme/cputypes/cpu m65.txt
 71share/doc/acme/cputypes/cpu nmos6502.txt
 72share/doc/acme/cputypes/cpu r65c02.txt
 73share/doc/acme/cputypes/cpu w65c02.txt
cvs diff -r1.7 -r1.8 pkgsrc/devel/acme/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/acme/distinfo 2021/10/26 10:14:12 1.7
+++ pkgsrc/devel/acme/distinfo 2022/03/19 16:53:28 1.8
@@ -1,10 +1,7 @@ @@ -1,10 +1,7 @@
1$NetBSD: distinfo,v 1.7 2021/10/26 10:14:12 nia Exp $ 1$NetBSD: distinfo,v 1.8 2022/03/19 16:53:28 rhialto Exp $
2 2
3BLAKE2s (acme091src.tar.gz) = 831ab2973b98e40c840aa4fec95f1bc4fcf71c802604e35d4719e9aa6ef5e5bd 3BLAKE2s (acme-crossass-code-0-r323-trunk.zip) = d2a2fbddc614dff1c55bdd6f9e56bef532da2d45fffd655e4afcdb65e3555198
4SHA512 (acme091src.tar.gz) = fe68ad1e8a77a520490484624e38d8eb251109efdba22cf8c8bc7d50ffa52e38d37a25726d7cfa3d7f49b278bc2cc6c004408522d67187453de55842e92c7534 4SHA512 (acme-crossass-code-0-r323-trunk.zip) = 841fe52c5c13228bacc52f25b7802193864ef6c6f7349ed84d8e4b39c076a1117d93828dec2fd30a2a57116a0308abce73ebc3b7b6a0118e3f5dfb5a10250435
5Size (acme091src.tar.gz) = 131953 bytes 5Size (acme-crossass-code-0-r323-trunk.zip) = 613411 bytes
6BLAKE2s (ACME_Lib2.zip) = bfab6b820ca353f72234f05613c08804a408e32f9556aeda508d65089a6b60f4 6SHA1 (patch-aa) = caec06051fb65d13e97e6489bb8b74bbd80fb82a
7SHA512 (ACME_Lib2.zip) = e61fa0777008e7424fa0b6b9b46de996ea27e85bc6f0120d4b743777ffae448fe81cf7489a5c1db88e72e0e2e701ecb7d33cccfe159864b09afec7e68c44b383 7SHA1 (patch-ab) = 4b82aa131e513953fd404f4b9f025fb0b16d4c14
8Size (ACME_Lib2.zip) = 18197 bytes 
9SHA1 (patch-aa) = bd08ee3c226d758080aa2c9f4094c668ab5c9105 
10SHA1 (patch-ab) = 4491111185dc1502a6424f5efbe352e181117df4 
cvs diff -r1.2 -r1.3 pkgsrc/devel/acme/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/devel/acme/patches/patch-aa 2012/12/12 10:12:16 1.2
+++ pkgsrc/devel/acme/patches/patch-aa 2022/03/19 16:53:28 1.3
@@ -1,21 +1,26 @@ @@ -1,21 +1,26 @@
1$NetBSD: patch-aa,v 1.2 2012/12/12 10:12:16 wiz Exp $ 1$NetBSD: patch-aa,v 1.3 2022/03/19 16:53:28 rhialto Exp $
2 2
3--- src/Makefile.orig 2006-03-26 18:10:54.000000000 +0300 3- Use our own CFLAGS, CC, RM, BINDIR
4+++ src/Makefile 2011-03-17 10:54:04.000000000 +0200 4- Add the default library location
5@@ -1,12 +1,12 @@ 5
6-CFLAGS = -O3 -Wall 6--- src/Makefile.orig 2020-10-21 16:36:03.000000000 +0000
7+CFLAGS+= -DDEFAULT_ACME_LIB=\"${ACME_LIB}/\" 7+++ src/Makefile
8 #LIBS = -lm 8@@ -1,13 +1,14 @@
 9-CFLAGS = -O3 -Wall -Wstrict-prototypes
 10+#CFLAGS = -O3 -Wall -Wstrict-prototypes
 11 #CFLAGS = -O3 -Wall -Wextra -Wstrict-prototypes
 12+CFLAGS+= -DDEFAULT_ACME_LIB=\"${ACME_LIB}/\"
 13 LIBS = -lm
9-CC = gcc 14-CC = gcc
10-RM = rm 15-RM = rm
11+#CC = gcc 16+#CC = gcc
12+#RM = rm 17+#RM = rm
13  18
14 #SRC = 19 #SRC =
15  20
16 PROGS = acme 21 PROGS = acme
17-BINDIR = /usr/local/bin 22-BINDIR = /usr/local/bin
18+BINDIR = $(PREFIX)/bin 23+BINDIR = $(PREFIX)/bin
19 USERBIN = $(HOME)/bin 24 USERBIN = $(HOME)/bin
 25 OBJS = acme.o alu.o cliargs.o cpu.o dynabuf.o encoding.o flow.o global.o input.o macro.o mnemo.o output.o platform.o pseudoopcodes.o section.o symbol.o tree.o typesystem.o
20  26
21 all: $(PROGS) 
cvs diff -r1.2 -r1.3 pkgsrc/devel/acme/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/devel/acme/patches/patch-ab 2012/12/12 10:12:16 1.2
+++ pkgsrc/devel/acme/patches/patch-ab 2022/03/19 16:53:28 1.3
@@ -1,13 +1,15 @@ @@ -1,13 +1,15 @@
1$NetBSD: patch-ab,v 1.2 2012/12/12 10:12:16 wiz Exp $ 1$NetBSD: patch-ab,v 1.3 2022/03/19 16:53:28 rhialto Exp $
2 2
3--- src/_std.c.orig 2006-03-26 20:37:02.000000000 +0300 3- Use the default library location
4+++ src/_std.c 2011-03-17 10:27:51.000000000 +0200 4
 5--- src/_std.c.orig 2016-12-28 20:32:00.000000000 +0000
 6+++ src/_std.c
5@@ -12,7 +12,7 @@ 7@@ -12,7 +12,7 @@
6  8
7  9
8 // Variables 10 // variables
9-char *AnyOS_lib_prefix = NULL; // header string of library tree 11-char *AnyOS_lib_prefix = NULL; // header string of library tree
10+char *AnyOS_lib_prefix = DEFAULT_ACME_LIB; // header string of library tree 12+char *AnyOS_lib_prefix = DEFAULT_ACME_LIB; // header string of library tree
11  13
12  14
13 // Functions 15 // used as PLATFORM_INIT: reads "ACME" environment variable