1 files changed, 28 insertions, 34 deletions

diff --git a/emulators/gngeo/Makefile b/emulators/gngeo/Makefile
index 3a964878e002..5d7ee94e0ad5 100644
--- a/emulators/gngeo/Makefile
+++ b/emulators/gngeo/Makefile
@@ -6,25 +6,28 @@
 #
 
 PORTNAME=	gngeo
-PORTVERSION=	0.6.4
+PORTVERSION=	0.6.11
 CATEGORIES=	emulators
 MASTER_SITES=	http://m.peponas.free.fr/gngeo/download/
 DIST_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	alepulver@FreeBSD.org
+MAINTAINER=	acardenas@bsd.org.pe
 COMMENT=	NeoGeo emulator
 
-RESTRICTED=	The Neo-Geo BIOS can not be redistributed
-
+USE_X_PREFIX=	yes
+USE_GETOPT_LONG=yes
 USE_GMAKE=	yes
 USE_SDL=	image sdl
 USE_GL=		yes
-USE_REINPLACE=	yes
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--program-transform-name=""
-CONFIGURE_ENV=	CPPFLAGS="`${SDL_CONFIG} --cflags` -I${X11BASE}/include" \
-		LDFLAGS="`${SDL_CONFIG} --libs`"
+CONFIGURE_ARGS=	--program-transform-name="" --disable-gp2x
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+
+CPPFLAGS=	${CFLAGS} `${SDL_CONFIG} --cflags` -I${X11BASE}/include
+LDFLAGS=	`${SDL_CONFIG} --libs` -L${X11BASE}/lib
+
+SUB_FILES=	pkg-message
 
 OPTIONS=	GUI "Enable GUI support (experimental)" off \
 		I386ASM "Use i386 optimization" on \
@@ -33,32 +36,14 @@ OPTIONS=	GUI "Enable GUI support (experimental)" off \
 
 MAN1=		gngeo.1
 
-NGBIOS=		neo-geo.rom ng-lo.rom ng-sfix.rom ng-sm1.rom
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|sdl-config|${SDL_CONFIG}| ; \
-			s|-mcpu=$$target_cpu||' \
-				${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
-
-post-install:
-# Neo-Geo BIOS
-.for f in ${NGBIOS}
-	@${INSTALL_DATA} ${DISTDIR}/${f} ${DATADIR}
-.endfor
-
-# Examples
-	@${MKDIR} ${EXAMPLESDIR}
-	@${INSTALL_DATA} ${WRKSRC}/sample_gngeorc ${EXAMPLESDIR}/gngeorc
-
 .include <bsd.port.pre.mk>
 
-.for f in ${NGBIOS}
-.	if !exists(${DISTDIR}/${DIST_SUBDIR}/${f}) || defined(PACKAGE_BUILDING)
-IGNORE?=	Could not find ${DISTDIR}/${DIST_SUBDIR}/${f}. You need to manually download a copy of the Neo-Geo BIOS, extract the files and place them into ${DISTDIR}/${DIST_SUBDIR}. It is available at http://www.ocf.berkeley.edu/~wwu/downloads/neogeo.zip
-.	endif
-.endfor
+.if ${OSVERSION} < 500000
+EXTRA_PATCHES+=	${FILESDIR}/extra-patch-src__emu.h
+.endif
 
-.if defined(WITH_I386ASM) || defined(WITH_RAZE) || defined(WITH_STAR)
+.if !defined(WITHOUT_I386ASM) || !defined(WITHOUT_RAZE) || \
+    !defined(WITHOUT_STAR)
 BUILD_DEPENDS+=		nasm:${PORTSDIR}/devel/nasm
 .endif
 
@@ -68,22 +53,31 @@ CONFIGURE_ARGS+=	--enable-gui
 CONFIGURE_ARGS+=	--disable-gui
 .endif
 
-.if defined(WITH_I386ASM) && ${ARCH} == "i386"
+.if !defined(WITHOUT_I386ASM) && ${ARCH} == "i386"
 CONFIGURE_ARGS+=	--enable-i386asm
 .else
 CONFIGURE_ARGS+=	--disable-i386asm
 .endif
 
-.if defined(WITH_RAZE) && ${ARCH} == "i386"
+.if !defined(WITHOUT_RAZE) && ${ARCH} == "i386"
 CONFIGURE_ARGS+=	--enable-raze
 .else
 CONFIGURE_ARGS+=	--enable-mamez80
 .endif
 
-.if defined(WITH_STAR) && ${ARCH} == "i386"
+.if !defined(WITHOUT_STAR) && ${ARCH} == "i386"
 CONFIGURE_ARGS+=	--enable-starscream
 .else
 CONFIGURE_ARGS+=	--enable-gen68k
 .endif
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|sdl-config|${SDL_CONFIG}|' \
+		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
+
+post-install:
+	${MKDIR} ${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/sample_gngeorc ${EXAMPLESDIR}/gngeorc
+	@${ECHO_CMD}; ${CAT} ${PKGMESSAGE}; ${ECHO_CMD}
+
 .include <bsd.port.post.mk>