Hi,
Below is an update to fceux-2.2.2.
Tested on i386/amd64.
ok?
Index: Makefile
===================================================================
RCS file: /cvs/ports/emulators/fceux/Makefile,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 Makefile
--- Makefile 22 Apr 2013 23:28:07 -0000 1.5
+++ Makefile 14 Mar 2014 05:59:21 -0000
@@ -2,7 +2,7 @@
COMMENT = emulator for Nintendo Entertainment System
-V = 2.2.1
+V = 2.2.2
DISTNAME = fceux-${V}.src
PKGNAME = fceux-${V}
CATEGORIES = emulators games
@@ -20,6 +20,7 @@ WANTLIB += GL SDL X11 c gd gdk-x11-2.0
WANTLIB += gobject-2.0 gtk-x11-2.0 lua5.1 m pthread
WANTLIB += stdc++ z ${MODLUA_WANTLIB}
+RUN_DEPENDS = devel/desktop-file-utils
LIB_DEPENDS = devel/sdl \
graphics/gd \
x11/gtk+2
@@ -45,7 +46,7 @@ post-extract:
@perl -MExtUtils::Command -e dos2unix ${WRKSRC}
pre-configure:
- ${SUBST_CMD} ${WRKDIST}/SConstruct
+ ${SUBST_CMD} ${WRKDIST}/SConstruct ${WRKDIST}/fceux.desktop
do-install:
${SETENV} ${MAKE_ENV} ${MODSCONS_BIN} -C ${WRKSRC} \
Index: distinfo
===================================================================
RCS file: /cvs/ports/emulators/fceux/distinfo,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 distinfo
--- distinfo 22 Apr 2013 23:28:07 -0000 1.2
+++ distinfo 14 Mar 2014 05:59:21 -0000
@@ -1,2 +1,2 @@
-SHA256 (fceux-2.2.1.src.tar.gz) = 5V++1rZLvLYKnOFYWS79F29rtWtylsRHN8xxEZqLAFU=
-SIZE (fceux-2.2.1.src.tar.gz) = 8873566
+SHA256 (fceux-2.2.2.src.tar.gz) = gE0RvbShlfOlgM5dLQG+h3WCdjN4Y34WGGoiRZ9f5eE=
+SIZE (fceux-2.2.2.src.tar.gz) = 9249858
Index: patches/patch-SConstruct
===================================================================
RCS file: /cvs/ports/emulators/fceux/patches/patch-SConstruct,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-SConstruct
--- patches/patch-SConstruct 22 Apr 2013 23:28:07 -0000 1.2
+++ patches/patch-SConstruct 14 Mar 2014 05:59:21 -0000
@@ -1,34 +1,68 @@
-$OpenBSD: patch-SConstruct,v 1.2 2013/04/22 23:28:07 bentley Exp $
---- SConstruct.orig Sun Mar 10 15:21:52 2013
-+++ SConstruct Fri Apr 19 14:34:56 2013
-@@ -125,8 +125,8 @@ else:
+$OpenBSD$
+Fix SCons install target. From upstream r3067.
+--- SConstruct.orig Thu Mar 13 23:30:04 2014
++++ SConstruct Thu Mar 13 23:30:28 2014
+@@ -138,9 +138,9 @@ else:
# Should work on any *nix
env.Append(CCFLAGS = ["-DLUA_USE_LINUX"])
lua_available = False
- if conf.CheckLib('lua5.1'):
- env.Append(LINKFLAGS = ["-ldl", "-llua5.1"])
+- env.Append(CCFLAGS = ["-I/usr/include/lua5.1"])
+ if conf.CheckLib('${MODLUA_WANTLIB}'):
+ env.Append(LINKFLAGS = '${MODLUA_LIB}')
++ env.Append(CCFLAGS = ["-I${MODLUA_INCL_DIR}"])
lua_available = True
elif conf.CheckLib('lua'):
env.Append(LINKFLAGS = ["-ldl", "-llua"])
-@@ -164,8 +164,6 @@ print "base CCFLAGS:",env['CCFLAGS']
+@@ -177,8 +177,6 @@ print "base CCFLAGS:",env['CCFLAGS']
if env['DEBUG']:
- env.Append(CPPDEFINES=["_DEBUG"], CCFLAGS = ['-g'])
+ env.Append(CPPDEFINES=["_DEBUG"], CCFLAGS = ['-g', '-O0'])
-else:
- env.Append(CCFLAGS = ['-O2'])
if env['PLATFORM'] != 'win32' and env['PLATFORM'] != 'cygwin' and
env['CREATE_AVI']:
env.Append(CPPDEFINES=["CREATE_AVI"])
-@@ -203,8 +201,8 @@ env.Command(auxlib_dst, auxlib_src, [Copy(auxlib_dst,
+@@ -205,7 +205,6 @@
+
+ auxlib_src = 'src/auxlib.lua'
+ auxlib_dst = 'bin/auxlib.lua'
+-auxlib_inst_dst = prefix + '/share/fceux/auxlib.lua'
+
+ fceux_h_src = 'output/fceux.chm'
+ fceux_h_dst = 'bin/fceux.chm'
+@@ -217,25 +216,17 @@
man_src = 'documentation/fceux.6'
man_net_src = 'documentation/fceux-net-server.6'
-man_dst = prefix + '/share/man/man6/fceux.6'
-man_net_dst = prefix + '/share/man/man6/fceux-net-server.6'
-+man_dst = prefix + '/man/man6/fceux.6'
-+man_net_dst = prefix + '/man/man6/fceux-net-server.6'
share_src = 'output/'
- share_dst = prefix + '/share/fceux/'
+-share_dst = prefix + '/share/fceux/'
+
+ image_src = 'fceux.png'
+-image_dst = prefix + '/share/pixmaps'
+
+ desktop_src = 'fceux.desktop'
+-desktop_dst = prefix + '/share/applications/'
+-
+-env.Install(prefix + "/bin/", fceux)
+-env.Install(prefix + "/bin/", "fceux-net-server")
+-# TODO: Where to put auxlib on "scons install?"
+-env.Alias('install', env.Command(auxlib_inst_dst, auxlib_src,
[Copy(auxlib_inst_dst, auxlib_src)]))
+-env.Alias('install', env.Command(share_dst, share_src, [Copy(share_dst,
share_src)]))
+-env.Alias('install', env.Command(man_dst, man_src, [Copy(man_dst, man_src)]))
+-env.Alias('install', env.Command(man_net_dst, man_net_src, [Copy(man_net_dst,
man_net_src)]))
+-env.Alias('install', env.Command(image_dst, image_src, [Copy(image_dst,
image_src)]))
+-env.Alias('install', env.Command(desktop_dst, desktop_src, [Copy(desktop_dst,
desktop_src)]))
+-env.Alias('install', (prefix + "/bin/"))
++
++env.Install(prefix + "/bin/", [fceux, fceux_net_server_src])
++env.InstallAs(prefix + '/share/fceux/', share_src)
++env.Install(prefix + '/share/fceux/', auxlib_src)
++env.Install(prefix + '/share/pixmaps/', image_src)
++env.Install(prefix + '/share/applications/', desktop_src)
++env.Install(prefix + "/man/man6/", [man_src, man_net_src])
++env.Alias('install', prefix)
Index: patches/patch-fceux_desktop
===================================================================
RCS file: patches/patch-fceux_desktop
diff -N patches/patch-fceux_desktop
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-fceux_desktop 14 Mar 2014 05:59:21 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- fceux.desktop.orig Thu Mar 13 23:34:49 2014
++++ fceux.desktop Thu Mar 13 23:34:02 2014
+@@ -6,7 +6,7 @@ GenericName=NES/Famicom emulator
+ NoDisplay=false
+ Comment=Emulate NES ROMs
+ Exec=/usr/bin/fceux
+-Icon=/usr/share/pixmaps/fceux.png
++Icon=${PREFIX}/share/pixmaps/fceux.png
+ Terminal=false
+ MimeType=application/x-nes-rom
+ Categories=Game;Emulator;
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/emulators/fceux/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 PLIST
--- pkg/PLIST 22 Apr 2013 23:28:07 -0000 1.2
+++ pkg/PLIST 14 Mar 2014 05:59:21 -0000
@@ -1,10 +1,14 @@
-@comment $OpenBSD: PLIST,v 1.2 2013/04/22 23:28:07 bentley Exp $
+@comment $OpenBSD$
@bin bin/fceux
@bin bin/fceux-net-server
@man man/man6/fceux-net-server.6
@man man/man6/fceux.6
+share/applications/fceux.desktop
share/fceux/
share/fceux/auxlib.lua
+share/fceux/fceux.chm
+share/fceux/${MODLUA_WANTLIB}.dll
+share/fceux/${MODLUA_DEP}.dll
share/fceux/luaScripts/
share/fceux/luaScripts/AVI-HeadsUpDisplay.lua
share/fceux/luaScripts/BoulderDash_AmoebaAI.lua
@@ -79,3 +83,7 @@ share/fceux/palettes/nestopia_yuv.pal
share/fceux/taseditor.chm
share/fceux/tools/
share/fceux/tools/taseditor_patterns.txt
+share/pixmaps/
+share/pixmaps/fceux.png
+@exec %D/bin/update-desktop-database
+@unexec-delete %D/bin/update-desktop-database
