svn commit: r307802 - in head/games: megaglest megaglest-data megaglest/files

Bryan Drewery bdrewery at FreeBSD.org
Mon Nov 26 21:30:06 UTC 2012 

Author: bdrewery
Date: Mon Nov 26 21:30:05 2012
New Revision: 307802
URL: http://svnweb.freebsd.org/changeset/ports/307802

Log:
  - Update megaglest and megaglest-data to 3.7.1 [1]
  - Convert to new options framework
  - Trim headers
  - Remove ABI versions from LIB_DEPENDS
  
  PR:		ports/173921 [1]
  Submitted by:	Rusty Nejdl <rnejdl at ringofsaturn.com> (maintainer) [1]
  Feature safe:	yes

Added:
  head/games/megaglest/files/patch-source-shared_lib-CMakeLists.txt   (contents, props changed)
Modified:
  head/games/megaglest-data/Makefile
  head/games/megaglest-data/distinfo
  head/games/megaglest/Makefile
  head/games/megaglest/distinfo
  head/games/megaglest/files/patch-source-shared_lib-sources-platform-posix-ircclient.cpp

Modified: head/games/megaglest-data/Makefile
==============================================================================
--- head/games/megaglest-data/Makefile	Mon Nov 26 21:29:19 2012	(r307801)
+++ head/games/megaglest-data/Makefile	Mon Nov 26 21:30:05 2012	(r307802)
@@ -1,12 +1,8 @@
-# New ports collection makefile for:	megaglest-data
-# Date created:				2010-11-12
-# Whom:					Sven Moeller <smoeller at nichthelfer.de>
-#
+# Created by: Sven Moeller <smoeller at nichthelfer.de>
 # $FreeBSD$
-#
 
 PORTNAME=	megaglest
-PORTVERSION=	3.6.0.3
+PORTVERSION=	3.7.1
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}_${PORTVERSION}/
 PKGNAMESUFFIX=	-data

Modified: head/games/megaglest-data/distinfo
==============================================================================
--- head/games/megaglest-data/distinfo	Mon Nov 26 21:29:19 2012	(r307801)
+++ head/games/megaglest-data/distinfo	Mon Nov 26 21:30:05 2012	(r307802)
@@ -1,2 +1,2 @@
-SHA256 (megaglest-data-3.6.0.3.tar.xz) = 2a9f0293565a5ec56714b2f73f63e02b807478dce78251cedeeb25b57afb962e
-SIZE (megaglest-data-3.6.0.3.tar.xz) = 192795104
+SHA256 (megaglest-data-3.7.1.tar.xz) = e31a84d32e35bd1b96ebba55188d05099411497dae4bad2ece9cb0cea5723b0d
+SIZE (megaglest-data-3.7.1.tar.xz) = 191777052

Modified: head/games/megaglest/Makefile
==============================================================================
--- head/games/megaglest/Makefile	Mon Nov 26 21:29:19 2012	(r307801)
+++ head/games/megaglest/Makefile	Mon Nov 26 21:30:05 2012	(r307802)
@@ -1,12 +1,8 @@
-# New ports collection makefile for:	megaglest
-# Date created:				2011-02-10
-# Whom:					Sven Moeller <smoeller at nichthelfer.de>
-#
+# Created by: Sven Moeller <smoeller at nichthelfer.de>
 # $FreeBSD$
-#
 
 PORTNAME=	megaglest
-PORTVERSION=	3.6.0.3
+PORTVERSION=	3.7.1
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}_${PORTVERSION}/
 DISTNAME=	${PORTNAME}-source-${PORTVERSION}
@@ -14,12 +10,12 @@ DISTNAME=	${PORTNAME}-source-${PORTVERSI
 MAINTAINER=	rnejdl at ringofsaturn.com
 COMMENT=	Open source 3D real-time strategy game
 
-LIB_DEPENDS=	curl.6:${PORTSDIR}/ftp/curl \
-		jpeg.11:${PORTSDIR}/graphics/jpeg \
+LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl \
+		jpeg:${PORTSDIR}/graphics/jpeg \
 		png15:${PORTSDIR}/graphics/png \
-		xerces-c.27:${PORTSDIR}/textproc/xerces-c2 \
-		ftgl.2:${PORTSDIR}/graphics/ftgl \
-		vorbis.4:${PORTSDIR}/audio/libvorbis
+		xerces-c:${PORTSDIR}/textproc/xerces-c2 \
+		ftgl:${PORTSDIR}/graphics/ftgl \
+		vorbis:${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
@@ -39,11 +35,12 @@ MAKE_JOBS_SAFE=	yes
 CFLAGS+=	-I${LOCALBASE}/include/libpng15
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-OPTIONS=	EDITOR "Install MegaGlest Editor" off
+OPTIONS_DEFINE=	EDITOR
+EDITOR_DESC=	Install MegaGlest Editor
 
 .include <bsd.port.options.mk>
 
-.if defined(WITH_EDITOR)
+.if ${PORT_OPTIONS:MEDITOR}
 PLIST_SUB+=	EDITOR=""
 .else
 PLIST_SUB+=	EDITOR="@comment "
@@ -66,7 +63,7 @@ do-install:
 .for f in AUTHORS.source_code.txt CHANGELOG.txt README.txt COPYRIGHT.source_code.txt
 	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
 .endfor
-.if defined(WITH_EDITOR)
+.if ${PORT_OPTIONS:MEDITOR}
 	${INSTALL_PROGRAM} ${WRKSRC}/mk/linux/megaglest_editor ${PREFIX}/bin/megaglest_editor
 .endif
 

Modified: head/games/megaglest/distinfo
==============================================================================
--- head/games/megaglest/distinfo	Mon Nov 26 21:29:19 2012	(r307801)
+++ head/games/megaglest/distinfo	Mon Nov 26 21:30:05 2012	(r307802)
@@ -1,2 +1,2 @@
-SHA256 (megaglest-source-3.6.0.3.tar.xz) = 700b1eef534d72fa5efd329445aa085259a87dcea5e739eda629e6c41386b9f7
-SIZE (megaglest-source-3.6.0.3.tar.xz) = 1336432
+SHA256 (megaglest-source-3.7.1.tar.xz) = 0222196c6a274cfd1b5fd074206a6bedcf3da4f343345f3e2682e704f94adc26
+SIZE (megaglest-source-3.7.1.tar.xz) = 1439864

Added: head/games/megaglest/files/patch-source-shared_lib-CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/megaglest/files/patch-source-shared_lib-CMakeLists.txt	Mon Nov 26 21:30:05 2012	(r307802)
@@ -0,0 +1,11 @@
+--- source/shared_lib/CMakeLists.txt.orig	2012-11-25 00:19:10.000000000 +0000
++++ source/shared_lib/CMakeLists.txt	2012-11-25 00:12:01.000000000 +0000
+@@ -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()
+ 

Modified: head/games/megaglest/files/patch-source-shared_lib-sources-platform-posix-ircclient.cpp
==============================================================================
--- head/games/megaglest/files/patch-source-shared_lib-sources-platform-posix-ircclient.cpp	Mon Nov 26 21:29:19 2012	(r307801)
+++ head/games/megaglest/files/patch-source-shared_lib-sources-platform-posix-ircclient.cpp	Mon Nov 26 21:30:05 2012	(r307802)
@@ -1,13 +1,13 @@
---- source/shared_lib/sources/platform/posix/ircclient.cpp	2012-01-23 14:36:15.000000000 -0600
-+++ source/shared_lib/sources/platform/posix/ircclient.cpp.new	2012-06-24 09:51:37.000000000 -0500
+--- 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"
- #include "libircclient.h"
+ #include <libircclient.h>
 -
 -// upstream moved some defines into new headers as of 1.6
 -#ifndef LIBIRCCLIENT_PRE1_6
- #include "libirc_rfcnumeric.h"
+ #include <libirc_rfcnumeric.h>
 -#endif
  
  #include <stdio.h>

More information about the svn-ports-head mailing list