Update to version 2.6.1.

PR:		8189
Submitted by:	maintainer

4 files changed, 48 insertions, 67 deletions

diff --git a/emulators/xzx/Makefile b/emulators/xzx/Makefile
index c7850606515..fb74ce9dfd8 100644
--- a/emulators/xzx/Makefile
+++ b/emulators/xzx/Makefile
@@ -1,22 +1,20 @@
 # New ports collection makefile for:	xzx
-# Version required:     2.4.4
+# Version required:     2.6.1
 # Date created:         13 Nov 1997
 # Whom:                 Sheldon Hearn <axl@iafrica.com>
 #
-# $Id: Makefile,v 1.5 1998/03/21 12:00:26 asami Exp $
+# $Id: Makefile,v 1.6 1998/07/27 23:24:21 asami Exp $
 #
 
-DISTNAME=	xzx-2.4.4
+DISTNAME=	xzx-2.6.1
 CATEGORIES=	emulators
 MASTER_SITES=	ftp://ftp.gns.getronics.nl/pub/os/sinclair/emulators/unix/
-DISTFILES=	xzx-2.4.4-src.tar.gz \
-		xzx-2.4.4-roms.tar.gz \
-		xzx-2.4.4-contrib.tar.gz
 
 MAINTAINER=	axl@iafrica.com
 
-USE_IMAKE=	yes
+USE_X_PREFIX=	yes
+GNU_CONFIGURE=	yes
+
 MAN1=		xzx.1
-MANCOMPRESSED=	yes
 
 .include <bsd.port.mk>
diff --git a/emulators/xzx/distinfo b/emulators/xzx/distinfo
index b8d7be01c33..53e8299fdd5 100644
--- a/emulators/xzx/distinfo
+++ b/emulators/xzx/distinfo
@@ -1,3 +1 @@
-MD5 (xzx-2.4.4-src.tar.gz) = 2a220bdd46a35fa0f97024162880c744
-MD5 (xzx-2.4.4-roms.tar.gz) = 4270945d9392adf4c6ff6859417a2eda
-MD5 (xzx-2.4.4-contrib.tar.gz) = f3e4227822c251bfc685c0e58dc3e37c
+MD5 (xzx-2.6.1.tar.gz) = 72a2753a98d5cafccc73c832e3e2245b
diff --git a/emulators/xzx/files/patch-aa b/emulators/xzx/files/patch-aa
index 00e36d59968..33e4fabc63c 100644
--- a/emulators/xzx/files/patch-aa
+++ b/emulators/xzx/files/patch-aa
@@ -1,39 +1,26 @@
---- xzx.config.orig	Sun Feb  8 22:17:34 1998
-+++ xzx.config	Sat Mar 21 19:02:51 1998
-@@ -37,13 +37,13 @@
- /* #define REGISTERED /**/
+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
+@@ -47,4 +47,5 @@
+ sharedstatedir = @sharedstatedir@
+ localstatedir = @localstatedir@
++docdir = $(datadir)/doc
+ libdir = @libdir@
+ infodir = @infodir@
+@@ -54,4 +55,5 @@
  
- /* Where the configuraion files and ROM images are installed */
--ZXLIBDIR = /usr/local/lib/xzx
-+ZXLIBDIR = /usr/X11R6/lib/X11/xzx
+ pkgdatadir = $(datadir)/@PACKAGE@
++pkgdocdir = $(docdir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+@@ -215,7 +217,7 @@
  
- /* Where the binary files are installed */
--BINDIR   = /usr/local/bin
-+BINDIR   = /usr/X11R6/bin
- 
- /* Where the manual pages are installed */
--MANDIR   = /usr/local/man/man1
-+MANDIR   = /usr/X11R6/man/man1
- 
- 
- /*******************************************************************************
---- src/config.h.orig	Sun Feb  8 22:13:50 1998
-+++ src/config.h	Sat Mar 21 19:03:50 1998
-@@ -30,7 +30,7 @@
- /* $Id: config.h,v 1.2 1998/02/08 13:54:34 erik Rel $ */
- 
- #include <X11/keysym.h>
--#include <endian.h>		/* Comment this out if your system doesn't have it! */
-+/* #include <endian.h>		/* Comment this out if your system doesn't have it! */
- 
- /********************************************************************************
-  * General configuration
-@@ -179,7 +179,7 @@
- /* Byte order of your CPU.  Intel is little-endian, Sparc is big-endian. */
- #if !defined(LITTLE_ENDIAN) &&  !defined(BIG_ENDIAN)
- #if defined(i386) || defined(add_your_machine_here)
--#define LITTLE_ENDIAN
-+/* #define LITTLE_ENDIAN */
- #else
- #define BIG_ENDIAN
- #endif
+ install-data-local: Xzx
+-	$(mkinstalldirs) $(pkglibdir)
++	$(mkinstalldirs) $(pkgdocdir)
+ 	for f in $(DOC_FILES); do \
+-	  $(INSTALL_DATA) $$f $(pkglibdir); \
++	  $(INSTALL_DATA) $$f $(pkgdocdir); \
+ 	done
+ 	$(INSTALL_DATA) Xzx @XAPPLOADDIR@
diff --git a/emulators/xzx/pkg-plist b/emulators/xzx/pkg-plist
index 603555ca68a..f1930f89a20 100644
--- a/emulators/xzx/pkg-plist
+++ b/emulators/xzx/pkg-plist
@@ -1,21 +1,19 @@
-bin/ddtrans
-bin/mkcart
 bin/xzx
+lib/xzx/spectrum.rom
+lib/xzx/128-0.rom
+lib/xzx/128-1.rom
+lib/xzx/pl2-0.rom
+lib/xzx/pl2-1.rom
+lib/xzx/pl3-0.rom
+lib/xzx/pl3-1.rom
+lib/xzx/pl3-2.rom
+lib/xzx/pl3-3.rom
+lib/xzx/if1-v1.rom
+lib/xzx/if1-v2.rom
+lib/xzx/keyboard.scr
 lib/X11/app-defaults/Xzx
-lib/X11/xzx/128-0.rom
-lib/X11/xzx/128-1.rom
-lib/X11/xzx/COPYRIGHT
-lib/X11/xzx/FAQ
-lib/X11/xzx/README
-lib/X11/xzx/if1-v1.rom
-lib/X11/xzx/if1-v2.rom
-lib/X11/xzx/keyboard.scr
-lib/X11/xzx/mf128.rom
-lib/X11/xzx/pl2-0.rom
-lib/X11/xzx/pl2-1.rom
-lib/X11/xzx/pl3-0.rom
-lib/X11/xzx/pl3-1.rom
-lib/X11/xzx/pl3-2.rom
-lib/X11/xzx/pl3-3.rom
-lib/X11/xzx/spectrum.rom
-@dirrm lib/X11/xzx
+share/doc/xzx/COPYRIGHT
+share/doc/xzx/README
+share/doc/xzx/FAQ
+@dirrm lib/xzx
+@dirrm share/doc/xzx