Index: head/emulators/gngeo/Makefile
===================================================================
--- head/emulators/gngeo/Makefile	(revision 436385)
+++ head/emulators/gngeo/Makefile	(revision 436386)
@@ -1,83 +1,90 @@
 # Created by: Alejandro Pulver <alejandro@varnet.biz>
 # $FreeBSD$
 
 PORTNAME=	gngeo
 PORTVERSION=	0.8
 PORTREVISION=	2
 CATEGORIES=	emulators
-MASTER_SITES=	GOOGLE_CODE/${PORTNAME}
+MASTER_SITES=	https://github.com/pepone42/gngeo/archive/ \
+		LOCAL/acm/${PORTNAME}
+DISTFILES=	${PORTNAME}_${PORTVERSION}.tar.gz
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	NeoGeo emulator
 
-BROKEN=		Unfetchable (google code has gone away)
-DEPRECATED=	Unfetchable for more than six months (google code has gone away)
-EXPIRATION_DATE=	2017-04-30
+LICENSE=	GPLv2
 
-USES=		compiler:features gmake
+USES=		autoreconf compiler:features gmake
 USE_SDL=	image sdl
 USE_GL=		yes
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--program-transform-name="" --disable-gp2x
 MAKE_JOBS_UNSAFE=	yes
 
 CPPFLAGS+=	${CFLAGS} `${SDL_CONFIG} --cflags` -I${LOCALBASE}/include
 LDFLAGS+=	`${SDL_CONFIG} --libs` -L${LOCALBASE}/lib
 USE_CSTD=	gnu89
 MAKE_ARGS+=	CC_FOR_BUILD=${CC}
 
 SUB_FILES=	pkg-message
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTNAME}_${PORTVERSION}
 
 OPTIONS_DEFINE_i386=	ASM RAZE STAR
 OPTIONS_DEFAULT_i386=	ASM
 RAZE_DESC=	Use Raze as z80 emulator (broken)
 STAR_DESC=	Use Starscream as 68k emulator (broken)
 
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MI386ASM} || ${PORT_OPTIONS:MRAZE} || \
     ${PORT_OPTIONS:MSTAR}
 BUILD_DEPENDS+=		nasm:devel/nasm
 .endif
 
 .if ${PORT_OPTIONS:MI386ASM}
 CONFIGURE_ARGS+=	--enable-i386asm
 .else
 CONFIGURE_ARGS+=	--disable-i386asm
 .endif
 
 .if ${PORT_OPTIONS:MRAZE}
 CONFIGURE_ARGS+=	--with-z80core=raze
 BROKEN=			fails to link
 .else
 CONFIGURE_ARGS+=	--with-z80core=mamez80
 .endif
 
 .if ${PORT_OPTIONS:MSTAR}
 CONFIGURE_ARGS+=	--with-m68kcore=starscream
 BROKEN=			fails to link
 .else
 CONFIGURE_ARGS+=	--with-m68kcore=gen68k
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|x86_64|amd64|' ${WRKSRC}/configure
 .if ${ARCH} == "amd64"
 	@${REINPLACE_CMD} -e 's|-malign-double||' ${WRKSRC}/configure
 .endif
 .if ${COMPILER_TYPE} == "clang"
 	@${REINPLACE_CMD} -e 's|-frerun-loop-opt||; \
 		s|-falign-jumps=2||; s|-falign-loops=2||; \
 		s|-fschedule-insns2||; s|-malign-double||' \
 		${WRKSRC}/configure
 .endif
 	@${REINPLACE_CMD} -e 's|sdl-config|${SDL_CONFIG}|' \
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} \
 		${WRKSRC}/src/generator68k/Makefile.in
 
+pre-configure:
+	@cd ${WRKSRC} && ${AUTORECONF} -i
+
 post-install:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/sample_gngeorc ${STAGEDIR}${EXAMPLESDIR}/gngeorc
+	${INSTALL_DATA} ${WRKSRC}/romrc ${STAGEDIR}${DATADIR}/romrc
+	${INSTALL_DATA} ${WRKSRC}/gngeo.dat/gngeo_data.zip ${STAGEDIR}${DATADIR}/gngeo_data.zip
 
 .include <bsd.port.post.mk>
Index: head/emulators/gngeo/distinfo
===================================================================
--- head/emulators/gngeo/distinfo	(revision 436385)
+++ head/emulators/gngeo/distinfo	(revision 436386)
@@ -1,2 +1,3 @@
-SHA256 (gngeo-0.8.tar.gz) = 4955a36a978accbc13cc9d58be3dbbed8864f27c34446b2fea879ee27fd7c4b6
-SIZE (gngeo-0.8.tar.gz) = 1043579
+TIMESTAMP = 1489817213
+SHA256 (gngeo_0.8.tar.gz) = 6bad892e727f242fca43f6cbb8f136283f8a0c28bcfc5a97495aba59476ade4e
+SIZE (gngeo_0.8.tar.gz) = 1128342
Index: head/emulators/gngeo/pkg-descr
===================================================================
--- head/emulators/gngeo/pkg-descr	(revision 436385)
+++ head/emulators/gngeo/pkg-descr	(revision 436386)
@@ -1,10 +1,10 @@
 GnGeo is a NeoGeo emulator for Linux (and maybe some other UNIX). It use the
 following cpu core:
 
 * The 68k core from the generator project by James Ponder.
 * Starscream 680x0 emulation library by Neill Corlett
 * Raze Z80 emulator by Richard Mitton.
 * Z80 Mame core from the Mame project.
 * YM2610 Mame core by Tatsuyuki Satoh.
 
-WWW: http://gngeo.berlios.de/
+WWW: https://github.com/pepone42/gngeo
Index: head/emulators/gngeo/pkg-plist
===================================================================
--- head/emulators/gngeo/pkg-plist	(revision 436385)
+++ head/emulators/gngeo/pkg-plist	(revision 436386)
@@ -1,5 +1,5 @@
 bin/gngeo
 man/man1/gngeo.1.gz
 %%DATADIR%%/gngeo_data.zip
+%%DATADIR%%/romrc
 %%EXAMPLESDIR%%/gngeorc
-@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%%."