From owner-freebsd-ports Fri Mar 1 14:30:21 2002 Delivered-To: freebsd-ports@hub.freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 786E837B41C for ; Fri, 1 Mar 2002 14:30:01 -0800 (PST) Received: (from gnats@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g21MU1377785; Fri, 1 Mar 2002 14:30:01 -0800 (PST) (envelope-from gnats) Received: from energyhq.homeip.net (213-97-200-73.uc.nombres.ttd.es [213.97.200.73]) by hub.freebsd.org (Postfix) with ESMTP id 995BB37B405 for ; Fri, 1 Mar 2002 14:20:00 -0800 (PST) Received: by energyhq.homeip.net (Postfix, from userid 1001) id 838373FC2E; Fri, 1 Mar 2002 23:20:01 +0100 (CET) Message-Id: <20020301222001.838373FC2E@energyhq.homeip.net> Date: Fri, 1 Mar 2002 23:20:01 +0100 (CET) From: Miguel Mendez Reply-To: Miguel Mendez To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.113 Subject: ports/35465: Maintainer update: emulators/xzx Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 35465 >Category: ports >Synopsis: Maintainer update: emulators/xzx >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Fri Mar 01 14:30:01 PST 2002 >Closed-Date: >Last-Modified: >Originator: Miguel Mendez >Release: FreeBSD 4.5-STABLE i386 >Organization: >Environment: System: FreeBSD energyhq.homeip.net 4.5-STABLE FreeBSD 4.5-STABLE #0: Thu Feb 14 12:09:50 CET 2002 root@energyhq.homeip.net:/storage2/obj/storage2/src/sys/ENERGYHQ i386 >Description: Version 4.0 of xzx is out. Please, whoever commits this could have a look at the Makefile and tell if this is okay. I have a small problem. ${FETCH_CMD} uses -A by default, and that causes the fetch stage to fail. Doing the fetch without -A works, so I've implemented a do-fetch target that does the job. Is this solution ok or should I redefine ${FETCH_CMD} ? I also had to bump PORTEPOC so this port version is > 3.0.0 (The old one) >How-To-Repeat: >Fix: --- xzx.diff begins here --- diff -ruN xzx.old/Makefile xzx/Makefile --- xzx.old/Makefile Wed Jan 9 03:34:08 2002 +++ xzx/Makefile Fri Mar 1 23:11:15 2002 @@ -6,15 +6,19 @@ # PORTNAME= xzx -PORTVERSION= 3.0.0 +PORTVERSION= 4.0 +PORTEPOCH= 1 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 @@ -24,4 +28,10 @@ MAN1= xzx.1 -.include +.include + +do-fetch: + @cd ${PORTSDIR}/distfiles && ([ -e ${DISTNAME}.tar.gz ] || \ + /usr/bin/fetch ${MASTER_SITES}/${DISTNAME}.tar.gz) + +.include diff -ruN xzx.old/distinfo xzx/distinfo --- xzx.old/distinfo Wed Jan 9 03:34:08 2002 +++ xzx/distinfo Fri Mar 1 22:47:57 2002 @@ -1 +1 @@ -MD5 (xzx-3.0.0.tar.gz) = d76c1f6df1eee65da18687b28151da65 +MD5 (xzx-pro-4.0-eval.tar.gz) = 265ed240d9d0da47255263c0c0122c38 diff -ruN xzx.old/files/patch-aa xzx/files/patch-aa --- xzx.old/files/patch-aa Mon Aug 30 14:06:50 1999 +++ xzx/files/patch-aa Thu Jan 1 01:00:00 1970 @@ -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 -ruN xzx.old/pkg-plist xzx/pkg-plist --- xzx.old/pkg-plist Mon Nov 20 15:47:16 2000 +++ xzx/pkg-plist Fri Mar 1 23:07:16 2002 @@ -1,15 +1,10 @@ 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 +@exec ln -f %D/lib/xzx-pro/if1-v2.rom %D/lib/xzx-pro/if1.rom +@unexec rm -f %D/lib/xzx-pro/if1.rom --- xzx.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message