diff --git a/devel/z88dk/Makefile b/devel/z88dk/Makefile index 399699127a30..d056ab26cacd 100644 --- a/devel/z88dk/Makefile +++ b/devel/z88dk/Makefile @@ -1,72 +1,74 @@ # Created by: Alexey Dokuchaev PORTNAME= z88dk PORTVERSION= 2.1 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= SF/${PORTNAME}/${PORTVERSION} DISTNAME= ${PORTNAME}-src-${PORTVERSION} MAINTAINER= danfe@FreeBSD.org COMMENT= Complete Z80/Z180 development kit LICENSE= ClArtistic LICENSE_FILE= ${WRKSRC}/LICENSE TEST_DEPENDS= dos2unix:converters/unix2dos \ p5-CPU-Z80-Assembler>=0:devel/p5-CPU-Z80-Assembler \ p5-Capture-Tiny>=0:devel/p5-Capture-Tiny \ p5-Capture-Tiny-Extended>=0:devel/p5-Capture-Tiny-Extended \ p5-Clone>=0:devel/p5-Clone \ p5-Data-Dump>=0:devel/p5-Data-Dump \ p5-Data-HexDump>=0:devel/p5-Data-HexDump \ p5-File-Slurp>=0:devel/p5-File-Slurp \ p5-Iterator-Simple-Lookahead>=0:devel/p5-Iterator-Simple-Lookahead \ p5-List-Uniq>=0:devel/p5-List-Uniq \ p5-Modern-Perl>=0:lang/p5-Modern-Perl \ p5-Object-Tiny-RW>=0:devel/p5-Object-Tiny-RW \ p5-Path-Tiny>=0:devel/p5-Path-Tiny \ p5-Regexp-Common>=0:textproc/p5-Regexp-Common \ p5-Template-Plugin-YAML>=0:textproc/p5-Template-Plugin-YAML \ p5-Test-Differences>=0:devel/p5-Test-Differences \ p5-Test-HexDifferences>=0:devel/p5-Test-HexDifferences \ p5-Text-Table>=0:textproc/p5-Text-Table -USES= gmake gnome shebangfix tar:tgz +USES= gmake gnome perl5 shebangfix tar:tgz USE_GNOME= libxml2 -MAKE_ENV= ZCCCFG=${WRKSRC}/lib/config +USE_PERL5= run +MAKE_ENV= ZCCCFG=${WRKSRC}/lib/config Q= # force verbose build SHEBANG_FILES= src/z80asm/asmpp.pl TEST_TARGET= testsuite test WRKSRC= ${WRKDIR}/${PORTNAME} MAKE_JOBS_UNSAFE= ../../z80asm: No such file or directory post-patch: @${REINPLACE_CMD} -e 's,"gcc,"${CC},' \ ${WRKSRC}/src/z80asm/lib/t/array.t \ ${WRKSRC}/src/z80asm/lib/t/class.t \ ${WRKSRC}/src/z80asm/lib/t/classhash.t \ ${WRKSRC}/src/z80asm/lib/t/classlist.t \ ${WRKSRC}/src/z80asm/lib/t/list.t \ ${WRKSRC}/src/z80asm/lib/t/srcfile.t \ ${WRKSRC}/src/z80asm/lib/t/strhash.t \ ${WRKSRC}/src/z80asm/t/test_utils.pl @${REINPLACE_CMD} -e 's,"make,"${MAKE_CMD},' \ ${WRKSRC}/src/z80asm/t/TestZ80asm.pm \ ${WRKSRC}/src/z80asm/t/objfile.t \ ${WRKSRC}/src/z80asm/t/test_enigma.t \ ${WRKSRC}/src/z80asm/t/test_utils.pl \ ${WRKSRC}/src/z80asm/t/testlib.pl \ ${WRKSRC}/src/zobjcopy/t/test.t @${REINPLACE_CMD} -e '/\/bin\//s,bash,sh,' \ ${WRKSRC}/src/common/t/run_tests.sh pre-build: ${LN} -sf z88dk/bin ${BINARY_LINKDIR} post-install: @${RM} -r ${INSTALL_WRKSRC}/include/_DEVELOPMENT cd ${INSTALL_WRKSRC} && ${COPYTREE_SHARE} "include lib" \ ${STAGEDIR}${DATADIR} @${RMDIR} ${STAGEDIR}${DATADIR}/src .include diff --git a/devel/z88dk/files/patch-Makefile b/devel/z88dk/files/patch-Makefile index 32e82f25bc9e..e84a339b2188 100644 --- a/devel/z88dk/files/patch-Makefile +++ b/devel/z88dk/files/patch-Makefile @@ -1,85 +1,85 @@ --- Makefile.orig 2021-01-30 03:00:06 UTC +++ Makefile @@ -14,9 +14,9 @@ else EXESUFFIX ?= endif -DESTDIR ?= /usr/local +PREFIX ?= /usr/local -prefix_share = $(DESTDIR)/share/z88dk +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) @@ -54,7 +54,7 @@ BINS = bin/z88dk-appmake$(EXESUFFIX) bin/z88dk-copt$(E bin/z88dk-font2pv1000$(EXESUFFIX) bin/z88dk-basck$(EXESUFFIX) \ bin/z88dk-lib$(EXESUFFIX) -ALL = $(BINS) testsuite +ALL = libs ALL_EXT = bin/zsdcc$(EXESUFFIX) @@ -171,33 +171,35 @@ bin/z88dk-lib$(EXESUFFIX): src/config.h libs: $(BINS) - cd libsrc ; $(MAKE) - cd libsrc ; $(MAKE) install + $(MAKE) -C libsrc + $(MAKE) -C libsrc 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/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/zsdcpp$(EXESUFFIX) ]; then cp bin/zsdcpp$(EXESUFFIX) $(DESTDIR)/bin/; fi - if [ -f bin/zsdcc$(EXESUFFIX) ]; then cp bin/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: + mkdir -p $(DESTDIR)$(PREFIX)/bin $(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/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/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/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 + # XXX: perform installation in the port's Makefile (bogus permissions, + # huge and useless(?) _DEVELOPMENT collection) -+ #cp -r lib $(DESTDIR)$(prefix_share)/ + #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