diff options
| -rw-r--r-- | emulators/xmame/Makefile | 23 | ||||
| -rw-r--r-- | emulators/xmame/files/md5 | 3 | ||||
| -rw-r--r-- | emulators/xmame/patches/patch-aa | 161 | ||||
| -rw-r--r-- | emulators/xmame/patches/patch-ab | 25 | ||||
| -rw-r--r-- | emulators/xmame/patches/patch-ba | 13 | ||||
| -rw-r--r-- | emulators/xmame/pkg/PLIST | 6 |
6 files changed, 101 insertions, 130 deletions
diff --git a/emulators/xmame/Makefile b/emulators/xmame/Makefile index eb3a471e056..40cc221cd2a 100644 --- a/emulators/xmame/Makefile +++ b/emulators/xmame/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.13 1998/08/23 19:29:51 tron Exp $ +# $NetBSD: Makefile,v 1.14 1998/08/29 04:08:12 mycroft Exp $ # -DISTNAME= xmame-0.33b6.1 +DISTNAME= xmame-0.34b1.1 CATEGORIES= emulators games x11 -MASTER_SITES= ftp://drake.dit.upm.es/pub/emulators/mame/ +MASTER_SITES= ftp://drake.dit.upm.es/xmame/ftpsite/ EXTRACT_SUFX= .tgz MAINTAINER= mycroft@NetBSD.ORG @@ -12,7 +12,7 @@ HOMEPAGE= http://drake.dit.upm.es/~mame/ RUN_DEPENDS= unzip:../../archivers/unzip DEPENDS+= xpm-3.4k:../../graphics/xpm -CONFLICTS= xmame-0.30.1 +CONFLICTS= xmame-0.30.1 xmame-0.33b6.1 USE_X11= yes USE_GMAKE= yes @@ -20,8 +20,10 @@ MAKE_ENV+= OPSYS=${OPSYS} ARCH=${ARCH} DESTDIR=${DESTDIR} \ INSTALL_MAN="${INSTALL_MAN}" \ INSTALL_PROGRAM="${INSTALL_PROGRAM}" \ NETBSD_JOYSTICK="${NETBSD_JOYSTICK}" +MAKEFILE= makefile.unix +ALL_TARGET= xmame.xwindows -MAMEDIR= ${PREFIX}/share/mame +MAMEDIR= ${PREFIX}/share/xmame .if exists(/usr/include/machine/joystick.h) NETBSD_JOYSTICK= yes .else @@ -29,13 +31,14 @@ NETBSD_JOYSTICK= no .endif post-patch: - ${CP} ${WRKSRC}/makefile.unix ${WRKSRC}/Makefile - ${SED} 's|@MAMEDIR@|${MAMEDIR}|' ${WRKSRC}/doc/xmamerc.dist >${WRKSRC}/doc/xmamerc - ${MV} ${WRKSRC}/src/unix/netbsd_i386.c ${WRKSRC}/src/unix/netbsd.c + (cd ${WRKSRC}/doc && ${SED} 's|@MAMEDIR@|${MAMEDIR}|' xmamerc.dist >xmamerc) + (cd ${WRKSRC}/src/unix && ${MV} netbsd_i386.c netbsd.c) -post-install: +do-install: + (cd ${WRKSRC} && ${INSTALL_PROGRAM} ${ALL_TARGET} ${PREFIX}/bin/xmame) + (cd ${WRKSRC}/doc && ${INSTALL_MAN} xmame.man ${PREFIX}/man/man6/xmame.6) ${MKDIR} ${MAMEDIR} - ${CP} ${WRKSRC}/doc/xmamerc ${MAMEDIR}/xmamerc + (cd ${WRKSRC}/doc && ${INSTALL_DATA} xmamerc ${MAMEDIR}/xmamerc) @${ECHO} Remember to set MAMEDIR to ${MAMEDIR}. .include "../../mk/bsd.pkg.mk" diff --git a/emulators/xmame/files/md5 b/emulators/xmame/files/md5 index 1471afe9e25..8f0a6e605a4 100644 --- a/emulators/xmame/files/md5 +++ b/emulators/xmame/files/md5 @@ -1,3 +1,4 @@ -$NetBSD: md5,v 1.3 1998/08/07 13:21:29 agc Exp $ +$NetBSD: md5,v 1.4 1998/08/29 04:08:13 mycroft Exp $ MD5 (xmame-0.33b6.1.tgz) = 6d0a801031f33ae5610005ed82e7e35f +MD5 (xmame-0.34b1.1.tgz) = 83fb9b6a57743d59a1ca1fe54950d4c0 diff --git a/emulators/xmame/patches/patch-aa b/emulators/xmame/patches/patch-aa index adc7cdcb5f4..db6a369bd90 100644 --- a/emulators/xmame/patches/patch-aa +++ b/emulators/xmame/patches/patch-aa @@ -1,8 +1,6 @@ -$NetBSD: patch-aa,v 1.8 1998/08/23 19:25:40 tron Exp $ - ---- makefile.unix.orig Wed Jun 17 06:07:13 1998 -+++ makefile.unix Thu Jul 23 05:34:54 1998 -@@ -36,7 +36,7 @@ +--- makefile.unix.orig Sun Aug 23 17:44:39 1998 ++++ makefile.unix Fri Aug 28 23:42:40 1998 +@@ -38,7 +38,7 @@ # GNU MAKE is MANDATORY !!! # so please give me the path... # if GNU make is "native" use this @@ -11,7 +9,31 @@ $NetBSD: patch-aa,v 1.8 1998/08/23 19:25:40 tron Exp $ # else ... # MAKE=/usr/people/jantonio/bin/gmake -@@ -95,7 +95,9 @@ +@@ -98,18 +98,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/mame + + # *** Where the ROM source tree ? +-MDIR = \"/usr/games/lib/mame\" ++MDIR = \"${PREFIX}/share/xmame\" + + # *** Where to store high scores ? +-SDIR = \"/usr/games/lib/mame\" ++SDIR = \"${PREFIX}/share/xmame\" + + # *** Where resides global configuration file ? +-MRC = \"/usr/games/lib/mame/xmamerc\" ++MRC = \"${PREFIX}/share/xmame/xmamerc\" + + + ############################################################################## +@@ -117,7 +117,9 @@ ############################################################################## # *** To disable joystick support comment next line @@ -22,7 +44,7 @@ $NetBSD: patch-aa,v 1.8 1998/08/23 19:25:40 tron Exp $ # *** To disable mouse support comment next line MOUSE = -DUSE_MOUSE -@@ -114,7 +116,9 @@ +@@ -136,7 +138,9 @@ # JSLIB = -lXi # On iX86 based OS's, if supported, you can use standard joystick driver @@ -33,16 +55,25 @@ $NetBSD: patch-aa,v 1.8 1998/08/23 19:25:40 tron Exp $ # Linux FM-TOWNS game PAD joystick emulation support # Thanks to Osamu Kurati for provided patch -@@ -129,7 +133,7 @@ +@@ -157,8 +161,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 +@@ -208,14 +212,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 to svgalib xmame + # Comment it if not compiling for normal xwindows -# MSHM = -DUSE_MITSHM +MSHM = -DUSE_MITSHM - # *** Does your system support gettimeofday() function? If do, we encourage you - # to enable this feature . Else .... comment it :-( -@@ -148,8 +152,8 @@ + # standard location for X11 # X11INC = -I/usr/include/X11 # X11LIB = -L/usr/lib/X11 # standard location for XFree86 @@ -53,86 +84,46 @@ $NetBSD: patch-aa,v 1.8 1998/08/23 19:25:40 tron Exp $ # for Sun systems # X11INC = -I/usr/openwin/include # X11LIB = -L/usr/openwin/lib -@@ -164,18 +168,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/mame - - # *** Where the ROM source tree ? --MDIR = \"/usr/games/lib/mame\" -+MDIR = \"${PREFIX}/share/mame\" - - # *** Where to store high scores ? --SDIR = \"/usr/games/lib/mame\" -+SDIR = \"${PREFIX}/share/mame\" - - # *** Where resides global configuration file ? --MRC = \"/usr/games/lib/mame/xmamerc\" -+MRC = \"${PREFIX}/share/mame/xmamerc\" - - # *** Use this definition as default X Display - DP = \":0.0\" -@@ -197,8 +201,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 -@@ -220,7 +224,7 @@ - ######## Alpha/Linux/X11 +@@ -236,11 +240,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 -@@ -228,7 +232,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 -@@ -304,17 +309,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 +@@ -275,7 +280,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 +@@ -293,12 +302,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/xmame/patches/patch-ab b/emulators/xmame/patches/patch-ab index d95d22f1f52..f0826203670 100644 --- a/emulators/xmame/patches/patch-ab +++ b/emulators/xmame/patches/patch-ab @@ -1,21 +1,10 @@ -$NetBSD: patch-ab,v 1.3 1998/08/07 10:40:37 agc Exp $ - ---- src/unix/Makefile.orig Fri Jun 5 07:32:04 1998 -+++ src/unix/Makefile Sat Jul 4 07:37:41 1998 -@@ -25,6 +25,7 @@ +--- src/unix/Makefile.orig Sun Aug 23 17:31:13 1998 ++++ src/unix/Makefile Fri Aug 28 23:37:29 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/xmame/patches/patch-ba b/emulators/xmame/patches/patch-ba deleted file mode 100644 index 9be73453873..00000000000 --- a/emulators/xmame/patches/patch-ba +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ba,v 1.2 1998/08/07 10:40:37 agc Exp $ - ---- src/drivers/1942.c.orig Wed Jun 17 04:28:50 1998 -+++ src/drivers/1942.c Sun Jul 5 07:42:45 1998 -@@ -849,7 +849,7 @@ - { - __FILE__, - &c1942_driver, -- "1942", -+ "1942a", - "1942 (alternate)", - "1984", - "Capcom", diff --git a/emulators/xmame/pkg/PLIST b/emulators/xmame/pkg/PLIST index de3e9e838e5..957f16cfda1 100644 --- a/emulators/xmame/pkg/PLIST +++ b/emulators/xmame/pkg/PLIST @@ -1,5 +1,5 @@ -@comment $NetBSD: PLIST,v 1.2 1998/07/04 12:05:07 mycroft Exp $ +@comment $NetBSD: PLIST,v 1.3 1998/08/29 04:08:13 mycroft Exp $ bin/xmame man/man6/xmame.6 -share/mame/xmamerc -@dirrm share/mame +share/xmame/xmamerc +@dirrm share/xmame |