6 files changed, 77 insertions, 26 deletions

diff --git a/emulators/visualboyadvance-m/Makefile b/emulators/visualboyadvance-m/Makefile
index 80c2451ce785..4e8ff32a025a 100644
--- a/emulators/visualboyadvance-m/Makefile
+++ b/emulators/visualboyadvance-m/Makefile
@@ -30,13 +30,13 @@ USE_GL=		gl glu
 USE_SDL=	sdl
 USE_CMAKE=	yes
 CMAKE_ARGS+=	-DVERSION:STRING="${PORTVERSION}" -DSYSCONFDIR:STRING="${PREFIX}/etc"
-SVN_REV=	966
+SVN_REV=	1001
 
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_ASM) && ${ARCH} == "i386"
 BUILD_DEPENDS+=	as:${PORTSDIR}/devel/binutils
-CMAKE_ARGS+=	-DUSE_ASM_CORE=yes -DUSE_ASM_SCALERS=yes
+CMAKE_ARGS+=	-DENABLE_ASM_CORE:BOOL=yes -DENABLE_ASM_SCALERS:BOOL=yes
 .endif
 
 .if defined(WITH_GVBAM)
@@ -49,7 +49,16 @@ LIB_DEPENDS+=	gtkmm-2.4:${PORTSDIR}/x11-toolkits/gtkmm24 \
 		gdkglextmm-x11-1.2:${PORTSDIR}/x11-toolkits/gtkglextmm
 .else
 PLIST_SUB+=	GVBAM="@comment "
-CMAKE_ARGS+=	-DNO_GTK:BOOL=yes
+CMAKE_ARGS+=	-DENABLE_GTK:BOOL=no
+.endif
+
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT=	yes
+CMAKE_ARGS+=	-DENABLE_NLS:BOOL=yes
+PLIST_SUB+=	NLS=""
+.else
+CMAKE_ARGS+=	-DENABLE_NLS:BOOL=no
+PLIST_SUB+=	NLS="@comment "
 .endif
 
 post-patch:
diff --git a/emulators/visualboyadvance-m/distinfo b/emulators/visualboyadvance-m/distinfo
index 917b41e00ab0..e856c46999cb 100644
--- a/emulators/visualboyadvance-m/distinfo
+++ b/emulators/visualboyadvance-m/distinfo
@@ -1,2 +1,2 @@
-SHA256 (visualboyadvance-m-1.8.0r966.tar.bz2) = 921bcc750fdaff4a41c72f1a52efa90886022cdefbefa909881da7b096b64021
-SIZE (visualboyadvance-m-1.8.0r966.tar.bz2) = 746183
+SHA256 (visualboyadvance-m-1.8.0r1001.tar.bz2) = 8668c8b556826681c8e848d999ff3ba1383daf78e3410a20bcfc0e8f2eeed4c2
+SIZE (visualboyadvance-m-1.8.0r1001.tar.bz2) = 766938
diff --git a/emulators/visualboyadvance-m/files/patch-CMakeLists.txt b/emulators/visualboyadvance-m/files/patch-CMakeLists.txt
index 409dc3eae7df..0045b74eb06d 100644
--- a/emulators/visualboyadvance-m/files/patch-CMakeLists.txt
+++ b/emulators/visualboyadvance-m/files/patch-CMakeLists.txt
@@ -1,18 +1,19 @@
 --- CMakeLists.txt.orig	2010-03-14 23:36:45.000000000 -0400
 +++ CMakeLists.txt	2010-11-26 03:08:11.543538713 -0500
 @@ -1,5 +1,5 @@
- # The project's name is VBA-M it uses assembly, C and C++ code
--PROJECT(VBA-M ASM C CXX)
+ # The project's name is VBA-M it uses C and C++ code
+-PROJECT(VBA-M C CXX)
 +PROJECT(VBA-M)
  
- cmake_minimum_required( VERSION 2.4.6 )
+ cmake_minimum_required( VERSION 2.6.0 )
  if( COMMAND cmake_policy )
-@@ -341,8 +341,7 @@
+@@ -344,8 +344,7 @@
  
      INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/vbam DESTINATION bin)
      INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/sdl/vbam.cfg-example
 -            DESTINATION ${SYSCONFDIR}
 -            RENAME vbam.cfg)
 +            DESTINATION ${SYSCONFDIR})
+ ENDIF( ENABLE_SDL )
  
- ENDIF( CAN_BUILD_VBAM )
+ IF( ENABLE_GTK )
diff --git a/emulators/visualboyadvance-m/files/patch-src-gtk-filters.cpp b/emulators/visualboyadvance-m/files/patch-src-gtk-filters.cpp
new file mode 100644
index 000000000000..0e0f549b9c20
--- /dev/null
+++ b/emulators/visualboyadvance-m/files/patch-src-gtk-filters.cpp
@@ -0,0 +1,20 @@
+--- src/gtk/filters.cpp.orig	2011-02-24 16:06:17.000000000 +0300
++++ src/gtk/filters.cpp	2011-08-04 21:05:59.000000000 +0400
+@@ -87,7 +87,7 @@
+   return astFilters[_eFilter].m_apvFunc[_eDepth];
+ }
+ 
+-char* pcsGetFilterName(const EFilter _eFilter)
++const char* pcsGetFilterName(const EFilter _eFilter)
+ {
+         return gettext(astFilters[_eFilter].m_csName);
+ }
+@@ -97,7 +97,7 @@
+   return astFiltersIB[_eFilterIB].m_apvFunc[_eDepth];
+ }
+ 
+-char* pcsGetFilterIBName(const EFilterIB _eFilterIB)
++const char* pcsGetFilterIBName(const EFilterIB _eFilterIB)
+ {
+         return gettext(astFiltersIB[_eFilterIB].m_csName);
+ }
diff --git a/emulators/visualboyadvance-m/files/patch-src-gtk-filters.h b/emulators/visualboyadvance-m/files/patch-src-gtk-filters.h
new file mode 100644
index 000000000000..541cb664577e
--- /dev/null
+++ b/emulators/visualboyadvance-m/files/patch-src-gtk-filters.h
@@ -0,0 +1,15 @@
+--- src/gtk/filters.h.orig	2011-02-20 00:33:53.000000000 +0300
++++ src/gtk/filters.h	2011-08-04 21:06:06.000000000 +0400
+@@ -64,10 +64,10 @@
+ };
+ 
+ Filter pvGetFilter(EFilter _eFilter, EFilterDepth _eDepth);
+-char* pcsGetFilterName(const EFilter _eFilter);
++const char* pcsGetFilterName(const EFilter _eFilter);
+ 
+ FilterIB pvGetFilterIB(EFilterIB _eFilterIB, EFilterDepth _eDepth);
+-char* pcsGetFilterIBName(const EFilterIB _eFilterIB);
++const char* pcsGetFilterIBName(const EFilterIB _eFilterIB);
+ 
+ } // namespace VBA
+ 
diff --git a/emulators/visualboyadvance-m/pkg-plist b/emulators/visualboyadvance-m/pkg-plist
index 7a341427919f..6e2f822e4b80 100644
--- a/emulators/visualboyadvance-m/pkg-plist
+++ b/emulators/visualboyadvance-m/pkg-plist
@@ -9,25 +9,31 @@ etc/vbam.cfg-example
 %%GVBAM%%share/icons/hicolor/24x24/apps/vbam.png
 %%GVBAM%%share/icons/hicolor/32x32/apps/vbam.png
 %%GVBAM%%share/icons/hicolor/scalable/apps/vbam.svg
-%%GVBAM%%share/vbam/ui/sound.ui
-%%GVBAM%%share/vbam/ui/gameboyadvance.ui
+%%GVBAM%%%%NLS%%share/locale/en/LC_MESSAGES/gvbam.mo
+%%GVBAM%%%%NLS%%share/locale/fr/LC_MESSAGES/gvbam.mo
+%%GVBAM%%share/vbam/ui/cheatedit.ui
+%%GVBAM%%share/vbam/ui/cheatlist.ui
 %%GVBAM%%share/vbam/ui/display.ui
 %%GVBAM%%share/vbam/ui/gameboy.ui
-%%GVBAM%%share/vbam/ui/vbam.glade
-%%GVBAM%%@dirrmtry share/icons/hicolor/16x16/apps/
-%%GVBAM%%@dirrmtry share/icons/hicolor/22x22/apps/
-%%GVBAM%%@dirrmtry share/icons/hicolor/24x24/apps/
-%%GVBAM%%@dirrmtry share/icons/hicolor/32x32/apps/
-%%GVBAM%%@dirrmtry share/icons/hicolor/scalable/apps/
-%%GVBAM%%@dirrmtry share/icons/hicolor/16x16/
-%%GVBAM%%@dirrmtry share/icons/hicolor/22x22/
-%%GVBAM%%@dirrmtry share/icons/hicolor/24x24/
-%%GVBAM%%@dirrmtry share/icons/hicolor/32x32/
-%%GVBAM%%@dirrmtry share/icons/hicolor/scalable/
-%%GVBAM%%@dirrmtry share/icons/hicolor/
-%%GVBAM%%@dirrmtry share/icons/
+%%GVBAM%%share/vbam/ui/gameboyadvance.ui
+%%GVBAM%%share/vbam/ui/preferences.ui
+%%GVBAM%%share/vbam/ui/sound.ui
+%%GVBAM%%share/vbam/ui/vbam.ui
+%%GVBAM%%share/vbam/vba-over.ini
 %%GVBAM%%@dirrm share/vbam/ui
 %%GVBAM%%@dirrm share/vbam
-%%GVBAM%%@dirrmtry share/applications
+%%GVBAM%%@dirrm share/icons/hicolor/scalable/apps
+%%GVBAM%%@dirrm share/icons/hicolor/scalable
+%%GVBAM%%@dirrm share/icons/hicolor/32x32/apps
+%%GVBAM%%@dirrm share/icons/hicolor/32x32
+%%GVBAM%%@dirrm share/icons/hicolor/24x24/apps
+%%GVBAM%%@dirrm share/icons/hicolor/24x24
+%%GVBAM%%@dirrm share/icons/hicolor/22x22/apps
+%%GVBAM%%@dirrm share/icons/hicolor/22x22
+%%GVBAM%%@dirrm share/icons/hicolor/16x16/apps
+%%GVBAM%%@dirrm share/icons/hicolor/16x16
+%%GVBAM%%@dirrm share/icons/hicolor
+%%GVBAM%%@dirrm share/icons
+%%GVBAM%%@dirrm share/applications
 %%GVBAM%%@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
 %%GVBAM%%@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true