- Update to version 1.4

- Add WWW
- Takeover maintainership

PR: 32811
Submitted by: Ronald Kuehn <rk@ronald.org>

5 files changed, 76 insertions, 103 deletions

diff --git a/games/imaze/Makefile b/games/imaze/Makefile
index 5c9b38c7fd5c..fc5794dfae28 100644
--- a/games/imaze/Makefile
+++ b/games/imaze/Makefile
@@ -1,68 +1,68 @@
 # New ports collection makefile for:    imaze
 # Date created:         27. April 1996
-# Whom:                 Ronald Kuehn <kuehn@rz.tu-clausthal.de>
+# Whom:                 Ronald Kuehn <rk@ronald.org>
 #
 # $FreeBSD$
 #
 
 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 <bsd.port.mk>
diff --git a/games/imaze/distinfo b/games/imaze/distinfo
index e463c4d7b004..cc00ff55979c 100644
--- a/games/imaze/distinfo
+++ b/games/imaze/distinfo
@@ -1,2 +1 @@
-MD5 (imaze1.3.tar.Z) = 1cfac4f65653dbd2ed43f8e842a9a374
-MD5 (imaze.tar) = 6c042fe0afcc3399b31b25ce16d9fb3b
+MD5 (imaze-1.4.tar.gz) = 359cd8e072bfd7e51acafc1f106b9ea0
diff --git a/games/imaze/files/patch-aa b/games/imaze/files/patch-aa
index 660c4ac16cf6..32ae78816f9e 100644
--- a/games/imaze/files/patch-aa
+++ b/games/imaze/files/patch-aa
@@ -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 --git a/games/imaze/pkg-descr b/games/imaze/pkg-descr
index 31563f815703..e11b21a5761d 100644
--- a/games/imaze/pkg-descr
+++ b/games/imaze/pkg-descr
@@ -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 --git a/games/imaze/pkg-plist b/games/imaze/pkg-plist
index ee4f4ef08681..2f9243d0fc53 100644
--- a/games/imaze/pkg-plist
+++ b/games/imaze/pkg-plist
@@ -2,6 +2,8 @@ bin/imaze
 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/doors.lab
 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/pause.au
 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