5 files changed, 48 insertions, 60 deletions

diff --git a/games/linux-steam/Makefile b/games/linux-steam/Makefile
index cab2fa2be859..d4b968cae7bf 100644
--- a/games/linux-steam/Makefile
+++ b/games/linux-steam/Makefile
@@ -6,37 +6,41 @@
 #
 
 PORTNAME=	steam
-PORTVERSION=	1.0
-PORTREVISOIN=	2
+PORTVERSION=	1.1
 CATEGORIES=	games linux
-MASTER_SITES=	http://www.coreblack.com/files/
+MASTER_SITES=	http://storefront.steampowered.com/download/
 PKGNAMEPREFIX=	linux-
+DISTNAME=	hldsupdatetool.bin
+EXTRACT_SUFX=
+EXTRACT_ONLY=
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Half Life dedicated server running on steam
+MAINTAINER=	chris@easymac.org
+COMMENT=	Half Life and Source dedicated server using steam
 
 BUILD_DEPENDS=	${LINUX_BASE_PORT}
 
 IS_INTERACTIVE=	yes
 USE_LINUX=	yes
 USE_LINUX_APPS=	xorglibs
-PKGMESSAGE=	${WRKDIR}/pkg-message
 
 INSTALLDIR?=	steam
 
+SUB_FILES=	pkg-message
+SUB_LIST=	INSTALLDIR=${PREFIX}/${INSTALLDIR}
 PLIST_SUB+=	INSTALLDIR=${INSTALLDIR}
 
 pre-everything::
-	@ ${ECHO_MSG} "You can use the INSTALLDIR option to change the install dir"
+	@${ECHO_MSG} "You can use the INSTALLDIR option to change the install directory."
 
 do-build:
-	@ ${BRANDELF} -t Linux ${WRKDIR}/hldsupdatetool.bin
-	@ ${CHMOD} +x ${WRKDIR}/hldsupdatetool.bin && cd ${WRKDIR} && ./hldsupdatetool.bin
-	@ ${CAT} pkg-message | ${SED} 's|%%PREFIX%%|${PREFIX}|' > ${PKGMESSAGE}
+	@${CP} ${DISTDIR}/${DISTFILES} ${WRKDIR}
+	@${BRANDELF} -t Linux ${WRKDIR}/${DISTFILES}
+	@${CHMOD} +x ${WRKDIR}/${DISTFILES} && cd ${WRKDIR} && ./${DISTFILES}
+	@${CAT} pkg-message | ${SED} 's|%%PREFIX%%|${PREFIX}|' > ${PKGMESSAGE}
 
 do-install:
-	@ ${MKDIR} ${PREFIX}/${INSTALLDIR}
-	@ ${CP} ${WRKDIR}/${PORTNAME} ${PREFIX}/${INSTALLDIR}/
-	@ ${CAT} ${PKGMESSAGE}
+	@${MKDIR} ${PREFIX}/${INSTALLDIR}
+	@${CP} ${WRKDIR}/${PORTNAME} ${PREFIX}/${INSTALLDIR}/
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/games/linux-steam/distinfo b/games/linux-steam/distinfo
index 464d81db748a..f41817f05a54 100644
--- a/games/linux-steam/distinfo
+++ b/games/linux-steam/distinfo
@@ -1,3 +1,3 @@
-MD5 (steam-1.0.tar.gz) = 3d32775d1cf34ff8c9c938312e5128b8
-SHA256 (steam-1.0.tar.gz) = ffe005259eb85fa78f0699afe8b45335b969d67c3f95a93140ce0f6f5ac04df3
-SIZE (steam-1.0.tar.gz) = 2586017
+MD5 (hldsupdatetool.bin) = 3d92b54b74387e3881b35b92d09d8e16
+SHA256 (hldsupdatetool.bin) = dda8786ac0ce755acc3f307989641482a19de4b28801289b910a3bbcd097a6db
+SIZE (hldsupdatetool.bin) = 3513408
diff --git a/games/linux-steam/files/pkg-message.in b/games/linux-steam/files/pkg-message.in
new file mode 100644
index 000000000000..5f4089b30936
--- /dev/null
+++ b/games/linux-steam/files/pkg-message.in
@@ -0,0 +1,21 @@
+------------------------------------------------------------------------
+Linux HLDS Update Tool has been successfully installed!
+
+To get started:
+	cd %%INSTALLDIR%%
+	./steam -command update -game [name] -dir .
+
+Steam will then begin downloading the game content to your system.  Once
+complete you may start your server by:
+
+	./hlds_run -game [name] +map [mapname] -maxplayers [#] \
+		-autoupdate
+
+	OR
+
+	./srcds_run -game [name] +map [mapname] -maxplayers [#] \
+		-autoupdate
+
+
+NOTE: Steam no longer requires login information.
+------------------------------------------------------------------------
diff --git a/games/linux-steam/pkg-descr b/games/linux-steam/pkg-descr
index 24583ab0f8b8..a96ab115ef98 100644
--- a/games/linux-steam/pkg-descr
+++ b/games/linux-steam/pkg-descr
@@ -1,19 +1,11 @@
-Steam is Valve's new way of getting games into your hands ASAP. Games like
-Half-Life, Counter-Strike, and Counter-Strike Condition Zero
-are all being made available through Steam.
+HLDS Update Tool (more truthfully named Steam):
 
-Steam games are automatically kept up-to-date with the latest content
-and revisions. Steam also includes an instant-message client which
-even works while you're in-game.
+Steam allows you to download the game content necessary to run a 
+Half-Life Dedicated Server or Source Dedicated Server.  The downloaded
+content can also be updated to the newest revisions and patches
+automatically with the use of Steam.
 
-At its core, Steam is a distributed file system and shared set of technology
-components that can be implemented into any software application.
-
-With Steam, developers are given integrated tools for direct-content
-publishing, flexible billing, ensured-version
-control, anti-cheating, anti-piracy, and more.
+This port installs the Linux version of Steam, as no FreeBSD version
+exists.
 
 WWW: http://www.steampowered.com/
-
-- Hideki
-hido@coreblack.com
diff --git a/games/linux-steam/pkg-message b/games/linux-steam/pkg-message
deleted file mode 100644
index b970223cc988..000000000000
--- a/games/linux-steam/pkg-message
+++ /dev/null
@@ -1,29 +0,0 @@
-##################################################################
-# To get started goto %%PREFIX%%/%%INSTALLDIR%%                             #
-# and type the following to create a steam-user.                 #
-# ./steam -command create -username <username> \                 #
-# -email <emailaddress> -password <password> \                   #
-# -question <question> -answer <answer>                          #
-#                                                                #
-# Example                                                        #
-# ./steam -command create -username johndoe \                    #
-# -email johndoe@mydomain.com -password 12345678 \               #
-# -question nameofmygun -answer M4A1                             #
-#                                                                #
-# Once you have a steam-user account or if you have a registered #
-# account already type the following to start updating your HLDS #
-# ./steam -command update -game <game> -dir <steamdir> \         #
-# -username <username> -password <password> -remember_password   #
-#                                                                #
-# Example                                                        #
-# ./steam -command update -game cstrike -dir %%PREFIX%%/steam \  #
-# -username johndoe -password 12345678 -remember_password        #
-#                                                                #
-# Once your server has been updated type the following           #
-# to test your server.                                           #
-# ./hlds_run -game cstrike +map de_dust -maxplayers 16           #
-#                                                                #
-# For instructions on configuring your server goto               #
-# http://server.counter-strike.net                               #
-#                                                                #
-##################################################################