6 files changed, 30 insertions, 218 deletions

diff --git a/games/megaglest/Makefile b/games/megaglest/Makefile
index 49e3f0d2274c..3c0b29c11877 100644
--- a/games/megaglest/Makefile
+++ b/games/megaglest/Makefile
@@ -2,21 +2,20 @@
 # $FreeBSD$
 
 PORTNAME=	megaglest
-PORTVERSION=	3.7.1
-PORTREVISION=	2
+PORTVERSION=	3.9.0.4
 CATEGORIES=	games
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}_${PORTVERSION}/
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}_3.9.0/
 DISTNAME=	${PORTNAME}-source-${PORTVERSION}
 
 MAINTAINER=	rnejdl@ringofsaturn.com
 COMMENT=	Open source 3D real-time strategy game
 
-LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl \
-		jpeg:${PORTSDIR}/graphics/jpeg \
-		png15:${PORTSDIR}/graphics/png \
-		xerces-c:${PORTSDIR}/textproc/xerces-c2 \
-		ftgl:${PORTSDIR}/graphics/ftgl \
-		vorbis:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
+		libjpeg.so:${PORTSDIR}/graphics/jpeg \
+		libpng15.so:${PORTSDIR}/graphics/png \
+		libxerces-c.so:${PORTSDIR}/textproc/xerces-c2 \
+		libftgl.so:${PORTSDIR}/graphics/ftgl \
+		libvorbis.so:${PORTSDIR}/audio/libvorbis
 BUILD_DEPENDS=	${LOCALBASE}/include/libircclient.h:${PORTSDIR}/irc/libircclient \
 		${LOCALBASE}/include/miniupnpc/miniupnpc.h:${PORTSDIR}/net/miniupnpc
 RUN_DEPENDS=	${DATADIR}/tutorials/2_basic_tutorial/2_basic_tutorial.xml:${PORTSDIR}/games/megaglest-data
@@ -33,44 +32,31 @@ USE_SDL=	yes
 USE_WX=		2.8+
 
 CFLAGS+=	-I${LOCALBASE}/include/libpng15
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+WRKSRC=		${WRKDIR}/${PORTNAME}-3.9.0
 
 OPTIONS_DEFINE=	EDITOR
+OPTIONS_SUB=	yes
 EDITOR_DESC=	Install MegaGlest Editor
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MEDITOR}
-PLIST_SUB+=	EDITOR=""
-.else
-PLIST_SUB+=	EDITOR="@comment "
-.endif
-
-post-patch:
-	@${REINPLACE_CMD} -e '/<curl\/types.h>/d' \
-		${WRKSRC}/source/shared_lib/sources/platform/posix/miniftpclient.cpp
-
 do-install:
-	${STRIP_CMD} ${WRKSRC}/mk/linux/megaglest
-	@${MKDIR} ${DATADIR}
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-.endif
-	${INSTALL_PROGRAM} ${WRKSRC}/mk/linux/megaglest ${PREFIX}/bin/${PORTNAME}
+	${STRIP_CMD} ${WRKSRC}/source/glest_game/megaglest
+	@${MKDIR} ${STAGEDIR}${DATADIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/source/glest_game/megaglest ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 .for f in glest.ini glestkeys.ini servers.ini
-	${INSTALL_DATA} ${WRKSRC}/${f} ${DATADIR}
-.endfor
-.for f in AUTHORS.source_code.txt CHANGELOG.txt README.txt COPYRIGHT.source_code.txt
-	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DATADIR}
 .endfor
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+. for f in AUTHORS.source_code.txt CHANGELOG.txt README.txt COPYRIGHT.source_code.txt
+	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
+. endfor
+.endif
 .if ${PORT_OPTIONS:MEDITOR}
-	${INSTALL_PROGRAM} ${WRKSRC}/mk/linux/megaglest_editor ${PREFIX}/bin/megaglest_editor
+	${INSTALL_PROGRAM} ${WRKSRC}/source/glest_map_editor/megaglest_editor ${STAGEDIR}${PREFIX}/bin/megaglest_editor
 .endif
 
-post-install:
-	@${CAT} ${PKGMESSAGE}
-
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64"
diff --git a/games/megaglest/distinfo b/games/megaglest/distinfo
index c223f2cf97d7..261eaa0ea5ea 100644
--- a/games/megaglest/distinfo
+++ b/games/megaglest/distinfo
@@ -1,2 +1,2 @@
-SHA256 (megaglest-source-3.7.1.tar.xz) = 0222196c6a274cfd1b5fd074206a6bedcf3da4f343345f3e2682e704f94adc26
-SIZE (megaglest-source-3.7.1.tar.xz) = 1439864
+SHA256 (megaglest-source-3.9.0.4.tar.xz) = 3362ade61af3c01c2d8976d2d481769698dc0c800f35251b8c5489f8e41d9bc3
+SIZE (megaglest-source-3.9.0.4.tar.xz) = 1596692
diff --git a/games/megaglest/files/patch-mk-cmake-modules-FindMiniupnpc.cmake b/games/megaglest/files/patch-mk-cmake-modules-FindMiniupnpc.cmake
deleted file mode 100644
index 6f6a6a9e0304..000000000000
--- a/games/megaglest/files/patch-mk-cmake-modules-FindMiniupnpc.cmake
+++ /dev/null
@@ -1,114 +0,0 @@
---- mk/cmake/Modules/FindMiniupnpc.cmake.orig	2013-05-15 21:42:23.000000000 -0500
-+++ mk/cmake/Modules/FindMiniupnpc.cmake	2013-05-15 21:42:02.000000000 -0500
-@@ -58,20 +58,40 @@
-     #include <stdio.h>
-     int main()
-     {
--        struct UPNPDev *devlist = NULL;
--	int upnp_delay = 5000;
--	const char *upnp_multicastif = NULL;
--	const char *upnp_minissdpdsock = NULL;
--	int upnp_sameport = 0;
--	int upnp_ipv6 = 0;
--	int upnp_error = 0;
--	devlist = upnpDiscover(upnp_delay, upnp_multicastif, upnp_minissdpdsock, upnp_sameport, upnp_ipv6, &upnp_error);
-+        static struct UPNPUrls urls;
-+        static struct IGDdatas data;
-+
-+        GetUPNPUrls (&urls, &data, \"myurl\",0);
- 
-         return 0;
-     }"
--   MINIUPNPC_VERSION_1_6_OR_HIGHER)
--    
--   IF (NOT MINIUPNPC_VERSION_1_6_OR_HIGHER)
-+   MINIUPNPC_VERSION_1_7_OR_HIGHER)
-+
-+  IF (NOT MINIUPNPC_VERSION_1_7_OR_HIGHER)
-+          set(CMAKE_REQUIRED_INCLUDES ${MINIUPNP_INCLUDE_DIR})
-+          set(CMAKE_REQUIRED_LIBRARIES ${MINIUPNP_LIBRARY})
-+          check_cxx_source_runs("
-+            #include <miniwget.h>
-+            #include <miniupnpc.h>
-+            #include <upnpcommands.h>
-+            #include <stdio.h>
-+            int main()
-+            {
-+                struct UPNPDev *devlist = NULL;
-+	        int upnp_delay = 5000;
-+	        const char *upnp_multicastif = NULL;
-+	        const char *upnp_minissdpdsock = NULL;
-+	        int upnp_sameport = 0;
-+	        int upnp_ipv6 = 0;
-+	        int upnp_error = 0;
-+	        devlist = upnpDiscover(upnp_delay, upnp_multicastif, upnp_minissdpdsock, upnp_sameport, upnp_ipv6, &upnp_error);
-+
-+                return 0;
-+            }"
-+           MINIUPNPC_VERSION_PRE1_7)
-+   ENDIF()
-+ 
-+   IF (NOT MINIUPNPC_VERSION_PRE1_7 AND NOT MINIUPNPC_VERSION_1_7_OR_HIGHER)
-           set(CMAKE_REQUIRED_INCLUDES ${MINIUPNP_INCLUDE_DIR})
-           set(CMAKE_REQUIRED_LIBRARIES ${MINIUPNP_LIBRARY})
-           check_cxx_source_runs("
-@@ -96,25 +116,27 @@
- 
-    ENDIF()
- 
--   set(CMAKE_REQUIRED_INCLUDES ${MINIUPNP_INCLUDE_DIR})
--   set(CMAKE_REQUIRED_LIBRARIES ${MINIUPNP_LIBRARY})
--   check_cxx_source_runs("
--    #include <miniwget.h>
--    #include <miniupnpc.h>
--    #include <upnpcommands.h>
--    #include <stdio.h>
--    static struct UPNPUrls urls;
--    static struct IGDdatas data;
--    int main()
--    {
--        char externalIP[16]     = "";
--	UPNP_GetExternalIPAddress(urls.controlURL, data.first.servicetype, externalIP);
-+   IF (NOT MINIUPNPC_VERSION_PRE1_6 AND NOT MINIUPNPC_VERSION_PRE1_7 AND NOT MINIUPNPC_VERSION_1_7_OR_HIGHER)
-+           set(CMAKE_REQUIRED_INCLUDES ${MINIUPNP_INCLUDE_DIR})
-+           set(CMAKE_REQUIRED_LIBRARIES ${MINIUPNP_LIBRARY})
-+           check_cxx_source_runs("
-+            #include <miniwget.h>
-+            #include <miniupnpc.h>
-+            #include <upnpcommands.h>
-+            #include <stdio.h>
-+            static struct UPNPUrls urls;
-+            static struct IGDdatas data;
-+            int main()
-+            {
-+                char externalIP[16]     = "";
-+	        UPNP_GetExternalIPAddress(urls.controlURL, data.first.servicetype, externalIP);
- 
--        return 0;
--    }"
--    MINIUPNPC_VERSION_1_5_OR_HIGHER)
-+                return 0;
-+            }"
-+            MINIUPNPC_VERSION_1_5_OR_HIGHER)
-+    ENDIF()
- 
--    IF (NOT MINIUPNPC_VERSION_1_5_OR_HIGHER)
-+    IF (NOT MINIUPNPC_VERSION_1_5_OR_HIGHER AND NOT MINIUPNPC_VERSION_PRE1_6 AND NOT MINIUPNPC_VERSION_PRE1_7 AND NOT MINIUPNPC_VERSION_1_7_OR_HIGHER)
-          set(CMAKE_REQUIRED_INCLUDES ${MINIUPNP_INCLUDE_DIR})
-          set(CMAKE_REQUIRED_LIBRARIES ${MINIUPNP_LIBRARY})
-          check_cxx_source_runs("
-@@ -141,8 +163,12 @@
-     IF(MINIUPNPC_VERSION_PRE1_6)
- 	message(STATUS "Found miniupnpc version is pre v1.6")
-     ENDIF()
--    IF(NOT MINIUPNPC_VERSION_PRE1_5 AND NOT MINIUPNPC_VERSION_PRE1_6)
--	message(STATUS "Found miniupnpc version is v1.6 or higher")
-+    IF(MINIUPNPC_VERSION_PRE1_7)
-+	message(STATUS "Found miniupnpc version is pre v1.7")
-+    ENDIF()
-+
-+    IF(NOT MINIUPNPC_VERSION_PRE1_5 AND NOT MINIUPNPC_VERSION_PRE1_6 AND NOT MINIUPNPC_VERSION_PRE1_7)
-+	message(STATUS "Found miniupnpc version is v1.7 or higher")
-     ENDIF()
- 
- else ()
diff --git a/games/megaglest/files/patch-source-share_lib-sources-platform-posix-socket.cpp b/games/megaglest/files/patch-source-share_lib-sources-platform-posix-socket.cpp
deleted file mode 100644
index 5eedf20bcaff..000000000000
--- a/games/megaglest/files/patch-source-share_lib-sources-platform-posix-socket.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
---- source/shared_lib/sources/platform/posix/socket.cpp.orig	2013-05-15 21:33:42.000000000 -0500
-+++ source/shared_lib/sources/platform/posix/socket.cpp	2013-05-15 21:37:06.000000000 -0500
-@@ -2478,13 +2478,22 @@
- 				if(SystemFlags::VERBOSE_MODE_ENABLED) printf("UPnP device found: %s %s\n", dev->descURL, dev->st);
- 
- 				//printf("UPnP device found: [%s] [%s] lanaddr [%s]\n", dev->descURL, dev->st,lanaddr);
-+#ifndef MINIUPNPC_VERSION_PRE1_7
-+				descXML = (char *)miniwget_getaddr(dev->descURL, &descXMLsize, lanaddr, (sizeof(lanaddr) / sizeof(lanaddr[0])),0);
-+#else
- 				descXML = (char *)miniwget_getaddr(dev->descURL, &descXMLsize, lanaddr, (sizeof(lanaddr) / sizeof(lanaddr[0])));
-+#endif
- 				if(SystemFlags::getSystemSettingType(SystemFlags::debugNetwork).enabled) SystemFlags::OutputDebug(SystemFlags::debugNetwork,"LAN address: %s\n", lanaddr);
- 
- 				if (descXML) {
- 					parserootdesc (descXML, descXMLsize, &data);
- 					free (descXML); descXML = 0;
-+
-+#ifndef MINIUPNPC_VERSION_PRE1_7
-+					GetUPNPUrls (&urls, &data, dev->descURL,0);
-+#else
- 					GetUPNPUrls (&urls, &data, dev->descURL);
-+#endif
- 				}
- 				snprintf(buf, 255,"UPnP device found: %s %s LAN address %s", dev->descURL, dev->st, lanaddr);
- 
diff --git a/games/megaglest/files/patch-source-shared_lib-CMakeLists.txt b/games/megaglest/files/patch-source-shared_lib-CMakeLists.txt
deleted file mode 100644
index 9ba8817806e4..000000000000
--- a/games/megaglest/files/patch-source-shared_lib-CMakeLists.txt
+++ /dev/null
@@ -1,34 +0,0 @@
---- source/shared_lib/CMakeLists.txt.orig	2013-05-15 21:40:33.000000000 -0500
-+++ source/shared_lib/CMakeLists.txt	2013-05-15 21:41:00.000000000 -0500
-@@ -116,7 +116,7 @@
- #
- #	        INCLUDE_DIRECTORIES(${LUAJIT_INCLUDE_DIR})
- #	        IF(UNIX)
--#		        SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${LUAJIT_LIBRARIES} "libdl.so")
-+#		        SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${LUAJIT_LIBRARIES} ${CMAKE_DL_LIBS})
- #	        ENDIF()
- #        ELSE()
- #                MESSAGE(STATUS "**WARNING: LUAJIT NOT found, so Lua performance may suffer.")
-@@ -124,7 +124,7 @@
-         FIND_PACKAGE(LUA REQUIRED)
-         INCLUDE_DIRECTORIES(${LUA_INCLUDE_DIR})
-         IF(UNIX)
--	        SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${LUA_LIBRARIES} "libdl.so")
-+	        SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${LUA_LIBRARIES} ${CMAKE_DL_LIBS})
-         ENDIF()
- #        ENDIF()
- 
-@@ -297,7 +297,12 @@
- 		ADD_DEFINITIONS(-DMINIUPNPC_VERSION_PRE1_6)
-                 message(STATUS "Adding macro for miniupnpc version: pre v1.6")
- 	ENDIF()
--        IF(NOT MINIUPNPC_VERSION_PRE1_5 AND NOT MINIUPNPC_VERSION_PRE1_6)
-+	IF(MINIUPNPC_VERSION_PRE1_7)
-+		ADD_DEFINITIONS(-DMINIUPNPC_VERSION_PRE1_7)
-+                message(STATUS "Adding macro for miniupnpc version: pre v1.7")
-+	ENDIF()
-+
-+        IF(NOT MINIUPNPC_VERSION_PRE1_5 AND NOT MINIUPNPC_VERSION_PRE1_6 AND NOT MINIUPNPC_VERSION_PRE1_7)
-                 message(STATUS "**No macros required for miniupnpc version")
-         ENDIF()
- 
diff --git a/games/megaglest/files/patch-source-shared_lib-sources-platform-posix-ircclient.cpp b/games/megaglest/files/patch-source-shared_lib-sources-platform-posix-ircclient.cpp
index bbff0c114c07..1330f3686fd4 100644
--- a/games/megaglest/files/patch-source-shared_lib-sources-platform-posix-ircclient.cpp
+++ b/games/megaglest/files/patch-source-shared_lib-sources-platform-posix-ircclient.cpp
@@ -1,14 +1,13 @@
---- source/shared_lib/sources/platform/posix/ircclient.cpp	2012-11-10 03:22:28.000000000 -0600
-+++ source/shared_lib/sources/platform/posix/ircclient.cpp.new	2012-11-20 11:51:10.000000000 -0600
-@@ -14,11 +14,7 @@
- #include "util.h"
- #include "platform_common.h"
+--- source/shared_lib/sources/platform/posix/ircclient.cpp.orig	2013-11-22 15:51:23.000000000 -0600
++++ source/shared_lib/sources/platform/posix/ircclient.cpp	2013-11-22 15:51:42.000000000 -0600
+@@ -19,10 +19,7 @@
+ #if !defined(DISABLE_IRCCLIENT)
+ 
  #include <libircclient.h>
--
 -// upstream moved some defines into new headers as of 1.6
 -#ifndef LIBIRCCLIENT_PRE1_6
  #include <libirc_rfcnumeric.h>
 -#endif
  
- #include <stdio.h>
- #include <stdarg.h>
+ #endif
+