6 files changed, 13 insertions, 257 deletions

diff --git a/emulators/gngeo/Makefile b/emulators/gngeo/Makefile
index 1eb2267832c1..04623f188c25 100644
--- a/emulators/gngeo/Makefile
+++ b/emulators/gngeo/Makefile
@@ -2,16 +2,15 @@
 # $FreeBSD$
 
 PORTNAME=	gngeo
-PORTVERSION=	0.7
-PORTREVISION=	9
+PORTVERSION=	0.8
 CATEGORIES=	emulators
-MASTER_SITES=	${MASTER_SITE_BERLIOS}
+MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	NeoGeo emulator
 
-USE_GMAKE=	yes
+USES=		gmake
 USE_SDL=	image sdl
 USE_GL=		yes
 
@@ -26,16 +25,12 @@ MAKE_ARGS+=	CC_FOR_BUILD=${CC}
 
 SUB_FILES=	pkg-message
 
-OPTIONS_DEFINE=	GUI
 OPTIONS_DEFINE_i386=	ASM RAZE STAR
 OPTIONS_DEFAULT_i386=	ASM RAZE STAR
-GUI_DESC=	Enable GUI support (experimental)
 RAZE_DESC=	Use Raze as z80 emulator
 STAR_DESC=	Use Starscream as 68k emulator
 
 MAN1=		gngeo.1
-
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MI386ASM} || ${PORT_OPTIONS:MRAZE} || \
@@ -43,12 +38,6 @@ NO_STAGE=	yes
 BUILD_DEPENDS+=		nasm:${PORTSDIR}/devel/nasm
 .endif
 
-.if ${PORT_OPTIONS:MGUI}
-CONFIGURE_ARGS+=	--enable-gui
-.else
-CONFIGURE_ARGS+=	--disable-gui
-.endif
-
 .if ${PORT_OPTIONS:MI386ASM}
 CONFIGURE_ARGS+=	--enable-i386asm
 .else
@@ -56,15 +45,15 @@ CONFIGURE_ARGS+=	--disable-i386asm
 .endif
 
 .if ${PORT_OPTIONS:MRAZE}
-CONFIGURE_ARGS+=	--enable-raze
+CONFIGURE_ARGS+=	--with-z80core=raze
 .else
-CONFIGURE_ARGS+=	--enable-mamez80
+CONFIGURE_ARGS+=	--with-z80core=mamez80
 .endif
 
 .if ${PORT_OPTIONS:MSTAR}
-CONFIGURE_ARGS+=	--enable-starscream
+CONFIGURE_ARGS+=	--with-m68kcore=starscream
 .else
-CONFIGURE_ARGS+=	--enable-gen68k
+CONFIGURE_ARGS+=	--with-m68kcore=gen68k
 .endif
 
 post-patch:
@@ -73,8 +62,8 @@ post-patch:
 		${WRKSRC}/src/generator68k/Makefile.in
 
 post-install:
-	${MKDIR} ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/sample_gngeorc ${EXAMPLESDIR}/gngeorc
+	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/sample_gngeorc ${STAGEDIR}${EXAMPLESDIR}/gngeorc
 	@${ECHO_CMD}; ${CAT} ${PKGMESSAGE}; ${ECHO_CMD}
 
 .include <bsd.port.post.mk>
diff --git a/emulators/gngeo/distinfo b/emulators/gngeo/distinfo
index 8b521f833ef2..857f17bd6977 100644
--- a/emulators/gngeo/distinfo
+++ b/emulators/gngeo/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gngeo-0.7.tar.gz) = 4c1c56aacede9aceb0d8b2900d7b3edccd2ac6efe7f81a0d3723e998177ab5dc
-SIZE (gngeo-0.7.tar.gz) = 853892
+SHA256 (gngeo-0.8.tar.gz) = 4955a36a978accbc13cc9d58be3dbbed8864f27c34446b2fea879ee27fd7c4b6
+SIZE (gngeo-0.8.tar.gz) = 1043579
diff --git a/emulators/gngeo/files/extra-patch-src__emu.h b/emulators/gngeo/files/extra-patch-src__emu.h
deleted file mode 100644
index 9fa9f09c3207..000000000000
--- a/emulators/gngeo/files/extra-patch-src__emu.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/emu.h.orig	Wed Feb  8 17:21:55 2006
-+++ src/emu.h	Fri Apr 14 12:52:00 2006
-@@ -24,7 +24,7 @@
- #endif
- 
- #include <string.h>
--#include <stdint.h>
-+#include <inttypes.h>
- #include "SDL.h"
- #include "SDL_types.h"
- #define Uintptr long
diff --git a/emulators/gngeo/files/patch-configure b/emulators/gngeo/files/patch-configure
deleted file mode 100644
index c853eaa4173b..000000000000
--- a/emulators/gngeo/files/patch-configure
+++ /dev/null
@@ -1,14 +0,0 @@
---- configure.orig	Sat Apr  1 10:19:10 2006
-+++ configure	Thu Apr 13 23:02:32 2006
-@@ -3111,11 +3111,6 @@
- echo "$as_me: error: can't find SDL on your system" >&2;}
-    { (exit 1); exit 1; }; }
- fi
--
--	else
--		{ { echo "$as_me:$LINENO: error: can't find sdl-config on your system" >&5
--echo "$as_me: error: can't find sdl-config on your system" >&2;}
--   { (exit 1); exit 1; }; };
- 	fi
- 	enable_gp2x=false
- fi
diff --git a/emulators/gngeo/files/patch-src-streams.c b/emulators/gngeo/files/patch-src-streams.c
deleted file mode 100644
index f471bcdcf1b7..000000000000
--- a/emulators/gngeo/files/patch-src-streams.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/streams.c.orig	Sat Feb 28 12:50:41 2004
-+++ src/streams.c	Wed Aug 17 16:32:02 2005
-@@ -10,7 +10,7 @@
- #endif
- 
- #include <string.h>
--#include <malloc.h>
-+#include <stdlib.h>
- #include <stdio.h>
- #include "emu.h"
- #include <math.h>
diff --git a/emulators/gngeo/pkg-plist b/emulators/gngeo/pkg-plist
index f668e61679b2..e1e0e341eb0b 100644
--- a/emulators/gngeo/pkg-plist
+++ b/emulators/gngeo/pkg-plist
@@ -1,203 +1,6 @@
 bin/gngeo
+man/man1/gngeo.1.gz
+%%DATADIR%%/gngeo_data.zip
 %%EXAMPLESDIR%%/gngeorc
-%%DATADIR%%/cursor.bmp
-%%DATADIR%%/gui_font.bmp
-%%DATADIR%%/gui_font2.bmp
-%%DATADIR%%/little_font.bmp
-%%DATADIR%%/romrc
-%%DATADIR%%/romrc.d/2020bb.rc
-%%DATADIR%%/romrc.d/2020bba.rc
-%%DATADIR%%/romrc.d/2020bbh.rc
-%%DATADIR%%/romrc.d/3countb.rc
-%%DATADIR%%/romrc.d/alpham2.rc
-%%DATADIR%%/romrc.d/androdun.rc
-%%DATADIR%%/romrc.d/aodk.rc
-%%DATADIR%%/romrc.d/aof.rc
-%%DATADIR%%/romrc.d/aof2.rc
-%%DATADIR%%/romrc.d/aof2a.rc
-%%DATADIR%%/romrc.d/aof3.rc
-%%DATADIR%%/romrc.d/bakatono.rc
-%%DATADIR%%/romrc.d/bangbead.rc
-%%DATADIR%%/romrc.d/bjourney.rc
-%%DATADIR%%/romrc.d/blazstar.rc
-%%DATADIR%%/romrc.d/breakers.rc
-%%DATADIR%%/romrc.d/breakrev.rc
-%%DATADIR%%/romrc.d/bstars.rc
-%%DATADIR%%/romrc.d/bstars2.rc
-%%DATADIR%%/romrc.d/burningf.rc
-%%DATADIR%%/romrc.d/burningh.rc
-%%DATADIR%%/romrc.d/crsword.rc
-%%DATADIR%%/romrc.d/cthd2003.rc
-%%DATADIR%%/romrc.d/cthd2003sp.rc
-%%DATADIR%%/romrc.d/ctomaday.rc
-%%DATADIR%%/romrc.d/cyberlip.rc
-%%DATADIR%%/romrc.d/doubledr.rc
-%%DATADIR%%/romrc.d/eightman.rc
-%%DATADIR%%/romrc.d/fatfursa.rc
-%%DATADIR%%/romrc.d/fatfursp.rc
-%%DATADIR%%/romrc.d/fatfury1.rc
-%%DATADIR%%/romrc.d/fatfury2.rc
-%%DATADIR%%/romrc.d/fatfury3.rc
-%%DATADIR%%/romrc.d/fbfrenzy.rc
-%%DATADIR%%/romrc.d/fightfev.rc
-%%DATADIR%%/romrc.d/fightfva.rc
-%%DATADIR%%/romrc.d/flipshot.rc
-%%DATADIR%%/romrc.d/galaxyfg.rc
-%%DATADIR%%/romrc.d/garou.rc
-%%DATADIR%%/romrc.d/garoup.rc
-%%DATADIR%%/romrc.d/ghostlop.rc
-%%DATADIR%%/romrc.d/goalx3.rc
-%%DATADIR%%/romrc.d/gowcaizr.rc
-%%DATADIR%%/romrc.d/gpilots.rc
-%%DATADIR%%/romrc.d/gururin.rc
-%%DATADIR%%/romrc.d/janshin.rc
-%%DATADIR%%/romrc.d/jockeygp.rc
-%%DATADIR%%/romrc.d/joyjoy.rc
-%%DATADIR%%/romrc.d/kabukikl.rc
-%%DATADIR%%/romrc.d/karnovr.rc
-%%DATADIR%%/romrc.d/kizuna.rc
-%%DATADIR%%/romrc.d/kof10thu.rc
-%%DATADIR%%/romrc.d/kof2000n.rc
-%%DATADIR%%/romrc.d/kof2001n.rc
-%%DATADIR%%/romrc.d/kof2002.rc
-%%DATADIR%%/romrc.d/kof2003.rc
-%%DATADIR%%/romrc.d/kof2003a.rc
-%%DATADIR%%/romrc.d/kof2003b.rc
-%%DATADIR%%/romrc.d/kof2k1rp.rc
-%%DATADIR%%/romrc.d/kof2k2.rc
-%%DATADIR%%/romrc.d/kof2k2pls.rc
-%%DATADIR%%/romrc.d/kof2k4es.rc
-%%DATADIR%%/romrc.d/kof94.rc
-%%DATADIR%%/romrc.d/kof95.rc
-%%DATADIR%%/romrc.d/kof95a.rc
-%%DATADIR%%/romrc.d/kof96.rc
-%%DATADIR%%/romrc.d/kof96h.rc
-%%DATADIR%%/romrc.d/kof97.rc
-%%DATADIR%%/romrc.d/kof97a.rc
-%%DATADIR%%/romrc.d/kof97pls.rc
-%%DATADIR%%/romrc.d/kof98.rc
-%%DATADIR%%/romrc.d/kof98k.rc
-%%DATADIR%%/romrc.d/kof98n.rc
-%%DATADIR%%/romrc.d/kof99.rc
-%%DATADIR%%/romrc.d/kof99p.rc
-%%DATADIR%%/romrc.d/kog.rc
-%%DATADIR%%/romrc.d/kotm.rc
-%%DATADIR%%/romrc.d/kotm2.rc
-%%DATADIR%%/romrc.d/kotmh.rc
-%%DATADIR%%/romrc.d/lastblad.rc
-%%DATADIR%%/romrc.d/lastbld2.rc
-%%DATADIR%%/romrc.d/lastblda.rc
-%%DATADIR%%/romrc.d/lbowling.rc
-%%DATADIR%%/romrc.d/legendos.rc
-%%DATADIR%%/romrc.d/lresort.rc
-%%DATADIR%%/romrc.d/magdrop2.rc
-%%DATADIR%%/romrc.d/magdrop3.rc
-%%DATADIR%%/romrc.d/maglord.rc
-%%DATADIR%%/romrc.d/maglordh.rc
-%%DATADIR%%/romrc.d/mahretsu.rc
-%%DATADIR%%/romrc.d/marukodq.rc
-%%DATADIR%%/romrc.d/miexchng.rc
-%%DATADIR%%/romrc.d/minasan.rc
-%%DATADIR%%/romrc.d/mosyougi.rc
-%%DATADIR%%/romrc.d/mslug.rc
-%%DATADIR%%/romrc.d/mslug2.rc
-%%DATADIR%%/romrc.d/mslug3.rc
-%%DATADIR%%/romrc.d/mslug3n.rc
-%%DATADIR%%/romrc.d/mslug4.rc
-%%DATADIR%%/romrc.d/mslug5.rc
-%%DATADIR%%/romrc.d/mslug5nd.rc
-%%DATADIR%%/romrc.d/mslugx.rc
-%%DATADIR%%/romrc.d/mutnat.rc
-%%DATADIR%%/romrc.d/nam1975.rc
-%%DATADIR%%/romrc.d/ncombat.rc
-%%DATADIR%%/romrc.d/ncombata.rc
-%%DATADIR%%/romrc.d/ncommand.rc
-%%DATADIR%%/romrc.d/neobombe.rc
-%%DATADIR%%/romrc.d/neocup98.rc
-%%DATADIR%%/romrc.d/neodrift.rc
-%%DATADIR%%/romrc.d/neomrdo.rc
-%%DATADIR%%/romrc.d/neopong.rc
-%%DATADIR%%/romrc.d/ninjamas.rc
-%%DATADIR%%/romrc.d/nitd.rc
-%%DATADIR%%/romrc.d/overtop.rc
-%%DATADIR%%/romrc.d/panicbom.rc
-%%DATADIR%%/romrc.d/pbobbl2n.rc
-%%DATADIR%%/romrc.d/pbobble.rc
-%%DATADIR%%/romrc.d/pbobblen.rc
-%%DATADIR%%/romrc.d/pbobblna.rc
-%%DATADIR%%/romrc.d/pgoal.rc
-%%DATADIR%%/romrc.d/pim.rc
-%%DATADIR%%/romrc.d/pochi.rc
-%%DATADIR%%/romrc.d/popbounc.rc
-%%DATADIR%%/romrc.d/preisle2.rc
-%%DATADIR%%/romrc.d/pspikes2.rc
-%%DATADIR%%/romrc.d/pulstar.rc
-%%DATADIR%%/romrc.d/puzzldpr.rc
-%%DATADIR%%/romrc.d/puzzledp.rc
-%%DATADIR%%/romrc.d/quizdai2.rc
-%%DATADIR%%/romrc.d/quizdais.rc
-%%DATADIR%%/romrc.d/quizkof.rc
-%%DATADIR%%/romrc.d/ragnagrd.rc
-%%DATADIR%%/romrc.d/rbff1.rc
-%%DATADIR%%/romrc.d/rbff2.rc
-%%DATADIR%%/romrc.d/rbff2a.rc
-%%DATADIR%%/romrc.d/rbffspec.rc
-%%DATADIR%%/romrc.d/ridhero.rc
-%%DATADIR%%/romrc.d/ridheroh.rc
-%%DATADIR%%/romrc.d/roboarma.rc
-%%DATADIR%%/romrc.d/roboarmy.rc
-%%DATADIR%%/romrc.d/rodd.rc
-%%DATADIR%%/romrc.d/s1945p.rc
-%%DATADIR%%/romrc.d/samsho.rc
-%%DATADIR%%/romrc.d/samsho2.rc
-%%DATADIR%%/romrc.d/samsho3.rc
-%%DATADIR%%/romrc.d/samsho3a.rc
-%%DATADIR%%/romrc.d/samsho4.rc
-%%DATADIR%%/romrc.d/samsho5.rc
-%%DATADIR%%/romrc.d/samsho5sp.rc
-%%DATADIR%%/romrc.d/savagere.rc
-%%DATADIR%%/romrc.d/sdodgeb.rc
-%%DATADIR%%/romrc.d/sengokh.rc
-%%DATADIR%%/romrc.d/sengoku.rc
-%%DATADIR%%/romrc.d/sengoku2.rc
-%%DATADIR%%/romrc.d/sengoku3.rc
-%%DATADIR%%/romrc.d/shocktr2.rc
-%%DATADIR%%/romrc.d/shocktra.rc
-%%DATADIR%%/romrc.d/shocktrj.rc
-%%DATADIR%%/romrc.d/shocktro.rc
-%%DATADIR%%/romrc.d/socbrawl.rc
-%%DATADIR%%/romrc.d/sonicwi2.rc
-%%DATADIR%%/romrc.d/sonicwi3.rc
-%%DATADIR%%/romrc.d/spinmast.rc
-%%DATADIR%%/romrc.d/ssideki.rc
-%%DATADIR%%/romrc.d/ssideki2.rc
-%%DATADIR%%/romrc.d/ssideki3.rc
-%%DATADIR%%/romrc.d/ssideki4.rc
-%%DATADIR%%/romrc.d/ssvsp.rc
-%%DATADIR%%/romrc.d/stakwin.rc
-%%DATADIR%%/romrc.d/stakwin2.rc
-%%DATADIR%%/romrc.d/strhoop.rc
-%%DATADIR%%/romrc.d/superspy.rc
-%%DATADIR%%/romrc.d/svcplus.rc
-%%DATADIR%%/romrc.d/tophunta.rc
-%%DATADIR%%/romrc.d/tophuntr.rc
-%%DATADIR%%/romrc.d/tpgolf.rc
-%%DATADIR%%/romrc.d/trally.rc
-%%DATADIR%%/romrc.d/turfmast.rc
-%%DATADIR%%/romrc.d/twinspri.rc
-%%DATADIR%%/romrc.d/tws96.rc
-%%DATADIR%%/romrc.d/viewpoin.rc
-%%DATADIR%%/romrc.d/wakuwak7.rc
-%%DATADIR%%/romrc.d/wh1.rc
-%%DATADIR%%/romrc.d/wh1h.rc
-%%DATADIR%%/romrc.d/wh2.rc
-%%DATADIR%%/romrc.d/wh2j.rc
-%%DATADIR%%/romrc.d/whp.rc
-%%DATADIR%%/romrc.d/wjammers.rc
-%%DATADIR%%/romrc.d/zedblade.rc
-%%DATADIR%%/romrc.d/zintrckb.rc
-%%DATADIR%%/romrc.d/zupapa.rc
-%%DATADIR%%/sb_arrows.bmp
 @dirrm %%EXAMPLESDIR%%
-@dirrm %%DATADIR%%/romrc.d
 @unexec rmdir %D/%%DATADIR%% >/dev/null 2>&1 || echo "If you are permanently removing this port, you should remove the Neo-Geo BIOS files left in %D/%%DATADIR%%."