5 files changed, 26 insertions, 112 deletions

diff --git a/games/utserver-asu/Makefile b/games/utserver-asu/Makefile
index 8bb5bba5ee88..82296aa9f5b6 100644
--- a/games/utserver-asu/Makefile
+++ b/games/utserver-asu/Makefile
@@ -6,34 +6,27 @@
 #
 
 PORTNAME=	asu
-PORTVERSION=	0.4
-PORTREVISION=	2
-MASTER_SITES=	ftp://ftp.abfackeln.com/pub/linux/ut/
-DISTFILES=	asu-${PORTVERSION}.tar.gz \
-		asu-0.4-redirectfix-0.1-patch.tar.gz \
-		CSHP-4+-patch.tar.gz
-EXTRACT_ONLY=	asu-${PORTVERSION}.tar.gz
+PORTVERSION=	0.5
+MASTER_SITES=	ftp://ftp.abfackeln.com/pub/linux/ut/asu/
+DISTNAME=	asu-${PORTVERSION}
 
 MAINTAINER=	matuska@wu-wien.ac.at
 
 RUN_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
 
-WRKSRC=		${WRKDIR}/Abfackeln.com
+NO_WRKSUBDIR=	yes
 DONT_USE_ZIP=	yes
 DO_USE_WRKSUBDIR=	yes
 EXECUTABLES=	pl
+GZIP=		9
 
 post-extract:
-	@${GZIP_CMD} -9c ${FILESDIR}/ucc.init > ${WRKSRC}/Lib/ucc.init.gz
-	@${RM} -f ${WRKSRC}/Patches/*
-.for files in ${DISTFILES:S/${EXTRACT_ONLY}//}
-	@${CP} -f ${DISTDIR}/${files} ${WRKSRC}/Patches
-.endfor
+	@${GZIP_CMD} -c ${FILESDIR}/ucc.init > ${WRKSRC}/ASU/ucc.init.gz
 
 post-patch:
 	@${SED} -e "s|%%LINUXBASE%%|${LINUXBASE}|" \
 		-e "s|%%UTDIR%%|${UTDIR}|" \
-		${FILESDIR}/template-settings.ini > ${WRKSRC}/Lib/settings.ini
+		${FILESDIR}/template-settings.ini > ${WRKSRC}/ASU/settings.ini
 
 UT_MASTER_PORT=	${.CURDIR}/../utserver-to
 
diff --git a/games/utserver-asu/distinfo b/games/utserver-asu/distinfo
index bb4047125af6..3d9463db4b7d 100644
--- a/games/utserver-asu/distinfo
+++ b/games/utserver-asu/distinfo
@@ -1,3 +1 @@
-MD5 (asu-0.4.tar.gz) = ea90350dbc7e0d402351abab0070a150
-MD5 (asu-0.4-redirectfix-0.1-patch.tar.gz) = 62ce112f3f39f36babc1d263065b675e
-MD5 (CSHP-4+-patch.tar.gz) = 925c71e24881377b799c19efec2f3383
+MD5 (asu-0.5.tar.gz) = 9bd0fbb3afe57c4f94af1688a80f3d40
diff --git a/games/utserver-asu/files/patch-Lib:asu-main.sh b/games/utserver-asu/files/patch-Lib:asu-main.sh
deleted file mode 100644
index ee8c3fb15a74..000000000000
--- a/games/utserver-asu/files/patch-Lib:asu-main.sh
+++ /dev/null
@@ -1,73 +0,0 @@
---- Lib/asu-main.sh	Thu Oct 18 16:33:54 2001
-+++ Lib/asu-main.sh	Thu Oct 18 16:35:01 2001
-@@ -8,6 +8,8 @@
- #
- # Copyright (C) 2001 abfackeln@abfackeln.com
- # 
-+# FreeBSD modifications by matuska@wu-wien.ac.at
-+# 
- # This program is free software; you can redistribute it and/or
- # modify it under the terms of the GNU General Public License
- # as published by the Free Software Foundation; either version 2
-@@ -32,9 +34,9 @@
- Install_Package ()
- {
-    if [ -f "$PATCH_DIR/$1-patch.tar.gz" ]; then
--      pushd $UT_DIR > /dev/null
-+      /bin/csh -c pushd $UT_DIR > /dev/null 2> /dev/null
-       tar zxpf "$PATCH_DIR/$1-patch.tar.gz"
--      popd > /dev/null
-+      /bin/csh -c popd > /dev/null 2> /dev/null
-       if [ -f "$UT_DIR/$1-install.asu" ]; then
-          TMP=`head -1 "$UT_DIR/$1-install.asu" | sed -n -e "s/#~asu \([0-9.]*\).*$/\\\\1/" -e "t label" -e "d" -e ": label" -e "p"`
-          if [ -f "$ABF_DIR/legacy-asu-script-$TMP.sh" ]; then
-@@ -1545,9 +1547,9 @@
-    echo
-    echo "Zip and Umod files in your game directory:"
-    echo
--   pushd $UT_DIR > /dev/null
-+   /bin/csh -c pushd $UT_DIR > /dev/null 2> /dev/null
-    ls *.[zZ][iI][pP] *.[uU][mM][oO][dD] 2> /dev/null
--   popd > /dev/null
-+   /bin/csh -c popd > /dev/null 2> /dev/null
-    echo
-    echo "Enter the name of the file from the above list"
-    echo "or enter the full file name if it is located elsewhere."
---- Lib/legacy-asu-script-0.1.sh	Sat Jun 23 02:46:49 2001
-+++ Lib/legacy-asu-script-0.1.sh	Thu Oct 18 18:01:54 2001
-@@ -1,10 +1,29 @@
- #~asu 0.4
- #~legacy 0.1 ## compatability functions for version 0.1 scripts
- 
--AddIni () { IniAdd "$1" "$2" "$3" "$4" }
--UnAddIni () { IniUnAdd "$1" "$2" "$3" "$4" }
--SetIni () { IniSet "$1" "$2" "$3" "$4" }
--UnSetIni () { IniUnSet "$1" "$2" "$3" }
--MatchIni () { IniMatch "$1" "$2" "$3" "$4" }
--ReadIni () { IniRead "$1" "$2" "$3" }
-+AddIni() 
-+{
-+	IniAdd "$1" "$2" "$3" "$4"
-+}
- 
-+UnAddIni() {
-+IniUnAdd "$1" "$2" "$3" "$4"
-+}
-+
-+SetIni() 
-+{
-+IniSet "$1" "$2" "$3" "$4"
-+}
-+
-+UnSetIni() 
-+{
-+IniUnSet "$1" "$2" "$3"
-+}
-+
-+MatchIni() {
-+IniMatch "$1" "$2" "$3" "$4"
-+}
-+
-+ReadIni() {
-+IniRead "$1" "$2" "$3"
-+}
diff --git a/games/utserver-asu/pkg-message b/games/utserver-asu/pkg-message
index db90314c23a7..72678245a934 100644
--- a/games/utserver-asu/pkg-message
+++ b/games/utserver-asu/pkg-message
@@ -6,7 +6,3 @@ Notes:
 - If you intend to start ucc.init as root, the user account 
   you specify in the configuration requires a valid login shell and
   a valid home directory.
-
-- the netgames-abfackeln-0.8.2 patch is already integrated in
-  the utserver port 436 revision 2 and modified for FreeBSD
-
diff --git a/games/utserver-asu/pkg-plist b/games/utserver-asu/pkg-plist
index 2fc4345d3130..82e6efad0a0f 100644
--- a/games/utserver-asu/pkg-plist
+++ b/games/utserver-asu/pkg-plist
@@ -1,21 +1,21 @@
 %%UTDIR%%Patches/CSHP-4+-patch.tar.gz
-%%UTDIR%%Patches/asu-0.4-redirectfix-0.1-patch.tar.gz
-%%UTDIR%%Lib/umodpack-abf/Tie/IxHash.pm
-%%UTDIR%%Lib/umodpack-abf/umod
-%%UTDIR%%Lib/umodpack-abf/Umod.pm
-%%UTDIR%%Lib/umodpack-abf/IniFile.pm
-%%PORTDOCS%%%%UTDIR%%Lib/gpl.txt.gz
-%%PORTDOCS%%%%UTDIR%%Lib/help.txt.gz
-%%UTDIR%%Lib/legacy-asu-script-0.1.sh
-%%PORTDOCS%%%%UTDIR%%Lib/legal.txt.gz
-%%UTDIR%%Lib/umod.pl
-%%UTDIR%%Lib/settings.ini
-%%UTDIR%%Lib/UnrealTournament.ini.gz
-%%UTDIR%%Lib/User.ini.gz
-%%UTDIR%%Lib/ucc.init.gz
-%%UTDIR%%Lib/asu-main.sh
+%%UTDIR%%ASU/umodasu/IxHash.pm
+%%UTDIR%%ASU/umodasu/umodasu.pm
+%%UTDIR%%ASU/umodasu/Umod.pm
+%%UTDIR%%ASU/umodasu/Ini.pm
+%%UTDIR%%ASU/umodasu/rc.umod
+%%PORTDOCS%%%%UTDIR%%ASU/gpl.txt.gz
+%%PORTDOCS%%%%UTDIR%%ASU/help.txt.gz
+%%UTDIR%%ASU/legacy-asu-script-0.1.sh
+%%PORTDOCS%%%%UTDIR%%ASU/legal.txt.gz
+%%UTDIR%%ASU/umod.pl
+%%UTDIR%%ASU/settings.ini
+%%UTDIR%%ASU/UnrealTournament.ini.gz
+%%UTDIR%%ASU/User.ini.gz
+%%UTDIR%%ASU/ucc.init.gz
+%%UTDIR%%ASU/asu-main.sh
 %%UTDIR%%asu.sh
 @dirrm %%UTDIR%%Patches
-@dirrm %%UTDIR%%Lib/umodpack-abf/Tie
-@unexec rmdir %D/%%UTDIR%%Lib/umodpack-abf 2>/dev/null || echo "If you are permanently removing this port, you should do a ``rm -rf ${PKG_PREFIX}/%%UTDIR%%Lib/umodpack-abf`` to remove any configuration files and logs left." | fmt
-@unexec rmdir %D/%%UTDIR%%Lib 2>/dev/null || true
+@dirrm %%UTDIR%%ASU/umodasu
+@unexec rmdir %D/%%UTDIR%%ASU/umodasu 2>/dev/null || echo "If you are permanently removing this port, you should do a ``rm -rf ${PKG_PREFIX}/%%UTDIR%%ASU/umodasu`` to remove any configuration files and logs left." | fmt
+@unexec rmdir %D/%%UTDIR%%ASU 2>/dev/null || true