3 files changed, 104 insertions, 91 deletions

diff --git a/games/imaze/Makefile b/games/imaze/Makefile
index 966760a81e63..fcbc15b47247 100644
--- a/games/imaze/Makefile
+++ b/games/imaze/Makefile
@@ -3,7 +3,7 @@
 # Date created:         27. April 1996
 # Whom:                 Ronald Kuehn <kuehn@rz.tu-clausthal.de>
 #
-# $Id: Makefile,v 1.11 1998/09/21 22:15:53 steve Exp $
+# $Id: Makefile,v 1.12 1998/09/28 02:07:19 steve Exp $
 #
 
 DISTNAME=       imaze
@@ -15,19 +15,54 @@ DISTFILES=	imaze1.3.tar.Z imaze.tar
 
 MAINTAINER=	kuehn@rz.tu-clausthal.de
 
-.if defined(HAVE_MOTIF) && !defined(PACKAGE_BUILDING)
-MAKE_ENV+=	FORCE_MOTIF=yes
-.else
+#
+# 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)
 LIB_DEPENDS=	xview.3:${PORTSDIR}/x11-toolkits/xview-lib
 .endif
 
 EXTRACT_ONLY=	imaze1.3.tar.Z
 USE_X_PREFIX=	yes
 MAN6=		genlab.6 imaze.6 imazesrv.6 ninja.6
-MANCOMPRESSED=	yes
+MANCOMPRESSED=	maybe
+
+SOUNDDIR=${PREFIX}/share/imaze/sounds
+
+.if !defined(NOMANCOMPRESS)
+compresscommand=gzip -9nf
+.else
+compresscommand=":"
+.endif
 
 post-extract:
-	@${CP} ${FILESDIR}/Makefile ${WRKDIR}/imaze/Makefile
 	@tar xf ${DISTDIR}/imaze.tar -C ${WRKDIR}/imaze
 
+do-build:
+	@(cd ${WRKSRC}/source; ${MAKE} SOUNDDIR=${SOUNDDIR} \
+		FORCE_MOTIF=${FORCE_MOTIF} MOTIFLIB="${MOTIFLIB}" \
+		X11BASE=${X11BASE} freebsd)
+
+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)
+	@mkdir -p ${PREFIX}/share/imaze/labs
+	@(cd ${WRKSRC}/labs && for f in *.lab;\
+		do ${INSTALL_DATA} $$f ${PREFIX}/share/imaze/labs; done)
+	@mkdir -p ${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 "Please read the file \"README\" in \"${PREFIX}/share/imaze\"."
+
 .include <bsd.port.mk>
diff --git a/games/imaze/files/patch-aa b/games/imaze/files/patch-aa
index 4921671a2563..54abb7da989f 100644
--- a/games/imaze/files/patch-aa
+++ b/games/imaze/files/patch-aa
@@ -1,60 +1,38 @@
-*** source/Makefile.orig	Thu Feb 22 23:01:18 1996
---- source/Makefile	Tue Nov 19 14:50:50 1996
-***************
-*** 111,123 ****
-  	  all
-  
-  freebsd:
-  	$(MAKE) \
-  	  OPENWINHOME='/usr/X11R6' \
-  	  GRAFLIBS='$$(XVLIBS)' \
-  	  GRAFINCLUDES='$$(XVINCLUDES)' \
-  	  GRAFOBJS='$$(XVOBJS)' \
-! 	  SYSDEFS='-DDONT_DECLARE_ERRLIST -DSOUND -DJOYSTICK' \
-  	  all
-  
-  irix:
-  	$(MAKE) \
---- 111,135 ----
-  	  all
-  
-  freebsd:
-+ .if defined(HAVE_MOTIF) && defined(FORCE_MOTIF) && ${FORCE_MOTIF} == "yes"
-+ 	$(MAKE) \
-+ 	  GRAF=MOTIF \
-+ 	  GRAFLIBS='$$(MOTIFLIB) $$(MOTIFLIBS)' \
-+ 	  GRAFINCLUDES='-I$$(X11BASE)/include' \
-+ 	  GRAFOBJS='$$(MOTIFOBJS)' \
-+ 	  SYSDEFS='-DDONT_DECLARE_ERRLIST -DSOUND \
-+ 		-DDEFAULT_SOUND_DIR=\"$(SOUNDDIR)\" -DJOYSTICK' \
-+ 	  all
-+ .else
-  	$(MAKE) \
-  	  OPENWINHOME='/usr/X11R6' \
-  	  GRAFLIBS='$$(XVLIBS)' \
-  	  GRAFINCLUDES='$$(XVINCLUDES)' \
-  	  GRAFOBJS='$$(XVOBJS)' \
-! 	  SYSDEFS='-DDONT_DECLARE_ERRLIST -DSOUND \
-! 		-DDEFAULT_SOUND_DIR=\"$(SOUNDDIR)\" -DJOYSTICK' \
-  	  all
-+ .endif
-  
-  irix:
-  	$(MAKE) \
-***************
-*** 143,149 ****
-  XVLIBS=-L$(OPENWINHOME)/lib -lxview -lolgx -lX11
-  XVINCLUDES=-I$(OPENWINHOME)/include
-  
-! MOTIFLIBS=-lXm -lXt -lX11
-  MOTIFINCLUDES=
-  
-  GRAFLIBS=$($(GRAF)LIBS)
---- 155,161 ----
-  XVLIBS=-L$(OPENWINHOME)/lib -lxview -lolgx -lX11
-  XVINCLUDES=-I$(OPENWINHOME)/include
-  
-! MOTIFLIBS=-lXt -lX11
-  MOTIFINCLUDES=
-  
-  GRAFLIBS=$($(GRAF)LIBS)
+--- source/Makefile.orig	Sat Feb 13 00:33:39 1999
++++ source/Makefile	Sat Feb 13 00:41:26 1999
+@@ -111,13 +111,24 @@
+ 	  all
+ 
+ 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
++	$(MAKE) \
++	  OPENWINHOME='$$(X11BASE)' \
+ 	  GRAFLIBS='$$(XVLIBS)' \
+ 	  GRAFINCLUDES='$$(XVINCLUDES)' \
+ 	  GRAFOBJS='$$(XVOBJS)' \
+-	  SYSDEFS='-DDONT_DECLARE_ERRLIST -DSOUND -DJOYSTICK' \
++	  SYSDEFS='-DDONT_DECLARE_ERRLIST -DSOUND \
++		-DDEFAULT_SOUND_DIR=\"$(SOUNDDIR)\" -DJOYSTICK' \
+ 	  all
++.endif
+ 
+ irix:
+ 	$(MAKE) \
+@@ -143,7 +154,7 @@
+ XVLIBS=-L$(OPENWINHOME)/lib -lxview -lolgx -lX11
+ XVINCLUDES=-I$(OPENWINHOME)/include
+ 
+-MOTIFLIBS=-lXm -lXt -lX11
++MOTIFLIBS=-lXt -lX11
+ MOTIFINCLUDES=
+ 
+ GRAFLIBS=$($(GRAF)LIBS)
diff --git a/games/imaze/pkg-plist b/games/imaze/pkg-plist
index d6f6fa02bda1..ee4f4ef08681 100644
--- a/games/imaze/pkg-plist
+++ b/games/imaze/pkg-plist
@@ -2,28 +2,28 @@ bin/imaze
 bin/ninja
 bin/genlab
 bin/imazesrv
-lib/imaze/labs/10x10.lab
-lib/imaze/labs/12x12.lab
-lib/imaze/labs/15x15.lab
-lib/imaze/labs/20x20.lab
-lib/imaze/labs/25x25.lab
-lib/imaze/labs/april.lab
-lib/imaze/labs/demolab.lab
-lib/imaze/labs/doors.lab
-lib/imaze/labs/longest.lab
-lib/imaze/labs/no1.lab
-lib/imaze/labs/november.lab
-lib/imaze/labs/october.lab
-lib/imaze/sounds/awake.au
-lib/imaze/sounds/dead.au
-lib/imaze/sounds/kill.au
-lib/imaze/sounds/miss.au
-lib/imaze/sounds/pause.au
-lib/imaze/sounds/shoot.au
-lib/imaze/sounds/title.au
-lib/imaze/README
-lib/imaze/Xdefaults.Motif.example
-lib/imaze/Xdefaults.OpenWindows.example
-@dirrm lib/imaze/sounds
-@dirrm lib/imaze/labs
-@dirrm lib/imaze
+share/imaze/labs/10x10.lab
+share/imaze/labs/12x12.lab
+share/imaze/labs/15x15.lab
+share/imaze/labs/20x20.lab
+share/imaze/labs/25x25.lab
+share/imaze/labs/april.lab
+share/imaze/labs/demolab.lab
+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/dead.au
+share/imaze/sounds/kill.au
+share/imaze/sounds/miss.au
+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