Update to 2.50.52

4 files changed, 9 insertions, 199 deletions

diff --git a/games/hlserver-admin/Makefile b/games/hlserver-admin/Makefile
index 9cad83fa0fcc..a69ac275b981 100644
--- a/games/hlserver-admin/Makefile
+++ b/games/hlserver-admin/Makefile
@@ -6,13 +6,12 @@
 #
 
 PORTNAME=	admin
-PORTVERSION=	2.50.51
+PORTVERSION=	2.50.52
 PORTEPOCH=	1
 MASTER_SITES=	http://www.adminmod.org/downloads/update/ \
 		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	halflifeadmin
-DISTFILES=	halflife-admin-2.50.50.tgz \
-		halflifeadmin-update-2_50_51.tgz
+DISTNAME=	halflife-admin-${PORTVERSION}
 EXTRACT_SUFX=	.tgz
 DIST_SUBDIR=	${PORTNAME}
 
@@ -21,10 +20,6 @@ COMMENT=	Popular Half-Life mod server administration tool for Linux
 WRKSRC=		${WRKDIR}/Adminmod
 
 slaveport-post-extract:
-	@${CP} ${WRKSRC}/../metamod_i386.so \
-		${WRKSRC}/dlls
-	@${CP} ${WRKSRC}/../admin_MM_i386.so \
-		${WRKSRC}/dlls
 	@${PERL} -pi.orig -e \
 		's|/usr/local/hlds_l|${PREFIX}${HLDSDIR:S/\/$//}|' \
 		${WRKSRC}/install_admin
diff --git a/games/hlserver-admin/distinfo b/games/hlserver-admin/distinfo
index c3289ebaf7a7..dee83d2733ab 100644
--- a/games/hlserver-admin/distinfo
+++ b/games/hlserver-admin/distinfo
@@ -1,2 +1 @@
-MD5 (admin/halflife-admin-2.50.50.tgz) = 743c7d0b2ee8595118ef81504f6f549e
-MD5 (admin/halflifeadmin-update-2_50_51.tgz) = 73af7d2dc006871e5ad1eb734d316fab
+MD5 (admin/halflife-admin-2.50.52.tgz) = 9c5b7a8f7981ca0cbd9be09292c8fb6d
diff --git a/games/hlserver-admin/files/patch-install_admin b/games/hlserver-admin/files/patch-install_admin
deleted file mode 100644
index b1299d665cee..000000000000
--- a/games/hlserver-admin/files/patch-install_admin
+++ /dev/null
@@ -1,189 +0,0 @@
---- install_admin.orig	Fri Feb 14 14:07:46 2003
-+++ install_admin	Fri Feb 14 14:07:53 2003
-@@ -17,6 +17,22 @@
- doit=
- 
- 
-+# make sure we are running with bash
-+if [ x"$BASH" = 'x' ] ; then
-+    # we are not running as bash, probably xBSD
-+    # check if we have one
-+    am_bash=`(bash --version) 2> /dev/null`
-+    if [ x"$am_bash" = 'x' ] ; then
-+	echo "This is a script for the Bash. You need to have the Bash"
-+	echo "shell installed in order to run this script. Please install"
-+	echo "the Bash (Bourne Again SHell) before running this script."
-+	exit
-+    else
-+	exec bash $0 "$@"
-+    fi
-+fi
-+
-+
- 
- FALLBACK_VERSION="2.50.50"
- 
-@@ -257,9 +273,9 @@
- 		if ( echo $second | $grep '[0-9][0-9]*\.[0-9][0-9]' ) >/dev/null 2>&1 ; then
- 			# this number is of the format xx.yy.zz
- 			major1=`echo $first | $sed 's/^\([0-9][0-9]*\).*/\1/'`
--			rest=`echo $first | $sed 's/^\([0-9][0-9]*\)\.\?\(.*\)/\2/'`
-+			rest=`echo $first | $sed 's/^\([0-9][0-9]*\)\.\{0,1\}\(.*\)/\2/'`
- 			minor1=`echo $rest | $sed 's/^\([0-9][0-9]*\).*/\1/'`
--			rest=`echo $rest | $sed 's/^\([0-9][0-9]*\)\.\?\(.*\)/\2/'`
-+			rest=`echo $rest | $sed 's/^\([0-9][0-9]*\)\.\{0,1\}\(.*\)/\2/'`
- 			patch1=`echo $rest | $sed 's/^\([0-9][0-9]*\).*/\1/'`
- 
- 			[ -z "$major1" ] && major1=0
-@@ -268,9 +284,9 @@
- 
- 			# this number is of the format xx.yy.zz
- 			major2=`echo $second | $sed 's/^\([0-9][0-9]*\).*/\1/'`
--			rest=`echo $second | $sed 's/^\([0-9][0-9]*\)\.\?\(.*\)/\2/'`
-+			rest=`echo $second | $sed 's/^\([0-9][0-9]*\)\.\{0,1\}\(.*\)/\2/'`
- 			minor2=`echo $rest | $sed 's/^\([0-9][0-9]*\).*/\1/'`
--			rest=`echo $rest | $sed 's/^\([0-9][0-9]*\)\.\?\(.*\)/\2/'`
-+			rest=`echo $rest | $sed 's/^\([0-9][0-9]*\)\.\{0,1\}\(.*\)/\2/'`
- 			patch2=`echo $rest | $sed 's/^\([0-9][0-9]*\).*/\1/'`
- 
- 			[ -z "$major2" ] && major2=0
-@@ -706,7 +722,7 @@
-   TOPDIR=$foundtopdir
- fi
- 
--if [[ ( ! -z "$premod_dir" ) && ( "$premod_dir" != "." ) ]]  ; then
-+if [  ! -z "$premod_dir" -a  x"$premod_dir" != 'x.' ]  ; then
-   TOPDIR=$premod_dir
- fi
- 
-@@ -901,7 +917,7 @@
- 					install="inst:"
- 				else
- 					# the old version is in a different path
--					if [[ ( "$gamedll" = "dlls/metamod_i386.so" ) && ( -z "$oldMMversion" ) ]] ; then
-+					if [ x"$gamedll" = 'xdlls/metamod_i386.so' -a -z "$oldMMversion" ] ; then
- 						# probably a pre-addons-standard old version.
- 						echo ""
- 						echo ""
-@@ -962,7 +978,7 @@
- 	$doit $cp $MYDIR/dlls/$mmDso $MODDIR/$mmBaseDir/$mmDllDir
- 	$doit $rm $gamedll
- 	$doit $cp $MODDIR/metamod.ini $MODDIR/$mmBaseDir/plugins.ini
--	$doit $cp $MODDIR/metaexec.cfg $MODDIR/$mmBaseDir/exec.cfg
-+	$doit $cp $MODDIR/metaexec.cfg $MODDIR/$mmBaseDir/exec.cfg > /dev/null 2>&1
- 	$doit $rm $MODDIR/metamod.ini
- 	$doit $rm $MODDIR/metaexec.cfg
- 	mmPluginsFile="$MODDIR/$mmBaseDir/plugins.ini"
-@@ -1038,7 +1054,7 @@
- # check if we already have an adminmod installed.
- if [ -f $MODDIR/$mmBaseDir/plugins.ini ] ; then
- # first check plugins.ini
--	amdll=`$grep '^ *linux  *.*admin_MM_i386' $MODDIR/$mmBaseDir/plugins.ini | $sed -e 's/.* \([^ ][^ ]*\) *.\?$/\1/'`
-+	amdll=`$grep '^ *linux  *.*admin_MM_i386' $MODDIR/$mmBaseDir/plugins.ini | $sed -e 's/.* \([^ ][^ ]*\) *.\{0,1\}$/\1/'`
- 	if [ ! -z "$amdll" ] ; then
- 		oldAMdso=`$basename $amdll`
- 		oldAMdir=`$dirname $amdll`
-@@ -1049,7 +1065,7 @@
- 	mmPluginsFile="$MODDIR/$mmBaseDir/plugins.ini"
- elif [ -f $MODDIR/metamod.ini ] ; then
- # second check for metamod.ini
--	amdll=`$grep '^ *linux  *.*admin_MM_i386' $MODDIR/metamod.ini | $sed -e 's/.* \([^ ][^ ]*\) *.\?$/\1/'`
-+	amdll=`$grep '^ *linux  *.*admin_MM_i386' $MODDIR/metamod.ini | $sed -e 's/.* \([^ ][^ ]*\) *.\{0,1\}$/\1/'`
- 	if [ ! -z "$amdll" ] ; then
- 		oldAMdso=`$basename $amdll`
- 		oldAMdir=`$dirname $amdll`
-@@ -1074,9 +1090,9 @@
- # check if the installed version is older than ours.
- if [ ! -z "$amdll" ] ; then
- 	if [ ! -z "$ident" ] ; then  # use ident
--		oldAMversion=`$ident $amdll 2>/dev/null | $grep Pg: | $sed 's/.*-- \(b\?[0-9][0-9]*\.\?[0-9][0-9]*\(\.\?[0-9][0-9]*\)\).*/\1/'`
-+		oldAMversion=`$ident $amdll 2>/dev/null | $grep Pg: | $sed 's/.*-- \(b\{0,1\}[0-9][0-9]*\.\{0,1\}[0-9][0-9]*\(\.\{0,1\}[0-9][0-9]*\)\).*/\1/'`
- 	elif [ ! -z "$strings" ] ; then # use strings
--		oldAMversion=`$strings $amdll | $grep '\$Pg: Admin Mod.* \\$' | $sed 's/.*-- \(b\?[0-9][0-9]*\.\?[0-9][0-9]*\(\.\?[0-9][0-9]*\)\).*/\1/'`
-+		oldAMversion=`$strings $amdll | $grep '\$Pg: Admin Mod.* \\$' | $sed 's/.*-- \(b\{0,1\}[0-9][0-9]*\.\{0,1\}[0-9][0-9]*\(\.\{0,1\}[0-9][0-9]*\)\).*/\1/'`
- 	else
- 		echo "I am unable to find out which version of Admin Mod you have currently installed."
- 		echo "I will assume that it is older that the one that comes with this package."
-@@ -1226,7 +1242,7 @@
- 	echo ""
- 	echon "Trying to locate your config files and moving them to $mod_name/$amBaseDir/$amConfDir ..."
- 	# do we have a users.ini file?
--	cfile=`$grep "^ *users_file" $MODDIR/server.cfg | $sed 's/.* \"\?\([^\"][^\"]*\)\"\? *.\?$/\1/'`
-+	cfile=`$grep "^ *users_file" $MODDIR/server.cfg | $sed 's/.* \"\{0,1\}\([^\"][^\"]*\)\"\{0,1\} *.\{0,1\}$/\1/'`
- 	if [ -z "$cfile" ] ; then
- 		[ -f $MODDIR/users.ini ] && cfile="users.ini"
- 	fi
-@@ -1242,7 +1258,7 @@
- 	fi
- 
- 	# do we have a maps.ini file?
--	cfile=`$grep "^ *maps_file" $MODDIR/server.cfg | $sed 's/.* \"\?\([^\"][^\"]*\)\"\? *.\?$/\1/'`
-+	cfile=`$grep "^ *maps_file" $MODDIR/server.cfg | $sed 's/.* \"\{0,1\}\([^\"][^\"]*\)\"\{0,1\} *.\{0,1\}$/\1/'`
- 	if [ -z "$cfile" ] ; then
- 		[ -f "$MODDIR/maps.ini" ] && cfile="maps.ini"
- 	fi
-@@ -1258,7 +1274,7 @@
- 	fi
- 
- 	# do we have a ips.ini file?
--	cfile=`$grep "^ *ips_file" $MODDIR/server.cfg | $sed 's/.* \"\?\([^\"][^\"]*\)\"\? *.\?$/\1/'`
-+	cfile=`$grep "^ *ips_file" $MODDIR/server.cfg | $sed 's/.* \"\{0,1\}\([^\"][^\"]*\)\"\{0,1\} *.\{0,1\}$/\1/'`
- 	if [ -z "$cfile" ] ; then
- 		[ -f "$MODDIR/ips.ini" ] && cfile="ips.ini"
- 	fi
-@@ -1274,7 +1290,7 @@
- 	fi
- 
- 	# do we have a models.ini file?
--	cfile=`$grep "^ *models_file" $MODDIR/server.cfg | $sed 's/.* \"\?\([^\"][^\"]*\)\"\? *.\?$/\1/'`
-+	cfile=`$grep "^ *models_file" $MODDIR/server.cfg | $sed 's/.* \"\{0,1\}\([^\"][^\"]*\)\"\{0,1\} *.\{0,1\}$/\1/'`
- 	if [ -z "$cfile" ] ; then
- 		[ -f "$MODDIR/modles.ini" ] && cfile="modles.ini"
- 	fi
-@@ -1290,7 +1306,7 @@
- 	fi
- 
- 	# do we have a vault.ini file?
--	cfile=`$grep "^ *admin_vault_file" $MODDIR/server.cfg | $sed 's/.* \"\?\([^\"][^\"]*\)\"\? *.\?$/\1/'`
-+	cfile=`$grep "^ *admin_vault_file" $MODDIR/server.cfg | $sed 's/.* \"\{0,1\}\([^\"][^\"]*\)\"\{0,1\} *.\{0,1\}$/\1/'`
- 	if [ -z "$cfile" ] ; then
- 		[ -f $MODDIR/vault.ini ] && cfile="vault.ini"
- 	fi
-@@ -1306,7 +1322,7 @@
- 	fi
- 
- 	# do we have a plugin.ini file?
--	cfile=`$grep "^ *admin_plugin_file" $MODDIR/server.cfg | $sed 's/.* \"\?\([^\"][^\"]*\)\"\? *.\?$/\1/'`
-+	cfile=`$grep "^ *admin_plugin_file" $MODDIR/server.cfg | $sed 's/.* \"\{0,1\}\([^\"][^\"]*\)\"\{0,1\} *.\{0,1\}$/\1/'`
- 	if [ -z "$cfile" ] ; then
- 		[ -f $MODDIR/plugin.ini ] && cfile="plugin.ini"
- 	fi
-@@ -1333,10 +1349,10 @@
- 		echo ""
- 		echon "Relocating your script files to $mod_name/$amBaseDir/$amAmxDir ..."
- 		( cat $MODDIR/$cfile | while read plugin ; do 
--			if ( echo $plugin | grep '^;\? *dlls/.*\.amx' ) >/dev/null 2>&1 ; then
-+			if ( echo $plugin | grep '^;\{0,1\}#\{0,1\} *dlls/.*\.amx' ) >/dev/null 2>&1 ; then
- 				# if this is a plugin installed in the default MOD/dlls path
- 				# we copy it over
--				pfile=`echo $plugin | $sed 's/^\(\;\?#\?\) *dlls\/\(..*\.amx\).*/dlls\/\2/'`
-+				pfile=`echo $plugin | $sed 's/^\(\;\{0,1\}#\{0,1\}\) *dlls\/\(..*\.amx\).*/dlls\/\2/'`
- 				bpfile=`$basename $pfile`
- 				$doit $mv $MODDIR/$pfile $MODDIR/$amBaseDir/$amAmxDir/
- 				echol "$pfile"
-@@ -1345,7 +1361,7 @@
- 				echo "Leaving \"$plugin\" in place. You can move it by hand if you need it."
- 			fi
- 		done )
--		$doit eval "$cat $MODDIR/${cfile} | $sed 's/^\(\;\?#\?\) *dlls\/\(..*\.amx\)/\1addons\/adminmod\/scripts\/\2/' > $MODDIR/$amBaseDir/$amConfDir/$bcfile"
-+		$doit eval "$cat $MODDIR/${cfile} | $sed 's/^\(\;\{0,1\}#\{0,1\}\) *dlls\/\(..*\.amx\)/\1addons\/adminmod\/scripts\/\2/' > $MODDIR/$amBaseDir/$amConfDir/$bcfile"
- 		$doit $mv $MODDIR/$cfile $MODDIR/${cfile}.old	
- 	else
- 		$doit $cp $MYDIR/config/plugin.ini $MODDIR/$amBaseDir/$amConfDir
-@@ -1649,4 +1665,4 @@
- 
- 
- 
--#this_is_the_last_line
-\ No newline at end of file
-+#this_is_the_last_line
diff --git a/games/hlserver-admin/pkg-plist b/games/hlserver-admin/pkg-plist
index c1acd1a0ddb3..a717342b5c93 100644
--- a/games/hlserver-admin/pkg-plist
+++ b/games/hlserver-admin/pkg-plist
@@ -3,15 +3,17 @@
 %%HLDSDIR%%Adminmod/.amdd/.delete.cfg.sed
 %%HLDSDIR%%Adminmod/.amdd/.instscr.sed
 %%HLDSDIR%%Adminmod/.amdd/.instscrDOS.sed
+%%HLDSDIR%%Adminmod/.amdd/.xdbbase
 %%HLDSDIR%%Adminmod/.amdd/versions
+%%PORTDOCS%%%%HLDSDIR%%Adminmod/CHANGES
 %%PORTDOCS%%%%HLDSDIR%%Adminmod/LICENSE
 %%PORTDOCS%%%%HLDSDIR%%Adminmod/README
+%%HLDSDIR%%Adminmod/config/Legacy/admin_help.cfg
 %%HLDSDIR%%Adminmod/config/Samples/ips.ini
 %%HLDSDIR%%Adminmod/config/Samples/maps.ini
 %%HLDSDIR%%Adminmod/config/Samples/models.ini
 %%HLDSDIR%%Adminmod/config/Samples/users.ini
 %%HLDSDIR%%Adminmod/config/Samples/wordlist.txt
-%%HLDSDIR%%Adminmod/config/admin_help.cfg
 %%HLDSDIR%%Adminmod/config/adminmod.cfg
 %%HLDSDIR%%Adminmod/config/metamod.ini
 %%HLDSDIR%%Adminmod/config/plugin.ini
@@ -29,6 +31,7 @@
 %%PORTDOCS%%%%HLDSDIR%%Adminmod/docs/html/Admin_Etc/Admin_Mod_Erata.htm
 %%PORTDOCS%%%%HLDSDIR%%Adminmod/docs/html/Admin_Mod_Plugins/Downloading_and_Installing_Additional_Plugins.htm
 %%PORTDOCS%%%%HLDSDIR%%Adminmod/docs/html/Admin_Mod_Plugins/The_Admin_Mod_Default_Plugins.htm
+%%PORTDOCS%%%%HLDSDIR%%Adminmod/docs/html/Admin_Mod_Reference/.#Admin_Mod_Configuration_Variables_CVARs.htm.1.10
 %%PORTDOCS%%%%HLDSDIR%%Adminmod/docs/html/Admin_Mod_Reference/Access_Levels_and_Respective_Admin_Commands.htm
 %%PORTDOCS%%%%HLDSDIR%%Adminmod/docs/html/Admin_Mod_Reference/Admin_Mod_Commands.htm
 %%PORTDOCS%%%%HLDSDIR%%Adminmod/docs/html/Admin_Mod_Reference/Admin_Mod_Configuration_Variables_CVARs.htm
@@ -46,6 +49,7 @@
 %%PORTDOCS%%%%HLDSDIR%%Adminmod/docs/html/Before_You_Start/Introductory_Information.htm
 %%PORTDOCS%%%%HLDSDIR%%Adminmod/docs/html/Before_You_Start/License_and_Copyright_Information.htm
 %%PORTDOCS%%%%HLDSDIR%%Adminmod/docs/html/Before_You_Start/What_this_document_covers.htm
+%%PORTDOCS%%%%HLDSDIR%%Adminmod/docs/html/Configuration/.#Setting_up_your_server.cfg_file.htm.1.11
 %%PORTDOCS%%%%HLDSDIR%%Adminmod/docs/html/Configuration/How_to_Use_Bots_with_MetaMod_AM_2.50_and_up.htm
 %%PORTDOCS%%%%HLDSDIR%%Adminmod/docs/html/Configuration/Linux_Passwords.htm
 %%PORTDOCS%%%%HLDSDIR%%Adminmod/docs/html/Configuration/MySQL_Setup.htm
@@ -219,6 +223,7 @@
 %%PORTDOCS%%@dirrm %%HLDSDIR%%Adminmod/docs
 @dirrm %%HLDSDIR%%Adminmod/dlls
 @dirrm %%HLDSDIR%%Adminmod/config/Samples
+@dirrm %%HLDSDIR%%Adminmod/config/Legacy
 @dirrm %%HLDSDIR%%Adminmod/config
 @dirrm %%HLDSDIR%%Adminmod/.amdd
 @dirrm %%HLDSDIR%%Adminmod