From owner-freebsd-ports Wed Oct 7 11:00:12 1998 Return-Path: Received: (from majordom@localhost) by hub.freebsd.org (8.8.8/8.8.8) id LAA11248 for freebsd-ports-outgoing; Wed, 7 Oct 1998 11:00:12 -0700 (PDT) (envelope-from owner-freebsd-ports@FreeBSD.ORG) Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id LAA11186 for ; Wed, 7 Oct 1998 11:00:01 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.8.8/8.8.5) id LAA06612; Wed, 7 Oct 1998 11:00:00 -0700 (PDT) Received: from axl.training.iafrica.com (axl.training.iafrica.com [196.31.1.175]) by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id KAA09039 for ; Wed, 7 Oct 1998 10:53:23 -0700 (PDT) (envelope-from sheldonh@axl.training.iafrica.com) Received: from sheldonh by axl.training.iafrica.com with local (Exim 2.02 #1) id 0zQxlu-0000lG-00 for FreeBSD-gnats-submit@freebsd.org; Wed, 7 Oct 1998 19:53:10 +0200 Message-Id: Date: Wed, 7 Oct 1998 19:53:10 +0200 From: axl@iafrica.com Reply-To: axl@iafrica.com To: FreeBSD-gnats-submit@FreeBSD.ORG X-Send-Pr-Version: 3.2 Subject: ports/8189: [PATCH] re: FreeBSD ports: 1 unfetchable distfiles: emulators/xzx Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 8189 >Category: ports >Synopsis: [PATCH] re: FreeBSD ports: 1 unfetchable distfiles: emulators/xzx >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed Oct 7 11:00:00 PDT 1998 >Last-Modified: >Originator: Sheldon Hearn >Organization: UUNET Internet Africa >Release: FreeBSD 2.2.7-STABLE i386 >Environment: N/A >Description: The xzx Spectrum emulator has advanced several versions since this port was created. The current version of xzx uses a GNU configure script. This makes the existing port obsolete. >How-To-Repeat: N/A >Fix: The following diffs will upgrade the xzx port to use the current version of xzx. Be sure to patch -E to remove empty files. diff -urN xzx.orig/Makefile xzx/Makefile --- xzx.orig/Makefile Tue Jul 28 01:24:21 1998 +++ xzx/Makefile Wed Oct 7 19:41:46 1998 @@ -1,22 +1,21 @@ # New ports collection makefile for: xzx -# Version required: 2.4.4 +# Version required: 2.6.1 # Date created: 13 Nov 1997 # Whom: Sheldon Hearn # # $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 MAN1= xzx.1 -MANCOMPRESSED= yes + +USE_X11= yes +HAS_CONFIGURE= yes +CONFIGURE_ARGS= --prefix=${PREFIX} --libdir=${PREFIX}/lib/X11 .include diff -urN xzx.orig/files/md5 xzx/files/md5 --- xzx.orig/files/md5 Wed Mar 11 09:54:33 1998 +++ xzx/files/md5 Wed Oct 7 19:41:46 1998 @@ -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 -urN xzx.orig/patches/patch-aa xzx/patches/patch-aa --- xzx.orig/patches/patch-aa Sat Mar 21 13:35:31 1998 +++ xzx/patches/patch-aa Wed Oct 7 19:41:46 1998 @@ -1,39 +1,39 @@ ---- 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 /**/ - - /* Where the configuraion files and ROM images are installed */ --ZXLIBDIR = /usr/local/lib/xzx -+ZXLIBDIR = /usr/X11R6/lib/X11/xzx - - /* 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: patch-aa,v 1.3 1998/03/21 11:35:31 vanilla Exp $ */ - - #include --#include /* Comment this out if your system doesn't have it! */ -+/* #include /* Comment this out if your system doesn't have it! */ +--- config.h.in.orig Fri Sep 11 18:10:01 1998 ++++ config.h.in Thu Sep 17 07:40:43 1998 +@@ -47,10 +47,10 @@ + #define HOST "unknown" + + /* Where the X11 app-defaults directory is. */ +-#define USRLIBDIR "/usr/lib/X11" ++#define USRLIBDIR "${PREFIX}/lib/X11" + + /* Where the configuration files and ROM images are installed. */ +-#define LIBDIR "/usr/local/lib/xzx" ++#define LIBDIR "${PREFIX}/lib/X11/xzx" + + /* Compile without assert() calls. */ + #undef NDEBUG +--- acconfig.h.orig Thu Sep 17 07:38:32 1998 ++++ acconfig.h Thu Sep 17 07:40:30 1998 +@@ -46,10 +46,10 @@ + #define HOST "unknown" + + /* Where the X11 app-defaults directory is. */ +-#define USRLIBDIR "/usr/lib/X11" ++#define USRLIBDIR "${PREFIX}/lib/X11" + + /* Where the configuration files and ROM images are installed. */ +-#define LIBDIR "/usr/local/lib/xzx" ++#define LIBDIR "${PREFIX}/lib/X11/xzx" + + /* Compile without assert() calls. */ + #undef NDEBUG +@@ -58,7 +58,7 @@ + is a huge switch statement. With optimizations turned on, cc needs a huge + amount of memory in order to compile/optimize this code. Undefine this + if you run out of swap space. */ +-#define HAVE_ENOUGH_SWAP ++/* #define HAVE_ENOUGH_SWAP */ /******************************************************************************** - * 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 + * Common configuration valid for both shareware and registered version diff -urN xzx.orig/patches/patch-ac xzx/patches/patch-ac --- xzx.orig/patches/patch-ac Wed Mar 11 09:54:40 1998 +++ xzx/patches/patch-ac Thu Jan 1 02:00:00 1970 @@ -1,11 +0,0 @@ ---- doc/Xzx.ad.orig Wed Mar 11 15:41:31 1998 -+++ doc/Xzx.ad Wed Mar 11 15:41:46 1998 -@@ -4,7 +4,7 @@ - ! $Id: patch-ac,v 1.2 1998/03/11 07:54:40 vanilla Exp $ - !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - --*libDir: .:/usr/local/lib/xzx -+*libDir: .:/usr/X11R6/lib/X11/xzx - *quiet: false - - ! Display releated resources diff -urN xzx.orig/patches/patch-ad xzx/patches/patch-ad --- xzx.orig/patches/patch-ad Wed Mar 11 09:54:44 1998 +++ xzx/patches/patch-ad Thu Jan 1 02:00:00 1970 @@ -1,11 +0,0 @@ ---- doc/xzx.man.orig Sun Feb 8 22:19:49 1998 -+++ doc/xzx.man Wed Mar 11 15:42:09 1998 -@@ -26,7 +26,7 @@ - Use \fIpath\fR as the colon-separated directory list to check when loading the - Spectrum ROM and any snapshots specified. Directories are guaranteed to be - searched in the order they are listed. Defaults to -- \fI".:/usr/local/lib/xzx"\fR. -+ \fI".:/usr/X11R6/lib/X11/xzx"\fR. - .TP - .BI \-quiet " \fI\fR" - Supresses all non-error messages. You will see neither warnings nor diff -urN xzx.orig/pkg/PLIST xzx/pkg/PLIST --- xzx.orig/pkg/PLIST Mon Aug 17 11:43:17 1998 +++ xzx/pkg/PLIST Wed Oct 7 19:41:46 1998 @@ -1,21 +1,19 @@ -bin/ddtrans -bin/mkcart bin/xzx lib/X11/app-defaults/Xzx +lib/X11/xzx/spectrum.rom 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 +lib/X11/xzx/if1-v1.rom +lib/X11/xzx/if1-v2.rom +lib/X11/xzx/keyboard.scr +lib/X11/xzx/COPYRIGHT +lib/X11/xzx/README +lib/X11/xzx/FAQ +man/man1/xzx.1.gz @dirrm lib/X11/xzx >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message