- Update to 1.0.0

7 files changed, 28 insertions, 71 deletions

diff --git a/games/valyriatear/Makefile b/games/valyriatear/Makefile
index 88606b62df8c..85d8237df657 100644
--- a/games/valyriatear/Makefile
+++ b/games/valyriatear/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	valyriatear
-PORTVERSION=	0.6.0
-PORTREVISION=	8
+PORTVERSION=	1.0.0
 CATEGORIES=	games
 
 MAINTAINER=	amdmi3@FreeBSD.org
@@ -21,30 +20,41 @@ LIB_DEPENDS=	libboost_thread.so:devel/boost-libs \
 USE_GITHUB=	yes
 GH_ACCOUNT=	Bertram25
 GH_PROJECT=	ValyriaTear
+GH_TAGNAME=	${PORTVERSION}-gcc5 # contains relevant tolua++ fixes
 
-USES=		alias cmake iconv lua:51 openal
+USES=		alias cmake gettext-tools iconv lua:51 openal
 CMAKE_ARGS=	-DUSE_PCH_COMPILATION=OFF
 USE_SDL=	sdl image ttf
-USE_GL=		gl
+USE_GL=		gl glu
+USE_XORG=	x11 xext sm ice
 INSTALLS_ICONS=	yes
-LDFLAGS=	-L${LOCALBASE}/lib ${ICONV_LIB} -lintl
 
 PORTDOCS=	*
 PORTDATA=	*
 
-OPTIONS_DEFINE=	DOCS NLS
+OPTIONS_DEFINE=	EDITOR DOCS NLS
 OPTIONS_SUB=	yes
 
-NLS_CMAKE_OFF=	-DDISABLE_TRANSLATIONS=ON
-NLS_CMAKE_ON=	-DDISABLE_TRANSLATIONS=OFF
+EDITOR_DESC=	Compile the Qt editor along with the game
+EDITOR_CMAKE_BOOL=	EDITOR_SUPPORT
+EDITOR_USE=	QT4=corelib,gui,opengl,qmake_build,moc_build,uic_build,rcc_build
+EDITOR_DESKTOP_ENTRIES=	\
+		"Valyria Tear Editor" \
+		"Map editor for Valyria Tear game" \
+		"valyriatear" \
+		"vt-editor" \
+		"Graphics;2DGraphics;" \
+		""
+
+NLS_CMAKE_OFF=	-DDISABLE_TRANSLATIONS:BOOL=OFF
 NLS_USES=	gettext
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \
 		${WRKSRC}/CMake/Modules/*.cmake
 
-post-install:
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
+post-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/MANUAL ${STAGEDIR}${DOCSDIR}/
 
 .include <bsd.port.mk>
diff --git a/games/valyriatear/distinfo b/games/valyriatear/distinfo
index 7cc28ec2db8a..9a1c324c2da6 100644
--- a/games/valyriatear/distinfo
+++ b/games/valyriatear/distinfo
@@ -1,2 +1,3 @@
-SHA256 (Bertram25-ValyriaTear-0.6.0_GH0.tar.gz) = 20bad925b931a685e2dec3ed8f87cfb840b58ae79423307753fd5929aefbd097
-SIZE (Bertram25-ValyriaTear-0.6.0_GH0.tar.gz) = 81975778
+TIMESTAMP = 1491391131
+SHA256 (Bertram25-ValyriaTear-1.0.0-1.0.0-gcc5_GH0.tar.gz) = c15beceb0bbb2315604a52ae050d02e08fe414da87de4d5e035faa10a8d97e9e
+SIZE (Bertram25-ValyriaTear-1.0.0-1.0.0-gcc5_GH0.tar.gz) = 100883404
diff --git a/games/valyriatear/files/patch-CMakeLists.txt b/games/valyriatear/files/patch-CMakeLists.txt
deleted file mode 100644
index c7987e8f595a..000000000000
--- a/games/valyriatear/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,15 +0,0 @@
---- CMakeLists.txt.orig	2013-09-24 15:33:12.000000000 +0400
-+++ CMakeLists.txt	2013-10-08 04:14:13.346487900 +0400
-@@ -51,8 +51,10 @@
- ADD_SUBDIRECTORY(src)
- 
- # Add data packages
--FIND_PACKAGE(Gettext)
--ADD_SUBDIRECTORY(po)
-+IF(NOT DISABLE_TRANSLATIONS)
-+    FIND_PACKAGE(Gettext)
-+    ADD_SUBDIRECTORY(po)
-+ENDIF(NOT DISABLE_TRANSLATIONS)
- 
- # CPack installation part
- If(UNIX)
diff --git a/games/valyriatear/files/patch-src_CMakeLists.txt b/games/valyriatear/files/patch-src_CMakeLists.txt
deleted file mode 100644
index 20aee16bf15d..000000000000
--- a/games/valyriatear/files/patch-src_CMakeLists.txt
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/CMakeLists.txt.orig	2013-09-24 11:33:12 UTC
-+++ src/CMakeLists.txt
-@@ -8,7 +8,11 @@ FIND_PACKAGE(OpenAL REQUIRED)
- FIND_PACKAGE(VorbisFile REQUIRED)
- FIND_PACKAGE(Lua51 REQUIRED)
- FIND_PACKAGE(PNG REQUIRED)
--FIND_PACKAGE(Gettext REQUIRED)
-+
-+IF(NOT DISABLE_TRANSLATIONS)
-+    FIND_PACKAGE(Gettext REQUIRED)
-+ENDIF(NOT DISABLE_TRANSLATIONS)
-+
- FIND_PACKAGE(Boost 1.48.0 REQUIRED)
- 
- IF (UNIX AND USE_SYSTEM_LUABIND)
diff --git a/games/valyriatear/files/patch-src_luabind_luabind_detail_object__rep.hpp b/games/valyriatear/files/patch-src_luabind_luabind_detail_object__rep.hpp
deleted file mode 100644
index 3f73a828560f..000000000000
--- a/games/valyriatear/files/patch-src_luabind_luabind_detail_object__rep.hpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/luabind/luabind/detail/object_rep.hpp.orig	2013-09-24 11:33:12 UTC
-+++ src/luabind/luabind/detail/object_rep.hpp
-@@ -29,6 +29,8 @@
- #include <luabind/detail/instance_holder.hpp>
- #include <luabind/detail/ref.hpp>
- 
-+#include <cstdlib>
-+
- namespace luabind { namespace detail
- {
- 	class class_rep;
diff --git a/games/valyriatear/files/patch-src_luabind_luabind_object.hpp b/games/valyriatear/files/patch-src_luabind_luabind_object.hpp
deleted file mode 100644
index a37ed859d84e..000000000000
--- a/games/valyriatear/files/patch-src_luabind_luabind_object.hpp
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/luabind/luabind/object.hpp.orig	2013-09-24 11:33:12 UTC
-+++ src/luabind/luabind/object.hpp
-@@ -546,6 +546,7 @@ namespace detail
-       handle m_key;
-   };
- 
-+#if BOOST_VERSION < 105700
- // Needed because of some strange ADL issues.
- 
- #define LUABIND_OPERATOR_ADL_WKND(op) \
-@@ -567,6 +568,7 @@ namespace detail
-   LUABIND_OPERATOR_ADL_WKND(!=)
- 
- #undef LUABIND_OPERATOR_ADL_WKND
-+#endif
-  
- } // namespace detail
- 
diff --git a/games/valyriatear/pkg-plist b/games/valyriatear/pkg-plist
index 9d8c9bf46be0..02601744b239 100644
--- a/games/valyriatear/pkg-plist
+++ b/games/valyriatear/pkg-plist
@@ -1,9 +1,14 @@
 bin/valyriatear
+%%EDITOR%%bin/vt-editor
+share/appdata/valyriatear.appdata.xml
 share/applications/valyriatear.desktop
 share/icons/hicolor/48x48/apps/valyriatear.png
 %%NLS%%share/locale/de/LC_MESSAGES/valyriatear.mo
 %%NLS%%share/locale/en@quot/LC_MESSAGES/valyriatear.mo
+%%NLS%%share/locale/es/LC_MESSAGES/valyriatear.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/valyriatear.mo
 %%NLS%%share/locale/gl/LC_MESSAGES/valyriatear.mo
 %%NLS%%share/locale/it/LC_MESSAGES/valyriatear.mo
+%%NLS%%share/locale/nl_NL/LC_MESSAGES/valyriatear.mo
 %%NLS%%share/locale/pt_PT/LC_MESSAGES/valyriatear.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/valyriatear.mo