Updated to 2.3

4 files changed, 9 insertions, 161 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 689f9e6c4246..5aadf8fb985a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = z88dk
 	pkgdesc = Developement kit for Z80 computers
-	pkgver = 2.2
-	pkgrel = 2
+	pkgver = 2.3
+	pkgrel = 1
 	url = http://z88dk.org
 	arch = i686
 	arch = x86_64
@@ -17,13 +17,9 @@ pkgbase = z88dk
 	makedepends = dos2unix
 	depends = libxml2
 	backup = etc/profile.d/z88dk.sh
-	source = https://github.com/z88dk/z88dk/releases/download/v2.2/z88dk-src-2.2.tgz
-	source = fix-whitespace-Makefile.patch
-	source = fix-makefile-v2.2.patch
+	source = https://github.com/z88dk/z88dk/releases/download/v2.3/z88dk-src-2.3.tgz
 	source = z88dk.sh
-	sha256sums = 942aef3f5c55209a76925c8df681271e8340cf6623bedcb5a2933d4024657a41
-	sha256sums = dea585b77f15d42b1f9c9ca4bf20b26f884ed828e7b0891afb915361f008a8a1
-	sha256sums = 55a7d58e239f5513cd110d924b30f2cb8d3b3f1d38b3c24d90ddc65bb1e345e2
+	sha256sums = e08887ef9344f8dbd9d669bb904e17c35290a316bb1fe8b02c1a45b0d291292f
 	sha256sums = 4eef7c67e5b142db3006a4076876cdae9f386a7b94a66841a5a8fac869bea156
 
 pkgname = z88dk
diff --git a/PKGBUILD b/PKGBUILD
index c34b9b453ea3..4840f906e233 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Ábel Futó <lebaotuf+arch at gmail dot com>
 # Contributor: John Schug <xtr.xtrnet@gmail.com>
 pkgname=z88dk
-pkgver=2.2
-pkgrel=2
+pkgver=2.3
+pkgrel=1
 pkgdesc="Developement kit for Z80 computers"
 arch=('i686' 'x86_64')
 url="http://z88dk.org"
@@ -13,21 +13,10 @@ makedepends=('perl' 'perl-modern-perl' 'perl-yaml-tiny' 'perl-cpu-z80-assembler'
 	     'ragel' 're2c' 'dos2unix')
 backup=(etc/profile.d/z88dk.sh)
 source=(https://github.com/${pkgname}/${pkgname}/releases/download/v${pkgver}/${pkgname}-src-${pkgver}.tgz
-	fix-whitespace-Makefile.patch
-        fix-makefile-v2.2.patch
         z88dk.sh)
-sha256sums=('942aef3f5c55209a76925c8df681271e8340cf6623bedcb5a2933d4024657a41'
-            'dea585b77f15d42b1f9c9ca4bf20b26f884ed828e7b0891afb915361f008a8a1'
-            '55a7d58e239f5513cd110d924b30f2cb8d3b3f1d38b3c24d90ddc65bb1e345e2'
+sha256sums=('e08887ef9344f8dbd9d669bb904e17c35290a316bb1fe8b02c1a45b0d291292f'
             '4eef7c67e5b142db3006a4076876cdae9f386a7b94a66841a5a8fac869bea156')
 
-prepare() {
-  cd "${srcdir}/${pkgname}"
-
-  patch -Np0 < ../fix-whitespace-Makefile.patch
-  patch -Np0 < ../fix-makefile-v2.2.patch
-}
-
 build() {
   cd "${srcdir}/${pkgname}"
 
@@ -42,8 +31,8 @@ build() {
 
 package() {
   cd "${srcdir}/${pkgname}"
-  make -C libsrc prefix="/usr" DESTDIR="${pkgdir}" install
-  make prefix="/usr" DESTDIR="${pkgdir}" install
+  make -C libsrc PREFIX="/usr" DESTDIR="${pkgdir}" install
+  make PREFIX="/usr" DESTDIR="${pkgdir}" install
 
   # Uncomment for a cleaner install directory - no functionality will be lost
   #rm -rf ${pkgdir}/usr/share/z88dk/libsrc/target/{zx,zxn,ts2068}/newlib/obj
diff --git a/fix-makefile-v2.2.patch b/fix-makefile-v2.2.patch
deleted file mode 100644
index 4fdb30f4eb39..000000000000
--- a/fix-makefile-v2.2.patch
+++ /dev/null
@@ -1,79 +0,0 @@
---- Makefile.orig	2022-07-27 21:49:30.261649271 +0200
-+++ Makefile	2022-07-27 21:56:13.981923364 +0200
-@@ -14,9 +14,8 @@
-   EXESUFFIX 		?=
- endif
- 
--DESTDIR ?= /usr/local
--
--prefix_share = $(DESTDIR)/share/z88dk
-+prefix ?= /usr/local
-+prefix_share = $(prefix)/share/z88dk
- git_rev ?= $(shell git rev-parse --short HEAD)
- git_count ?= $(shell git rev-list --count HEAD)
- version ?= $(shell date +%Y%m%d)
-@@ -59,7 +58,7 @@
- ALL_EXT = bin/z88dk-zsdcc$(EXESUFFIX)
- 
- .PHONY: all
--all: 	$(ALL) $(ALL_EXT)
-+all: 	$(ALL)
- 
- src/config.h:
- 	$(shell if [ "${git_count}" != "" ]; then \
-@@ -179,30 +178,31 @@
- 	cd libsrc ; $(MAKE) install
- 
- install: install-clean
--	install -d $(DESTDIR) $(DESTDIR)/bin $(prefix_share)/lib $(prefix_share)/src
--	$(MAKE) -C src/appmake PREFIX=$(DESTDIR) install
--	$(MAKE) -C src/copt PREFIX=$(DESTDIR) install
--	$(MAKE) -C src/ucpp PREFIX=$(DESTDIR) install
--	$(MAKE) -C src/cpp PREFIX=$(DESTDIR) install
--	$(MAKE) -C src/sccz80 PREFIX=$(DESTDIR) install
--	$(MAKE) -C src/z80asm  PREFIX=$(DESTDIR) PREFIX_SHARE=$(prefix_share) install
--	$(MAKE) -C src/zcc PREFIX=$(DESTDIR) install
--	$(MAKE) -C src/zpragma PREFIX=$(DESTDIR) install
--	$(MAKE) -C src/zx7 PREFIX=$(DESTDIR) install
--	$(MAKE) -C src/zx0 PREFIX=$(DESTDIR) install
--	$(MAKE) -C src/z80nm PREFIX=$(DESTDIR) install
--	$(MAKE) -C src/zobjcopy PREFIX=$(DESTDIR) install
--	$(MAKE) -C src/ticks PREFIX=$(DESTDIR) install
--	$(MAKE) -C src/z88dk-lib PREFIX=$(DESTDIR) install
--	$(MAKE) -C support/graphics PREFIX=$(DESTDIR) install
--	$(MAKE) -C support/basck PREFIX=$(DESTDIR) install
--	$(MAKE) -C support/pv1000 PREFIX=$(DESTDIR) install
--	if [ -f bin/z88dk-zsdcpp$(EXESUFFIX) ]; then cp bin/z88dk-zsdcpp$(EXESUFFIX) $(DESTDIR)/bin/; fi
--	if [ -f bin/z88dk-zsdcc$(EXESUFFIX) ]; then cp bin/z88dk-zsdcc$(EXESUFFIX) $(DESTDIR)/bin/; fi
--	cp -r include $(prefix_share)/
--	cp -r lib $(prefix_share)/
--	cp -r libsrc $(prefix_share)/
--	cp -r src/m4 $(prefix_share)/src/
-+	install -d $(DESTDIR)$(prefix) $(DESTDIR)$(prefix)/bin
-+	install -d $(DESTDIR)$(prefix_share)/lib $(DESTDIR)$(prefix_share)/src
-+	$(MAKE) -C src/appmake PREFIX=$(DESTDIR)$(prefix) install
-+	$(MAKE) -C src/copt PREFIX=$(DESTDIR)$(prefix) install
-+	$(MAKE) -C src/ucpp PREFIX=$(DESTDIR)$(prefix) install
-+	$(MAKE) -C src/cpp PREFIX=$(DESTDIR)$(prefix) install
-+	$(MAKE) -C src/sccz80 PREFIX=$(DESTDIR)$(prefix) install
-+	$(MAKE) -C src/z80asm  PREFIX=$(DESTDIR)$(prefix) PREFIX_SHARE=$(DESTDIR)$(prefix_share) install
-+	$(MAKE) -C src/zcc PREFIX=$(DESTDIR)$(prefix) install
-+	$(MAKE) -C src/zpragma PREFIX=$(DESTDIR)$(prefix) install
-+	$(MAKE) -C src/zx7 PREFIX=$(DESTDIR)$(prefix) install
-+	$(MAKE) -C src/zx0 PREFIX=$(DESTDIR)$(prefix) install
-+	$(MAKE) -C src/z80nm PREFIX=$(DESTDIR)$(prefix) install
-+	$(MAKE) -C src/zobjcopy PREFIX=$(DESTDIR)$(prefix) install
-+	$(MAKE) -C src/ticks PREFIX=$(DESTDIR)$(prefix) install
-+	$(MAKE) -C src/z88dk-lib PREFIX=$(DESTDIR)$(prefix) install
-+	$(MAKE) -C support/graphics PREFIX=$(DESTDIR)$(prefix) install
-+	$(MAKE) -C support/basck PREFIX=$(DESTDIR)$(prefix) install
-+	$(MAKE) -C support/pv1000 PREFIX=$(DESTDIR)$(prefix) install
-+	if [ -f bin/z88dk-zsdcpp$(EXESUFFIX) ]; then cp bin/z88dk-zsdcpp$(EXESUFFIX) $(DESTDIR)$(prefix)/bin/; fi
-+	if [ -f bin/z88dk-zsdcc$(EXESUFFIX) ]; then cp bin/z88dk-zsdcc$(EXESUFFIX) $(DESTDIR)$(prefix)/bin/; fi
-+	cp -r include $(DESTDIR)$(prefix_share)/
-+	cp -r lib $(DESTDIR)$(prefix_share)/
-+	cp -r libsrc $(DESTDIR)$(prefix_share)/
-+	cp -r src/m4 $(DESTDIR)$(prefix_share)/src/
- 
- install-clean:
- 	$(MAKE) -C libsrc install-clean
diff --git a/fix-whitespace-Makefile.patch b/fix-whitespace-Makefile.patch
deleted file mode 100644
index 6dca8f4fd261..000000000000
--- a/fix-whitespace-Makefile.patch
+++ /dev/null
@@ -1,58 +0,0 @@
---- Makefile.orig	2022-07-27 21:48:59.652388484 +0200
-+++ Makefile	2022-07-27 21:49:30.261649271 +0200
-@@ -53,7 +53,7 @@
- 	bin/z88dk-ticks$(EXESUFFIX) bin/z88dk-z80svg$(EXESUFFIX) \
- 	bin/z88dk-font2pv1000$(EXESUFFIX) bin/z88dk-basck$(EXESUFFIX) \
- 	bin/z88dk-lib$(EXESUFFIX) bin/z88dk-zx0$(EXESUFFIX)
--	
-+
- ALL = $(BINS) testsuite
- 
- ALL_EXT = bin/z88dk-zsdcc$(EXESUFFIX)
-@@ -81,7 +81,7 @@
- 	tar xzf $^
- 	touch $@
- else
--	svn checkout -r $(SDCC_VERSION) https://svn.code.sf.net/p/sdcc/code/trunk/sdcc -q $(SDCC_PATH) 
-+	svn checkout -r $(SDCC_VERSION) https://svn.code.sf.net/p/sdcc/code/trunk/sdcc -q $(SDCC_PATH)
- 	patch -d $(SDCC_PATH) -p0 < $(Z88DK_PATH)/src/zsdcc/sdcc-z88dk.patch
- endif
- endif
-@@ -93,7 +93,6 @@
- zsdcc-tarball: $(SDCC_PATH)/configure
- 	@mkdir -p dist
- 	tar --exclude=.svn -cvzf dist/zsdcc_r$(SDCC_VERSION)_src.tar.gz src/sdcc-build
--	
- 
- $(SDCC_PATH)/Makefile: $(SDCC_PATH)/configure
- ifdef BUILD_SDCC
-@@ -209,13 +208,13 @@
- 	$(MAKE) -C libsrc install-clean
- 	$(RM) lib/z80asm*.lib
- 
--	# BSD install syntax below
--	#find include -type d -exec $(INSTALL) -d -m 755 {,$(prefix_share)/}{}  \;
--	#find include -type f -exec $(INSTALL) -m 664 {,$(prefix_share)/}{}  \;
--	#find lib -type d -exec $(INSTALL) -d -m 755 {,$(prefix_share)/}{} \;
--	#find lib -type f -exec $(INSTALL) -m 664 {,$(prefix_share)/}{} \;
--	#find libsrc -type d -exec $(INSTALL) -d -m 755 {,$(prefix_share)/}{} \;
--	#find libsrc -type f -exec $(INSTALL) -m 664 {,$(prefix_share)/}{} \;
-+# BSD install syntax below
-+#find include -type d -exec $(INSTALL) -d -m 755 {,$(prefix_share)/}{}  \;
-+#find include -type f -exec $(INSTALL) -m 664 {,$(prefix_share)/}{}  \;
-+#find lib -type d -exec $(INSTALL) -d -m 755 {,$(prefix_share)/}{} \;
-+#find lib -type f -exec $(INSTALL) -m 664 {,$(prefix_share)/}{} \;
-+#find libsrc -type d -exec $(INSTALL) -d -m 755 {,$(prefix_share)/}{} \;
-+#find libsrc -type f -exec $(INSTALL) -m 664 {,$(prefix_share)/}{} \;
- 
- 
- # Needs to have a dependency on libs
-@@ -259,7 +258,7 @@
- 	$(RM) $(SDCC_DEPS)
- endif
- endif
--	#if [ -d bin ]; then find bin -type f -exec rm -f {} ';' ; fi
-+#if [ -d bin ]; then find bin -type f -exec rm -f {} ';' ; fi
- 
- test-clean:
- 	$(MAKE) -C test clean