CVS commit: pkgsrc/devel/acme

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/devel/acme
From: "Olaf Seibert" <rhialto%netbsd.org@localhost>
Date: Sat, 19 Mar 2022 16:53:28 +0000

Module Name:    pkgsrc
Committed By:   rhialto
Date:           Sat Mar 19 16:53:28 UTC 2022

Modified Files:
        pkgsrc/devel/acme: Makefile PLIST distinfo
        pkgsrc/devel/acme/patches: patch-aa patch-ab

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 pkgsrc/devel/acme/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/acme/PLIST
cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/acme/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/acme/patches/patch-aa \
    pkgsrc/devel/acme/patches/patch-ab

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/acme/Makefile
diff -u pkgsrc/devel/acme/Makefile:1.17 pkgsrc/devel/acme/Makefile:1.18
--- pkgsrc/devel/acme/Makefile:1.17     Sun Apr 12 19:52:40 2020
+++ pkgsrc/devel/acme/Makefile  Sat Mar 19 16:53:28 2022
@@ -1,13 +1,11 @@
-# $NetBSD: Makefile,v 1.17 2020/04/12 19:52:40 joerg Exp $
+# $NetBSD: Makefile,v 1.18 2022/03/19 16:53:28 rhialto Exp $
 #
 
-DISTNAME=              acme091src
-PKGNAME=               acme-0.91
-CATEGORIES=            devel
-MASTER_SITES=          http://www.esw-heim.tu-clausthal.de/~marco/smorbrod/acme/current/
-DISTFILES=             ${DISTNAME}${EXTRACT_SUFX} ${LIBDIST}
-EXTRACT_ONLY=          ${DISTNAME}${EXTRACT_SUFX}
-SITES.${LIBDIST}=      http://www.esw-heim.tu-clausthal.de/~marco/smorbrod/acme/
+DISTNAME=      acme-crossass-code-0-r323-trunk
+PKGNAME=       acme-0.97.0.0.323
+CATEGORIES=    devel
+MASTER_SITES=  https://sourceforge.net/code-snapshots/svn/a/ac/acme-crossass/code-0/
+EXTRACT_SUFX=  .zip
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://sourceforge.net/projects/acme-crossass/
@@ -16,8 +14,7 @@ LICENSE=      gnu-gpl-v2
 
 USE_TOOLS+=    pax unzip
 
-LIBDIST=       ACME_Lib2.zip
-WRKSRC=                ${WRKDIR}/acme091
+WRKSRC=                ${WRKDIR}/${DISTNAME}
 BUILD_DIRS=    src
 
 ACME_LIB=      ${PREFIX}/share/acme
@@ -27,13 +24,10 @@ INSTALLATION_DIRS=  bin
 INSTALLATION_DIRS+=    share/acme
 INSTALLATION_DIRS+=    share/doc/acme
 
-post-extract:
-       cd ${WRKDIR} && unzip -qa ${_DISTDIR}/${LIBDIST}
-
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/src/acme ${DESTDIR}${PREFIX}/bin/acme
-       ${INSTALL_DATA} ${WRKSRC}/docs/* ${DESTDIR}${PREFIX}/share/doc/acme
-       cd ${WRKDIR}/ACME_Lib && pax -rw . ${DESTDIR}${ACME_LIB}
+       cd ${WRKSRC}/docs && pax -rw . ${DESTDIR}${PREFIX}/share/doc/acme
+       cd ${WRKSRC}/ACME_Lib && pax -rw . ${DESTDIR}${ACME_LIB}
 
 .include "../../mk/bsd.prefs.mk"
 

Index: pkgsrc/devel/acme/PLIST
diff -u pkgsrc/devel/acme/PLIST:1.3 pkgsrc/devel/acme/PLIST:1.4
--- pkgsrc/devel/acme/PLIST:1.3 Wed Dec 12 10:12:16 2012
+++ pkgsrc/devel/acme/PLIST     Sat Mar 19 16:53:28 2022
@@ -1,27 +1,52 @@
-@comment $NetBSD: PLIST,v 1.3 2012/12/12 10:12:16 wiz Exp $
+@comment $NetBSD: PLIST,v 1.4 2022/03/19 16:53:28 rhialto Exp $
 bin/acme
-share/acme/6502/Help.txt
+share/acme/6502/opcodes.a
+share/acme/6502/rc4.a
+share/acme/6502/split.a
 share/acme/6502/std.a
-share/acme/65816/Help.txt
-share/acme/65816/scpu.a
 share/acme/65816/std.a
-share/acme/Acorn/Help.txt
-share/acme/Atari/Help.txt
-share/acme/C128/BASIC7.a
-share/acme/C128/Help.txt
-share/acme/C128/kernel.a
-share/acme/C128/mmu.a
-share/acme/C128/petscii.a
-share/acme/C128/vdc.a
-share/acme/C128/zeropage.a
-share/acme/C64/BASIC2.a
-share/acme/C64/Help.txt
-share/acme/C64/cia1.a
-share/acme/C64/cia2.a
-share/acme/C64/kernel.a
-share/acme/C64/petscii.a
-share/acme/C64/vic.a
-share/acme/Own/Help.txt
+share/acme/apple ii/convtab.bin
+share/acme/cbm/264/basic.a
+share/acme/cbm/264/petscii.a
+share/acme/cbm/264/ted.a
+share/acme/cbm/baserror.a
+share/acme/cbm/basic1.a
+share/acme/cbm/basic10.a
+share/acme/cbm/basic2.a
+share/acme/cbm/basic3.5.a
+share/acme/cbm/basic4.a
+share/acme/cbm/basic7.a
+share/acme/cbm/c128/basic.a
+share/acme/cbm/c128/kernal.a
+share/acme/cbm/c128/kernel.a
+share/acme/cbm/c128/mmu.a
+share/acme/cbm/c128/petscii.a
+share/acme/cbm/c128/vdc.a
+share/acme/cbm/c128/vic.a
+share/acme/cbm/c128/zeropage.a
+share/acme/cbm/c64/basic.a
+share/acme/cbm/c64/cia1.a
+share/acme/cbm/c64/cia2.a
+share/acme/cbm/c64/float.a
+share/acme/cbm/c64/georam.a
+share/acme/cbm/c64/kernal.a
+share/acme/cbm/c64/kernel.a
+share/acme/cbm/c64/memcopy.a
+share/acme/cbm/c64/petscii.a
+share/acme/cbm/c64/reu.a
+share/acme/cbm/c64/sid.a
+share/acme/cbm/c64/vic.a
+share/acme/cbm/c65/basic.a
+share/acme/cbm/cia.a
+share/acme/cbm/flpt.a
+share/acme/cbm/ioerror.a
+share/acme/cbm/kernal.a
+share/acme/cbm/kernel.a
+share/acme/cbm/mflpt.a
+share/acme/cbm/msbstring.a
+share/acme/cbm/multicolor.a
+share/acme/cbm/petscii.a
+share/acme/m65/std.a
 share/doc/acme/65816.txt
 share/doc/acme/AddrModes.txt
 share/doc/acme/AllPOs.txt
@@ -29,9 +54,20 @@ share/doc/acme/COPYING
 share/doc/acme/Changes.txt
 share/doc/acme/Errors.txt
 share/doc/acme/Example.txt
+share/doc/acme/Floats.txt
 share/doc/acme/Help.txt
 share/doc/acme/Illegals.txt
 share/doc/acme/Lib.txt
 share/doc/acme/QuickRef.txt
 share/doc/acme/Source.txt
 share/doc/acme/Upgrade.txt
+share/doc/acme/cputypes/all.txt
+share/doc/acme/cputypes/cpu 4502.txt
+share/doc/acme/cputypes/cpu 6502.txt
+share/doc/acme/cputypes/cpu 65816.txt
+share/doc/acme/cputypes/cpu 65c02.txt
+share/doc/acme/cputypes/cpu 65ce02.txt
+share/doc/acme/cputypes/cpu m65.txt
+share/doc/acme/cputypes/cpu nmos6502.txt
+share/doc/acme/cputypes/cpu r65c02.txt
+share/doc/acme/cputypes/cpu w65c02.txt

Index: pkgsrc/devel/acme/distinfo
diff -u pkgsrc/devel/acme/distinfo:1.7 pkgsrc/devel/acme/distinfo:1.8
--- pkgsrc/devel/acme/distinfo:1.7      Tue Oct 26 10:14:12 2021
+++ pkgsrc/devel/acme/distinfo  Sat Mar 19 16:53:28 2022
@@ -1,10 +1,7 @@
-$NetBSD: distinfo,v 1.7 2021/10/26 10:14:12 nia Exp $
+$NetBSD: distinfo,v 1.8 2022/03/19 16:53:28 rhialto Exp $
 
-BLAKE2s (acme091src.tar.gz) = 831ab2973b98e40c840aa4fec95f1bc4fcf71c802604e35d4719e9aa6ef5e5bd
-SHA512 (acme091src.tar.gz) = fe68ad1e8a77a520490484624e38d8eb251109efdba22cf8c8bc7d50ffa52e38d37a25726d7cfa3d7f49b278bc2cc6c004408522d67187453de55842e92c7534
-Size (acme091src.tar.gz) = 131953 bytes
-BLAKE2s (ACME_Lib2.zip) = bfab6b820ca353f72234f05613c08804a408e32f9556aeda508d65089a6b60f4
-SHA512 (ACME_Lib2.zip) = e61fa0777008e7424fa0b6b9b46de996ea27e85bc6f0120d4b743777ffae448fe81cf7489a5c1db88e72e0e2e701ecb7d33cccfe159864b09afec7e68c44b383
-Size (ACME_Lib2.zip) = 18197 bytes
-SHA1 (patch-aa) = bd08ee3c226d758080aa2c9f4094c668ab5c9105
-SHA1 (patch-ab) = 4491111185dc1502a6424f5efbe352e181117df4
+BLAKE2s (acme-crossass-code-0-r323-trunk.zip) = d2a2fbddc614dff1c55bdd6f9e56bef532da2d45fffd655e4afcdb65e3555198
+SHA512 (acme-crossass-code-0-r323-trunk.zip) = 841fe52c5c13228bacc52f25b7802193864ef6c6f7349ed84d8e4b39c076a1117d93828dec2fd30a2a57116a0308abce73ebc3b7b6a0118e3f5dfb5a10250435
+Size (acme-crossass-code-0-r323-trunk.zip) = 613411 bytes
+SHA1 (patch-aa) = caec06051fb65d13e97e6489bb8b74bbd80fb82a
+SHA1 (patch-ab) = 4b82aa131e513953fd404f4b9f025fb0b16d4c14

Index: pkgsrc/devel/acme/patches/patch-aa
diff -u pkgsrc/devel/acme/patches/patch-aa:1.2 pkgsrc/devel/acme/patches/patch-aa:1.3
--- pkgsrc/devel/acme/patches/patch-aa:1.2      Wed Dec 12 10:12:16 2012
+++ pkgsrc/devel/acme/patches/patch-aa  Sat Mar 19 16:53:28 2022
@@ -1,11 +1,16 @@
-$NetBSD: patch-aa,v 1.2 2012/12/12 10:12:16 wiz Exp $
+$NetBSD: patch-aa,v 1.3 2022/03/19 16:53:28 rhialto Exp $
 
---- src/Makefile.orig  2006-03-26 18:10:54.000000000 +0300
-+++ src/Makefile       2011-03-17 10:54:04.000000000 +0200
-@@ -1,12 +1,12 @@
--CFLAGS                = -O3 -Wall
-+CFLAGS+=      -DDEFAULT_ACME_LIB=\"${ACME_LIB}/\"
- #LIBS         = -lm
+- Use our own CFLAGS, CC, RM, BINDIR
+- Add the default library location
+
+--- src/Makefile.orig  2020-10-21 16:36:03.000000000 +0000
++++ src/Makefile
+@@ -1,13 +1,14 @@
+-CFLAGS                = -O3 -Wall -Wstrict-prototypes
++#CFLAGS               = -O3 -Wall -Wstrict-prototypes
+ #CFLAGS               = -O3 -Wall -Wextra -Wstrict-prototypes
++CFLAGS+=       -DDEFAULT_ACME_LIB=\"${ACME_LIB}/\"
+ LIBS          = -lm
 -CC            = gcc
 -RM            = rm
 +#CC           = gcc
@@ -17,5 +22,5 @@ $NetBSD: patch-aa,v 1.2 2012/12/12 10:12
 -BINDIR                = /usr/local/bin
 +BINDIR                = $(PREFIX)/bin
  USERBIN               = $(HOME)/bin
+ 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
  
- all: $(PROGS)
Index: pkgsrc/devel/acme/patches/patch-ab
diff -u pkgsrc/devel/acme/patches/patch-ab:1.2 pkgsrc/devel/acme/patches/patch-ab:1.3
--- pkgsrc/devel/acme/patches/patch-ab:1.2      Wed Dec 12 10:12:16 2012
+++ pkgsrc/devel/acme/patches/patch-ab  Sat Mar 19 16:53:28 2022
@@ -1,13 +1,15 @@
-$NetBSD: patch-ab,v 1.2 2012/12/12 10:12:16 wiz Exp $
+$NetBSD: patch-ab,v 1.3 2022/03/19 16:53:28 rhialto Exp $
 
---- src/_std.c.orig    2006-03-26 20:37:02.000000000 +0300
-+++ src/_std.c 2011-03-17 10:27:51.000000000 +0200
+- Use the default library location
+
+--- src/_std.c.orig    2016-12-28 20:32:00.000000000 +0000
++++ src/_std.c
 @@ -12,7 +12,7 @@
  
  
- // Variables
+ // variables
 -char  *AnyOS_lib_prefix       = NULL; // header string of library tree
 +char  *AnyOS_lib_prefix       = DEFAULT_ACME_LIB;     // header string of library tree
  
  
- // Functions
+ // used as PLATFORM_INIT: reads "ACME" environment variable

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index