- Finish repocopy of sdlmame-devel and update to version 0.130u1

PR:		ports/128558
Submitted by:	Emmanuel Vadot <elbarto@arcadebsd.org>

9 files changed, 71 insertions, 56 deletions

diff --git a/emulators/sdlmame-devel/Makefile b/emulators/sdlmame-devel/Makefile
index b08dccff1688..e1f9d4e2bdf0 100644
--- a/emulators/sdlmame-devel/Makefile
+++ b/emulators/sdlmame-devel/Makefile
@@ -5,13 +5,12 @@
 # $FreeBSD$
 #
 
-PORTNAME=	sdlmame
-PORTVERSION=	0.130
-PORTREVISION=	1
+PORTNAME=	sdlmame-devel
+PORTVERSION=	0.130u1
 CATEGORIES=	emulators
 MASTER_SITES=	ftp://ftp.arcadebsd.org/pub/FreeBSD/ports/distfiles/ \
 		http://rbelmont.mameworld.info/
-DISTNAME=	${PORTNAME}${PORTVERSION:S/.//}
+DISTNAME=	sdlmame${PORTVERSION:S/.//}
 
 MAINTAINER=	elbarto@ArcadeBSD.org
 COMMENT=	SDL port of the popular MAME (Multi Arcade Machine Emulator)
@@ -32,14 +31,12 @@ OPTIONS=	DEBUG "Build sdlmame debugger" off
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_DEBUG)
-EXTRA_PATCHES+=		${FILESDIR}/sdl.mak.patch-debug
-.else
+.if !defined(WITH_DEBUG)
 USE_GNOME=		#
 EXTRA_PATCHES+=		${FILESDIR}/sdl.mak.patch
 .endif
 
-MAKE_JOBS_SAFE=	yes
+MAKE_JOBS_SAFE=		yes
 
 .if ${ARCH} == "amd64"
 MAKE_ENV+=	PTR64=1
@@ -53,11 +50,10 @@ post-patch:
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin/
-	${MKDIR} ${PREFIX}/libexec/sdlmame
-	${INSTALL_PROGRAM} ${WRKSRC}/chdman ${PREFIX}/libexec/sdlmame
-	${INSTALL_PROGRAM} ${WRKSRC}/ldresample ${PREFIX}/libexec/sdlmame
-	${INSTALL_PROGRAM} ${WRKSRC}/ldverify ${PREFIX}/libexec/sdlmame
-	${INSTALL_PROGRAM} ${WRKSRC}/testkeys ${PREFIX}/libexec/sdlmame
+	${MKDIR} ${PREFIX}/libexec/${PORTNAME}
+.for f in chdman ldresample ldverify testkeys
+	${INSTALL_PROGRAM} ${WRKSRC}/${f} ${PREFIX}/libexec/${PORTNAME}
+.endfor
 
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
diff --git a/emulators/sdlmame-devel/distinfo b/emulators/sdlmame-devel/distinfo
index 6eeaeeb73f42..d99f1f080206 100644
--- a/emulators/sdlmame-devel/distinfo
+++ b/emulators/sdlmame-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (sdlmame0130.zip) = 1195da0b6ae762eeebb21f500509d62d
-SHA256 (sdlmame0130.zip) = d6f25291ec79583dceb300a721f76a10d1839ad13890e51d9ed47b5236363de8
-SIZE (sdlmame0130.zip) = 17681979
+MD5 (sdlmame0130u1.zip) = 547f9a517c29e08ed99593a4508999cd
+SHA256 (sdlmame0130u1.zip) = daf2188a670a85a07f77b7498b7d701c49a3dfa145520574455985e1234a3f9b
+SIZE (sdlmame0130u1.zip) = 17770936
diff --git a/emulators/sdlmame-devel/files/mame.ini b/emulators/sdlmame-devel/files/mame.ini
index b67dcf7fe1c8..24275eefbb2f 100644
--- a/emulators/sdlmame-devel/files/mame.ini
+++ b/emulators/sdlmame-devel/files/mame.ini
@@ -8,25 +8,25 @@ readconfig                1
 #
 # CORE SEARCH PATH OPTIONS
 #
-rompath                   $HOME/.mame/roms
-samplepath                $HOME/.mame/samples
-artpath                   $HOME/.mame/artwork
-ctrlrpath                 $HOME/.mame/ctrlr
-inipath                   $HOME/.mame;.;ini
-fontpath                  /usr/local/share/sdlmame/
-cheatpath                 $HOME/.mame/cheat
+rompath                   $HOME/.mame-devel/roms
+samplepath                $HOME/.mame-devel/samples
+artpath                   $HOME/.mame-devel/artwork
+ctrlrpath                 $HOME/.mame-devel/ctrlr
+inipath                   $HOME/.mame-devel;.;ini
+fontpath                  /usr/local/share/sdlmame-devel/
+cheatpath                 $HOME/.mame-devel/cheat
 
 #
 # CORE OUTPUT DIRECTORY OPTIONS
 #
-cfg_directory             $HOME/.mame/cfg
-nvram_directory           $HOME/.mame/nvram
-memcard_directory         $HOME/.mame/memcard
-input_directory           $HOME/.mame/inp
-state_directory           $HOME/.mame/sta
-snapshot_directory        $HOME/.mame/snap
-diff_directory            $HOME/.mame/diff
-comment_directory         $HOME/.mame/comments
+cfg_directory             $HOME/.mame-devel/cfg
+nvram_directory           $HOME/.mame-devel/nvram
+memcard_directory         $HOME/.mame-devel/memcard
+input_directory           $HOME/.mame-devel/inp
+state_directory           $HOME/.mame-devel/sta
+snapshot_directory        $HOME/.mame-devel/snap
+diff_directory            $HOME/.mame-devel/diff
+comment_directory         $HOME/.mame-devel/comments
 
 #
 # CORE STATE/PLAYBACK OPTIONS
diff --git a/emulators/sdlmame-devel/files/patch-makefile b/emulators/sdlmame-devel/files/patch-makefile
index f3a447bb9818..740a57366e57 100644
--- a/emulators/sdlmame-devel/files/patch-makefile
+++ b/emulators/sdlmame-devel/files/patch-makefile
@@ -1,5 +1,5 @@
---- makefile.orig	2009-03-05 14:16:35.000000000 +0000
-+++ makefile	2009-03-13 02:39:13.000000000 +0000
+--- makefile.orig	2009-03-19 14:14:18.000000000 +0100
++++ makefile	2009-03-25 05:24:41.000000000 +0100
 @@ -59,7 +59,7 @@
  ifeq ($(OSD),windows)
  TARGETOS = win32
@@ -9,6 +9,15 @@
  endif
  endif
  
+@@ -73,7 +73,7 @@
+ # PREFIX =
+ 
+ # uncomment and specify suffix to be added to the name
+-# SUFFIX =
++SUFFIX = -devel
+ 
+ 
+ 
 @@ -197,8 +197,8 @@
  
  # compiler, linker and utilities
diff --git a/emulators/sdlmame-devel/files/patch-sdlmain.c b/emulators/sdlmame-devel/files/patch-sdlmain.c
new file mode 100644
index 000000000000..bddfcc3e3a7d
--- /dev/null
+++ b/emulators/sdlmame-devel/files/patch-sdlmain.c
@@ -0,0 +1,11 @@
+--- src/osd/sdl/sdlmain.c.orig	2009-03-25 05:55:00.000000000 +0100
++++ src/osd/sdl/sdlmain.c	2009-03-25 05:56:04.000000000 +0100
+@@ -82,7 +82,7 @@
+ #ifdef MESS
+ 	{ "inipath",                              "$HOME/.mess;.;ini",     0,     "path to ini files" },
+ #else
+-	{ SDLOPTION_INIPATH,                     "$HOME/.mame;.;ini",     0,     "path to ini files" },
++	{ SDLOPTION_INIPATH,                     "$HOME/.mame-devel;.;ini",     0,     "path to ini files" },
+ #endif // MESS
+ #endif // INI_PATH
+ #endif // MACOSX
diff --git a/emulators/sdlmame-devel/files/pkg-message.in b/emulators/sdlmame-devel/files/pkg-message.in
index 072489632688..2038b03c7b87 100644
--- a/emulators/sdlmame-devel/files/pkg-message.in
+++ b/emulators/sdlmame-devel/files/pkg-message.in
@@ -1,10 +1,10 @@
 ==============================================================================
 
-SDLMAME has been installed.
+SDLMAME devel has been installed.
 
 A example configuration file has been installed in "%%EXAMPLESDIR%%/mame.ini"
-Should you create a "~/.mame" directory and place it here or
-launch "sdlmame -createconfig" and place the mame.ini created instead.
+Should you create a "~/.mame-devel" directory and place it here or
+launch "sdlmame-devel -createconfig" and place the mame.ini created instead.
 
 If you have a non-qwerty keyboard, you should put in your mame.ini :
 keymap      1
diff --git a/emulators/sdlmame-devel/files/sdl.mak.patch b/emulators/sdlmame-devel/files/sdl.mak.patch
index 36fd61624130..63a6f480c890 100644
--- a/emulators/sdlmame-devel/files/sdl.mak.patch
+++ b/emulators/sdlmame-devel/files/sdl.mak.patch
@@ -1,6 +1,15 @@
---- src/osd/sdl/sdl.mak.orig	2009-03-05 20:03:50.000000000 +0100
-+++ src/osd/sdl/sdl.mak	2009-03-05 20:06:22.000000000 +0100
-@@ -264,10 +264,10 @@
+--- src/osd/sdl/sdl.mak.orig	2009-03-19 14:09:23.000000000 +0100
++++ src/osd/sdl/sdl.mak	2009-03-25 05:32:18.000000000 +0100
+@@ -127,7 +127,7 @@
+ 
+ ifeq ($(TARGETOS),freebsd)
+ TARGETOS = unix
+-DEFS += -DNO_THREAD_COOPERATIVE
++DEFS += -DNO_THREAD_COOPERATIVE -DNO_DEBUGGER
+ endif
+ 
+ ifeq ($(TARGETOS),openbsd)
+@@ -269,10 +269,10 @@
  # the new debugger relies on GTK+ in addition to the base SDLMAME needs
  # Non-X11 builds can not use the debugger
  ifndef NO_X11
diff --git a/emulators/sdlmame-devel/files/sdl.mak.patch-debug b/emulators/sdlmame-devel/files/sdl.mak.patch-debug
deleted file mode 100644
index 66573868cdc2..000000000000
--- a/emulators/sdlmame-devel/files/sdl.mak.patch-debug
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/osd/sdl/sdl.mak.orig	2009-03-05 21:41:13.000000000 +0100
-+++ src/osd/sdl/sdl.mak	2009-03-05 21:41:25.000000000 +0100
-@@ -127,7 +127,7 @@
- 
- ifeq ($(TARGETOS),freebsd)
- TARGETOS = unix
--DEFS += -DNO_THREAD_COOPERATIVE -DNO_DEBUGGER
-+DEFS += -DNO_THREAD_COOPERATIVE
- endif
- 
- ifeq ($(TARGETOS),unix)
diff --git a/emulators/sdlmame-devel/pkg-plist b/emulators/sdlmame-devel/pkg-plist
index fae88491a0c6..169b3433458d 100644
--- a/emulators/sdlmame-devel/pkg-plist
+++ b/emulators/sdlmame-devel/pkg-plist
@@ -1,8 +1,8 @@
-bin/sdlmame
-libexec/sdlmame/chdman
-libexec/sdlmame/ldverify
-libexec/sdlmame/ldresample
-libexec/sdlmame/testkeys
+bin/sdlmame-devel
+libexec/sdlmame-devel/chdman
+libexec/sdlmame-devel/ldverify
+libexec/sdlmame-devel/ldresample
+libexec/sdlmame-devel/testkeys
 %%PORTDOCS%%%%DOCSDIR%%/SDLMAME.txt
 %%PORTDOCS%%%%DOCSDIR%%/docs/license.txt
 %%PORTDOCS%%%%DOCSDIR%%/docs/mame.txt
@@ -10,6 +10,7 @@ libexec/sdlmame/testkeys
 %%PORTDOCS%%%%DOCSDIR%%/docs/windows.txt
 %%PORTDOCS%%%%DOCSDIR%%/docs/config.txt
 %%PORTDOCS%%%%DOCSDIR%%/whatsnew.txt
+%%PORTDOCS%%%%DOCSDIR%%/whatsnew_0130u1.txt
 %%DATADIR%%/ui.bdf
 %%DATADIR%%/keymaps/km-be.txt
 %%DATADIR%%/keymaps/km-ch.txt
@@ -20,7 +21,7 @@ libexec/sdlmame/testkeys
 %%EXAMPLESDIR%%/mame.ini
 @dirrm %%DATADIR%%/keymaps/
 @dirrm %%DATADIR%%/
-@dirrm libexec/sdlmame
+@dirrm libexec/sdlmame-devel
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/docs
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%EXAMPLESDIR%%