- Update to 0.3.015b

- Remove CVS code. Now, it's fetchable using a MASTER_SITE (Thanks to DraX :))
- Fix some .in files
- Modify pkg-message. Remove/Add some entries
- Modify some *_DEPENDS entries
- Other tiny modifications

Approved by:	garga (mentor)

9 files changed, 140 insertions, 196 deletions

diff --git a/games/planeshift/Makefile b/games/planeshift/Makefile
index 9bf58dd9a04c..83473292ac92 100644
--- a/games/planeshift/Makefile
+++ b/games/planeshift/Makefile
@@ -6,19 +6,18 @@
 #
 
 PORTNAME=	planeshift
-PORTVERSION=	0.3.013
+PORTVERSION=	0.3.015b
 CATEGORIES=	games
-MASTER_SITES=	#
-NO_CHECKSUM=	${DISTFILES}
+MASTER_SITES=	http://alex.foxybanana.com/freebsd/
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	First 3D MMORPG to be free for players
 
 BUILD_DEPENDS=	jam:${PORTSDIR}/devel/jam \
-		cs-config:${PORTSDIR}/graphics/crystalspace \
-		cel-config:${PORTSDIR}/graphics/crystalentitylayer \
+		cs-config:${PORTSDIR}/graphics/crystalspace-devel \
+		cel-config:${PORTSDIR}/graphics/crystalentitylayer-devel \
 		${LOCALBASE}/lib/libbfd.a:${PORTSDIR}/devel/libbfd
-LIB_DEPENDS=	cal3d.11:${PORTSDIR}/graphics/cal3d-devel \
+LIB_DEPENDS=	cal3d.12:${PORTSDIR}/graphics/cal3d \
 		curl.3:${PORTSDIR}/ftp/curl
 
 USE_BZIP2=	yes
@@ -35,8 +34,10 @@ CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CRYSTAL="${CRYSTAL}"
 SUB_FILES=	pkg-message planeshift pssetup updater psserver
 PLANEDIR=	lib/${PORTNAME}
 PLIST_SUB=	PLANEDIR=${PLANEDIR}
+INSTALL_PSDATA=	${INSTALL} ${COPY} ${_SHROWNGRP} -m 0644
 
 JAM_CMD=	jam
+JAM_ARGS=	-qa
 
 OPTIONS=	MYSQL	"MySQL support for server mode "	off
 
@@ -55,62 +56,33 @@ PLIST_SUB+=	MYSQL="@comment " \
 		EXAMPLE="@comment "
 .endif
 
-CVS_CMD?=	cvs -z3
-CVS_DATE=	2006-03-01 00:00:00
-CVS_SITES?=	pserver:anonymous@planeshift.cvs.sourceforge.net:/cvsroot/planeshift
-CVS_MODULE=	${PORTNAME}
-
-do-fetch:
-	@if test ! -f ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} ; then \
-		${MKDIR} ${DISTDIR}/${DISTNAME} && \
-		cd ${DISTDIR}/${DISTNAME}; \
-		for CVS_SITE in ${CVS_SITES}; do \
-			${ECHO_MSG} ">> Attempting to check out from $${CVS_SITE}."; \
-			if ${CVS_CMD} -d:$${CVS_SITE} co -D "${CVS_DATE}" ${CVS_MODULE}; \
-			then \
-				cd ${DISTDIR}; \
-				${ECHO_MSG} ">> Creating dist tarball in ${DISTDIR}"; \
-				${ECHO_MSG} ">> \"${DISTNAME}${EXTRACT_SUFX}\"."; \
-				${MV} ${DISTNAME}/${CVS_MODULE} \
-					${DISTNAME}/${CVS_MODULE:H}/${DISTNAME}; \
-					${TAR} -cj \
-					-X ${FILESDIR}/tarignore \
-					-f ${DISTNAME}${EXTRACT_SUFX} \
-					-C ${DISTNAME}/${CVS_MODULE:H} \
-					${DISTNAME}; \
-					${RM} -rf ${DISTDIR}/${DISTNAME}; \
-				exit; \
-			fi \
-		done; \
-		${RM} -rf ${DISTDIR}/${DISTNAME}; \
-		${ECHO_MSG} ">> CVS checkout failed."; \
-		exit 1; \
-	fi
-
 post-patch:
 	${REINPLACE_CMD} -e 's|%%AUTOHEADER%%|${AUTOHEADER}|g' -e 's|%%AUTOCONF%%|${AUTOCONF}|g' \
 		${WRKSRC}/autogen.sh
 	@cd ${WRKSRC}/src && \
 		${FIND} * -type f -name "*.c" -exec \
 			${REINPLACE_CMD} -i "" -e 's|malloc.h|stdlib.h|g' "{}" \;
+	@cd ${WRKSRC} && \
+		${FIND} * -type f -name ".cvsignore" -print0 | \
+			${XARGS} -0 ${RM} -R
 
 pre-configure:
 	@cd ${WRKSRC} && ${SH} autogen.sh
 
 do-build:
 	@cd ${WRKSRC} && \
-		${JAM_CMD} -q
+		${SETENV} ${MAKE_ENV} ${JAM_CMD} ${JAM_ARGS}
 
 post-build:
 	@${REINPLACE_CMD} -e 's|<mirror id="1" name="local" url="http://192.168.2.19/updater/" />| \
 		<mirror id="1" name="mir1" url="http://psmirror.pfdev.net/psupdater/" \
-			repository="repository.zip\" files="" /> \
+			repository="repository.zip" files="" /> \n \
 		<mirror id="2" name="mir2" url="http://planeshift.mirror.thumbnail.cz/psupdater/" \
-			repository="repository.zip" files="" /> \
+			repository="repository.zip" files="" /> \n \
 		<mirror id="3" name="mir3" url="http://www.psmirror.org/psupdater/" \
-			repository="repository.zip" files="" /> \
+			repository="repository.zip" files="" /> \n \
 		<mirror id="4" name="mir4" url="http://psmirror.u24.solone.net/psupdater/" \
-			repository="repository.zip" files="" /> \
+			repository="repository.zip" files="" /> \n \
 		<mirror id="5" name="backp" url="http://laanx.fragnetics.com/updater_hidden/" \
 			repository="repository.zip" files="" />|g' ${WRKSRC}/updaterconfig.xml
 
@@ -123,14 +95,14 @@ do-install:
 .endfor
 
 .for FILE in *.cfg *.xml
-	${INSTALL_DATA} ${WRKSRC}/${FILE} ${PREFIX}/${PLANEDIR}
+	${INSTALL_PSDATA} ${WRKSRC}/${FILE} ${PREFIX}/${PLANEDIR}
 .endfor
 
 .for DIRE in art data
 	@${MKDIR} ${PREFIX}/${PLANEDIR}/${DIRE}
 	@cd ${WRKSRC}/${DIRE} && \
 		${FIND} * -type d -exec ${MKDIR} "${PREFIX}/${PLANEDIR}/${DIRE}/{}" \; && \
-			${FIND} * -type f -exec ${INSTALL_DATA} "{}" "${PREFIX}/${PLANEDIR}/${DIRE}/{}" \;
+			${FIND} * -type f -exec ${INSTALL_PSDATA} "{}" "${PREFIX}/${PLANEDIR}/${DIRE}/{}" \;
 .endfor
 
 .if defined(MYSQL_FLAG)
diff --git a/games/planeshift/distinfo b/games/planeshift/distinfo
index 8dbce90c655b..a071bb5c3605 100644
--- a/games/planeshift/distinfo
+++ b/games/planeshift/distinfo
@@ -1 +1,3 @@
-Source code is retrieved via CVS
+MD5 (planeshift-0.3.015b.tar.bz2) = 761e1836bfe7e8eba8131be21d2c0aa8
+SHA256 (planeshift-0.3.015b.tar.bz2) = 9281c0e800837a2fe14a6d2946b6efaee5562b152cfb769aa1b14a76fe9a8585
+SIZE (planeshift-0.3.015b.tar.bz2) = 8457082
diff --git a/games/planeshift/files/pkg-message.in b/games/planeshift/files/pkg-message.in
index 1917416f1542..40d9e12b26fa 100644
--- a/games/planeshift/files/pkg-message.in
+++ b/games/planeshift/files/pkg-message.in
@@ -9,49 +9,23 @@ CLIENT ONLY
 
    This download 200M aprox.
 
-2) After to update data and art directory, you need to make some changes in
-   files into data directory. I don't know about the problem with <?Include and 
-   <?Template tag defined. The solution is changing these tag to lowercase.
-
-   # find data -type f -exec sed -i '' -e 's|<?Template|<?template|g' -e \
-	's|<?Endtemplate|<?endtemplate|g' -e 's|<?Include|<?include|g' "{}" \;
-
-3) Also, I had problem with cg-base file into data/shader/snippets directory. I
-   solved it modifying some lines.
-
-    <?template _List_$LIST$ ?><?endtemplate?>
-   
-    <?template _List_$LIST$ ?>
-      <?_List_$LIST$?>
-      <?$ITEM$?>
-    <?endtemplate?>
-   
-    <?_List_$LIST$?>
-
-   to
-
-    <?!template _List_$LIST$ ?><?!endtemplate?>
-    
-    <?!template _List_$LIST$ ?>
-      <?!_List_$LIST$?>
-      <?!$ITEM$?>
-    <?!endtemplate?>
-
-    <?!_List_$LIST$?>
-
-4) Modify psclient.cfg and change line:
+2) Modify psclient.cfg
 
+    ; Change this line
     Planeshift.GUI.Skin.Ingame = /this/art/skins/cvs.zip
-
-    to
-
+    ; to
     Planeshift.GUI.Skin.Ingame = /this/art/skins/default.zip
 
-5) For play online, you need create an account
+    ; Uncomment this line
+    SndSys.Driver = crystalspace.sndsys.software.driver.oss
+    ; and add this, this line  avoid a crash when planeshift is starting
+    SndSys.Driver.OSS.SoundBufferms = 150
+
+3) For play online, you need create an account
 
    http://laanx.fragnetics.com/register/
 
-6) Edit planeshift.cfg file and modify these lines:
+4) Edit planeshift.cfg file and modify these lines:
 
    ; Change values if you want.
    Video.ScreenWidth = 800
@@ -61,9 +35,9 @@ CLIENT ONLY
    Video.FullScreen = true
    Planeshift.Connection.User = PlaneshiftAccount
 
-7) Start planeshift using root account once.
-8) Finally you can start planeshift using simple user account
-9) Enjoy it ;)
+5) Start planeshift using root account once.
+6) Finally you can start planeshift using simple user account
+7) Enjoy it ;)
 
 SERVER ONLY
 -----------
diff --git a/games/planeshift/files/planeshift.in b/games/planeshift/files/planeshift.in
index 398335ab64da..eacedaf03d13 100644
--- a/games/planeshift/files/planeshift.in
+++ b/games/planeshift/files/planeshift.in
@@ -1,8 +1,8 @@
-#!/bin/csh
+#!/bin/sh
 
-export CRYSTAL=%%X11BASE%%/lib/planeshift
-export CEL=%%X11BASE%%/lib/cel
-export CSCONFPATH=%%X11BASE%%/etc/crystalspace
+export CRYSTAL=%%LOCALBASE%%/lib/planeshift
+export CEL=%%LOCALBASE%%/lib/cel
+export CSCONFPATH=%%LOCALBASE%%/etc/crystalspace
 
 cd %%PREFIX%%/lib/planeshift
 exec ./psclient $1
diff --git a/games/planeshift/files/psserver.in b/games/planeshift/files/psserver.in
index 74d28d6bf3db..76b2bfa1c383 100644
--- a/games/planeshift/files/psserver.in
+++ b/games/planeshift/files/psserver.in
@@ -1,8 +1,8 @@
 #!/bin/sh
 
-export CRYSTAL=%%X11BASE%%/lib/planeshift
-export CEL=%%X11BASE%%/lib/cel
-export CSCONFPATH=%%X11BASE%%/etc/crystalspace
+export CRYSTAL=%%LOCALBASE%%/lib/planeshift
+export CEL=%%LOCALBASE%%/lib/cel
+export CSCONFPATH=%%LOCALBASE%%/etc/crystalspace
 
 cd %%PREFIX%%/lib/planeshift
 exec ./psserver $1
diff --git a/games/planeshift/files/pssetup.in b/games/planeshift/files/pssetup.in
index b69142c3da89..870c8777d418 100644
--- a/games/planeshift/files/pssetup.in
+++ b/games/planeshift/files/pssetup.in
@@ -1,8 +1,8 @@
 #!/bin/sh
 
-export CRYSTAL=%%X11BASE%%/lib/planeshift
-export CEL=%%X11BASE%%/lib/cel
-export CSCONFPATH=%%X11BASE%%/etc/crystalspace
+export CRYSTAL=%%LOCALBASE%%/lib/planeshift
+export CEL=%%LOCALBASE%%/lib/cel
+export CSCONFPATH=%%LOCALBASE%%/etc/crystalspace
 
 cd %%PREFIX%%/lib/planeshift
 exec ./pssetup $1
diff --git a/games/planeshift/files/tarignore b/games/planeshift/files/tarignore
deleted file mode 100644
index 7ac83b287f2f..000000000000
--- a/games/planeshift/files/tarignore
+++ /dev/null
@@ -1 +0,0 @@
-CVS
diff --git a/games/planeshift/files/updater.in b/games/planeshift/files/updater.in
index 2604fd69b8e9..72baff7b1c72 100644
--- a/games/planeshift/files/updater.in
+++ b/games/planeshift/files/updater.in
@@ -1,8 +1,8 @@
 #!/bin/sh
 
-export CRYSTAL=%%X11BASE%%/lib/planeshift
-export CEL=%%X11BASE%%/lib/cel
-export CSCONFPATH=%%X11BASE%%/etc/crystalspace
+export CRYSTAL=%%LOCALBASE%%/lib/planeshift
+export CEL=%%LOCALBASE%%/lib/cel
+export CSCONFPATH=%%LOCALBASE%%/etc/crystalspace
 
 cd %%PREFIX%%/lib/planeshift
 exec ./updater $1
diff --git a/games/planeshift/pkg-plist b/games/planeshift/pkg-plist
index 390523b4e1ee..75f8b09456a6 100644
--- a/games/planeshift/pkg-plist
+++ b/games/planeshift/pkg-plist
@@ -1,92 +1,14 @@
 bin/planeshift
-bin/updater
-bin/pssetup
 %%MYSQL%%bin/psserver
-%%EXAMPLE%%share/examples/planeshift/accessrules.sql
-%%EXAMPLE%%share/examples/planeshift/accounts.sql
-%%EXAMPLE%%share/examples/planeshift/action_locations.sql
-%%EXAMPLE%%share/examples/planeshift/alliances.sql
-%%EXAMPLE%%share/examples/planeshift/armorvsweapon.sql
-%%EXAMPLE%%share/examples/planeshift/bad_names.sql
-%%EXAMPLE%%share/examples/planeshift/bans.sql
-%%EXAMPLE%%share/examples/planeshift/buddy_list.sql
-%%EXAMPLE%%share/examples/planeshift/command_access.sql
-%%EXAMPLE%%share/examples/planeshift/commonstrings.sql
-%%EXAMPLE%%share/examples/planeshift/create_all.sql
-%%EXAMPLE%%share/examples/planeshift/char_adv.sql
-%%EXAMPLE%%share/examples/planeshift/char_creation.sql
-%%EXAMPLE%%share/examples/planeshift/char_skills.sql
-%%EXAMPLE%%share/examples/planeshift/char_traits.sql
-%%EXAMPLE%%share/examples/planeshift/character_marriage_details.sql
-%%EXAMPLE%%share/examples/planeshift/character_quests.sql
-%%EXAMPLE%%share/examples/planeshift/characters.sql
-%%EXAMPLE%%share/examples/planeshift/deletechar.sql
-%%EXAMPLE%%share/examples/planeshift/deletenpc.sql
-%%EXAMPLE%%share/examples/planeshift/deletenpc_mb.sql
-%%EXAMPLE%%share/examples/planeshift/drop.sql
-%%EXAMPLE%%share/examples/planeshift/factions.sql
-%%EXAMPLE%%share/examples/planeshift/gm_command_log.sql
-%%EXAMPLE%%share/examples/planeshift/guildlevels.sql
-%%EXAMPLE%%share/examples/planeshift/guilds.sql
-%%EXAMPLE%%share/examples/planeshift/hunt_locations.sql
-%%EXAMPLE%%share/examples/planeshift/item_animations.sql
-%%EXAMPLE%%share/examples/planeshift/item_categories.sql
-%%EXAMPLE%%share/examples/planeshift/item_instances.sql
-%%EXAMPLE%%share/examples/planeshift/item_stats.sql
-%%EXAMPLE%%share/examples/planeshift/loot_modifiers.sql
-%%EXAMPLE%%share/examples/planeshift/loot_rule_details.sql
-%%EXAMPLE%%share/examples/planeshift/loot_rules.sql
-%%EXAMPLE%%share/examples/planeshift/merchant_item_cats.sql
-%%EXAMPLE%%share/examples/planeshift/migration.sql
-%%EXAMPLE%%share/examples/planeshift/movement_base.sql
-%%EXAMPLE%%share/examples/planeshift/movement_extras.sql
-%%EXAMPLE%%share/examples/planeshift/movement_require.sql
-%%EXAMPLE%%share/examples/planeshift/movement_variant.sql
-%%EXAMPLE%%share/examples/planeshift/natural_resources.sql
-%%EXAMPLE%%share/examples/planeshift/npc_bad_text.sql
-%%EXAMPLE%%share/examples/planeshift/npc_disallowed_words.sql
-%%EXAMPLE%%share/examples/planeshift/npc_kas.sql
-%%EXAMPLE%%share/examples/planeshift/npc_responses.sql
-%%EXAMPLE%%share/examples/planeshift/npc_spawn_ranges.sql
-%%EXAMPLE%%share/examples/planeshift/npc_spawn_rules.sql
-%%EXAMPLE%%share/examples/planeshift/npc_synonyms.sql
-%%EXAMPLE%%share/examples/planeshift/npc_trigger_groups.sql
-%%EXAMPLE%%share/examples/planeshift/npc_triggers.sql
-%%EXAMPLE%%share/examples/planeshift/petitions.sql
-%%EXAMPLE%%share/examples/planeshift/player_spells.sql
-%%EXAMPLE%%share/examples/planeshift/progress_events.sql
-%%EXAMPLE%%share/examples/planeshift/quest_scripts.sql
-%%EXAMPLE%%share/examples/planeshift/quests.sql
-%%EXAMPLE%%share/examples/planeshift/race_info.sql
-%%EXAMPLE%%share/examples/planeshift/sc_npc_definitions.sql
-%%EXAMPLE%%share/examples/planeshift/sectors.sql
-%%EXAMPLE%%share/examples/planeshift/security_levels.sql
-%%EXAMPLE%%share/examples/planeshift/server_options.sql
-%%EXAMPLE%%share/examples/planeshift/skills.sql
-%%EXAMPLE%%share/examples/planeshift/spell_glyphs.sql
-%%EXAMPLE%%share/examples/planeshift/spells.sql
-%%EXAMPLE%%share/examples/planeshift/sys_modules.sql
-%%EXAMPLE%%share/examples/planeshift/sys_privileges.sql
-%%EXAMPLE%%share/examples/planeshift/sys_privileges_list.sql
-%%EXAMPLE%%share/examples/planeshift/sys_programs.sql
-%%EXAMPLE%%share/examples/planeshift/tips.sql
-%%EXAMPLE%%share/examples/planeshift/trade_autocontainers.sql
-%%EXAMPLE%%share/examples/planeshift/trade_combinations.sql
-%%EXAMPLE%%share/examples/planeshift/trade_constraints.sql
-%%EXAMPLE%%share/examples/planeshift/trade_patterns.sql
-%%EXAMPLE%%share/examples/planeshift/trade_transformations.sql
-%%EXAMPLE%%share/examples/planeshift/trainer_skills.sql
-%%EXAMPLE%%share/examples/planeshift/traits.sql
-%%EXAMPLE%%share/examples/planeshift/upgrade_schema.sql
-%%EXAMPLE%%share/examples/planeshift/ways.sql
+bin/pssetup
+bin/updater
 %%PLANEDIR%%/art/README
 %%PLANEDIR%%/art/apps.zip
+%%PLANEDIR%%/art/characters.zip
 %%PLANEDIR%%/art/eedit.zip
-%%PLANEDIR%%/art/effects/marker01.png
-%%PLANEDIR%%/art/effects/raindrop.png
-%%PLANEDIR%%/art/effects/snow.jpg
-%%PLANEDIR%%/art/fakemodels.zip
-%%PLANEDIR%%/art/models.zip
+%%PLANEDIR%%/art/effects/marker01.dds
+%%PLANEDIR%%/art/effects/raindrop.dds
+%%PLANEDIR%%/art/effects/snow.dds
 %%PLANEDIR%%/art/music/ComplexWind3.ogg
 %%PLANEDIR%%/art/music/README
 %%PLANEDIR%%/art/music/effects/PS_Thunder1.wav
@@ -117,19 +39,20 @@ bin/pssetup
 %%PLANEDIR%%/art/music/gui/menu/btndown.wav
 %%PLANEDIR%%/art/music/gui/menu/btquit.wav
 %%PLANEDIR%%/art/music/torch_test.wav
+%%PLANEDIR%%/art/npcs.zip
 %%PLANEDIR%%/art/pawseditor.zip
 %%PLANEDIR%%/art/psclient-setup.zip
 %%PLANEDIR%%/art/racelib.xml
 %%PLANEDIR%%/art/runes/README
-%%PLANEDIR%%/art/runes/azure/air.bmp
-%%PLANEDIR%%/art/runes/azure/bond.bmp
-%%PLANEDIR%%/art/runes/azure/dome.bmp
-%%PLANEDIR%%/art/runes/azure/fly.bmp
-%%PLANEDIR%%/art/runes/azure/gas.bmp
-%%PLANEDIR%%/art/runes/azure/humanoid.bmp
-%%PLANEDIR%%/art/runes/azure/mind.bmp
-%%PLANEDIR%%/art/runes/azure/sleep.bmp
-%%PLANEDIR%%/art/runes/azure/sound.bmp
+%%PLANEDIR%%/art/runes/azure/air.dds
+%%PLANEDIR%%/art/runes/azure/bond.dds
+%%PLANEDIR%%/art/runes/azure/dome.dds
+%%PLANEDIR%%/art/runes/azure/fly.dds
+%%PLANEDIR%%/art/runes/azure/gas.dds
+%%PLANEDIR%%/art/runes/azure/humanoid.dds
+%%PLANEDIR%%/art/runes/azure/mind.dds
+%%PLANEDIR%%/art/runes/azure/sleep.dds
+%%PLANEDIR%%/art/runes/azure/sound.dds
 %%PLANEDIR%%/art/sfxfiles.dtd
 %%PLANEDIR%%/art/shaders/colorize.xml
 %%PLANEDIR%%/art/shaders/particle_basic.xml
@@ -145,7 +68,6 @@ bin/pssetup
 %%PLANEDIR%%/art/things/items.zip
 %%PLANEDIR%%/art/things/potions.zip
 %%PLANEDIR%%/art/things/weapons.zip
-%%PLANEDIR%%/art/world/.cvsignore
 %%PLANEDIR%%/art/world/lighting.xml
 %%PLANEDIR%%/art/world/npcroom.zip
 %%PLANEDIR%%/art/world/podium.zip
@@ -223,6 +145,7 @@ bin/pssetup
 %%PLANEDIR%%/data/gui/guildwindow.xml
 %%PLANEDIR%%/data/gui/helpwindow.xml
 %%PLANEDIR%%/data/gui/ignorewindow.xml
+%%PLANEDIR%%/data/gui/illumination.xml
 %%PLANEDIR%%/data/gui/infowindow.xml
 %%PLANEDIR%%/data/gui/interact.xml
 %%PLANEDIR%%/data/gui/inventory.xml
@@ -253,6 +176,7 @@ bin/pssetup
 %%PLANEDIR%%/data/gui/splash.xml
 %%PLANEDIR%%/data/gui/styles.xml
 %%PLANEDIR%%/data/gui/summary.xml
+%%PLANEDIR%%/data/gui/tutorial.xml
 %%PLANEDIR%%/data/gui/widgetconfigwindow.xml
 %%PLANEDIR%%/data/gui/yesno.xml
 %%PLANEDIR%%/data/gui/zodiacs.xml
@@ -260,12 +184,11 @@ bin/pssetup
 %%PLANEDIR%%/data/help.xml
 %%PLANEDIR%%/data/npcbehave.xml
 %%PLANEDIR%%/data/npcdefs.xml
-%%PLANEDIR%%/data/options/.cvsignore
 %%PLANEDIR%%/data/options/camera_def.xml
+%%PLANEDIR%%/data/options/controls_def.xml
 %%PLANEDIR%%/data/options/chat_def.xml
 %%PLANEDIR%%/data/options/entityinter_def.xml
 %%PLANEDIR%%/data/options/entitylabels_def.xml
-%%PLANEDIR%%/data/options/keys_def.xml
 %%PLANEDIR%%/data/options/mouse_def.xml
 %%PLANEDIR%%/data/options/pvp_def.xml
 %%PLANEDIR%%/data/options/shortcutcommands_def.xml
@@ -311,6 +234,7 @@ bin/pssetup
 %%PLANEDIR%%/data/ttf/scurlock.ttf
 %%PLANEDIR%%/data/ttf/verdana.ttf
 %%PLANEDIR%%/data/updater/serverlist.xml
+%%PLANEDIR%%/data/updater/updateroptions.xml
 %%PLANEDIR%%/data/updater/updaterwindow.xml
 %%PLANEDIR%%/data/zoneinfo.xml
 %%MYSQL%%%%PLANEDIR%%/dbmysql.so
@@ -335,7 +259,79 @@ bin/pssetup
 %%PLANEDIR%%/updater
 %%PLANEDIR%%/updaterconfig.xml
 %%PLANEDIR%%/vfs.cfg
-%%EXAMPLE%%@dirrm share/examples/planeshift
+%%EXAMPLE%%share/examples/planeshift/accessrules.sql
+%%EXAMPLE%%share/examples/planeshift/accounts.sql
+%%EXAMPLE%%share/examples/planeshift/action_locations.sql
+%%EXAMPLE%%share/examples/planeshift/alliances.sql
+%%EXAMPLE%%share/examples/planeshift/armorvsweapon.sql
+%%EXAMPLE%%share/examples/planeshift/bad_names.sql
+%%EXAMPLE%%share/examples/planeshift/bans.sql
+%%EXAMPLE%%share/examples/planeshift/command_access.sql
+%%EXAMPLE%%share/examples/planeshift/commonstrings.sql
+%%EXAMPLE%%share/examples/planeshift/create_all.sql
+%%EXAMPLE%%share/examples/planeshift/char_adv.sql
+%%EXAMPLE%%share/examples/planeshift/char_create_affinity.sql
+%%EXAMPLE%%share/examples/planeshift/char_creation.sql
+%%EXAMPLE%%share/examples/planeshift/char_skills.sql
+%%EXAMPLE%%share/examples/planeshift/char_traits.sql
+%%EXAMPLE%%share/examples/planeshift/character_quests.sql
+%%EXAMPLE%%share/examples/planeshift/character_relationships.sql
+%%EXAMPLE%%share/examples/planeshift/characters.sql
+%%EXAMPLE%%share/examples/planeshift/deletechar.sql
+%%EXAMPLE%%share/examples/planeshift/deletenpc.sql
+%%EXAMPLE%%share/examples/planeshift/deletenpc_mb.sql
+%%EXAMPLE%%share/examples/planeshift/drop.sql
+%%EXAMPLE%%share/examples/planeshift/factions.sql
+%%EXAMPLE%%share/examples/planeshift/familiar_types.sql
+%%EXAMPLE%%share/examples/planeshift/gm_command_log.sql
+%%EXAMPLE%%share/examples/planeshift/guildlevels.sql
+%%EXAMPLE%%share/examples/planeshift/guilds.sql
+%%EXAMPLE%%share/examples/planeshift/hunt_locations.sql
+%%EXAMPLE%%share/examples/planeshift/item_animations.sql
+%%EXAMPLE%%share/examples/planeshift/item_categories.sql
+%%EXAMPLE%%share/examples/planeshift/item_instances.sql
+%%EXAMPLE%%share/examples/planeshift/item_stats.sql
+%%EXAMPLE%%share/examples/planeshift/loot_modifiers.sql
+%%EXAMPLE%%share/examples/planeshift/loot_rule_details.sql
+%%EXAMPLE%%share/examples/planeshift/loot_rules.sql
+%%EXAMPLE%%share/examples/planeshift/merchant_item_cats.sql
+%%EXAMPLE%%share/examples/planeshift/migration.sql
+%%EXAMPLE%%share/examples/planeshift/movement.sql
+%%EXAMPLE%%share/examples/planeshift/natural_resources.sql
+%%EXAMPLE%%share/examples/planeshift/npc_bad_text.sql
+%%EXAMPLE%%share/examples/planeshift/npc_disallowed_words.sql
+%%EXAMPLE%%share/examples/planeshift/npc_kas.sql
+%%EXAMPLE%%share/examples/planeshift/npc_responses.sql
+%%EXAMPLE%%share/examples/planeshift/npc_spawn_ranges.sql
+%%EXAMPLE%%share/examples/planeshift/npc_spawn_rules.sql
+%%EXAMPLE%%share/examples/planeshift/npc_synonyms.sql
+%%EXAMPLE%%share/examples/planeshift/npc_trigger_groups.sql
+%%EXAMPLE%%share/examples/planeshift/npc_triggers.sql
+%%EXAMPLE%%share/examples/planeshift/petitions.sql
+%%EXAMPLE%%share/examples/planeshift/player_spells.sql
+%%EXAMPLE%%share/examples/planeshift/progress_events.sql
+%%EXAMPLE%%share/examples/planeshift/quest_scripts.sql
+%%EXAMPLE%%share/examples/planeshift/quests.sql
+%%EXAMPLE%%share/examples/planeshift/race_info.sql
+%%EXAMPLE%%share/examples/planeshift/sc_npc_definitions.sql
+%%EXAMPLE%%share/examples/planeshift/sectors.sql
+%%EXAMPLE%%share/examples/planeshift/security_levels.sql
+%%EXAMPLE%%share/examples/planeshift/server_options.sql
+%%EXAMPLE%%share/examples/planeshift/skills.sql
+%%EXAMPLE%%share/examples/planeshift/spell_glyphs.sql
+%%EXAMPLE%%share/examples/planeshift/spells.sql
+%%EXAMPLE%%share/examples/planeshift/tips.sql
+%%EXAMPLE%%share/examples/planeshift/trade_autocontainers.sql
+%%EXAMPLE%%share/examples/planeshift/trade_combinations.sql
+%%EXAMPLE%%share/examples/planeshift/trade_constraints.sql
+%%EXAMPLE%%share/examples/planeshift/trade_patterns.sql
+%%EXAMPLE%%share/examples/planeshift/trade_transformations.sql
+%%EXAMPLE%%share/examples/planeshift/trainer_skills.sql
+%%EXAMPLE%%share/examples/planeshift/traits.sql
+%%EXAMPLE%%share/examples/planeshift/tribe_members.sql
+%%EXAMPLE%%share/examples/planeshift/tribes.sql
+%%EXAMPLE%%share/examples/planeshift/upgrade_schema.sql
+%%EXAMPLE%%share/examples/planeshift/ways.sql
 @dirrmtry %%PLANEDIR%%/art/effects
 @dirrmtry %%PLANEDIR%%/art/music/effects
 @dirrmtry %%PLANEDIR%%/art/music/gui/ccreate
@@ -367,3 +363,4 @@ bin/pssetup
 @dirrmtry %%PLANEDIR%%/data/updater
 @dirrmtry %%PLANEDIR%%/data
 @unexec rmdir %D/%%PLANEDIR%% >/dev/null 2>&1 || echo "Remove manually the extra files into data and art directories (200M aprox.). Also you could move data and art directory to some backup directory."
+%%EXAMPLE%%@dirrm share/examples/planeshift