Update to 0.2b4.1.

5 files changed, 112 insertions, 115 deletions

diff --git a/emulators/xmess/Makefile b/emulators/xmess/Makefile
index a7b207f8daf..2e1031a06cd 100644
--- a/emulators/xmess/Makefile
+++ b/emulators/xmess/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 1998/08/20 15:16:53 tsarna Exp $
+# $NetBSD: Makefile,v 1.3 1998/08/29 04:24:28 mycroft Exp $
 #
 
-DISTNAME=		unix01
-PKGNAME=		xmess-0.1
+DISTNAME=		unix02b4
+PKGNAME=		xmess-0.2b4.1
 CATEGORIES=		emulators games x11
 MASTER_SITES=		http://internetter.com/titan/mess/
 EXTRACT_SUFX=		.tgz
@@ -13,24 +13,34 @@ HOMEPAGE=		http://internetter.com/titan/mess/
 RUN_DEPENDS=		unzip:../../archivers/unzip
 DEPENDS+=		xpm-3.4k:../../graphics/xpm
 
+CONFLICTS=		xmess-0.1
+
 USE_X11=		yes
 USE_GMAKE=		yes
 MAKE_ENV+=		OPSYS=${OPSYS} ARCH=${ARCH} DESTDIR=${DESTDIR} \
 			INSTALL_MAN="${INSTALL_MAN}" \
-			INSTALL_PROGRAM="${INSTALL_PROGRAM}"
+			INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
+			NETBSD_JOYSTICK="${NETBSD_JOYSTICK}"
+MAKEFILE=		makefile.unix
+ALL_TARGET=		xmess.x11
 
-WRKSRC=			${WRKDIR}/xmess-0.1
+WRKSRC=			${WRKDIR}/xmess-0.2b4.1
 
-MESSDIR=		${PREFIX}/share/mess
+MESSDIR=		${PREFIX}/share/xmess
+.if exists(/usr/include/machine/joystick.h)
+NETBSD_JOYSTICK=	yes 
+.else
+NETBSD_JOYSTICK=	no
+.endif
 
 post-patch:
-	${CP} ${WRKSRC}/makefile.unix ${WRKSRC}/Makefile
-	${SED} 's|@MESSDIR@|${MESSDIR}|' ${WRKSRC}/doc/xmessrc.dist >${WRKSRC}/doc/xmessrc
-	${MV} ${WRKSRC}/src/unix/netbsd_i386.c ${WRKSRC}/src/unix/netbsd.c
+	(cd ${WRKSRC}/doc && ${SED} 's|@MESSDIR@|${MESSDIR}|' xmessrc.dist >xmessrc)
+	(cd ${WRKSRC}/src/unix && ${MV} netbsd_i386.c netbsd.c)
 
-post-install:
-	${MKDIR} -p ${MESSDIR}
-	${CP} ${WRKSRC}/doc/xmessrc ${MESSDIR}/xmessrc
+do-install:
+	(cd ${WRKSRC} && ${INSTALL_PROGRAM} ${ALL_TARGET} ${PREFIX}/bin/xmess)
+	${MKDIR} ${MESSDIR}
+	(cd ${WRKSRC}/doc && ${INSTALL_DATA} xmessrc ${MESSDIR}/xmessrc)
 	@${ECHO} Remember to set MESSDIR to ${MESSDIR}.
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/xmess/files/md5 b/emulators/xmess/files/md5
index 9cdf88f15f9..fb298b9232f 100644
--- a/emulators/xmess/files/md5
+++ b/emulators/xmess/files/md5
@@ -1,3 +1,4 @@
-$NetBSD: md5,v 1.2 1998/08/07 13:21:29 agc Exp $
+$NetBSD: md5,v 1.3 1998/08/29 04:24:29 mycroft Exp $
 
 MD5 (unix01.tgz) = a97c1357d8caee829a3e2f6679f44535
+MD5 (unix02b4.tgz) = 2036d994aba7315d3204a9310c66f37c
diff --git a/emulators/xmess/patches/patch-aa b/emulators/xmess/patches/patch-aa
index 488ed76d848..46f269d8f2c 100644
--- a/emulators/xmess/patches/patch-aa
+++ b/emulators/xmess/patches/patch-aa
@@ -1,8 +1,6 @@
-$NetBSD: patch-aa,v 1.4 1998/08/07 10:40:37 agc Exp $
-
---- makefile.unix.orig	Fri Jun  5 09:49:04 1998
-+++ makefile.unix	Thu Jul 23 05:35:49 1998
-@@ -13,7 +13,7 @@
+--- makefile.unix.orig	Wed Aug 26 18:40:21 1998
++++ makefile.unix	Fri Aug 28 23:23:33 1998
+@@ -39,7 +39,7 @@
  # GNU MAKE is MANDATORY !!!
  # so please give me the path...
  # if GNU make is "native" use this
@@ -11,38 +9,71 @@ $NetBSD: patch-aa,v 1.4 1998/08/07 10:40:37 agc Exp $
  # else ...
  # MAKE=/usr/people/jantonio/bin/gmake
  
-@@ -72,7 +72,9 @@
+@@ -99,18 +99,18 @@
+ # *** Select destination directory for your compiled program , manual page
+ # and binary distribution ( if you want to... )
+ # ( only needed to install, not to compile... )
+-DESTDIR = /usr/games
+-MANDIR  = /usr/local/man/man6
++DESTDIR = ${PREFIX}/bin
++MANDIR  = ${PREFIX}/man/man6
+ DISTDIR = /home/ftp/pub/emulators/$(NAME)
+ 
+ # *** Where the ROM source tree ?
+-ROMPATH = \"/usr/games/lib/$(NAME)\"
++ROMPATH = \"${PREFIX}/share/$(NAME)\"
+ 
+ # *** Where to store high scores ?
+-SDIR = \"/usr/games/lib/$(NAME)\"
++SDIR = \"${PREFIX}/share/$(NAME)\"
+ 
+ # *** Where resides global configuration file ?
+-MRC = \"/usr/games/lib/$(NAME)/$(NAME)rc\"
++MRC = \"${PREFIX}/share/$(NAME)/$(NAME)rc\"
+ 
+ 
+ ##############################################################################
+@@ -118,7 +118,9 @@
  ##############################################################################
  
  # *** To disable joystick support comment next line
 -# JOY		= -DUSE_JOYSTICK
-+ifeq (${MACHINE},i386)
++ifeq (${NETBSD_JOYSTICK},yes)
 +JOY		= -DUSE_JOYSTICK
 +endif
  
  # *** To disable  mouse support comment next line
  MOUSE		= -DUSE_MOUSE
-@@ -91,7 +93,9 @@
+@@ -137,7 +139,9 @@
  # JSLIB   = -lXi
  
  # On iX86 based OS's, if supported, you can use standard joystick driver
 -# JS	= -DI386_JOYSTICK
-+ifeq (${MACHINE},i386)
++ifeq (${NETBSD_JOYSTICK},yes)
 +JS	= -DI386_JOYSTICK
 +endif
  
  # Linux FM-TOWNS game PAD joystick emulation support
  # Thanks to Osamu Kurati for provided patch
-@@ -106,7 +110,7 @@
+@@ -158,8 +162,8 @@
+ # you might decide to use these feature. Otherwise, you should use a 
+ # timer based audio code and ajust in src/unix/sound.h AUDIO_TIMER_FREQ item
+ #
+-S_TIM = -DDONTUSE_TIMER
+-# S_TIM = -DUSE_TIMER
++# S_TIM = -DDONTUSE_TIMER
++S_TIM = -DUSE_TIMER
+ 
+ # *** When using timer, you should provide the frequency to generate audio sample
+ # frames in your system. See readme.unix notes about these item
+@@ -215,14 +219,14 @@
  # *** If you haven't  the MIT-Shared Memory X Extensions, comment the following:
  # ( Test if available by mean of xdpyinfo command )
- # Comment it if compiling for svgalib
+ # Comment it if not compiling  for normal x11
 -# MSHM	= -DUSE_MITSHM
 +MSHM	= -DUSE_MITSHM
  
- # *** Does your system support gettimeofday() function? If do, we encourage you
- # to enable this feature . Else .... comment it :-(
-@@ -125,8 +129,8 @@
+ # standard location for X11 
  # X11INC		= -I/usr/include/X11
  # X11LIB		= -L/usr/lib/X11
  # standard location for XFree86
@@ -53,80 +84,46 @@ $NetBSD: patch-aa,v 1.4 1998/08/07 10:40:37 agc Exp $
  # for Sun systems 
  # X11INC		= -I/usr/openwin/include
  # X11LIB		= -L/usr/openwin/lib
-@@ -141,14 +145,14 @@
- # *** Select destination directory for your compiled program
- # and binary distribution ( if you want to... )
- # ( only needed to install, not to compile... )
--DESTDIR = /usr/games
-+DESTDIR = ${PREFIX}/bin
- DISTDIR = /home/ftp/pub/emulators/mess
- 
- # *** Where to store high scores ?
--SDIR = \"/usr/games/lib/mess\"
-+SDIR = \"${PREFIX}/share/mess\"
- 
- # *** Where resides global configuration file ?
--MRC = \"/usr/games/lib/mess/xmessrc\"
-+MRC = \"${PREFIX}/share/mess/xmessrc\"
- 
- # *** Use this definition as default X Display
- DP = \":0.0\"
-@@ -170,8 +174,8 @@
- # you might decide to use these feature. Otherwise, you should use a 
- # timer based audio code and ajust in src/unix/sound.h AUDIO_TIMER_FREQ item
- #
--S_TIM = -DDONTUSE_TIMER
--# S_TIM = -DUSE_TIMER
-+# S_TIM = -DDONTUSE_TIMER
-+S_TIM = -DUSE_TIMER
- 
- # *** When using timer, you should provide the frequency to generate audio sample
- # frames in your system. See readme.unix notes about these item
-@@ -193,7 +197,7 @@
- ######## Alpha/Linux/X11
+@@ -243,11 +247,12 @@
+ ######## Alpha/Linux
  # ARCH  = linux_alpha
- ######## ix86/Linux/X11
--ARCH  = linux
-+# ARCH  = linux
- ######## ix86/Linux/SVGALIB
- # ARCH	= svgalib
- ######## ix86/Linux/GGI *New* *New* *New* Please test - no mouse or joy yet
-@@ -201,7 +205,8 @@
- ######## ix86/FreeBSD/X11 and ix86/BSDi/X11
+ ######## ix86/Linux
+-ARCH  = linux_i386
++# ARCH  = linux_i386
+ ######## ix86/FreeBSD and ix86/BSDi
  # ARCH  = FREEBSD
- ######## ix86/NetBSD/X11
+ ######## ix86/NetBSD
 -# ARCH  = netbsd_i386
 +ARCH  = netbsd
 +MACHINE  != uname -m
- ######## Sparc/SunOS/X11 ( no sound )
+ ######## Sparc/SunOS ( no sound )
  # ARCH  = sunos
- ######## ix86/Solaris/X11
-@@ -277,17 +282,22 @@
- 		-fomit-frame-pointer -Wall
- INST.FREEBSD   = doinstall
- 
--# netbsd_i386
-+# netbsd
- #####################
--#If you want sound add to DEFS.netbsd_i386  "-DUSE_AUDIO" and 
-+#If you want sound add to DEFS.netbsd  "-DUSE_AUDIO" and 
- #set STIM=-DUSE_TIMER above
- #
--DEFS.netbsd_i386   = -DX86_ASM -DLSB_FIRST -DUNIX -Dnetbsd_i386 -DNETBSD \
+ ######## ix86/Solaris
+@@ -282,7 +287,11 @@
+ DEFS.linux_alpha   = -Dlinux -DLSB_FIRST -DAXP_ASM -DACORN
+ DEFS.linux_i386    = -Dlinux -DLSB_FIRST -DX86_ASM
+ DEFS.FREEBSD       = -DLSB_FIRST -DX86_ASM -Dlinux -DFREEBSD_SOUND_WORKAROUND
+-DEFS.netbsd_i386   = -DLSB_FIRST -DX86_ASM -DNETBSD -DUSE_AUDIO
 +ifeq (${MACHINE},i386)
-+DEFS.netbsd   = -DX86_ASM -DLSB_FIRST -DUNIX -DNETBSD \
- 		-DHAVE_GETTIMEOFDAY -DUSE_AUDIO -DSIGNED_SAMPLES
--LIBS.netbsd_i386   = $(X11LIB) -lX11 -lXext -lm
--CFLAGS.netbsd_i386 = $(X11INC) -m486 -fstrength-reduce -funroll-loops \
++DEFS.netbsd        = -DLSB_FIRST -DX86_ASM -DNETBSD -DUSE_AUDIO
 +else
-+DEFS.netbsd   =	-DLSB_FIRST -DUNIX -DNETBSD \
-+		-DHAVE_GETTIMEOFDAY -DUSE_AUDIO -DSIGNED_SAMPLES
++DEFS.netbsd        = -DLSB_FIRST -DNETBSD -DUSE_AUDIO
 +endif
-+LIBS.netbsd   = $(X11LIB) -lX11 -lXext -lm
-+CFLAGS.netbsd = $(X11INC) -O3 -fstrength-reduce -funroll-loops \
- 		-fomit-frame-pointer -Wall
--INST.netbsd_i386   = doinstall
-+INST.netbsd   = doinstall
+ DEFS.sunos	   = -Dsun -DCLOCKS_PER_SEC=1000000 -DACORN
+ DEFS.solaris	   = -Dsun -DACORN 
+ DEFS.solaris_i386  = -DLSB_FIRST -Dsun -Dsolaris
+@@ -300,12 +309,14 @@
+ LIBS.solaris_i386  = -lm -lnsl -lsocket
+ LIBS.irix          = -lm -laudio
+ LIBS.aix           = -lm -lUMSobj
++LIBS.netbsd	   = -lm
+ 
+ ##############################################################################
+ # **** Architecture dependent cflags. Only change if you know what're you doing...
+ ##############################################################################
+ CFLAGS.linux_powerpc = -fsigned-char
+ CFLAGS.aix	     = -I/usr/include/UMS -I/usr/lpp/som/include 
++CFLAGS.netbsd	     = -fstrength-reduce -funroll-loops -fomit-frame-pointer
  
- # SunOS
- #####################
+ #############################################################################
+ # **** Display dependent libs. Only change if you know what're you doing...
diff --git a/emulators/xmess/patches/patch-ab b/emulators/xmess/patches/patch-ab
index 32f08773709..4a3de59ef88 100644
--- a/emulators/xmess/patches/patch-ab
+++ b/emulators/xmess/patches/patch-ab
@@ -1,21 +1,10 @@
-$NetBSD: patch-ab,v 1.2 1998/08/07 10:40:37 agc Exp $
-
---- src/unix/Makefile.orig	Fri Jun  5 07:32:04 1998
-+++ src/unix/Makefile	Thu Jul  9 08:15:16 1998
-@@ -25,6 +25,7 @@
+--- src/unix/Makefile.orig	Tue Aug 25 07:39:20 1998
++++ src/unix/Makefile	Fri Aug 28 23:08:49 1998
+@@ -16,6 +16,7 @@
  
- $(TRG): $(ALLOBJS)
- 	ar -rcv $@ $(UOBJS)
+ $(TARGET): $(OBJS)
+ 	ar -rcv $@ $(OBJS)
 +	ranlib $@
  
- $(OBJDIR)/%.o: %.c xmame.h
- 	$(CC) $(DEFS) -I../../src/ $(MS) $(JS) $(CFLAGS) -o $@ -c $<
-@@ -42,7 +43,7 @@
- $(OBJDIR)/irix.o: irix.c xmame.h sound.h
- $(OBJDIR)/hpux.o: hpux.c xmame.h sound.h
- $(OBJDIR)/aix.o: aix.c xmame.h sound.h
--$(OBJDIR)/netbsd_i386.o: netbsd_i386.c xmame.h sound.h
-+$(OBJDIR)/netbsd.o: netbsd.c xmame.h sound.h
- $(OBJDIR)/sndserver.o: sndserver.c xmame.h
- $(OBJDIR)/svgalib.o: svgalib.c linux.c xmame.h sound.h
- $(OBJDIR)/ultrix.c: ultrix.c xmame.h sound.h
+ $(OBJDIR)/%.o: %.c xmame.h sound.h
+ 	$(CC) -I../../src/ $(CFLAGS) -o $@ -c $<
diff --git a/emulators/xmess/pkg/PLIST b/emulators/xmess/pkg/PLIST
index c1d1d66ff8d..307ee8ed7fd 100644
--- a/emulators/xmess/pkg/PLIST
+++ b/emulators/xmess/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 1998/07/09 12:34:57 mycroft Exp $
+@comment $NetBSD: PLIST,v 1.2 1998/08/29 04:24:29 mycroft Exp $
 bin/xmess
-share/mess/xmessrc
-@dirrm share/mess
+share/xmess/xmessrc
+@dirrm share/xmess