From owner-freebsd-ports Thu Dec 13 12: 0:27 2001 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 5DCC337B417 for ; Thu, 13 Dec 2001 12:00:02 -0800 (PST) Received: (from gnats@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id fBDK02w54436; Thu, 13 Dec 2001 12:00:02 -0800 (PST) (envelope-from gnats) Received: from kiste.thiemo.net (kiste.thiemo.net [193.159.181.84]) by hub.freebsd.org (Postfix) with ESMTP id 28C8A37B405 for ; Thu, 13 Dec 2001 11:56:17 -0800 (PST) Received: (from uucp@localhost) by kiste.thiemo.net (8.9.3/8.9.3) with UUCP id UAA78476 for FreeBSD-gnats-submit@freebsd.org; Thu, 13 Dec 2001 20:56:05 +0100 (CET) (envelope-from rk@home.ronald.org) Received: (from rk@localhost) by wallace.home.ronald.org (8.11.6/8.11.6) id fBDJt2K02035; Thu, 13 Dec 2001 20:55:02 +0100 (CET) (envelope-from rk@ronald.org) Message-Id: <200112131955.fBDJt2K02035@wallace.home.ronald.org> Date: Thu, 13 Dec 2001 20:55:02 +0100 (CET) From: Ronald Kuehn Reply-To: Ronald Kuehn To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.113 Subject: ports/32811: Update port: games/imaze update to version 1.4 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: 32811 >Category: ports >Synopsis: Update port: games/imaze update to version 1.4 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu Dec 13 12:00:01 PST 2001 >Closed-Date: >Last-Modified: >Originator: Ronald Kuehn >Release: FreeBSD 4.4-STABLE i386 >Organization: >Environment: System: FreeBSD merlin.home.ronald.org 4.4-STABLE FreeBSD 4.4-STABLE #4: Tue Dec 11 04:29:22 CET 2001 rk@merlin.home.ronald.org:/usr/build/obj/usr/src/sys/MERLIN i386 >Description: Update iMaze to version 1.4. iMaze now supports XView (still default), Motif and plain Athena widgets. Sound support (now included in all toolkits) is still somewhat flaky (missing synchronization) on FreeBSD. Works better with old Voxware driver than with the normal pcm driver. >How-To-Repeat: >Fix: diff -ruN imaze.orig/Makefile imaze/Makefile --- imaze.orig/Makefile Thu Jun 21 19:42:59 2001 +++ imaze/Makefile Thu Dec 13 19:56:23 2001 @@ -1,68 +1,68 @@ # New ports collection makefile for: imaze # Date created: 27. April 1996 -# Whom: Ronald Kuehn +# Whom: Ronald Kuehn # # $FreeBSD: ports/games/imaze/Makefile,v 1.21 2001/06/21 17:42:59 fenner Exp $ # PORTNAME= imaze -PORTVERSION= 1.3 +PORTVERSION= 1.4 CATEGORIES= games -MASTER_SITES= ftp://ftp.tu-clausthal.de/pub/misc/games/imaze/ \ - ftp://ftp.tu-clausthal.de/pub/misc/games/imaze/sounds/ -DISTFILES= imaze1.3.tar.Z imaze.tar +MASTER_SITES= http://home.tu-clausthal.de/student/iMaze/files/ +PKGNAMESUFFIX= -${TOOLKIT} -MAINTAINER= ports@freebsd.org +MAINTAINER= rk@ronald.org -# -# Sound support currently only exists for the XView version (apperently -# broken for the pcm driver; worked for voxware). The not yet released -# version 1.4 will add sound support for the Motif version too. -# XView is the default. If you want the Motif version, define FORCE_MOTIF=yes. -# -.if !(defined(HAVE_MOTIF) && defined(FORCE_MOTIF) && ${FORCE_MOTIF} == "yes") \ - || defined(PACKAGE_BUILDING) +.if defined(WITH_MOTIF) && defined(HAVE_MOTIF) +USE_MOTIF= yes +TOOLKIT= motif +.elif defined(WITH_ATHENA) +TOOLKIT= athena +.else LIB_DEPENDS= xview.3:${PORTSDIR}/x11-toolkits/xview +TOOLKIT= xview .endif -WRKSRC= ${WRKDIR}/imaze -EXTRACT_ONLY= imaze1.3.tar.Z USE_X_PREFIX= yes -MAN6= genlab.6 imaze.6 imazesrv.6 ninja.6 -MANCOMPRESSED= maybe +HAS_CONFIGURE= yes +CONFIGURE_ARGS= ${TOOLKIT} X11Dir=${X11BASE} CFlags="${CFLAGS}" +CONFIGURE_WRKSRC=${WRKSRC}/source +BUILD_WRKSRC= ${WRKSRC}/source +MAKE_ENV= SOUNDDIR=${SOUNDDIR} +MAN6= genlab.6 imaze.6 imazesrv.6 imazestat.6 ninja.6 xlabed.6 +MANCOMPRESSED= no -SOUNDDIR=${PREFIX}/share/imaze/sounds - -.if !defined(NOMANCOMPRESS) -compresscommand=gzip -9nf -.else -compresscommand=":" +.if defined(WITHOUT_AUDIO) +CONFIGURE_ARGS+=noaudio +.endif +.if defined(WITHOUT_JOYSTICK) +CONFIGURE_ARGS+=nojoystick .endif -post-extract: - @tar xf ${DISTDIR}/imaze.tar -C ${WRKDIR}/imaze +PROGRAMS= imaze imazesrv imazestat ninja genlab xlabed +SOUNDDIR= ${PREFIX}/share/imaze/sounds -do-build: - @(cd ${WRKSRC}/source; ${MAKE} SOUNDDIR=${SOUNDDIR} \ - FORCE_MOTIF=${FORCE_MOTIF} MOTIFLIB="${MOTIFLIB}" \ - X11BASE=${X11BASE} freebsd) +pre-everything:: + @$(ECHO_MSG) "iMaze can be built with XView (default), Motif or" \ + "Athena widgets." + @$(ECHO_MSG) "Use \"-DWITH_MOTIF\" or \"-DWITH_ATHENA\" to select" \ + "Motif or Athena widgets." + @$(ECHO_MSG) "Audio and joystick support can be disabled with" \ + "\"-DWITHOUT_AUDIO\"" + @$(ECHO_MSG) "and/or \"-DWITHOUT_JOYSTICK\"" do-install: - @(cd ${WRKSRC}/source && for f in imaze imazesrv ninja genlab;\ - do ${INSTALL_PROGRAM} $$f ${PREFIX}/bin; done) - @(cd ${WRKSRC}/man6 && for f in *.6;\ - do ${INSTALL_MAN} $$f ${PREFIX}/man/man6;\ - ${compresscommand} ${PREFIX}/man/man6/$$f; done) + @(cd ${WRKSRC}/source && for f in ${PROGRAMS}; do \ + ${INSTALL_PROGRAM} $$f ${PREFIX}/bin; done) + @(cd ${WRKSRC}/man6 && for f in *.6; do \ + ${INSTALL_MAN} $$f ${PREFIX}/man/man6; done) @${MKDIR} ${PREFIX}/share/imaze/labs - @(cd ${WRKSRC}/labs && for f in *.lab;\ - do ${INSTALL_DATA} $$f ${PREFIX}/share/imaze/labs; done) + @(cd ${WRKSRC}/labs && for f in *.lab; do \ + ${INSTALL_DATA} $$f ${PREFIX}/share/imaze/labs; done) @${MKDIR} ${SOUNDDIR} - @(cd ${WRKSRC}/sounds && for f in *.au;\ - do ${INSTALL_DATA} $$f ${SOUNDDIR}; done) - @(cd ${WRKSRC} && for f in Xdefaults.Motif Xdefaults.OpenWindows;\ - do ${INSTALL_DATA} $$f ${PREFIX}/share/imaze/$$f.example;\ - done; \ - ${INSTALL_DATA} README ${PREFIX}/share/imaze) - @${ECHO_MSG} "Please read the file \"README\" in \"${PREFIX}/share/imaze\"." + @(cd ${WRKSRC}/sounds && for f in *.au; do \ + ${INSTALL_DATA} $$f ${SOUNDDIR}; done) + @(cd ${WRKSRC} && ${INSTALL_DATA} README ${PREFIX}/share/imaze) + @$(ECHO_MSG) "Please read the file \"${PREFIX}/share/imaze/README\"." .include diff -ruN imaze.orig/distinfo imaze/distinfo --- imaze.orig/distinfo Sat Apr 27 20:37:41 1996 +++ imaze/distinfo Tue Dec 11 06:32:02 2001 @@ -1,2 +1 @@ -MD5 (imaze1.3.tar.Z) = 1cfac4f65653dbd2ed43f8e842a9a374 -MD5 (imaze.tar) = 6c042fe0afcc3399b31b25ce16d9fb3b +MD5 (imaze-1.4.tar.gz) = 359cd8e072bfd7e51acafc1f106b9ea0 diff -ruN imaze.orig/files/patch-aa imaze/files/patch-aa --- imaze.orig/files/patch-aa Sun Jun 6 17:39:50 1999 +++ imaze/files/patch-aa Thu Dec 13 10:56:37 2001 @@ -1,48 +1,20 @@ ---- source/Makefile.orig Thu Feb 22 16:01:18 1996 -+++ source/Makefile Mon May 31 16:46:38 1999 -@@ -111,13 +111,34 @@ - all +--- source/Makefile.in.orig Thu Dec 13 10:50:40 2001 ++++ source/Makefile.in Thu Dec 13 10:56:34 2001 +@@ -43,7 +43,7 @@ + @echo "run ./configure first, don't use this makefile" + #END configure output - freebsd: -+.if defined(FORCE_MOTIF) && ${FORCE_MOTIF} == "yes" - $(MAKE) \ -- OPENWINHOME='/usr/X11R6' \ -+ GRAF=MOTIF \ -+ GRAFLIBS='$$(MOTIFLIB) $$(MOTIFLIBS)' \ -+ GRAFINCLUDES='-I$$(X11BASE)/include' \ -+ GRAFOBJS='$$(MOTIFOBJS)' \ -+ SYSDEFS='-DDONT_DECLARE_ERRLIST -DJOYSTICK' \ -+ all -+.else -+.if $(MACHINE_ARCH) == "i386" -+ $(MAKE) \ -+ OPENWINHOME='$$(X11BASE)' \ -+ GRAFLIBS='$$(XVLIBS)' \ -+ GRAFINCLUDES='$$(XVINCLUDES)' \ -+ GRAFOBJS='$$(XVOBJS)' \ -+ SYSDEFS='-DDONT_DECLARE_ERRLIST -DSOUND \ -+ -DDEFAULT_SOUND_DIR=\"$(SOUNDDIR)\" -DJOYSTICK' \ -+ all -+.else -+ $(MAKE) \ -+ OPENWINHOME='$$(X11BASE)' \ - GRAFLIBS='$$(XVLIBS)' \ - GRAFINCLUDES='$$(XVINCLUDES)' \ - GRAFOBJS='$$(XVOBJS)' \ -- SYSDEFS='-DDONT_DECLARE_ERRLIST -DSOUND -DJOYSTICK' \ -+ SYSDEFS='-DDONT_DECLARE_ERRLIST -DDEFAULT_SOUND_DIR=\"$(SOUNDDIR)\"' \ - all -+.endif -+.endif +-DEFINES=-DDEFAULT_SOUND_DIR=\"`pwd`/../sounds\" ++DEFINES=-DDEFAULT_SOUND_DIR=\"${SOUNDDIR}\" + # + # possible values: + # +@@ -66,7 +66,7 @@ + X11Libs=-lX11 + #AthenaLibs=-lXaw -lXt + AthenaLibs=-lXaw -lXt -lXmu +-MotifLibs=-lXm -lXt ++MotifLibs=${MOTIFLIB} + XViewLibs=-lxview -lolgx - irix: - $(MAKE) \ -@@ -143,7 +164,7 @@ - XVLIBS=-L$(OPENWINHOME)/lib -lxview -lolgx -lX11 - XVINCLUDES=-I$(OPENWINHOME)/include - --MOTIFLIBS=-lXm -lXt -lX11 -+MOTIFLIBS=-lXt -lX11 - MOTIFINCLUDES= - - GRAFLIBS=$($(GRAF)LIBS) + # bis hier Optionen eintragen diff -ruN imaze.orig/pkg-descr imaze/pkg-descr --- imaze.orig/pkg-descr Sat Apr 27 20:37:41 1996 +++ imaze/pkg-descr Thu Dec 13 17:19:06 2001 @@ -1,22 +1,24 @@ iMaze is a multi-player network action game for TCP/IP with 3D graphics -under X11 (XView or Motif). You run through a labyrinth and shoot everything -that is round without being hit by other round anythings. +under X11 (XView, Motif or Athena). You run through a labyrinth and shoot +everything that is round without being hit by other round anythings. Of course anything round is one of the following: - * other players playing over the net * computer controlled ninjas * deadly shots (except your own) Features: - * sophisticated, reliable network protocol, works even with SLIP connections - via modem + via modem; modular, portable source code * windows can be freely scaled to avoid speed drawbacks due to poor display performance - * modular, portable source code - * scores * sound and joystick support + * scores; camera mode; labyrinth generator and interactive labyrinth editor + +Audio support is somewhat flaky on FreeBSD (synchronization problems). +It works better with the old Voxware driver than with the current pcm driver. + +WWW: http://home.tu-clausthal.de/student/iMaze/ - Ronald Kuehn -kuehn@rz.tu-clausthal.de +rk@ronald.org diff -ruN imaze.orig/pkg-plist imaze/pkg-plist --- imaze.orig/pkg-plist Mon Feb 22 05:00:36 1999 +++ imaze/pkg-plist Thu Dec 13 16:15:35 2001 @@ -2,6 +2,8 @@ bin/ninja bin/genlab bin/imazesrv +bin/imazestat +bin/xlabed share/imaze/labs/10x10.lab share/imaze/labs/12x12.lab share/imaze/labs/15x15.lab @@ -13,8 +15,8 @@ share/imaze/labs/longest.lab share/imaze/labs/no1.lab share/imaze/labs/november.lab -share/imaze/labs/october.lab share/imaze/sounds/awake.au +share/imaze/sounds/bounce.au share/imaze/sounds/dead.au share/imaze/sounds/kill.au share/imaze/sounds/miss.au @@ -22,8 +24,6 @@ share/imaze/sounds/shoot.au share/imaze/sounds/title.au share/imaze/README -share/imaze/Xdefaults.Motif.example -share/imaze/Xdefaults.OpenWindows.example @dirrm share/imaze/sounds @dirrm share/imaze/labs @dirrm share/imaze >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message