summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorÁbel Futó2022-07-28 12:26:05 +0200
committerÁbel Futó2022-07-28 12:26:05 +0200
commit5ed53aa14c053e6288e200821c8e8d348ec23bf7 (patch)
tree36a0f5e3a959a9643feaef03f086360e123dfb84
parent6d255804e9f87f8a8fd2aebf684a531d73add17a (diff)
downloadaur-5ed53aa14c053e6288e200821c8e8d348ec23bf7.tar.gz
Updated to 2.2
-rw-r--r--.SRCINFO22
-rw-r--r--PKGBUILD27
-rw-r--r--fix-makefile-v2.2.patch (renamed from fix-makefile-v2.1.patch)22
-rw-r--r--fix-whitespace-Makefile.patch27
4 files changed, 55 insertions, 43 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 175bc5fba9d..5a9e304acba 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,28 @@
pkgbase = z88dk
pkgdesc = Developement kit for Z80 computers
- pkgver = 2.1
+ pkgver = 2.2
pkgrel = 1
url = http://z88dk.org
arch = i686
arch = x86_64
license = custom:The Clarified Artistic License
- depends = perl
+ makedepends = perl
+ makedepends = perl-modern-perl
+ makedepends = perl-yaml-tiny
+ makedepends = perl-cpu-z80-assembler
+ makedepends = perl-path-tiny
+ makedepends = ragel
+ makedepends = re2c
+ makedepends = dos2unix
depends = libxml2
backup = etc/profile.d/z88dk.sh
- source = https://github.com/z88dk/z88dk/releases/download/v2.1/z88dk-src-2.1.tgz
+ source = https://github.com/z88dk/z88dk/releases/download/v2.2/z88dk-src-2.2.tgz
source = fix-whitespace-Makefile.patch
- source = fix-makefile-v2.1.patch
+ source = fix-makefile-v2.2.patch
source = z88dk.sh
- sha256sums = f3579ee59b4af552721173165af38223b115ccb67179e79d2f3c0ae64338dc7c
- sha256sums = 3ae2c544e97a49298e81c3fbd19ff4458b7627a827d83534c34499f7570cfaa8
- sha256sums = 02ad318eb810f2dff140f66e8c77b946f66018e077a7c27b87824081f6601646
+ sha256sums = 942aef3f5c55209a76925c8df681271e8340cf6623bedcb5a2933d4024657a41
+ sha256sums = dea585b77f15d42b1f9c9ca4bf20b26f884ed828e7b0891afb915361f008a8a1
+ sha256sums = 55a7d58e239f5513cd110d924b30f2cb8d3b3f1d38b3c24d90ddc65bb1e345e2
sha256sums = 4eef7c67e5b142db3006a4076876cdae9f386a7b94a66841a5a8fac869bea156
pkgname = z88dk
-
diff --git a/PKGBUILD b/PKGBUILD
index 38c380e5cab..827429e13f9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,28 +1,30 @@
# Maintainer: Ábel Futó <lebaotuf+arch at gmail dot com>
# Contributor: John Schug <xtr.xtrnet@gmail.com>
pkgname=z88dk
-pkgver=2.1
+pkgver=2.2
pkgrel=1
pkgdesc="Developement kit for Z80 computers"
arch=('i686' 'x86_64')
url="http://z88dk.org"
license=('custom:The Clarified Artistic License')
-depends=('perl' 'libxml2')
+depends=('libxml2')
+makedepends=('perl' 'perl-modern-perl' 'perl-yaml-tiny' 'perl-cpu-z80-assembler' 'perl-path-tiny'
+ '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.1.patch
+ fix-makefile-v2.2.patch
z88dk.sh)
-sha256sums=('f3579ee59b4af552721173165af38223b115ccb67179e79d2f3c0ae64338dc7c'
- '3ae2c544e97a49298e81c3fbd19ff4458b7627a827d83534c34499f7570cfaa8'
- '02ad318eb810f2dff140f66e8c77b946f66018e077a7c27b87824081f6601646'
+sha256sums=('942aef3f5c55209a76925c8df681271e8340cf6623bedcb5a2933d4024657a41'
+ 'dea585b77f15d42b1f9c9ca4bf20b26f884ed828e7b0891afb915361f008a8a1'
+ '55a7d58e239f5513cd110d924b30f2cb8d3b3f1d38b3c24d90ddc65bb1e345e2'
'4eef7c67e5b142db3006a4076876cdae9f386a7b94a66841a5a8fac869bea156')
prepare() {
cd "${srcdir}/${pkgname}"
patch -Np0 < ../fix-whitespace-Makefile.patch
- patch -Np0 < ../fix-makefile-v2.1.patch
+ patch -Np0 < ../fix-makefile-v2.2.patch
}
build() {
@@ -48,15 +50,22 @@ package() {
#rm -rf ${pkgdir}/usr/share/z88dk/libsrc/target/zx/fzx/obj/{z80,z80n}
install -dm755 ${pkgdir}/etc/profile.d/
- install -m755 ${srcdir}/z88dk.sh ${pkgdir}/etc/profile.d/
+ install -m644 ${srcdir}/z88dk.sh ${pkgdir}/etc/profile.d/
# Include docs
install -dm755 ${pkgdir}/usr/share/doc/${pkgname}
install -dm755 ${pkgdir}/usr/share/doc/${pkgname}/images
install -dm755 ${pkgdir}/usr/share/doc/${pkgname}/resources
+ install -dm755 ${pkgdir}/usr/share/doc/${pkgname}/target/gl
+ install -dm755 ${pkgdir}/usr/share/doc/${pkgname}/features
find doc/* -not \( -path doc/netman -prune \) -not \( -path doc/images -prune \) \
- -not \( -path doc/resources -prune \) | xargs -i install -m644 "{}" "${pkgdir}/usr/share/doc/${pkgname}"
+ -not \( -path doc/resources -prune \) -not \( -path doc/target -prune \) \
+ -not \( -path doc/features -prune \) | xargs -i install -m644 "{}" \
+ "${pkgdir}/usr/share/doc/${pkgname}"
find doc/images/* | xargs -i install -m644 "{}" "${pkgdir}/usr/share/doc/${pkgname}/images"
find doc/resources/* | xargs -i install -m644 "{}" "${pkgdir}/usr/share/doc/${pkgname}/resources"
+ find doc/target/gl/* | xargs -i install -m644 "{}" "${pkgdir}/usr/share/doc/${pkgname}/target/gl"
+ find doc/features/* | xargs -i install -m644 "{}" "${pkgdir}/usr/share/doc/${pkgname}/features"
+
# License
install -D -m755 LICENSE "${pkgdir}/usr/share/licenses/z88dk/LICENSE"
}
diff --git a/fix-makefile-v2.1.patch b/fix-makefile-v2.2.patch
index 4050481b98c..4fdb30f4eb3 100644
--- a/fix-makefile-v2.1.patch
+++ b/fix-makefile-v2.2.patch
@@ -1,5 +1,5 @@
---- Makefile 2021-02-14 14:08:54.860536559 +0100
-+++ Makefile 2021-02-14 14:19:49.782369663 +0100
+--- 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
@@ -13,7 +13,7 @@
git_count ?= $(shell git rev-list --count HEAD)
version ?= $(shell date +%Y%m%d)
@@ -59,7 +58,7 @@
- ALL_EXT = bin/zsdcc$(EXESUFFIX)
+ ALL_EXT = bin/z88dk-zsdcc$(EXESUFFIX)
.PHONY: all
-all: $(ALL) $(ALL_EXT)
@@ -21,7 +21,7 @@
src/config.h:
$(shell if [ "${git_count}" != "" ]; then \
-@@ -175,29 +174,30 @@
+@@ -179,30 +178,31 @@
cd libsrc ; $(MAKE) install
install: install-clean
@@ -35,6 +35,7 @@
- $(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
@@ -42,8 +43,8 @@
- $(MAKE) -C support/graphics PREFIX=$(DESTDIR) install
- $(MAKE) -C support/basck PREFIX=$(DESTDIR) install
- $(MAKE) -C support/pv1000 PREFIX=$(DESTDIR) install
-- if [ -f bin/zsdcpp$(EXESUFFIX) ]; then cp bin/zsdcpp$(EXESUFFIX) $(DESTDIR)/bin/; fi
-- if [ -f bin/zsdcc$(EXESUFFIX) ]; then cp bin/zsdcc$(EXESUFFIX) $(DESTDIR)/bin/; fi
+- 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)/
@@ -59,6 +60,7 @@
+ $(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
@@ -66,12 +68,12 @@
+ $(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/zsdcpp$(EXESUFFIX) ]; then cp bin/zsdcpp$(EXESUFFIX) $(DESTDIR)$(prefix)/bin/; fi
-+ if [ -f bin/zsdcc$(EXESUFFIX) ]; then cp bin/zsdcc$(EXESUFFIX) $(DESTDIR)$(prefix)/bin/; fi
++ 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/
-
- # BSD install syntax below
+ install-clean:
+ $(MAKE) -C libsrc install-clean
diff --git a/fix-whitespace-Makefile.patch b/fix-whitespace-Makefile.patch
index c857e3e0b22..6dca8f4fd26 100644
--- a/fix-whitespace-Makefile.patch
+++ b/fix-whitespace-Makefile.patch
@@ -1,14 +1,14 @@
---- Makefile 2021-02-14 12:59:55.868073893 +0100
-+++ Makefile 2021-02-14 13:02:54.451661445 +0100
+--- 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-lib$(EXESUFFIX) bin/z88dk-zx0$(EXESUFFIX)
-
+
ALL = $(BINS) testsuite
- ALL_EXT = bin/zsdcc$(EXESUFFIX)
+ ALL_EXT = bin/z88dk-zsdcc$(EXESUFFIX)
@@ -81,7 +81,7 @@
tar xzf $^
touch $@
@@ -18,18 +18,17 @@
patch -d $(SDCC_PATH) -p0 < $(Z88DK_PATH)/src/zsdcc/sdcc-z88dk.patch
endif
endif
-@@ -93,7 +93,7 @@
+@@ -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
-@@ -200,17 +200,17 @@
- cp -r src/m4 $(prefix_share)/src/
-
+@@ -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)/}{} \;
@@ -48,16 +47,12 @@
# Needs to have a dependency on libs
--test: $(ALL)
-+test: $(ALL)
- $(MAKE) -C test
-
- testsuite: $(BINS)
-@@ -251,6 +251,6 @@
+@@ -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
- .PHONY: test testsuite
+ test-clean:
+ $(MAKE) -C test clean