Attachment #164759 for bug #205485




# $FreeBSD$

PORTNAME=	megaglest
PORTVERSION=	3.11.1
PORTREVISION=	8
CATEGORIES=	games
MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}_3.9.0/
DISTNAME=	${PORTNAME}-source-${PORTVERSION}

MAINTAINER=	monwarez@mailoo.org
COMMENT=	Open source 3D real-time strategy game

BROKEN=		unfetchable
LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
		libpng.so:${PORTSDIR}/graphics/png \
		libxerces-c.so:${PORTSDIR}/textproc/xerces-c3 \

		${LOCALBASE}/include/miniupnpc/miniupnpc.h:${PORTSDIR}/net/miniupnpc
RUN_DEPENDS=	${DATADIR}/tutorials/2_basic_tutorial/2_basic_tutorial.xml:${PORTSDIR}/games/megaglest-data

USE_GITHUB=	yes
GH_ACCOUNT=	MegaGlest
GH_PROJECT=	megaglest-source

SUB_FILES=	pkg-message

USES=		cmake compiler:c++11-lib display:build dos2unix jpeg lua \

USE_SDL=	yes
USE_WX=		3.0
USE_CXXSTD=	c++11
WX_UNICODE=	yes

CFLAGS+=	-I${LOCALBASE}/include
LDFLAGS+=	-L${LOCALBASE}/lib -lssl -lcrypto
WRKSRC=		${WRKDIR}/${PORTNAME}-3.9.0

OPTIONS_DEFINE=	EDITOR DOCS
OPTIONS_SUB=	yes

do-install:
	${STRIP_CMD} ${WRKSRC}/source/glest_game/megaglest
	@${MKDIR} ${STAGEDIR}${DATADIR}
	${INSTALL_DATA} ${WRKSRC}/mk/linux/megaglest.desktop ${STAGEDIR}${PREFIX}/share/applications/
	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons
	${INSTALL_DATA} ${WRKSRC}/mk/linux/megaglest.png ${STAGEDIR}${PREFIX}/share/icons/
	${INSTALL_PROGRAM} ${WRKSRC}/source/glest_game/megaglest ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
.for f in mk/linux/glest.ini mk/shared/glestkeys.ini mk/shared/servers.ini
	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DATADIR}
.endfor
.if ${PORT_OPTIONS:MDOCS}
	@${MKDIR} ${STAGEDIR}${DOCSDIR}
. for f in docs/AUTHORS.source_code.txt docs/CHANGELOG.txt docs/README.txt docs/COPYRIGHT.source_code.txt
	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
. endfor
.endif

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (megaglest-source-3.9.0.4.tar.xz) = 3362ade61af3c01c2d8976d2d481769698dc0c800f35251b8c5489f8e41d9bc3	1	SHA256 (megaglest-source-3.11.1_GH0.tar.xz) = 6bbbbb69d01bc765f439a60c74178b75dc47753cc126e6758e3bc740d8b42a21
2	SIZE (megaglest-source-3.9.0.4.tar.xz) = 1596692	2	SIZE (megaglest-source-3.11.1_GH0.tar.xz) = 4807372




--- source/shared_lib/sources/platform/posix/socket.cpp.orig	2015-10-14 18:18:16 UTC
+++ source/shared_lib/sources/platform/posix/socket.cpp
@@ -2554,7 +2554,11 @@ int UPNP_Tools::upnp_init(void *param) {
 		int upnp_error = 0;
 
 #ifndef MINIUPNPC_VERSION_PRE1_6
+#if MINIUPNPC_API_VERSION >= 14
+		devlist = upnpDiscover(upnp_delay, upnp_multicastif, upnp_minissdpdsock, upnp_sameport, upnp_ipv6, 2, &upnp_error);
+#else
 		devlist = upnpDiscover(upnp_delay, upnp_multicastif, upnp_minissdpdsock, upnp_sameport, upnp_ipv6, &upnp_error);
+#endif
 
 		if(SystemFlags::getSystemSettingType(SystemFlags::debugNetwork).enabled) SystemFlags::OutputDebug(SystemFlags::debugNetwork,"UPnP discover returned upnp_error = %d.\n",upnp_error);
 		if(SystemFlags::VERBOSE_MODE_ENABLED) printf("UPnP discover returned upnp_error = %d.\n",upnp_error);
yes
native
text/plain

Lines 7-9 Link Here

(-)pkg-plist (+2 lines)
7	%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT.source_code.txt	7	%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT.source_code.txt
8	%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG.txt	8	%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG.txt
9	%%PORTDOCS%%%%DOCSDIR%%/AUTHORS.source_code.txt	9	%%PORTDOCS%%%%DOCSDIR%%/AUTHORS.source_code.txt
		10	share/applications/megaglest.desktop
		11	share/icons/megaglest.png

Return to bug 205485

Lines 2-17 Link Here

(-)Makefile (-9 / +11 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= megaglest	4	PORTNAME= megaglest
5	PORTVERSION= 3.9.0.4	5	PORTVERSION= 3.11.1
6	PORTREVISION= 8
7	CATEGORIES= games	6	CATEGORIES= games
8	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}_3.9.0/
9	DISTNAME= ${PORTNAME}-source-${PORTVERSION}	7	DISTNAME= ${PORTNAME}-source-${PORTVERSION}
10		8
11	MAINTAINER= ports@FreeBSD.org	9	MAINTAINER= monwarez@mailoo.org
12	COMMENT= Open source 3D real-time strategy game	10	COMMENT= Open source 3D real-time strategy game
13		11
14	BROKEN= unfetchable
15	LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl \	12	LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl \
16	libpng.so:${PORTSDIR}/graphics/png \	13	libpng.so:${PORTSDIR}/graphics/png \
17	libxerces-c.so:${PORTSDIR}/textproc/xerces-c3 \	14	libxerces-c.so:${PORTSDIR}/textproc/xerces-c3 \
Lines 21-26 Link Here
21	${LOCALBASE}/include/miniupnpc/miniupnpc.h:${PORTSDIR}/net/miniupnpc	18	${LOCALBASE}/include/miniupnpc/miniupnpc.h:${PORTSDIR}/net/miniupnpc
22	RUN_DEPENDS= ${DATADIR}/tutorials/2_basic_tutorial/2_basic_tutorial.xml:${PORTSDIR}/games/megaglest-data	19	RUN_DEPENDS= ${DATADIR}/tutorials/2_basic_tutorial/2_basic_tutorial.xml:${PORTSDIR}/games/megaglest-data
23		20
		21	USE_GITHUB= yes
		22	GH_ACCOUNT= MegaGlest
		23	GH_PROJECT= megaglest-source
		24
24	SUB_FILES= pkg-message	25	SUB_FILES= pkg-message
25		26
26	USES= cmake compiler:c++11-lib display:build dos2unix jpeg lua \	27	USES= cmake compiler:c++11-lib display:build dos2unix jpeg lua \
Lines 29-39 Link Here
29	USE_SDL= yes	30	USE_SDL= yes
30	USE_WX= 3.0	31	USE_WX= 3.0
31	USE_CXXSTD= c++11	32	USE_CXXSTD= c++11
32	WX_UNICODE= yes
33		33
34	CFLAGS+= -I${LOCALBASE}/include	34	CFLAGS+= -I${LOCALBASE}/include
35	LDFLAGS+= -L${LOCALBASE}/lib -lssl -lcrypto	35	LDFLAGS+= -L${LOCALBASE}/lib -lssl -lcrypto
36	WRKSRC= ${WRKDIR}/${PORTNAME}-3.9.0
37		36
38	OPTIONS_DEFINE= EDITOR DOCS	37	OPTIONS_DEFINE= EDITOR DOCS
39	OPTIONS_SUB= yes	38	OPTIONS_SUB= yes
Lines 50-62 Link Here
50	do-install:	49	do-install:
51	${STRIP_CMD} ${WRKSRC}/source/glest_game/megaglest	50	${STRIP_CMD} ${WRKSRC}/source/glest_game/megaglest
52	@${MKDIR} ${STAGEDIR}${DATADIR}	51	@${MKDIR} ${STAGEDIR}${DATADIR}
		52	${INSTALL_DATA} ${WRKSRC}/mk/linux/megaglest.desktop ${STAGEDIR}${PREFIX}/share/applications/
		53	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons
		54	${INSTALL_DATA} ${WRKSRC}/mk/linux/megaglest.png ${STAGEDIR}${PREFIX}/share/icons/
53	${INSTALL_PROGRAM} ${WRKSRC}/source/glest_game/megaglest ${STAGEDIR}${PREFIX}/bin/${PORTNAME}	55	${INSTALL_PROGRAM} ${WRKSRC}/source/glest_game/megaglest ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
54	.for f in glest.ini glestkeys.ini servers.ini	56	.for f in mk/linux/glest.ini mk/shared/glestkeys.ini mk/shared/servers.ini
55	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DATADIR}	57	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DATADIR}
56	.endfor	58	.endfor
57	.if ${PORT_OPTIONS:MDOCS}	59	.if ${PORT_OPTIONS:MDOCS}
58	@${MKDIR} ${STAGEDIR}${DOCSDIR}	60	@${MKDIR} ${STAGEDIR}${DOCSDIR}
59	. for f in AUTHORS.source_code.txt CHANGELOG.txt README.txt COPYRIGHT.source_code.txt	61	. for f in docs/AUTHORS.source_code.txt docs/CHANGELOG.txt docs/README.txt docs/COPYRIGHT.source_code.txt
60	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}	62	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
61	. endfor	63	. endfor
62	.endif	64	.endif

Lines 1-14 Link Here

(-)files/patch-source_shared__lib_sources_platform_posix_socket.cpp (-17 lines)
1	--- source/shared_lib/sources/platform/posix/socket.cpp.orig 2015-10-14 18:18:16 UTC
2	+++ source/shared_lib/sources/platform/posix/socket.cpp
3	@@ -2554,7 +2554,11 @@ int UPNP_Tools::upnp_init(void *param) {
4	int upnp_error = 0;
5
6	#ifndef MINIUPNPC_VERSION_PRE1_6
7	+#if MINIUPNPC_API_VERSION >= 14
8	+ devlist = upnpDiscover(upnp_delay, upnp_multicastif, upnp_minissdpdsock, upnp_sameport, upnp_ipv6, 2, &upnp_error);
9	+#else
10	devlist = upnpDiscover(upnp_delay, upnp_multicastif, upnp_minissdpdsock, upnp_sameport, upnp_ipv6, &upnp_error);
11	+#endif
12
13	if(SystemFlags::getSystemSettingType(SystemFlags::debugNetwork).enabled) SystemFlags::OutputDebug(SystemFlags::debugNetwork,"UPnP discover returned upnp_error = %d.\n",upnp_error);
14	if(SystemFlags::VERBOSE_MODE_ENABLED) printf("UPnP discover returned upnp_error = %d.\n",upnp_error);
15	yes
16	native
17	text/plain