Index: head/games/imaze/Makefile
===================================================================
--- head/games/imaze/Makefile	(revision 416999)
+++ head/games/imaze/Makefile	(revision 417000)
@@ -1,74 +1,55 @@
 # Created by: Ronald Kuehn <rk@ronald.org>
 # $FreeBSD$
 
 PORTNAME=	imaze
 PORTVERSION=	1.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games
-MASTER_SITES=	TUCOWS/x11/entertain/ \
-		http://www.sourcefiles.org/Games/Arcade/
+MASTER_SITES=	http://www.sourcefiles.org/Games/Arcade/
 PKGNAMESUFFIX=	-${TOOLKIT}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Multi-player network action game for TCP/IP with 3D graphics
 
 LICENSE=	BSD4CLAUSE
 LICENSE_FILE=	${WRKSRC}/Copyright
 
-BROKEN=		unfetchable
-DEPRECATED=	Broken for more than 6 months
-EXPIRATION_DATE=	2016-07-04
 OPTIONS_DEFINE=	AUDIO JOYSTICK
-OPTIONS_RADIO=	GUI
-OPTIONS_RADIO_GUI=	XVIEW MOTIF
-OPTIONS_DEFAULT=	AUDIO JOYSTICK XVIEW
+OPTIONS_SINGLE=	GUI
+OPTIONS_SINGLE_GUI=	ATHENA MOTIF XVIEW
+OPTIONS_DEFAULT=	ATHENA AUDIO JOYSTICK
+
+ATHENA_DESC=	Athena widget library support
+ATHENA_VARS=	TOOLKIT=athena
 AUDIO_DESC=	Audio support
+AUDIO_CONFIGURE_OFF=	noaudio
 JOYSTICK_DESC=	Joystick support
+JOYSTICK_CONFIGURE_OFF=	nojoystick
+MOTIF_USES=	motif
+MOTIF_VARS=	MOTIFLIB="-L${LOCALBASE}/lib -lXm -lXt" TOOLKIT=motif
 XVIEW_DESC=	XView widget library support
+XVIEW_LIB_DEPENDS=	libxview.so:x11-toolkits/xview
+XVIEW_VARS=	TOOLKIT=xview
 
 CONFIGURE_WRKSRC=${WRKSRC}/source
 BUILD_WRKSRC=	${WRKSRC}/source
 
-USE_XORG=	x11 xaw xt
+USE_XORG=	x11 xaw xmu xt
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	${TOOLKIT} X11Dir="${LOCALBASE}" CFlags="${CFLAGS}"
 MAKE_ENV=	SOUNDDIR="${DATADIR}/sounds"
-
-.include <bsd.port.options.mk>
-
-.if empty(PORT_OPTIONS:MAUDIO)
-CONFIGURE_ARGS+=noaudio
-.endif
-
-.if empty(PORT_OPTIONS:MJOYSTICK)
-CONFIGURE_ARGS+=nojoystick
-.endif
-
-.if empty(PORT_OPTIONS:MMOTIF) && empty(PORT_OPTIONS:MXVIEW)
-TOOLKIT=	athena
-.endif
-
-.if ${PORT_OPTIONS:MMOTIF}
-USES+=		motif
-TOOLKIT=	motif
-.endif
-
-.if ${PORT_OPTIONS:MXVIEW}
-LIB_DEPENDS+=	libxview.so:x11-toolkits/xview
-TOOLKIT=	xview
-.endif
 
 do-install:
 .for i in genlab imaze imazesrv imazestat ninja xlabed
 	(cd ${WRKSRC}/source && ${INSTALL_PROGRAM} ${i} ${STAGEDIR}${PREFIX}/bin)
 .endfor
 	(cd ${WRKSRC}/man6 && ${INSTALL_MAN} *.6 ${STAGEDIR}${MAN6PREFIX}/man/man6)
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	(cd ${WRKSRC} && ${INSTALL_DATA} README ${STAGEDIR}${DATADIR})
 	@${MKDIR} ${STAGEDIR}${DATADIR}/labs
 	(cd ${WRKSRC}/labs && ${INSTALL_DATA} *.lab ${STAGEDIR}${DATADIR}/labs)
 	@${MKDIR} ${STAGEDIR}${DATADIR}/sounds
 	(cd ${WRKSRC}/sounds && ${INSTALL_DATA} *.au ${STAGEDIR}${DATADIR}/sounds)
 	@${ECHO_MSG} "Please read the file \"${DATADIR}/README\"."
 
 .include <bsd.port.mk>
Index: head/games/imaze/files/patch-source_Makefile.in
===================================================================
--- head/games/imaze/files/patch-source_Makefile.in	(revision 416999)
+++ head/games/imaze/files/patch-source_Makefile.in	(revision 417000)
@@ -1,20 +1,20 @@
---- 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 @@
+--- source/Makefile.in.orig	2001-12-10 00:47:32 UTC
++++ source/Makefile.in
+@@ -43,7 +43,7 @@ Unconfigured:
  	@echo "run ./configure first, don't use this makefile"
  #END configure output
  
 -DEFINES=-DDEFAULT_SOUND_DIR=\"`pwd`/../sounds\"
 +DEFINES=-DDEFAULT_SOUND_DIR=\"${SOUNDDIR}\"
  #
  # possible values:
  #
-@@ -66,7 +66,7 @@
+@@ -66,7 +66,7 @@ INSTALL=install -s -m 755
  X11Libs=-lX11
  #AthenaLibs=-lXaw -lXt
  AthenaLibs=-lXaw -lXt -lXmu
 -MotifLibs=-lXm -lXt
 +MotifLibs=${MOTIFLIB}
  XViewLibs=-lxview -lolgx
  
  # bis hier Optionen eintragen
Index: head/games/imaze/files/patch-source_configure
===================================================================
--- head/games/imaze/files/patch-source_configure	(revision 416999)
+++ head/games/imaze/files/patch-source_configure	(revision 417000)
@@ -1,11 +1,11 @@
---- source/configure.orig	Thu Jul 24 22:06:46 2003
-+++ source/configure	Thu Jul 24 22:10:31 2003
-@@ -54,7 +54,7 @@
+--- source/configure.orig	2001-12-10 00:47:37 UTC
++++ source/configure
+@@ -54,7 +54,7 @@ LibpathTmpl=-L@
  MakefileIn=Makefile.in
  MakefileOut=Makefile
  
 -SedQuote="s/[^=]*\$/'&'/"
 +SedQuote="s/=\(.*\)/='\1'/"
  
  #----------
  #
Index: head/games/imaze/files/patch-source_fbsd_joystick.c
===================================================================
--- head/games/imaze/files/patch-source_fbsd_joystick.c	(revision 416999)
+++ head/games/imaze/files/patch-source_fbsd_joystick.c	(revision 417000)
@@ -1,11 +1,11 @@
---- source/fbsd_joystick.c.orig	Sat Jun 28 15:55:30 2003
-+++ source/fbsd_joystick.c	Sat Jun 28 15:56:01 2003
+--- source/fbsd_joystick.c.orig	2001-12-10 00:47:38 UTC
++++ source/fbsd_joystick.c
 @@ -44,7 +44,7 @@
  #include <errno.h>
  #include <fcntl.h>
  #include <sys/time.h>
 -#include <machine/joystick.h>
 +#include <sys/joystick.h>
  
  #include "argv.h"
  #include "global.h"
Index: head/games/imaze/files/patch-source_voxware_audio.c
===================================================================
--- head/games/imaze/files/patch-source_voxware_audio.c	(revision 416999)
+++ head/games/imaze/files/patch-source_voxware_audio.c	(revision 417000)
@@ -1,11 +1,11 @@
---- source/voxware_audio.c.orig	Sat Jun 28 15:55:41 2003
-+++ source/voxware_audio.c	Sat Jun 28 15:56:08 2003
+--- source/voxware_audio.c.orig	2001-12-10 00:47:46 UTC
++++ source/voxware_audio.c
 @@ -50,7 +50,7 @@
  #ifdef linux
  #include <linux/soundcard.h>
  #else
 -#include <machine/soundcard.h>
 +#include <sys/soundcard.h>
  #endif
  
  #include "argv.h"