5 files changed, 46 insertions, 65 deletions

diff --git a/games/mangos/Makefile b/games/mangos/Makefile
index 58b8accbdba4..fdc9ba4c65c3 100644
--- a/games/mangos/Makefile
+++ b/games/mangos/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	mangos
-PORTVERSION=	4154
+PORTVERSION=	4261
 CATEGORIES=	games
 MASTER_SITES=	CENKES http://mangos-port.by.ru/ \
 		http://neon.heavennet.ru/mangos/
 DISTFILES=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}
-SCRIPTDEV2REV=	84
+SCRIPTDEV2REV=	103
 
 MAINTAINER=    	neon_cyrex@mail.ru
 COMMENT=	Free dedicated-server for World of Warcraft
@@ -61,12 +61,12 @@ post-extract:
 	@${LN} -s ${LTMAIN} ${WRKSRC}/
 
 post-patch:
-	@${REINPLACE_CMD} -Ee 's!../etc/(mangos|realm)d.conf!${PREFIX}/etc/\1d.conf!g' \
-		${WRKSRC}/src/shared/SystemConfig.h.in
 	@${REINPLACE_CMD} -e 's|@MANGOSD_DATA@|${PREFIX}/share/mangos|g' \
 		${WRKSRC}/src/mangosd/mangosd.conf.in
 	@${REINPLACE_CMD} -e '/^sysconf_DATA/,/conf/d' \
 		${WRKSRC}/src/mangosd/Makefile.am ${WRKSRC}/src/realmd/Makefile.am
+	@cd ${WRKSRC}/sql/updates/&&${REINPLACE_CMD} -e '/pkgdata_DATA/,$$d' Makefile.am\
+		&&${ECHO_CMD} "pkgdata_DATA=`echo *.sql README`">>Makefile.am
 
 run-autotools-automake:
 	@(cd ${CONFIGURE_WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOMAKE} ${AUTOMAKE_ARGS})
diff --git a/games/mangos/distinfo b/games/mangos/distinfo
index 75b35f7cb2de..fa7ea6ada706 100644
--- a/games/mangos/distinfo
+++ b/games/mangos/distinfo
@@ -1,9 +1,9 @@
-MD5 (mangos-4154.tar.gz) = 421c0962c0256d17a841ba948c64a49f
-SHA256 (mangos-4154.tar.gz) = d541a65e5bd981823353c7271fd4835fd3b53d3d8a363a6431ff78385e54752f
-SIZE (mangos-4154.tar.gz) = 4238645
-MD5 (ScriptDev2-84.tar.gz) = 1ab26b9a3460120ea597b4bd85f733b8
-SHA256 (ScriptDev2-84.tar.gz) = 6fd8d875ba86ec9312b5fdb994282c5d019b2d60ad2c8c1a5cddbc3b731c56d2
-SIZE (ScriptDev2-84.tar.gz) = 240459
+MD5 (mangos-4261.tar.gz) = 22cd87a41211dcee79b2afbd5350f0e5
+SHA256 (mangos-4261.tar.gz) = eee3dde36da22b7974cec10965e867fe7d2a6b9dbcdaebe1442d1a97765eabf9
+SIZE (mangos-4261.tar.gz) = 4274913
+MD5 (ScriptDev2-103.tar.gz) = 341779e3e927569be71650d2ab985fdc
+SHA256 (ScriptDev2-103.tar.gz) = 696be307da6bff952ae8d9a4f96f63bde410b5fc423c40ed71278820aca71d9f
+SIZE (ScriptDev2-103.tar.gz) = 242216
 MD5 (mangos-dbc2_1_3.tar.gz) = 05eda19e4658f5fe59bb33aa48b83796
 SHA256 (mangos-dbc2_1_3.tar.gz) = 2d7eebbba390f5d853cfe066aa54aea76e7c07217ec949b1aaa16c8b35573aa3
 SIZE (mangos-dbc2_1_3.tar.gz) = 4257454
diff --git a/games/mangos/files/ScriptDev2.patch b/games/mangos/files/ScriptDev2.patch
index bf4d45446a43..94b367afc19e 100644
--- a/games/mangos/files/ScriptDev2.patch
+++ b/games/mangos/files/ScriptDev2.patch
@@ -26,9 +26,9 @@
  
  ## Link world daemon against the shared library
 -mangos_worldd_LDADD = ../bindings/universal/libmangosscript.la ../game/libmangosgame.a ../shared/libmangosdatabase.a ../shared/libmangosconfig.a ../shared/libmangosauth.a ../shared/libmangosshared.a ../shared/libmangosvmaps.a ../shared/libmangosnetwork.a ../framework/libmangosframework.a ../../dep/src/zthread/libZThread.la ../../dep/src/g3dlite/libg3dlite.a
--mangos_worldd_LDFLAGS = -L../../dep/src/zthread  -L../../dep/src/g3dlite -L../bindings/universal/ $(MYSQL_LIBS) -L$(libdir) $(ZLIB) $(COMPATLIB) $(SSLLIB) -export-dynamic
+-mangos_worldd_LDFLAGS = -L../../dep/src/zthread  -L../../dep/src/g3dlite -L../bindings/universal/ $(MYSQL_LIBS) $(POSTGRE_LIBS) -L$(libdir) $(ZLIB) $(COMPATLIB) $(SSLLIB) -export-dynamic
 +mangos_worldd_LDADD = ../bindings/ScriptDev2/libmangosscript.la ../game/libmangosgame.a ../shared/libmangosdatabase.a ../shared/libmangosconfig.a ../shared/libmangosauth.a ../shared/libmangosshared.a ../shared/libmangosvmaps.a ../shared/libmangosnetwork.a ../framework/libmangosframework.a ../../dep/src/zthread/libZThread.la ../../dep/src/g3dlite/libg3dlite.a
-+mangos_worldd_LDFLAGS = -L../../dep/src/zthread  -L../../dep/src/g3dlite -L../bindings/ScriptDev2/ $(MYSQL_LIBS) -L$(libdir) $(ZLIB) $(COMPATLIB) $(SSLLIB) -export-dynamic
++mangos_worldd_LDFLAGS = -L../../dep/src/zthread  -L../../dep/src/g3dlite -L../bindings/ScriptDev2/ $(MYSQL_LIBS) $(POSTGRE_LIBS) -L$(libdir) $(ZLIB) $(COMPATLIB) $(SSLLIB) -export-dynamic
  
  ## Additional files to include when running 'make dist'
  #  Include world daemon configuration
diff --git a/games/mangos/files/patch-time b/games/mangos/files/patch-time
deleted file mode 100644
index 8024cbfef93a..000000000000
--- a/games/mangos/files/patch-time
+++ /dev/null
@@ -1,53 +0,0 @@
---- src/shared/EventSystem.cpp	Wed May 23 10:14:13 2007
-+++ src/shared/EventSystem.cpp	Wed May 23 10:16:34 2007
-@@ -21,7 +21,7 @@
- #include "EventSystem.h"
- 
- #ifndef WIN32
--#include <sys/timeb.h>
-+#include <sys/time.h>
- #endif
- 
- PeriodicEvent *msPEvents=NULL;
-@@ -103,10 +103,11 @@
-     #if PLATFORM == PLATFORM_WIN32
-     return timeGetTime();
-     #else
--    struct timeb tp;
--    ftime(&tp);
-+    
-+    struct timeval tv;
-+    gettimeofday(&tv, (struct timezone*) NULL);
- 
--    return  tp.time * 1000 + tp.millitm;
-+    return  tv.tv_sec * 1000 + tv.tv_usec / 1000;
-     #endif
- }
- 
---- src/shared/Timer.h	Sat Mar 17 14:26:42 2007
-+++ src/shared/Timer.h	Wed May 23 10:43:28 2007
-@@ -27,7 +27,7 @@
- #   include <time.h>
- #else
- # if defined(__FreeBSD__) || defined(__APPLE_CC__)
--#   include <time.h>
-+#   include <sys/time.h>
- # endif
- #   include <sys/timeb.h>
- #endif
-@@ -38,10 +38,11 @@
-     #if PLATFORM == PLATFORM_WIN32
-     time_in_ms = timeGetTime();
-     #else
--    struct timeb tp;
--    ftime(&tp);
--
--    time_in_ms = tp.time * 1000 + tp.millitm;
-+    struct timeval tv;
-+    gettimeofday(&tv, (struct timezone*) NULL); 
-+    
-+    time_in_ms = tv.tv_sec * 1000 + tv.tv_usec / 1000; 
-+    
-     #endif
- 
-     return time_in_ms;
diff --git a/games/mangos/pkg-plist b/games/mangos/pkg-plist
index a84be75b27b6..51c4bbfd1513 100644
--- a/games/mangos/pkg-plist
+++ b/games/mangos/pkg-plist
@@ -327,6 +327,7 @@ lib/libmangosscript.so.0
 %%DATADIR%%/sql/updates/3845_account.sql
 %%DATADIR%%/sql/updates/3845_command.sql
 %%DATADIR%%/sql/updates/3859_spell_affect.sql
+%%DATADIR%%/sql/updates/3860_creature_template.sql
 %%DATADIR%%/sql/updates/3862_prospecting_loot_template.sql
 %%DATADIR%%/sql/updates/3874_spell_scripts.sql
 %%DATADIR%%/sql/updates/3875_item_template.sql
@@ -365,6 +366,35 @@ lib/libmangosscript.so.0
 %%DATADIR%%/sql/updates/4059_spell_learn_spell.sql
 %%DATADIR%%/sql/updates/4076_playercreateinfo_spell.sql
 %%DATADIR%%/sql/updates/4076_character_spell.sql
+%%DATADIR%%/sql/updates/4081_command.sql
+%%DATADIR%%/sql/updates/4096_pet.sql
+%%DATADIR%%/sql/updates/4116_creature_template.sql
+%%DATADIR%%/sql/updates/4133_command.sql
+%%DATADIR%%/sql/updates/4133_spell_chain.sql
+%%DATADIR%%/sql/updates/4134_command.sql
+%%DATADIR%%/sql/updates/4139_spell_proc_event.sql
+%%DATADIR%%/sql/updates/4140_command.sql
+%%DATADIR%%/sql/updates/4145_character_reputation.sql
+%%DATADIR%%/sql/updates/4154_spell_proc_event.sql
+%%DATADIR%%/sql/updates/4176_character.sql
+%%DATADIR%%/sql/updates/4176_command.sql
+%%DATADIR%%/sql/updates/4187_command.sql
+%%DATADIR%%/sql/updates/4204_command.sql
+%%DATADIR%%/sql/updates/4205_creature_template.sql
+%%DATADIR%%/sql/updates/4224_character_aura.sql
+%%DATADIR%%/sql/updates/4224_pet_aura.sql
+%%DATADIR%%/sql/updates/4235_spell_proc_event.sql
+%%DATADIR%%/sql/updates/4239_spell_chain.sql
+%%DATADIR%%/sql/updates/4239_spell_proc_event.sql
+%%DATADIR%%/sql/updates/4242_spell_proc_event.sql
+%%DATADIR%%/sql/updates/4243_spell_affect.sql
+%%DATADIR%%/sql/updates/4248_spell_chain.sql
+%%DATADIR%%/sql/updates/4248_spell_proc_event.sql
+%%DATADIR%%/sql/updates/4252_spell_threat.sql
+%%DATADIR%%/sql/updates/4255_spell_chain.sql
+%%DATADIR%%/sql/updates/4258_command.sql
+%%DATADIR%%/sql/updates/4259_spell_chain.sql
+%%DATADIR%%/sql/updates/4259_spell_proc_event.sql
 %%DATADIR%%/sql/updates/README
 %%DBC%%%%DATADIR%%/dbc/AnimationData.dbc
 %%DBC%%%%DATADIR%%/dbc/AreaPOI.dbc
@@ -543,6 +573,7 @@ lib/libmangosscript.so.0
 %%DBC%%%%DATADIR%%/dbc/gtRegenHPPerSpt.dbc
 %%DBC%%%%DATADIR%%/dbc/gtRegenMPPerSpt.dbc
 %%SD2%%share/scriptdev2/sql/scriptdev_full.sql
+%%SD2%%share/scriptdev2/sql/scriptdev_additional_req.sql
 %%SD2%%share/scriptdev2/sql/updates/09_BraveWindfeather.sql
 %%SD2%%share/scriptdev2/sql/updates/11_SilvaFilnaveth.sql
 %%SD2%%share/scriptdev2/sql/updates/27_Vaelastraz.sql
@@ -553,6 +584,9 @@ lib/libmangosscript.so.0
 %%SD2%%share/scriptdev2/sql/updates/r72.sql
 %%SD2%%share/scriptdev2/sql/updates/r78.sql
 %%SD2%%share/scriptdev2/sql/updates/r81.sql
+%%SD2%%share/scriptdev2/sql/updates/r91.sql
+%%SD2%%share/scriptdev2/sql/updates/r92.sql
+%%SD2%%share/scriptdev2/sql/updates/r97.sql
 @dirrm %%DATADIR%%/sql/updates
 @dirrm %%DATADIR%%/sql
 %%DBC%%@dirrm %%DATADIR%%/dbc