FIX: emulators/xmame for 4.1-stable

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

FIX: emulators/xmame for 4.1-stable

Antti Harri

Hi,

$ make show=MAINTAINER
The OpenBSD ports mailing-list <[hidden email]>

So, anyone willing to check it out and commit fix
for xmame? It's FOR 4.1-stable, changes taken
FROM -current (except patch level bumps).
The distfiles don't exist anymore (history, cheat and that stuff) and
thus making of bulk package build breaks.

Thanks :-)

PS. Could someone tell me how to handle that OpenBSD
tag line? For example
"# $OpenBSD: Makefile,v 1.29 2007/05/13 12:11:25 aanriot Exp $"

Index: Makefile
===================================================================
RCS file: /cvs/ports/emulators/xmame/Makefile,v
retrieving revision 1.27
retrieving revision 1.29
diff -u -r1.27 -r1.29
--- Makefile 26 Nov 2006 09:54:34 -0000 1.27
+++ Makefile 13 May 2007 12:11:25 -0000 1.29
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.27 2006/11/26 09:54:34 espie Exp $
+# $OpenBSD: Makefile,v 1.29 2007/05/13 12:11:25 aanriot Exp $

  COMMENT-main= "emulates arcade machines and old home computers"
  COMMENT-mame= "emulates a massive variety of arcade machines"
@@ -7,36 +7,26 @@
  VERSION= 0.104
  DISTNAME= xmame-${VERSION}

-PKGNAME-main= xmame+xmess-${VERSION}p0
-PKGNAME-mame= xmame-${VERSION}
-PKGNAME-mess= xmess-${VERSION}
+PKGNAME-main= xmame+xmess-${VERSION}p1
+PKGNAME-mame= xmame-${VERSION}p0
+PKGNAME-mess= xmess-${VERSION}p0

  CATEGORIES= emulators games
-MASTER_SITES= ${HOMEPAGE}/download/ \
- ${HOMEPAGE}/download/historic/ \
- ftp://ftp.kaupp.cx/pub/xmame/ \
- http://www.atlantilde.com/~aanriot/distfiles/
-MASTER_SITES0= http://www.mameworld.net/highscore/ \
- http://www.atlantilde.com/~aanriot/distfiles/
+MASTER_SITES= ftp://xmame.kaupp.us/pub/xmame/ \
+ http://www.energyhq.be/files/ \
+ http://www.pkix.net/mirror/x.mame.net/

  HOMEPAGE= http://x.mame.net

-HISCORE_FILE= uhsdat${VERSION:S/.//}.zip
-HISTORY_FILE= history1_02.zip
-CHEAT_FILE= cheat_20051018.zip
-DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${HISCORE_FILE}:0 \
- ${HISTORY_FILE} ${CHEAT_FILE}
-
  # Need to know endianness
  ONLY_FOR_ARCHS= amd64 alpha hppa i386 m68k sparc

-# xmame license, see
-# http://x.mame.net/license.html
+# xmame license, see http://x.mame.net/license.html
  PERMIT_PACKAGE_CDROM= "may not sell"
  PERMIT_PACKAGE_FTP= "Yes"
  PERMIT_DISTFILES_CDROM= "may not sell"
  PERMIT_DISTFILES_FTP= "Yes"
-WANTLIB= X11 Xext Xv Xxf86dga Xxf86vm c m usbhid z
+WANTLIB= X11 Xext Xv Xxf86dga Xxf86vm expat c m usbhid z

  EXTRACT_SUFX= .tar.bz2

@@ -47,12 +37,7 @@

  MULTI_PACKAGES= -main -mame -mess

-FLAVORS= x11 sdl
-FLAVORS+= esd
-
-#XXX arts coredumps, net broken
-#FLAVORS+= arts net
-
+FLAVORS= esd sdl x11
  FLAVOR?= x11

  .if ${FLAVOR:L:Msdl} && ${FLAVOR:L:Mx11}
@@ -69,17 +54,6 @@
  MAKE_FLAGS+= X11_OPENGL=1
  .endif

-# XXX coredump
-#.if ${FLAVOR:L:Marts}
-#LIB_DEPENDS+= artsc::x11/kde/arts3
-#MAKE_FLAGS+= SOUND_ARTS_SMOTEK=1 SOUND_ARTS_TEIRA=1
-#.endif
-
-# XXX broken
-#.if ${FLAVOR:L:Mnet}
-#MAKE_FLAGS+= XMAME_NET=1
-#.endif
-
  .if ${FLAVOR:L:Mesd}
  LIB_DEPENDS+= esd::audio/esound
  MAKE_FLAGS+= SOUND_ESOUND=1
@@ -101,16 +75,14 @@
  MAKE_FLAGS+= MY_CPU=risc
  .endif

-LIB_DEPENDS+= expat::textproc/expat
-
  MAKE_ENV= PREFIX="${PREFIX}"
  MAKE_FILE= Makefile.OpenBSD
  FAKE_FLAGS= ${MAKE_FLAGS}
  MAKE_FLAGS+= ARCH=openbsd \
  CC="${CC}" CFLAGS="${CFLAGS}" \
  DISPLAY_METHOD="${DISPLAY_METHOD}" \
- INCLUDES="-I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib -lexpat -lz" GLLIBS="" \
+ INCLUDES="-I${X11BASE}/include -I${LOCALBASE}/include" \
+ LIBS="-L${X11BASE}/lib -L${LOCALBASE}/lib -lexpat -lz" GLLIBS="" \
  INSTALL_PROGRAM_DIR="${INSTALL_PROGRAM_DIR}" \
  INSTALL_MAN_DIR="${INSTALL_MAN_DIR}" \
  INSTALL_DATA_DIR="${INSTALL_DATA_DIR}" \
@@ -153,11 +125,6 @@
  windows/mgebios.htm windows/instbios.htm windows/runsw.htm \
  windows/suppsys.htm

-post-extract:
- ${UNZIP} -u ${FULLDISTDIR}/${HISCORE_FILE} -d ${WRKDIR}
- ${UNZIP} -u ${FULLDISTDIR}/${HISTORY_FILE} -d ${WRKDIR}
- ${UNZIP} -u ${FULLDISTDIR}/${CHEAT_FILE} -d ${WRKDIR}
-
  post-patch:
  @cp ${FILESDIR}/${MAKE_FILE} ${WRKSRC}

@@ -186,7 +153,6 @@
  ${INSTALL_DATA} ${FILESDIR}/xmame-${DISPLAY_METHOD}rc \
  ${PREFIX}/share/xmame/xmamerc
  ${INSTALL_DATA} ${WRKSRC}/ctrlr/* ${PREFIX}/share/xmame/ctrlr
- ${INSTALL_DATA} ${WRKDIR}/*.{dat,txt} ${PREFIX}/share/xmame
  ${INSTALL_DATA_DIR} ${PREFIX}/share/xmess/hash
  ${INSTALL_DATA} ${WRKSRC}/hash/* ${PREFIX}/share/xmess/hash
  ${INSTALL_DATA} ${FILESDIR}/xmess-${DISPLAY_METHOD}rc \
Index: distinfo
===================================================================
RCS file: /cvs/ports/emulators/xmame/distinfo,v
retrieving revision 1.6
diff -u -r1.6 distinfo
--- distinfo 1 Apr 2006 07:20:33 -0000 1.6
+++ distinfo 12 Jun 2007 05:16:14 -0000
@@ -1,16 +1,5 @@
-MD5 (cheat_20051018.zip) = 0ff8ce7a39439d813760e1a8e57af62a
-MD5 (history1_02.zip) = 5e775f567e85c5c68da56947f02966fa
-MD5 (uhsdat0104.zip) = d3d34853d7153ed918985b7a0e69246c
  MD5 (xmame-0.104.tar.bz2) = d75ef4845f3b961ec1bfa6e80fbf9433
-RMD160 (cheat_20051018.zip) = 1302c3ec942862a7e1d0e3fa5ff4b5f3ae4e13a6
-RMD160 (history1_02.zip) = f394ca4cccb23db07779741a4a9ff6fe6a727756
-RMD160 (uhsdat0104.zip) = a8738fe5c8c404be603094fd524df0bffcc97c2d
  RMD160 (xmame-0.104.tar.bz2) = 5eda9ca4fcfe5cd76adcd0ab78104fd74acceb77
-SHA1 (cheat_20051018.zip) = 3eaa1be4a85a888de99ae4af38cc850e8a957b8e
-SHA1 (history1_02.zip) = ba3367695950f0feb921843fd06ba13e8cca1087
-SHA1 (uhsdat0104.zip) = d5e6b17cab70125032b0ae0933db72a52f1764db
  SHA1 (xmame-0.104.tar.bz2) = d974cdc5edbdc1591eb276dadfc6c35ec4d10e43
-SIZE (cheat_20051018.zip) = 944626
-SIZE (history1_02.zip) = 1569593
-SIZE (uhsdat0104.zip) = 64969
+SHA256 (xmame-0.104.tar.bz2) = 2d6bf6f4c18b21778c48c7f16bbdbd8a4a01450d30d71182e8d19db5983df550
  SIZE (xmame-0.104.tar.bz2) = 16249286
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/emulators/xmame/pkg/PLIST-main,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pkg/PLIST-main 26 Nov 2006 09:54:34 -0000 1.1
+++ pkg/PLIST-main 13 May 2007 12:11:25 -0000 1.2
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-main,v 1.1 2006/11/26 09:54:34 espie Exp $
+@comment $OpenBSD: PLIST-main,v 1.2 2007/05/13 12:11:25 aanriot Exp $
  @conflict xmame-*
  @conflict xmess-*
  bin/chdman
@@ -106,16 +106,12 @@
  share/xmame/cab/glmamejau/glmamejau.cab
  share/xmame/cab/trans/
  share/xmame/cab/trans/trans.cab
-share/xmame/cheat.dat
  share/xmame/ctrlr/
  share/xmame/ctrlr/hotrod.cfg
  share/xmame/ctrlr/hotrodse.cfg
  share/xmame/ctrlr/slikstik.cfg
  share/xmame/ctrlr/standard.cfg
  share/xmame/ctrlr/xarcade.cfg
-share/xmame/hiscore.dat
-share/xmame/history.dat
-share/xmame/unofficial_hiscore.txt
  share/xmame/xmamerc
  @sample ${SYSCONFDIR}/xmamerc
  share/xmess/
Index: pkg/PLIST-main-sdl
===================================================================
RCS file: /cvs/ports/emulators/xmame/pkg/PLIST-main-sdl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pkg/PLIST-main-sdl 26 Nov 2006 09:54:34 -0000 1.1
+++ pkg/PLIST-main-sdl 13 May 2007 12:11:25 -0000 1.2
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-main-sdl,v 1.1 2006/11/26 09:54:34 espie Exp $
+@comment $OpenBSD: PLIST-main-sdl,v 1.2 2007/05/13 12:11:25 aanriot Exp $
  @conflict xmame-*
  @conflict xmess-*
  bin/chdman
@@ -94,16 +94,12 @@
  share/doc/xmame/xmamerc.dist
  share/doc/xmame/xmessrc.dist
  share/xmame/
-share/xmame/cheat.dat
  share/xmame/ctrlr/
  share/xmame/ctrlr/hotrod.cfg
  share/xmame/ctrlr/hotrodse.cfg
  share/xmame/ctrlr/slikstik.cfg
  share/xmame/ctrlr/standard.cfg
  share/xmame/ctrlr/xarcade.cfg
-share/xmame/hiscore.dat
-share/xmame/history.dat
-share/xmame/unofficial_hiscore.txt
  share/xmame/xmamerc
  @sample ${SYSCONFDIR}/xmamerc
  share/xmess/
Index: pkg/PLIST-mame
===================================================================
RCS file: /cvs/ports/emulators/xmame/pkg/PLIST-mame,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- pkg/PLIST-mame 2 Oct 2005 01:39:38 -0000 1.7
+++ pkg/PLIST-mame 13 May 2007 12:11:25 -0000 1.8
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-mame,v 1.7 2005/10/02 01:39:38 fgsch Exp $
+@comment $OpenBSD: PLIST-mame,v 1.8 2007/05/13 12:11:25 aanriot Exp $
  @conflict xmame+xmess-*
  @conflict xmess-*
  bin/romcmp
@@ -56,15 +56,11 @@
  share/xmame/cab/glmamejau/glmamejau.cab
  share/xmame/cab/trans/
  share/xmame/cab/trans/trans.cab
-share/xmame/cheat.dat
  share/xmame/ctrlr/
  share/xmame/ctrlr/hotrod.cfg
  share/xmame/ctrlr/hotrodse.cfg
  share/xmame/ctrlr/slikstik.cfg
  share/xmame/ctrlr/standard.cfg
  share/xmame/ctrlr/xarcade.cfg
-share/xmame/hiscore.dat
-share/xmame/history.dat
-share/xmame/unofficial_hiscore.txt
  share/xmame/xmamerc
  @sample ${SYSCONFDIR}/xmamerc
Index: pkg/PLIST-mame-sdl
===================================================================
RCS file: /cvs/ports/emulators/xmame/pkg/PLIST-mame-sdl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- pkg/PLIST-mame-sdl 2 Oct 2005 01:39:38 -0000 1.6
+++ pkg/PLIST-mame-sdl 13 May 2007 12:11:25 -0000 1.7
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-mame-sdl,v 1.6 2005/10/02 01:39:38 fgsch Exp $
+@comment $OpenBSD: PLIST-mame-sdl,v 1.7 2007/05/13 12:11:25 aanriot Exp $
  @conflict xmame+xmess-*
  @conflict xmess-*
  bin/romcmp
@@ -44,15 +44,11 @@
  share/doc/xmame/xmame.css
  share/doc/xmame/xmamerc.dist
  share/xmame/
-share/xmame/cheat.dat
  share/xmame/ctrlr/
  share/xmame/ctrlr/hotrod.cfg
  share/xmame/ctrlr/hotrodse.cfg
  share/xmame/ctrlr/slikstik.cfg
  share/xmame/ctrlr/standard.cfg
  share/xmame/ctrlr/xarcade.cfg
-share/xmame/hiscore.dat
-share/xmame/history.dat
-share/xmame/unofficial_hiscore.txt
  share/xmame/xmamerc
  @sample ${SYSCONFDIR}/xmamerc