Date: Wed, 27 Nov 2013 18:30:06 -0600 (CST) From: Rusty Nejdl <rnejdl@ringofsaturn.com> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/184342: Update port games/megaglest to version 3.9.0.4 Message-ID: <assp.0044640d42.201311280030.rAS0U65S037141@tethys.ringofsaturn.com> Resent-Message-ID: <201311280040.rAS0e0Gd027069@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 184342 >Category: ports >Synopsis: Update port games/megaglest to version 3.9.0.4 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Thu Nov 28 00:40:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: Rusty Nejdl >Release: FreeBSD 9.2-STABLE amd64 >Organization: >Environment: System: FreeBSD tethys.ringofsaturn.com 9.2-STABLE FreeBSD 9.2-STABLE #1 r257395: Wed Oct 30 17:37:14 CDT 2013 root@tethys.ringofsaturn.com:/usr/obj/usr/src/sys/SATURN amd64 >Description: This updates megaglest and megaglest-data to 3.9.0.4 and also fixes much of the build on FreeBSD 10. With my virtual setup incomplete, I cannot completely confirm but this gets it MUCH closer if not all the way there. >How-To-Repeat: >Fix: --- megaglest-3.9.0.4.diff begins here --- diff -ruN megaglest/Makefile megaglest.new/Makefile --- megaglest/Makefile 2013-09-22 17:17:17.000000000 -0500 +++ megaglest.new/Makefile 2013-11-27 16:44:17.000000000 -0600 @@ -2,10 +2,9 @@ # $FreeBSD: head/games/megaglest/Makefile 327730 2013-09-20 17:36:33Z bapt $ 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 @@ -31,11 +30,10 @@ USE_OPENAL= al alut USE_SDL= yes USE_WX= 2.8+ - -MAKE_JOBS_UNSAFE=yes +MAKE_JOBS_UNSAFE= yes CFLAGS+= -I${LOCALBASE}/include/libpng15 -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} +WRKSRC= ${WRKDIR}/${PORTNAME}-3.9.0 OPTIONS_DEFINE= EDITOR EDITOR_DESC= Install MegaGlest Editor @@ -49,17 +47,13 @@ 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 + ${STRIP_CMD} ${WRKSRC}/source/glest_game/megaglest @${MKDIR} ${DATADIR} .if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} .endif - ${INSTALL_PROGRAM} ${WRKSRC}/mk/linux/megaglest ${PREFIX}/bin/${PORTNAME} + ${INSTALL_PROGRAM} ${WRKSRC}/source/glest_game/megaglest ${PREFIX}/bin/${PORTNAME} .for f in glest.ini glestkeys.ini servers.ini ${INSTALL_DATA} ${WRKSRC}/${f} ${DATADIR} .endfor @@ -67,7 +61,7 @@ ${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR} .endfor .if ${PORT_OPTIONS:MEDITOR} - ${INSTALL_PROGRAM} ${WRKSRC}/mk/linux/megaglest_editor ${PREFIX}/bin/megaglest_editor + ${INSTALL_PROGRAM} ${WRKSRC}/source/glest_map_editor/megaglest_editor ${PREFIX}/bin/megaglest_editor .endif post-install: diff -ruN megaglest/distinfo megaglest.new/distinfo --- megaglest/distinfo 2013-08-30 14:30:30.000000000 -0500 +++ megaglest.new/distinfo 2013-11-22 15:44:13.000000000 -0600 @@ -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 -ruN megaglest/files/patch-mk-cmake-modules-FindMiniupnpc.cmake megaglest.new/files/patch-mk-cmake-modules-FindMiniupnpc.cmake --- megaglest/files/patch-mk-cmake-modules-FindMiniupnpc.cmake 2013-08-30 14:30:30.000000000 -0500 +++ megaglest.new/files/patch-mk-cmake-modules-FindMiniupnpc.cmake 1969-12-31 18:00:00.000000000 -0600 @@ -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 -ruN megaglest/files/patch-source-share_lib-sources-platform-posix-socket.cpp megaglest.new/files/patch-source-share_lib-sources-platform-posix-socket.cpp --- megaglest/files/patch-source-share_lib-sources-platform-posix-socket.cpp 2013-08-30 14:30:30.000000000 -0500 +++ megaglest.new/files/patch-source-share_lib-sources-platform-posix-socket.cpp 1969-12-31 18:00:00.000000000 -0600 @@ -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 -ruN megaglest/files/patch-source-shared_lib-CMakeLists.txt megaglest.new/files/patch-source-shared_lib-CMakeLists.txt --- megaglest/files/patch-source-shared_lib-CMakeLists.txt 2013-08-30 14:30:30.000000000 -0500 +++ megaglest.new/files/patch-source-shared_lib-CMakeLists.txt 1969-12-31 18:00:00.000000000 -0600 @@ -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 -ruN megaglest/files/patch-source-shared_lib-sources-platform-posix-ircclient.cpp megaglest.new/files/patch-source-shared_lib-sources-platform-posix-ircclient.cpp --- megaglest/files/patch-source-shared_lib-sources-platform-posix-ircclient.cpp 2013-08-30 14:30:30.000000000 -0500 +++ megaglest.new/files/patch-source-shared_lib-sources-platform-posix-ircclient.cpp 2013-11-22 15:51:59.000000000 -0600 @@ -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 + --- megaglest-3.9.0.4.diff ends here --- --- megaglest-data-3.9.0.4.diff begins here --- diff -ruN megaglest-data/Makefile megaglest-data.new/Makefile --- megaglest-data/Makefile 2013-10-22 21:29:26.000000000 -0500 +++ megaglest-data.new/Makefile 2013-11-22 15:40:19.000000000 -0600 @@ -2,7 +2,7 @@ # $FreeBSD: head/games/megaglest-data/Makefile 331269 2013-10-22 13:53:33Z amdmi3 $ PORTNAME= megaglest -PORTVERSION= 3.7.1 +PORTVERSION= 3.9.0 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/${PORTNAME}_${PORTVERSION}/ PKGNAMESUFFIX= -data diff -ruN megaglest-data/distinfo megaglest-data.new/distinfo --- megaglest-data/distinfo 2013-08-30 14:30:43.000000000 -0500 +++ megaglest-data.new/distinfo 2013-11-22 15:40:57.000000000 -0600 @@ -1,2 +1,2 @@ -SHA256 (megaglest-data-3.7.1.tar.xz) = e31a84d32e35bd1b96ebba55188d05099411497dae4bad2ece9cb0cea5723b0d -SIZE (megaglest-data-3.7.1.tar.xz) = 191777052 +SHA256 (megaglest-data-3.9.0.tar.xz) = e6d6fdc994a6cc99e00bafda53537964ba069bb4bdcb3257dcbe4f7434011fc2 +SIZE (megaglest-data-3.9.0.tar.xz) = 269393520 --- megaglest-data-3.9.0.4.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?assp.0044640d42.201311280030.rAS0U65S037141>