Update to 4.0

PR:		35465
Submitted by:	maintainer

4 files changed, 22 insertions, 48 deletions

diff --git a/emulators/xzx/Makefile b/emulators/xzx/Makefile
index 6afcf52af61f..69afd32c72b8 100644
--- a/emulators/xzx/Makefile
+++ b/emulators/xzx/Makefile
@@ -6,19 +6,25 @@
 #
 
 PORTNAME=	xzx
-PORTVERSION=	3.0.0
+PORTVERSION=	4.0
 CATEGORIES=	emulators
-MASTER_SITES=	http://www.zophar.net/unix/Files/
+MASTER_SITES=	http://www.zx-spectrum.net/xzx/files/
+DISTNAME=	${PORTNAME}-pro-${PORTVERSION}-eval
 
 MAINTAINER=	flynn@energyhq.homeip.net
 
 # xmkmf is used in configure script
 BUILD_DEPENDS=	xmkmf:${PORTSDIR}/devel/imake-4
 
+WRKSRC=		${WRKDIR}/${PORTNAME}-pro-${PORTVERSION}
+
 USE_MOTIF=      yes
 USE_XPM=        yes
 USE_X_PREFIX=	yes
 
+# Hardcoding FETCH_CMD is necessary since -A argument causes problems
+FETCH_CMD=	/usr/bin/fetch
+
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-oss
 
diff --git a/emulators/xzx/distinfo b/emulators/xzx/distinfo
index a2d3fdd556f3..9cf531613451 100644
--- a/emulators/xzx/distinfo
+++ b/emulators/xzx/distinfo
@@ -1 +1 @@
-MD5 (xzx-3.0.0.tar.gz) = d76c1f6df1eee65da18687b28151da65
+MD5 (xzx-pro-4.0-eval.tar.gz) = 265ed240d9d0da47255263c0c0122c38
diff --git a/emulators/xzx/files/patch-aa b/emulators/xzx/files/patch-aa
deleted file mode 100644
index 429a17dbad8c..000000000000
--- a/emulators/xzx/files/patch-aa
+++ /dev/null
@@ -1,32 +0,0 @@
-Put documentation in share/doc/xzx instead of lib/xzx:
-
---- doc/Makefile.in.orig	Fri Oct  9 13:20:18 1998
-+++ doc/Makefile.in	Fri Oct  9 13:34:32 1998
-@@ -52,6 +52,7 @@
- sysconfdir = @sysconfdir@
- sharedstatedir = @sharedstatedir@
- localstatedir = @localstatedir@
-+docdir = $(datadir)/doc
- libdir = @libdir@
- infodir = @infodir@
- mandir = @mandir@
-@@ -61,6 +62,7 @@
- DESTDIR =
- 
- pkgdatadir = $(datadir)/@PACKAGE@
-+pkgdocdir = $(docdir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- 
-@@ -259,9 +261,9 @@
- 	sed -e "s,/usr/local/lib/xzx,$(pkglibdir)," < Xzx.ad > Xzx
- 
- install-data-local: Xzx
--	$(mkinstalldirs) $(DESTDIR)$(pkglibdir)
-+	$(mkinstalldirs) $(DESTDIR)$(pkgdocdir)
- 	for f in $(DOC_FILES); do \
--	  $(INSTALL_DATA) $$f $(DESTDIR)$(pkglibdir); \
-+	  $(INSTALL_DATA) $$f $(DESTDIR)$(pkgdocdir); \
- 	done
- 	$(INSTALL_DATA) Xzx @XAPPLOADDIR@/Xzx
- 	rm -f Xzx
diff --git a/emulators/xzx/pkg-plist b/emulators/xzx/pkg-plist
index c0c6daab7b60..cdaf316c1f33 100644
--- a/emulators/xzx/pkg-plist
+++ b/emulators/xzx/pkg-plist
@@ -1,15 +1,15 @@
 bin/xzx
 lib/X11/app-defaults/Xzx
-lib/xzx/128.rom
-lib/xzx/if1-v1.rom
-lib/xzx/if1-v2.rom
-lib/xzx/plus2.rom
-lib/xzx/plus3.rom
-lib/xzx/spectrum.rom
-share/doc/xzx/COPYRIGHT
-share/doc/xzx/FAQ
-share/doc/xzx/README
-@exec ln -f %D/lib/xzx/if1-v2.rom %D/lib/xzx/if1.rom
-@unexec rm -f %D/lib/xzx/if1.rom
-@dirrm lib/xzx
-@dirrm share/doc/xzx
+lib/xzx-pro/128.rom
+lib/xzx-pro/if1-v1.rom
+lib/xzx-pro/if1-v2.rom
+lib/xzx-pro/plus2.rom
+lib/xzx-pro/plus3.rom
+lib/xzx-pro/spectrum.rom
+share/doc/xzx-pro/COPYRIGHT
+share/doc/xzx-pro/FAQ
+share/doc/xzx-pro/README
+@unexec rm -f %D/lib/xzx-pro/if1.rom
+@exec ln -f %D/lib/xzx-pro/if1-v2.rom %D/lib/xzx-pro/if1.rom
+@dirrm share/doc/xzx-pro
+@dirrm lib/xzx-pro