svn commit: r420162 - in head/emulators/visualboyadvance-m: . files

Kurt Jaeger pi at FreeBSD.org
Sat Aug 13 15:31:45 UTC 2016 

Author: pi
Date: Sat Aug 13 15:31:43 2016
New Revision: 420162
URL: https://svnweb.freebsd.org/changeset/ports/420162

Log:
  emulators/visualboyadvance-m: 1.8.0 -> 2.0.0b2
  
  - patted portlint
  - patches are now makepatch compliant
  
  PR:		210058
  Changes:	http://vba-m.com/forum/showthread.php?tid=1037&pid=6091#pid6091
  		http://vba-m.com/forum/showthread.php?tid=1036&pid=6090#pid6090
  Submitted by:	Piotr Kubaj <pkubaj at anongoth.pl>
  Reviewed by:	pawel
  Approved by:	Allison N. Reid <root at cooltrainer.org> (maintainer)

Added:
  head/emulators/visualboyadvance-m/files/patch-src_common_ConfigManager.cpp   (contents, props changed)
Deleted:
  head/emulators/visualboyadvance-m/files/patch-src-common-ffmpeg.cpp
Modified:
  head/emulators/visualboyadvance-m/Makefile
  head/emulators/visualboyadvance-m/distinfo
  head/emulators/visualboyadvance-m/files/patch-CMakeLists.txt
  head/emulators/visualboyadvance-m/files/patch-src-common-Patch.cpp
  head/emulators/visualboyadvance-m/files/patch-src-gba-GBALink.cpp
  head/emulators/visualboyadvance-m/files/patch-src-sdl-expr.cpp
  head/emulators/visualboyadvance-m/pkg-plist

Modified: head/emulators/visualboyadvance-m/Makefile
==============================================================================
--- head/emulators/visualboyadvance-m/Makefile	Sat Aug 13 14:45:45 2016	(r420161)
+++ head/emulators/visualboyadvance-m/Makefile	Sat Aug 13 15:31:43 2016	(r420162)
@@ -2,10 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	visualboyadvance-m
-PORTVERSION=	1.8.0r${SVN_REV}
-PORTREVISION=	5
+PORTVERSION=	2.0.0b2
 CATEGORIES=	emulators
-MASTER_SITES=	https://cooltrainer.org/freebsd-ports/visualboyadvance-m/
 
 MAINTAINER=	root at cooltrainer.org
 COMMENT=	Game Boy Advance emulator with GTK frontend
@@ -14,6 +12,9 @@ LICENSE=	GPLv2
 
 LIB_DEPENDS=	libpng.so:graphics/png
 
+USE_GITHUB=	yes
+GH_TAGNAME=	VBA-M_Beta_2
+
 OPTIONS_DEFINE=	NLS FFMPEG LINK LIRC DEBUGGER
 OPTIONS_MULTI=	INTERFACE
 OPTIONS_MULTI_INTERFACE=	GVBAM SDL
@@ -38,7 +39,6 @@ USE_GL=		gl glu
 USE_SDL=	sdl
 USES=		cmake dos2unix pkgconfig tar:bzip2
 INSTALLS_ICONS=	yes
-SVN_REV=	1231
 CMAKE_ARGS+=	-DVERSION:STRING="${PORTVERSION}" \
 		-DSYSCONFDIR:STRING="${PREFIX}/etc"  \
 		-DENABLE_WX:BOOL=no
@@ -136,4 +136,8 @@ maint-gen-distfile:
 	${TAR} jcf ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}
 	${RM} -rf ${DISTNAME}
 
+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/vbam
+	${MV} ${STAGEDIR}${PREFIX}/share/man/man1/vbam.1 ${STAGEDIR}${PREFIX}/man/man1/
+
 .include <bsd.port.mk>

Modified: head/emulators/visualboyadvance-m/distinfo
==============================================================================
--- head/emulators/visualboyadvance-m/distinfo	Sat Aug 13 14:45:45 2016	(r420161)
+++ head/emulators/visualboyadvance-m/distinfo	Sat Aug 13 15:31:43 2016	(r420162)
@@ -1,2 +1,3 @@
-SHA256 (visualboyadvance-m-1.8.0r1231.tar.bz2) = 50729f26136fc3847d9f85d26aab0c080846d8df6c9b75e427c90ee117b63979
-SIZE (visualboyadvance-m-1.8.0r1231.tar.bz2) = 1007578
+TIMESTAMP = 1471102270
+SHA256 (visualboyadvance-m-visualboyadvance-m-2.0.0b2-VBA-M_Beta_2_GH0.tar.gz) = 0469684aa8bde5939cff9f928717c8b1b1ccbb7f57132b1752afd1359e9421ce
+SIZE (visualboyadvance-m-visualboyadvance-m-2.0.0b2-VBA-M_Beta_2_GH0.tar.gz) = 3023671

Modified: head/emulators/visualboyadvance-m/files/patch-CMakeLists.txt
==============================================================================
--- head/emulators/visualboyadvance-m/files/patch-CMakeLists.txt	Sat Aug 13 14:45:45 2016	(r420161)
+++ head/emulators/visualboyadvance-m/files/patch-CMakeLists.txt	Sat Aug 13 15:31:43 2016	(r420162)
@@ -1,5 +1,5 @@
---- CMakeLists.txt.orig	2013-09-24 04:49:26.000000000 -0700
-+++ CMakeLists.txt	2014-04-29 15:02:57.323817303 -0700
+--- CMakeLists.txt.orig	2015-09-19 15:58:26 UTC
++++ CMakeLists.txt
 @@ -1,5 +1,5 @@
  # The project's name is VBA-M it uses C and C++ code
 -PROJECT(VBA-M C CXX)
@@ -7,13 +7,22 @@
  
  cmake_minimum_required( VERSION 2.6.0 )
  if( COMMAND cmake_policy )
-@@ -427,8 +427,7 @@
+@@ -354,7 +354,7 @@ IF( ENABLE_SDL )
+     ENDIF( WIN32 )
  
-     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})
-     INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/vba-over.ini DESTINATION ${DATA_INSTALL_DIR})
+     IF( ENABLE_LIRC )
+-        SET( LIRC_CLIENT_LIBRARY lirc_client )
++        SET( LIRC_CLIENT_LIBRARY /usr/local/lib/liblirc_client.so )
+     ENDIF( ENABLE_LIRC )
+ 
+     TARGET_LINK_LIBRARIES (
+@@ -369,8 +369,7 @@ IF( ENABLE_SDL )
+ 		INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/vbam DESTINATION bin)
+ 	ENDIF( WIN32 )
+ 		INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/sdl/vbam.cfg-example
+-				DESTINATION ${SYSCONFDIR}
+-				RENAME vbam.cfg)
++				DESTINATION ${SYSCONFDIR})
  ENDIF( ENABLE_SDL )
  
+ IF( ENABLE_GTK )

Modified: head/emulators/visualboyadvance-m/files/patch-src-common-Patch.cpp
==============================================================================
--- head/emulators/visualboyadvance-m/files/patch-src-common-Patch.cpp	Sat Aug 13 14:45:45 2016	(r420161)
+++ head/emulators/visualboyadvance-m/files/patch-src-common-Patch.cpp	Sat Aug 13 15:31:43 2016	(r420162)
@@ -1,11 +1,10 @@
---- src/common/Patch.cpp.orig	2010-01-02 21:18:59.624899346 -0500
-+++ src/common/Patch.cpp	2010-01-02 21:18:45.448378670 -0500
-@@ -4,7 +4,7 @@
- #include <zlib.h>
+--- src/common/Patch.cpp.orig	2016-08-13 15:20:47 UTC
++++ src/common/Patch.cpp
+@@ -6,6 +6,7 @@
+ #endif
  
  #include "Patch.h"
--
 +#include <sys/param.h>
  
- #ifdef __GNUC__
- #if defined(__APPLE__) || defined (BSD)
+ #ifndef __LIBRETRO__
+ 

Modified: head/emulators/visualboyadvance-m/files/patch-src-gba-GBALink.cpp
==============================================================================
--- head/emulators/visualboyadvance-m/files/patch-src-gba-GBALink.cpp	Sat Aug 13 14:45:45 2016	(r420161)
+++ head/emulators/visualboyadvance-m/files/patch-src-gba-GBALink.cpp	Sat Aug 13 15:31:43 2016	(r420162)
@@ -1,5 +1,5 @@
---- src/gba/GBALink.cpp.orig	2014-04-29 17:12:28.260667843 -0700
-+++ src/gba/GBALink.cpp	2014-04-29 17:15:31.307655026 -0700
+--- src/gba/GBALink.cpp.orig	2016-08-13 15:20:47 UTC
++++ src/gba/GBALink.cpp
 @@ -2,9 +2,10 @@
  // with major changes by tjm
  #include <string.h>
@@ -12,3 +12,12 @@
  #include <stdlib.h>
  #else
  #include <malloc.h>
+@@ -89,7 +90,7 @@ bool speedhack = true;
+ #include "GBALink.h"
+ #include "GBASockClient.h"
+ 
+-#include <SFML/Network.hpp>
++#include <SFML1/Network.hpp>
+ 
+ #ifdef ENABLE_NLS
+ #include <libintl.h>

Modified: head/emulators/visualboyadvance-m/files/patch-src-sdl-expr.cpp
==============================================================================
--- head/emulators/visualboyadvance-m/files/patch-src-sdl-expr.cpp	Sat Aug 13 14:45:45 2016	(r420161)
+++ head/emulators/visualboyadvance-m/files/patch-src-sdl-expr.cpp	Sat Aug 13 15:31:43 2016	(r420162)
@@ -1,5 +1,5 @@
---- src/sdl/expr.cpp.orig	2014-05-02 23:55:56.000000000 +0800
-+++ src/sdl/expr.cpp	2014-05-02 23:56:07.000000000 +0800
+--- src/sdl/expr.cpp.orig	2016-08-13 15:20:47 UTC
++++ src/sdl/expr.cpp
 @@ -90,14 +90,10 @@
  /* Copy the first part of user declarations.  */
  #line 1 "expr.ypp"

Added: head/emulators/visualboyadvance-m/files/patch-src_common_ConfigManager.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/emulators/visualboyadvance-m/files/patch-src_common_ConfigManager.cpp	Sat Aug 13 15:31:43 2016	(r420162)
@@ -0,0 +1,10 @@
+--- src/common/ConfigManager.cpp.orig	2016-08-13 15:20:47 UTC
++++ src/common/ConfigManager.cpp
+@@ -10,6 +10,7 @@ extern "C" {
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <cmath>
++#include <unistd.h>
+ 
+ #include "../AutoBuild.h"
+ #include "../version.h"

Modified: head/emulators/visualboyadvance-m/pkg-plist
==============================================================================
--- head/emulators/visualboyadvance-m/pkg-plist	Sat Aug 13 14:45:45 2016	(r420161)
+++ head/emulators/visualboyadvance-m/pkg-plist	Sat Aug 13 15:31:43 2016	(r420162)
@@ -30,3 +30,10 @@
 %%GVBAM%%share/vbam/ui/sound.ui
 %%GVBAM%%share/vbam/ui/vbam.ui
 %%GVBAM%%share/vbam/vba-over.ini
+%%GVBAM%%share/icons/hicolor/128x128/apps/vbam.png
+%%GVBAM%%share/icons/hicolor/256x256/apps/vbam.png
+%%GVBAM%%share/icons/hicolor/48x48/apps/vbam.png
+%%GVBAM%%share/icons/hicolor/64x64/apps/vbam.png
+%%GVBAM%%share/icons/hicolor/96x96/apps/vbam.png
+ at dir share/man/man1
+man/man1/vbam.1.gz

More information about the svn-ports-all mailing list