On Sat, Apr 20, 2013 at 12:50:07AM -0600, Anthony J. Bentley wrote:
> Hi,
>
> Here is an update to fceux-2.2.1. Tested on i386/amd64.
>
> ok?
This tests good on i386, change PKGNAME to just fceux-2.2.1
instead of being smart via DISTNAME is the only change needed
I can see (per a recent post requesting we stop some excess
magic). other than that, ok rfreeman@
cheers,
-ryan
>
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/emulators/fceux/Makefile,v
> retrieving revision 1.4
> diff -u -p -u -p -r1.4 Makefile
> --- Makefile 11 Mar 2013 11:06:04 -0000 1.4
> +++ Makefile 19 Apr 2013 20:46:02 -0000
> @@ -2,9 +2,8 @@
>
> COMMENT = emulator for Nintendo Entertainment System
>
> -DISTNAME = fceux-2.2.0.src
> +DISTNAME = fceux-2.2.1.src
> PKGNAME = ${DISTNAME:S/.src//}
> -REVISION = 0
> CATEGORIES = emulators games
>
> HOMEPAGE = http://fceux.com/
> @@ -17,7 +16,7 @@ PERMIT_PACKAGE_CDROM = Yes
> MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=fceultra/}
>
> WANTLIB += GL SDL X11 c gd gdk-x11-2.0 gdk_pixbuf-2.0 glib-2.0
> -WANTLIB += gobject-2.0 gtk-x11-2.0 lua5.1 m pixman-1 pthread
> +WANTLIB += gobject-2.0 gtk-x11-2.0 lua5.1 m pthread
> WANTLIB += stdc++ z ${MODLUA_WANTLIB}
>
> LIB_DEPENDS = devel/sdl \
> @@ -29,11 +28,12 @@ MODULES = devel/scons \
>
> MAKE_ENV = CC="${CC}" \
> CXX="${CXX}" \
> + CXXFLAGS="${CXXFLAGS} -DIOAPI_NO_64" \
> LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
>
> CONFIGURE_STYLE = scons
>
> -WRKDIST = ${WRKDIR}/fceux
> +WRKDIST = ${WRKDIR}/${PKGNAME}
>
> NO_TEST = Yes
>
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/emulators/fceux/distinfo,v
> retrieving revision 1.1.1.1
> diff -u -p -u -p -r1.1.1.1 distinfo
> --- distinfo 25 Dec 2012 00:07:01 -0000 1.1.1.1
> +++ distinfo 19 Apr 2013 20:46:02 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (fceux-2.2.0.src.tar.gz) =
> Ma17R41cCRGmek6urp3pFdRPyVhEFIoTURTifX/RppQ=
> -SIZE (fceux-2.2.0.src.tar.gz) = 8852228
> +SHA256 (fceux-2.2.1.src.tar.gz) =
> 5V++1rZLvLYKnOFYWS79F29rtWtylsRHN8xxEZqLAFU=
> +SIZE (fceux-2.2.1.src.tar.gz) = 8873566
> Index: patches/patch-SConstruct
> ===================================================================
> RCS file: /cvs/ports/emulators/fceux/patches/patch-SConstruct,v
> retrieving revision 1.1.1.1
> diff -u -p -u -p -r1.1.1.1 patch-SConstruct
> --- patches/patch-SConstruct 25 Dec 2012 00:07:01 -0000 1.1.1.1
> +++ patches/patch-SConstruct 19 Apr 2013 20:46:02 -0000
> @@ -1,7 +1,7 @@
> $OpenBSD: patch-SConstruct,v 1.1.1.1 2012/12/25 00:07:01 bentley Exp $
> ---- SConstruct.orig Mon Dec 24 02:05:25 2012
> -+++ SConstruct Mon Dec 24 02:06:15 2012
> -@@ -113,8 +113,8 @@ else:
> +--- SConstruct.orig Sun Mar 10 15:21:52 2013
> ++++ SConstruct Fri Apr 19 14:34:56 2013
> +@@ -125,8 +125,8 @@ else:
> # Should work on any *nix
> env.Append(CCFLAGS = ["-DLUA_USE_LINUX"])
> lua_available = False
> @@ -12,7 +12,7 @@ $OpenBSD: patch-SConstruct,v 1.1.1.1 201
> lua_available = True
> elif conf.CheckLib('lua'):
> env.Append(LINKFLAGS = ["-ldl", "-llua"])
> -@@ -152,8 +152,6 @@ print "base CCFLAGS:",env['CCFLAGS']
> +@@ -164,8 +164,6 @@ print "base CCFLAGS:",env['CCFLAGS']
>
> if env['DEBUG']:
> env.Append(CPPDEFINES=["_DEBUG"], CCFLAGS = ['-g'])
> @@ -21,7 +21,7 @@ $OpenBSD: patch-SConstruct,v 1.1.1.1 201
>
> if env['PLATFORM'] != 'win32' and env['PLATFORM'] != 'cygwin' and
> env['CREATE_AVI']:
> env.Append(CPPDEFINES=["CREATE_AVI"])
> -@@ -191,8 +189,8 @@ env.Command(auxlib_dst, auxlib_src, [Copy(auxlib_dst,
> +@@ -203,8 +201,8 @@ env.Command(auxlib_dst, auxlib_src, [Copy(auxlib_dst,
>
> man_src = 'documentation/fceux.6'
> man_net_src = 'documentation/fceux-net-server.6'
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/emulators/fceux/pkg/PLIST,v
> retrieving revision 1.1.1.1
> diff -u -p -u -p -r1.1.1.1 PLIST
> --- pkg/PLIST 25 Dec 2012 00:07:01 -0000 1.1.1.1
> +++ pkg/PLIST 19 Apr 2013 20:46:02 -0000
> @@ -18,6 +18,7 @@ share/fceux/luaScripts/GUI-iup_button.lu
> share/fceux/luaScripts/GUI-iup_example.lua
> share/fceux/luaScripts/Galaxian.lua
> share/fceux/luaScripts/Gradius-BulletHell.lua
> +share/fceux/luaScripts/JumpingFCEUXWindow.lua
> share/fceux/luaScripts/Luabot.lua
> share/fceux/luaScripts/Machrider.lua
> share/fceux/luaScripts/MegamanII-LaserEyes.lua
>
