5 files changed, 63 insertions, 82 deletions

diff --git a/games/mangos/Makefile b/games/mangos/Makefile
index 862a0110e3ad..58b8accbdba4 100644
--- a/games/mangos/Makefile
+++ b/games/mangos/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	mangos
-PORTVERSION=	4010
+PORTVERSION=	4154
 CATEGORIES=	games
 MASTER_SITES=	CENKES http://mangos-port.by.ru/ \
 		http://neon.heavennet.ru/mangos/
 DISTFILES=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}
-SCRIPTDEV2REV=	64
+SCRIPTDEV2REV=	84
 
 MAINTAINER=    	neon_cyrex@mail.ru
 COMMENT=	Free dedicated-server for World of Warcraft
@@ -19,8 +19,7 @@ COMMENT=	Free dedicated-server for World of Warcraft
 OPTIONS=	SCRIPTDEV2	"ScriptDev2"	on \
 		CLI		"Command Line Itrerface support" off \
 		RA		"Remote Administration support" off \
-		DBC		"Install DBC files" on \
-		HONORRATE	"Enable HonorRate patch" on
+		DBC		"Install DBC files" on
 
 USE_AUTOTOOLS=	aclocal:19 libtoolize autoconf:261 autoheader:261 automake:19 libtool:15
 ACLOCAL_ARGS=	-I ${LOCALBASE}/share/aclocal
@@ -44,13 +43,10 @@ PLIST_SUB+=	SD2="@comment "
 .endif
 .ifdef WITH_DBC
 PLIST_SUB+=	DBC=""
-DISTFILES+=	mangos-dbc2.tar.gz
+DISTFILES+=	mangos-dbc2_1_3.tar.gz
 .else
 PLIST_SUB+=	DBC="@comment "
 .endif
-.ifdef WITH_HONORRATE
-EXTRA_PATCHES+=	${FILESDIR}/HonorRate.patch
-.endif
 .ifdef WITH_CLI
 CONFIGURE_ARGS+=--enable-cli
 .endif
diff --git a/games/mangos/distinfo b/games/mangos/distinfo
index eaef9200b78d..75b35f7cb2de 100644
--- a/games/mangos/distinfo
+++ b/games/mangos/distinfo
@@ -1,9 +1,9 @@
-MD5 (mangos-4010.tar.gz) = 8cad861aa5c0a63d866ffe07b2fcb057
-SHA256 (mangos-4010.tar.gz) = ec623f08b12509f65bdb7be0085d9d1fa04c389331c53f3960a2e9050b566d0c
-SIZE (mangos-4010.tar.gz) = 2566768
-MD5 (ScriptDev2-64.tar.gz) = 7140c70e44460c85fec6e0213d6f0f2e
-SHA256 (ScriptDev2-64.tar.gz) = 256f6685ad015493e281e6b9a818895775aa3f97a94c54913f166094edef2cc7
-SIZE (ScriptDev2-64.tar.gz) = 217436
-MD5 (mangos-dbc2.tar.gz) = f0258004858dbf283ed7d37887b7b74d
-SHA256 (mangos-dbc2.tar.gz) = 9f7d0c4138aa81b4e3e785da3879c36340bf8d895d7c52df955065d01d76cde0
-SIZE (mangos-dbc2.tar.gz) = 4107847
+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-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/HonorRate.patch b/games/mangos/files/HonorRate.patch
deleted file mode 100644
index 24b4b8b32dc4..000000000000
--- a/games/mangos/files/HonorRate.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- src/game/World.h
-+++ src/game/World.h
-@@ -120,6 +120,7 @@
-     RATE_AUCTION_TIME,
-     RATE_AUCTION_DEPOSIT,
-     RATE_AUCTION_CUT,
-+    RATE_HONOR,
-     RATE_MINING_AMOUNT,
-     RATE_MINING_NEXT,
-     MAX_RATES
---- src/mangosd/mangosd.conf.in
-+++ src/mangosd/mangosd.conf.in
-@@ -233,6 +233,9 @@
- Rate.Mining.Amount = 1
- Rate.Mining.Next   = 1
- 
-+#
-+Rate.Honor = 1
-+
- # Save respawn time for creatures at death, for gameobjects at use/open
- #          0 (save creature/gameobject respawn time at grid unload)
- # Default: 1 (save creature/gameobject respawn time without waiting grid unload)
- 
---- src/game/Player.cpp
-+++ src/game/Player.cpp
-@@ -4697,7 +4697,7 @@
- 
-     UpdateHonorFields();                                    // to prevent CalcluateHonor() on a new day before old honor was UpdateHonorFields()
- 
--    float honor = ((float)urand(1,80))/10;                  // honor between: 0.1 - 8.0
-+    float honor = ((float)urand(1,80))/10 * sWorld.getRate(RATE_HONOR);                  // honor between: 0.1 - 8.0
-     float approx_honor = honor * (((float)urand(8,12))/10); // approx honor: 80% - 120% of real honor
-     sDatabase.Execute("INSERT INTO `character_kill` (`guid`,`creature_template`,`honor`,`date`) VALUES (%u, %u, %f, %u)", GUID_LOPART(GetGUID()), uVictim->GetEntry(), honor, time(0));
- 
---- src/game/World.cpp
-+++ src/game/World.cpp
-@@ -257,6 +257,7 @@
-     rate_values[RATE_AUCTION_TIME]  = sConfig.GetFloatDefault("Rate.Auction.Time", 1);
-     rate_values[RATE_AUCTION_DEPOSIT] = sConfig.GetFloatDefault("Rate.Auction.Deposit", 1);
-     rate_values[RATE_AUCTION_CUT] = sConfig.GetFloatDefault("Rate.Auction.Cut", 1);
-+    rate_values[RATE_HONOR] = sConfig.GetFloatDefault("Rate.Honor", 1);
-     rate_values[RATE_MINING_AMOUNT] = sConfig.GetFloatDefault("Rate.Mining.Amount",1);
-     rate_values[RATE_MINING_NEXT]   = sConfig.GetFloatDefault("Rate.Mining.Next",1);
- 
diff --git a/games/mangos/files/ScriptDev2.patch b/games/mangos/files/ScriptDev2.patch
index af1cb7b0a082..bf4d45446a43 100644
--- a/games/mangos/files/ScriptDev2.patch
+++ b/games/mangos/files/ScriptDev2.patch
@@ -1,19 +1,14 @@
---- src/mangosd/Makefile.am
-+++ src/mangosd/Makefile.am
-@@ -33,8 +33,8 @@
- 	WorldRunnable.h
- 
- ## 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/libmangosnetwork.a ../framework/libmangosframework.a ../../dep/src/zthread/libZThread.la
--mangos_worldd_LDFLAGS = -L../../dep/src/zthread -L../bindings/universal/ $(MYSQL_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/libmangosnetwork.a ../framework/libmangosframework.a ../../dep/src/zthread/libZThread.la
-+mangos_worldd_LDFLAGS = -L../../dep/src/zthread -L../bindings/ScriptDev2/ $(MYSQL_LIBS) -L$(libdir) $(ZLIB) $(COMPATLIB) $(SSLLIB) -export-dynamic
+--- src/bindings/Makefile.am
++++ src/bindings/Makefile.am
+@@ -14,4 +14,4 @@
+ # along with this program; if not, write to the Free Software
+ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  
- ## Additional files to include when running 'make dist'
- #  Include world daemon configuration
+-SUBDIRS = universal
++SUBDIRS = ScriptDev2
 --- configure.ac
 +++ configure.ac
-@@ -191,7 +191,10 @@
+@@ -192,7 +192,9 @@
     src/mangosd/Makefile
     src/mangosd/mangosd.conf
     src/bindings/Makefile
@@ -21,15 +16,19 @@
 +   src/bindings/ScriptDev2/Makefile
 +   src/bindings/ScriptDev2/sql/Makefile
 +   src/bindings/ScriptDev2/sql/Updates/Makefile
-+   
  ])
  
  ## Disabled Makefiles, until they are ready for a successful make and
---- src/bindings/Makefile.am
-+++ src/bindings/Makefile.am
-@@ -14,4 +14,4 @@
- # along with this program; if not, write to the Free Software
- # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+--- src/mangosd/Makefile.am
++++ src/mangosd/Makefile.am
+@@ -33,8 +33,8 @@
+ 	WorldRunnable.h
  
--SUBDIRS = universal
-+SUBDIRS = ScriptDev2
+ ## 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_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
+ 
+ ## Additional files to include when running 'make dist'
+ #  Include world daemon configuration
diff --git a/games/mangos/pkg-plist b/games/mangos/pkg-plist
index 9a3a271fe06c..a84be75b27b6 100644
--- a/games/mangos/pkg-plist
+++ b/games/mangos/pkg-plist
@@ -340,6 +340,31 @@ lib/libmangosscript.so.0
 %%DATADIR%%/sql/updates/3939_realmd_account.sql
 %%DATADIR%%/sql/updates/3948_realmd_account.sql
 %%DATADIR%%/sql/updates/3951_exploration_basexp.sql
+%%DATADIR%%/sql/updates/3961_uptime.sql
+%%DATADIR%%/sql/updates/3964_command.sql
+%%DATADIR%%/sql/updates/4010_spell_proc_event.sql
+%%DATADIR%%/sql/updates/4012_spell_proc_event.sql
+%%DATADIR%%/sql/updates/4018_spell_proc_event.sql
+%%DATADIR%%/sql/updates/4019_spell_chain.sql
+%%DATADIR%%/sql/updates/4019_spell_proc_event.sql
+%%DATADIR%%/sql/updates/4020_spell_chain.sql
+%%DATADIR%%/sql/updates/4020_spell_proc_event.sql
+%%DATADIR%%/sql/updates/4021_spell_chain.sql
+%%DATADIR%%/sql/updates/4021_spell_proc_event.sql
+%%DATADIR%%/sql/updates/4023_spell_proc_event.sql
+%%DATADIR%%/sql/updates/4026_spell_proc_event.sql
+%%DATADIR%%/sql/updates/4028_spell_chain.sql
+%%DATADIR%%/sql/updates/4028_spell_proc_event.sql
+%%DATADIR%%/sql/updates/4031_spell_chain.sql
+%%DATADIR%%/sql/updates/4031_spell_proc_event.sql
+%%DATADIR%%/sql/updates/4035_spell_proc_event.sql
+%%DATADIR%%/sql/updates/4036_spell_proc_event.sql
+%%DATADIR%%/sql/updates/4037_spell_proc_event.sql
+%%DATADIR%%/sql/updates/4058.sql
+%%DATADIR%%/sql/updates/4059_spell_learn_skill.sql
+%%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/README
 %%DBC%%%%DATADIR%%/dbc/AnimationData.dbc
 %%DBC%%%%DATADIR%%/dbc/AreaPOI.dbc
@@ -498,6 +523,7 @@ lib/libmangosscript.so.0
 %%DBC%%%%DATADIR%%/dbc/WMOAreaTable.dbc
 %%DBC%%%%DATADIR%%/dbc/WeaponImpactSounds.dbc
 %%DBC%%%%DATADIR%%/dbc/WeaponSwingSounds2.dbc
+%%DBC%%%%DATADIR%%/dbc/Weather.dbc
 %%DBC%%%%DATADIR%%/dbc/WorldMapArea.dbc
 %%DBC%%%%DATADIR%%/dbc/WorldMapContinent.dbc
 %%DBC%%%%DATADIR%%/dbc/WorldMapOverlay.dbc
@@ -523,6 +549,10 @@ lib/libmangosscript.so.0
 %%SD2%%share/scriptdev2/sql/updates/r56.sql
 %%SD2%%share/scriptdev2/sql/updates/r59.sql
 %%SD2%%share/scriptdev2/sql/updates/r63.sql
+%%SD2%%share/scriptdev2/sql/updates/r65.sql
+%%SD2%%share/scriptdev2/sql/updates/r72.sql
+%%SD2%%share/scriptdev2/sql/updates/r78.sql
+%%SD2%%share/scriptdev2/sql/updates/r81.sql
 @dirrm %%DATADIR%%/sql/updates
 @dirrm %%DATADIR%%/sql
 %%DBC%%@dirrm %%DATADIR%%/dbc