From owner-freebsd-ports Fri Oct 9 05:10:07 1998 Return-Path: Received: (from majordom@localhost) by hub.freebsd.org (8.8.8/8.8.8) id FAA19815 for freebsd-ports-outgoing; Fri, 9 Oct 1998 05:10:07 -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 FAA19761 for ; Fri, 9 Oct 1998 05:10:02 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.8.8/8.8.5) id FAA06432; Fri, 9 Oct 1998 05:10:01 -0700 (PDT) Date: Fri, 9 Oct 1998 05:10:01 -0700 (PDT) Message-Id: <199810091210.FAA06432@freefall.freebsd.org> To: freebsd-ports@FreeBSD.ORG From: Sheldon Hearn Subject: Re: ports/8189: [PATCH] re: FreeBSD ports: 1 unfetchable distfiles: emulators/xzx Reply-To: Sheldon Hearn Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org The following reply was made to PR ports/8189; it has been noted by GNATS. From: Sheldon Hearn To: Bill Fumerola Cc: FreeBSD-gnats-submit@freebsd.org Subject: Re: ports/8189: [PATCH] re: FreeBSD ports: 1 unfetchable distfiles: emulators/xzx Date: Fri, 09 Oct 1998 14:03:21 +0200 On Thu, 08 Oct 1998 10:39:40 -0400, Bill Fumerola wrote: > This REALLY looks like GNU Configure (I even think you said something > about it in your PR) so > GNU_CONFIGURE= yes > should replace those two lines. Okay. That makes for a much more graceful port. Please ignore my previous patchset and apply this instead (remember patch -E). Thanks, Sheldon. Index: Makefile =================================================================== RCS file: /home/ncvs/ports/emulators/xzx/Makefile,v retrieving revision 1.6 diff -u -d -r1.6 Makefile --- Makefile 1998/07/27 23:24:21 1.6 +++ Makefile 1998/10/09 11:30:38 @@ -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 # # $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 Index: files/md5 =================================================================== RCS file: /home/ncvs/ports/emulators/xzx/files/md5,v retrieving revision 1.2 diff -u -d -r1.2 md5 --- md5 1998/03/11 07:54:33 1.2 +++ md5 1998/10/09 10:55:07 @@ -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 Index: patches/patch-aa =================================================================== RCS file: /home/ncvs/ports/emulators/xzx/patches/patch-aa,v retrieving revision 1.3 diff -u -d -r1.3 patch-aa --- patch-aa 1998/03/21 11:35:31 1.3 +++ patch-aa 1998/10/09 11:51:13 @@ -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 /**/ - - /* 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 $ */ +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 @@ - #include --#include /* Comment this out if your system doesn't have it! */ -+/* #include /* Comment this out if your system doesn't have it! */ + pkgdatadir = $(datadir)/@PACKAGE@ ++pkgdocdir = $(docdir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +@@ -215,7 +217,7 @@ - /******************************************************************************** - * 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@ Index: patches/patch-ac =================================================================== RCS file: /home/ncvs/ports/emulators/xzx/patches/patch-ac,v retrieving revision 1.2 diff -u -d -r1.2 patch-ac --- patch-ac 1998/03/11 07:54:40 1.2 +++ patch-ac 1998/10/09 11:59:18 @@ -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 Index: patches/patch-ad =================================================================== RCS file: /home/ncvs/ports/emulators/xzx/patches/patch-ad,v retrieving revision 1.2 diff -u -d -r1.2 patch-ad --- patch-ad 1998/03/11 07:54:44 1.2 +++ patch-ad 1998/10/09 11:59:19 @@ -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 Index: pkg/PLIST =================================================================== RCS file: /home/ncvs/ports/emulators/xzx/pkg/PLIST,v retrieving revision 1.3 diff -u -d -r1.3 PLIST --- PLIST 1998/08/17 09:43:17 1.3 +++ PLIST 1998/10/09 11:45:34 @@ -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 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message