Date: Thu, 22 Feb 2001 17:23:52 +0100 (CET) From: stijn@win.tue.nl To: FreeBSD-gnats-submit@freebsd.org Cc: nox@jelal.kn-bremen.de, c9710216@studentmail.newcastle.edu.au Subject: ports/25283: PORT UPDATE: emulators/xmame and emulators/xmess Message-ID: <200102221623.f1MGNqt52822@pcwin002.win.tue.nl>
next in thread | raw e-mail | index | archive | help
>Number: 25283
>Category: ports
>Synopsis: PORT UPDATE: emulators/xmame and emulators/xmess
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Thu Feb 22 08:30:01 PST 2001
>Closed-Date:
>Last-Modified:
>Originator: Stijn Hoop
>Release: FreeBSD 4.2-STABLE i386
>Organization:
>Environment:
FreeBSD 4.2-STABLE #0: Tue Feb 20 04:30:16 CET 2001
>Description:
- Make emulators/xmess a slave port of emulators/xmame
- Add DGA support (not enabled by default because of required root rights)
- Define spool directory to /var/games/x{mame,mess}, and install binary
setgid games to avoid creating a world writable directory
- Add mameinfo.dat, hiscore.dat, history.dat, and cheat.dat support
for xmame
- Convert last remaining patch into ${SED} in ports Makefile
NOTE: both maintainers CC'd
>How-To-Repeat:
N/A
>Fix:
- Apply attached patch
- Delete xmame/files/patch-ab
- Delete xmess/distinfo, xmess/files/patch-*, xmess/pkg-plist
- Note: both xmame/files and xmess/files should be empty afterwards
diff -urN /usr/ports/emulators/xmame/Makefile xmame/Makefile
--- /usr/ports/emulators/xmame/Makefile Mon Feb 19 05:30:36 2001
+++ xmame/Makefile Thu Feb 22 16:55:28 2001
@@ -2,17 +2,23 @@
# Date created: 4 Sep 1999
# Whom: Donald Burr <dburr@FreeBSD.org>
#
-# $FreeBSD: ports/emulators/xmame/Makefile,v 1.19 2001/02/18 22:23:26 olgeni Exp $
+# $FreeBSD: ports/emulators/xmame/Makefile,v 1.18 2001/02/03 19:59:55 olgeni Exp $
#
-PORTNAME= xmame
+PORTNAME?= xmame
PORTVERSION= 0.37b11.2
CATEGORIES= emulators
MASTER_SITES= http://x.mame.net/download/ \
ftp://ftp.kaupp.cx/pub/xmame/ \
- http://www.ozemail.com.au/~knebauer/xmame/files/
+ http://www.ozemail.com.au/~knebauer/xmame/files/ \
+ http://www.mameworld.net/mameinfo/download/ \
+ http://www.mame.net/zips/ \
+ http://cheat.retrogames.com/ \
+ http://www.sys2064.com/files/mame/
+DISTNAME= xmame-${PORTVERSION}
+DIST_SUBDIR= xmame
-MAINTAINER= c9710216@studentmail.newcastle.edu.au
+MAINTAINER?= c9710216@studentmail.newcastle.edu.au
USE_BZIP2= yes
USE_XPM= yes
@@ -20,15 +26,17 @@
USE_GMAKE= yes
MAKEFILE= makefile.unix
-MAN6= xmame.6
+MAN6= x${MAMEMESS}.6
-XMAMEDOCS= changes.mame \
- changes.unix \
+MAMEMESS?= mame
+SPOOLGAMES?= /var/games
+
+PLIST_SUB+= MAMEMESS="${MAMEMESS}" SPOOLGAMES="${SPOOLGAMES}"
+
+GENERALDOCS= changes.unix \
credits.txt \
- gamelist.mame \
liesmich.unix \
multiplayer-readme.txt \
- readme.mame \
xmame-doc-1.html \
xmame-doc-2.html \
xmame-doc-3.html \
@@ -42,28 +50,94 @@
xmame-doc.sgml \
xmame-doc.txt
+XMAMEDOCS= changes.mame \
+ gamelist.mame \
+ readme.mame
+
+XMESSDOCS= changes.mess \
+ gamelist.mess \
+ messold.txt \
+ messroms.txt \
+ readme.mess
+
+.if ${MAMEMESS} == "mame"
+ALLDOCS= ${GENERALDOCS} ${XMAMEDOCS}
+BUILD_DEPENDS= unzip:${PORTSDIR}/archivers/unzip
+
+MIVER= 281
+HIVER= 7
+
+DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
+ Mameinfo${MIVER}.zip hsdat${HIVER}.zip history.zip \
+ cheat.zip
+EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
+
+post-extract:
+ cd ${WRKDIR} && \
+ unzip -q ${DISTDIR}/${DIST_SUBDIR}/Mameinfo${MIVER}.zip mameinfo.dat
+ cd ${WRKDIR} && \
+ unzip -q ${DISTDIR}/${DIST_SUBDIR}/hsdat${HIVER}.zip hiscore.dat
+ cd ${WRKDIR} && \
+ unzip -q ${DISTDIR}/${DIST_SUBDIR}/history.zip history.dat
+ cd ${WRKDIR} && \
+ unzip -q ${DISTDIR}/${DIST_SUBDIR}/cheat.zip cheat.dat
+.else
+# xmess doesn't need info/highscore files
+ALLDOCS= ${GENERALDOCS} ${XMESSDOCS}
+.endif
+
# the large number of sed regexes here is intended to make this port a whole
# lot easier to maintain - please don't convert them into a patch.
post-patch:
- ${PERL} -pi -e "s@%%PREFIX%%@${PREFIX}@g" ${WRKSRC}/doc/xmamerc.dist
@${CP} ${WRKSRC}/makefile.unix ${WRKSRC}/makefile.unix.sed
- ${SED} -e "s@= gcc@?= ${CC}@g" -e "s@= -O -Wall@?= ${CFLAGS}@g" \
- -e "s@= cp@?= ${INSTALL} ${COPY}@g" -e "s@/usr/games@${PREFIX}/bin@g" \
- -e "s@/usr/local/man/man6@${PREFIX}/man/man6@g" \
- -e "s@/usr/games/lib/\$\(NAME\)@${PREFIX}/share/\$\(NAME\)@g" \
- -e "s@/usr/X11R6@${X11BASE}@g" -e "s@ARCH = linux@ARCH = freebsd@g" \
+ ${SED} -e "s@= gcc@?= ${CC}@g" \
+ -e "s@= -O2 -Wall@?= ${CFLAGS}@g" \
+ -e "s@= cp@?= ${INSTALL} ${COPY}@g" \
+ -e "s@lib/x\$$(TARGET)@share/x\$$(TARGET)@g" \
+ -e "s@/usr/X11R6@${X11BASE}@g" \
+ -e "s@ARCH = linux@ARCH = freebsd@g" \
+ -e "s@# X11_DGA@X11_DGA@g" \
+ -e "s@= mame@= ${MAMEMESS}@g" \
${WRKSRC}/makefile.unix.sed > ${WRKSRC}/makefile.unix
+post-build:
+ cd ${WRKSRC} && ${GMAKE} -f ${MAKEFILE} doc/x${MAMEMESS}.6
+ cd ${WRKSRC} && ${GMAKE} -f ${MAKEFILE} doc/x${MAMEMESS}rc.dist
+ @${CP} ${WRKSRC}/doc/x${MAMEMESS}rc.dist ${WRKSRC}/doc/x${MAMEMESS}rc.dist.sed
+ ${SED} -e "s@^spooldir.*\$$@spooldir ${SPOOLGAMES}/x${MAMEMESS}@" \
+ -e "s@^rompath.*\$$@rompath ${PREFIX}/share/x${MAMEMESS}/roms@" \
+ ${WRKSRC}/doc/x${MAMEMESS}rc.dist.sed > ${WRKSRC}/doc/x${MAMEMESS}rc.dist
+
post-install:
- ${MV} ${PREFIX}/bin/xmame.x11 ${PREFIX}/bin/xmame
- ${MKDIR} ${PREFIX}/share/xmame ${PREFIX}/share/xmame/hi ${PREFIX}/share/xmame/roms
- ${CHMOD} 777 ${PREFIX}/share/xmame/hi
- ${INSTALL_DATA} ${WRKSRC}/doc/xmamerc.dist ${PREFIX}/share/xmame/xmamerc
+ ${MV} ${PREFIX}/bin/x${MAMEMESS}.x11 ${PREFIX}/bin/x${MAMEMESS}
+ ${CHOWN} root:games ${PREFIX}/bin/x${MAMEMESS}
+ ${CHMOD} g+s ${PREFIX}/bin/x${MAMEMESS}
+ ${MKDIR} ${PREFIX}/share/x${MAMEMESS} ${PREFIX}/share/x${MAMEMESS}/roms
+ ${MKDIR} ${SPOOLGAMES}/x${MAMEMESS}
+ ${CHOWN} -R root:games ${SPOOLGAMES}/x${MAMEMESS}
+ ${CHMOD} 775 ${SPOOLGAMES}/x${MAMEMESS}
+ ${INSTALL_DATA} ${WRKSRC}/doc/x${MAMEMESS}rc.dist \
+ ${PREFIX}/etc/x${MAMEMESS}rc
+ ${LN} -sf ${PREFIX}/etc/x${MAMEMESS}rc \
+ ${PREFIX}/share/x${MAMEMESS}/x${MAMEMESS}rc
.if !defined(NOPORTDOCS)
- ${MKDIR} ${PREFIX}/share/doc/xmame
-.for file in ${XMAMEDOCS}
- ${INSTALL_DATA} ${WRKSRC}/doc/${file} ${PREFIX}/share/doc/xmame
+ ${MKDIR} ${PREFIX}/share/doc/x${MAMEMESS}
+.for file in ${ALLDOCS}
+ ${INSTALL_DATA} ${WRKSRC}/doc/${file} ${PREFIX}/share/doc/x${MAMEMESS}
+ @${ECHO} share/doc/x${MAMEMESS}/${file} >> ${TMPPLIST}
.endfor
+ @${ECHO} @dirrm share/doc/x${MAMEMESS} >> ${TMPPLIST}
+.endif
+.if ${MAMEMESS} == "mame"
+ ${INSTALL_DATA} ${WRKDIR}/mameinfo.dat ${PREFIX}/share/xmame
+ @${ECHO} share/xmame/mameinfo.dat >> ${TMPPLIST}
+ ${INSTALL_DATA} ${WRKDIR}/hiscore.dat ${PREFIX}/share/xmame
+ @${ECHO} share/xmame/hiscore.dat >> ${TMPPLIST}
+ ${INSTALL_DATA} ${WRKDIR}/history.dat ${PREFIX}/share/xmame
+ @${ECHO} share/xmame/history.dat >> ${TMPPLIST}
+ ${INSTALL_DATA} ${WRKDIR}/cheat.dat ${PREFIX}/share/xmame
+ @${ECHO} share/xmame/cheat.dat >> ${TMPPLIST}
.endif
-
+ @${ECHO} @dirrm share/x${MAMEMESS} >> ${TMPPLIST}
+
.include <bsd.port.mk>
diff -urN /usr/ports/emulators/xmame/distinfo xmame/distinfo
--- /usr/ports/emulators/xmame/distinfo Mon Feb 19 05:30:39 2001
+++ xmame/distinfo Thu Feb 22 16:12:11 2001
@@ -1 +1,5 @@
-MD5 (xmame-0.37b11.2.tar.bz2) = 723caaa67908860b952f9df6e3744b05
+MD5 (xmame/xmame-0.37b11.2.tar.bz2) = 723caaa67908860b952f9df6e3744b05
+MD5 (xmame/Mameinfo281.zip) = 0328d163ed88167f69160374c2c6ece7
+MD5 (xmame/hsdat7.zip) = 9e4a7e36448895f13128a675327e34e4
+MD5 (xmame/history.zip) = 69da5c33e6a78092c6cd75cbeb737c6a
+MD5 (xmame/cheat.zip) = dc380436c04780950cee07d3e31bfb0b
diff -urN /usr/ports/emulators/xmame/pkg-plist xmame/pkg-plist
--- /usr/ports/emulators/xmame/pkg-plist Sun Feb 4 05:30:34 2001
+++ xmame/pkg-plist Thu Feb 22 17:10:57 2001
@@ -1,28 +1,4 @@
-bin/xmame
-share/xmame/xmamerc
-%%PORTDOCS%%share/doc/xmame/changes.mame
-%%PORTDOCS%%share/doc/xmame/changes.unix
-%%PORTDOCS%%share/doc/xmame/credits.txt
-%%PORTDOCS%%share/doc/xmame/gamelist.mame
-%%PORTDOCS%%share/doc/xmame/liesmich.unix
-%%PORTDOCS%%share/doc/xmame/multiplayer-readme.txt
-%%PORTDOCS%%share/doc/xmame/readme.mame
-%%PORTDOCS%%share/doc/xmame/xmame-doc-1.html
-%%PORTDOCS%%share/doc/xmame/xmame-doc-2.html
-%%PORTDOCS%%share/doc/xmame/xmame-doc-3.html
-%%PORTDOCS%%share/doc/xmame/xmame-doc-4.html
-%%PORTDOCS%%share/doc/xmame/xmame-doc-5.html
-%%PORTDOCS%%share/doc/xmame/xmame-doc-6.html
-%%PORTDOCS%%share/doc/xmame/xmame-doc-7.html
-%%PORTDOCS%%share/doc/xmame/xmame-doc.html
-%%PORTDOCS%%share/doc/xmame/xmame-doc.lyx
-%%PORTDOCS%%share/doc/xmame/xmame-doc.ps
-%%PORTDOCS%%share/doc/xmame/xmame-doc.sgml
-%%PORTDOCS%%share/doc/xmame/xmame-doc.txt
-@exec mkdir -p %D/share/xmame/hi
-@exec mkdir -p %D/share/xmame/roms
-@exec chmod 777 %D/share/xmame/hi
-@unexec rmdir %D/share/xmame/roms 2>/dev/null || true
-@unexec rmdir %D/share/xmame/hi 2>/dev/null || true
-@unexec rmdir %D/share/xmame 2>/dev/null || true
-%%PORTDOCS%%@dirrm share/doc/xmame
+bin/x%%MAMEMESS%%
+share/x%%MAMEMESS%%/x%%MAMEMESS%%rc
+@dirrm share/x%%MAMEMESS%%/roms
+@unexec rmdir %%SPOOLGAMES%%/x%%MAMEMESS%% 2>/dev/null || true
diff -urN /usr/ports/emulators/xmess/Makefile xmess/Makefile
--- /usr/ports/emulators/xmess/Makefile Thu Aug 3 11:23:12 2000
+++ xmess/Makefile Thu Feb 22 13:59:19 2001
@@ -6,50 +6,13 @@
#
PORTNAME= xmess
-PORTVERSION= 0.2b4.1
-CATEGORIES= emulators
-MASTER_SITES= http://mess.emuverse.com/files/ \
- http://www.vintagegaming.com/hosted/vectrex/
-DISTNAME= unix02s4
-DISTFILES= ${DISTNAME}.tgz pdp1.zip
-#MAINTAINER= mycroft@NetBSD.ORG # NetBSD
MAINTAINER= nox@jelal.kn-bremen.de
-EXTRACT_ONLY= ${DISTNAME}.tgz
+MASTERDIR= ${.CURDIR}/../xmame
+COMMENT= ${.CURDIR}/pkg-comment
+DESCR= ${.CURDIR}/pkg-descr
-USE_X_PREFIX= yes
-USE_XPM= yes
-USE_GMAKE= yes
-MAKE_ENV+= OPSYS=${OPSYS} ARCH=${ARCH} MACHINE_ARCH=${ARCH} \
- DESTDIR=${DESTDIR} \
- INSTALL_MAN="${INSTALL_MAN}" \
- INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
- NETBSD_JOYSTICK="${NETBSD_JOYSTICK}" \
- DISPLAY_METHOD="${DISPLAY_METHOD}"
-MAKEFILE= makefile.unix
-DISPLAY_METHOD= x11
-ALL_TARGET= xmess.${DISPLAY_METHOD}
+MAMEMESS= mess
-WRKSRC= ${WRKDIR}/xmess-0.2b4.1
-
-MESSDIR= ${PREFIX}/share/xmess
-MESSLIB= ${PREFIX}/lib/xmess
-.if exists(/usr/include/machine/joystick.h)
-NETBSD_JOYSTICK=yes
-.else
-NETBSD_JOYSTICK=no
-.endif
-
-post-patch:
- (cd ${WRKSRC}/doc && ${SED} 's|@MESSDIR@|${MESSDIR}|;s|@MESSLIB@|${MESSLIB}|' xmessrc.dist >xmessrc)
-
-do-install:
- (cd ${WRKSRC} && ${INSTALL_PROGRAM} ${ALL_TARGET} ${PREFIX}/bin/xmess)
- ${MKDIR} ${MESSDIR}
- (cd ${WRKSRC}/doc && ${INSTALL_DATA} xmessrc ${MESSDIR}/xmessrc)
- ${MKDIR} ${MESSLIB}
- ${INSTALL_DATA} ${_DISTDIR}/pdp1.zip ${MESSLIB}/spacewar.zip
- @${ECHO} try \`xmess pdp1 spacewar\' for the original 1961 Space Wars
-
-.include <bsd.port.mk>
+.include "${MASTERDIR}/Makefile"
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200102221623.f1MGNqt52822>