ports/94023: [PATCH] emulators/gngeo: update to 0.6.10
Jose Alonso Cardenas Marquez
acardenas at bsd.org.pe
Thu Mar 2 14:30:06 UTC 2006
>Number: 94023
>Category: ports
>Synopsis: [PATCH] emulators/gngeo: update to 0.6.10
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Thu Mar 02 14:30:03 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Jose Alonso Cardenas Marquez
>Release: FreeBSD 6.1-PRERELEASE i386
>Organization:
BSDPeru (http://www.bsd.org.pe)
>Environment:
FreeBSD HellFire.BSD.org.pe 6.1-PRERELEASE FreeBSD 6.1-PRERELEASE #0: Wed Feb 15 20:23:11 PET 2006
>Description:
- Update to 0.6.10
- Removed IGNORE and RESTRICTED state, It's don't necessary now, users have to manually download and install neogeo-bios or neogeo-unibios (see pkg-message) . Now, Gngeo could pass building test and have package available in FreeBSD mirrors.
- Removed USE_REINPLACE
- Added USE_X_PREFIX, It's using X
- Respected CFLAGS
- Minor modifications
Added file(s):
- files/pkg-message.in
>How-To-Repeat:
>Fix:
--- gngeo-0.6.10.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/emulators/gngeo/Makefile /usr/ports/emulators/gngeo-new/Makefile
--- /usr/ports/emulators/gngeo/Makefile Tue Nov 22 06:33:06 2005
+++ /usr/ports/emulators/gngeo-new/Makefile Thu Mar 2 09:00:09 2006
@@ -6,8 +6,8 @@
#
PORTNAME= gngeo
-PORTVERSION= 0.6.4
-CATEGORIES= emulators
+PORTVERSION= 0.6.10
+CATEGORIES= emulators games
MASTER_SITES= http://m.peponas.free.fr/gngeo/download/
DIST_SUBDIR= ${PORTNAME}
@@ -16,15 +16,15 @@
RESTRICTED= The Neo-Geo BIOS can not be redistributed
+USE_X_PREFIX= 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_ENV= CPPFLAGS="`${SDL_CONFIG} --cflags` -I${X11BASE}/include ${CFLAGS}" \
+ LDFLAGS="`${SDL_CONFIG} --libs`" \
OPTIONS= GUI "Enable GUI support (experimental)" off \
I386ASM "Use i386 optimization" on \
@@ -33,31 +33,8 @@
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 defined(WITH_I386ASM) || defined(WITH_RAZE) || defined(WITH_STAR)
BUILD_DEPENDS+= nasm:${PORTSDIR}/devel/nasm
.endif
@@ -85,5 +62,15 @@
.else
CONFIGURE_ARGS+= --enable-gen68k
.endif
+
+post-patch:
+ @${REINPLACE_CMD} -e 's|%%SDL_CONFIG%%|${SDL_CONFIG}| ; \
+ s|-mcpu=$$target_cpu||' \
+ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
+ @${REINPLACE_CMD} -e 's|-O3||g' ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
+
+post-install:
+ @${MKDIR} ${EXAMPLESDIR}
+ @${INSTALL_DATA} ${WRKSRC}/sample_gngeorc ${EXAMPLESDIR}/gngeorc
.include <bsd.port.post.mk>
diff -ruN --exclude=CVS /usr/ports/emulators/gngeo/distinfo /usr/ports/emulators/gngeo-new/distinfo
--- /usr/ports/emulators/gngeo/distinfo Tue Nov 22 06:33:06 2005
+++ /usr/ports/emulators/gngeo-new/distinfo Wed Mar 1 20:16:53 2006
@@ -1,3 +1,3 @@
-MD5 (gngeo/gngeo-0.6.4.tar.gz) = 690a624935a25af19d80d05088dc7d3c
-SHA256 (gngeo/gngeo-0.6.4.tar.gz) = e51a699ce8800fd717166b31c94918b252d578e764fecff8b8ec3a7acbb4a6b7
-SIZE (gngeo/gngeo-0.6.4.tar.gz) = 558473
+MD5 (gngeo/gngeo-0.6.10.tar.gz) = 5b01e203f727ae14904e3f2cb0afa65c
+SHA256 (gngeo-0.6.10.tar.gz) = 93fd491217f09e768b3450ca214e3b5c0b5816181ea9138378f4634c5c7b5577
+SIZE (gngeo/gngeo-0.6.19.tar.gz) = 1015809
diff -ruN --exclude=CVS /usr/ports/emulators/gngeo/files/patch-configure /usr/ports/emulators/gngeo-new/files/patch-configure
--- /usr/ports/emulators/gngeo/files/patch-configure Tue Nov 22 06:33:07 2005
+++ /usr/ports/emulators/gngeo-new/files/patch-configure Wed Mar 1 21:09:40 2006
@@ -1,13 +1,34 @@
---- configure.orig Mon Sep 20 13:35:06 2004
-+++ configure Wed Aug 17 16:29:55 2005
-@@ -3118,10 +3118,6 @@
- { (exit 1); exit 1; }; }
+--- configure Wed Mar 1 21:08:25 2006
++++ configure Wed Mar 1 21:06:55 2006
+@@ -2997,7 +2997,7 @@
+ fi
+ else
+ # Extract the first word of "sdl-config", so it can be a program name with args.
+-set dummy sdl-config; ac_word=$2
++set dummy %%SDL_CONFIG%%; ac_word=$2
+ echo "$as_me:$LINENO: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_SDL_CONFIG+set}" = set; then
+@@ -3033,8 +3033,8 @@
fi
--else
-- { { echo "$as_me:$LINENO: error: can't find sdl-config on your system" >&5
+ if test "$SDL_CONFIG" = yes ; then
+- CFLAGS="$CFLAGS `sdl-config --cflags`";
+- LIBS="$LIBS `sdl-config --libs`";
++ CFLAGS="$CFLAGS `%%SDL_CONFIG%% --cflags`";
++ LIBS="$LIBS `%%SDL_CONFIG%% --libs`";
+
+ echo "$as_me:$LINENO: checking for SDL_Init in -lSDL" >&5
+ echo $ECHO_N "checking for SDL_Init in -lSDL... $ECHO_C" >&6
+@@ -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 -ruN --exclude=CVS /usr/ports/emulators/gngeo/files/pkg-message.in /usr/ports/emulators/gngeo-new/files/pkg-message.in
--- /usr/ports/emulators/gngeo/files/pkg-message.in Wed Dec 31 19:00:00 1969
+++ /usr/ports/emulators/gngeo-new/files/pkg-message.in Wed Mar 1 21:51:51 2006
@@ -0,0 +1,14 @@
+###################################################################################################
+
+1) You need to manually download neogeo-bios or neogeo-unibios. It's available at:
+
+ - neogeo-bios : http://www.ocf.berkeley.edu/~wwu/downloads/neogeo.zip
+ - neogeo-unibios: http://unibios.free.fr/download.html
+
+ Please keep in mind that the NEOGEO BIOS is copyrighted software.
+
+2) Choose one and extract the files and place them into %%DATADIR%% directory
+3) Run gngeo
+4) Enjoy it ;)
+
+###################################################################################################
diff -ruN --exclude=CVS /usr/ports/emulators/gngeo/pkg-plist /usr/ports/emulators/gngeo-new/pkg-plist
--- /usr/ports/emulators/gngeo/pkg-plist Tue Nov 22 06:33:06 2005
+++ /usr/ports/emulators/gngeo-new/pkg-plist Wed Mar 1 21:57:29 2006
@@ -3,10 +3,6 @@
%%DATADIR%%/gui_font.bmp
%%DATADIR%%/gui_font2.bmp
%%DATADIR%%/little_font.bmp
-%%DATADIR%%/neo-geo.rom
-%%DATADIR%%/ng-lo.rom
-%%DATADIR%%/ng-sfix.rom
-%%DATADIR%%/ng-sm1.rom
%%DATADIR%%/romrc
%%DATADIR%%/sb_arrows.bmp
%%EXAMPLESDIR%%/gngeorc
--- gngeo-0.6.10.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list