update HOMEPAGE; error check; tidy

3 files changed, 33 insertions, 29 deletions

diff --git a/games-strategy/freecraft/ChangeLog b/games-strategy/freecraft/ChangeLog
index 56a845464695..e314e18d718f 100644
--- a/games-strategy/freecraft/ChangeLog
+++ b/games-strategy/freecraft/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-strategy/freecraft
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/freecraft/ChangeLog,v 1.6 2004/06/24 23:27:32 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freecraft/ChangeLog,v 1.7 2004/09/06 18:38:51 mr_bones_ Exp $
+
+  06 Sep 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  freecraft-1.18-r3.ebuild:
+  update HOMEPAGE; error check; tidy
 
 *freecraft-1.18-r3 (22 Jan 2004)
 
diff --git a/games-strategy/freecraft/Manifest b/games-strategy/freecraft/Manifest
index 06882e3e5c1a..f397b746cbac 100644
--- a/games-strategy/freecraft/Manifest
+++ b/games-strategy/freecraft/Manifest
@@ -1,6 +1,6 @@
-MD5 86f4aa9f892c0f57564cdb819a8856fe freecraft-1.18-r3.ebuild 2568
-MD5 1e641db4999a83582ae87aeac1a253f6 ChangeLog 1875
+MD5 3c112dde1c889cf99f0d9440db61b0d8 ChangeLog 1997
+MD5 d2ae4fa137b6828687dd61f1d9cb8cc5 freecraft-1.18-r3.ebuild 2632
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 c7be4012a9ba721244dec67d4abc2e53 files/1.18-setup.patch 1057
 MD5 6c27ce2218d486e19d552a2ae7781c17 files/digest-freecraft-1.18-r3 73
 MD5 0e6f6ecc763f6ca1565717fa90296b45 files/freecraft 493
-MD5 c7be4012a9ba721244dec67d4abc2e53 files/1.18-setup.patch 1057
diff --git a/games-strategy/freecraft/freecraft-1.18-r3.ebuild b/games-strategy/freecraft/freecraft-1.18-r3.ebuild
index 9c710300a2fd..5ba46cff3ead 100644
--- a/games-strategy/freecraft/freecraft-1.18-r3.ebuild
+++ b/games-strategy/freecraft/freecraft-1.18-r3.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/freecraft/freecraft-1.18-r3.ebuild,v 1.4 2004/06/24 23:27:32 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freecraft/freecraft-1.18-r3.ebuild,v 1.5 2004/09/06 18:38:51 mr_bones_ Exp $
 
 inherit games eutils
 
 MY_P=${PN}-030311
 DESCRIPTION="realtime strategy game engine for games like Warcraft/Starcraft/etc."
-HOMEPAGE="http://www.freecraft.org/"
+HOMEPAGE="http://www.savefree-aft.4t.com/"
 SRC_URI="${MY_P}-src.tar.gz"
 
 LICENSE="GPL-2"
@@ -19,7 +19,7 @@ DEPEND=">=media-libs/libpng-1.2.3
 	>=media-libs/libsdl-1.2.4
 	sys-libs/zlib"
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
 
 pkg_nofetch() {
 	einfo "Due to a Ceast and Desist given by Blizzard,"
@@ -31,8 +31,8 @@ pkg_nofetch() {
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PV}-setup.patch
+	cd "${S}"
+	epatch "${FILESDIR}/${PV}-setup.patch"
 	env GENTOO_CFLAGS="${CFLAGS}" ./setup || die
 }
 
@@ -42,20 +42,20 @@ src_compile() {
 }
 
 src_install() {
-	exeinto ${GAMES_LIBDIR}/${PN}
-	doexe freecraft
-	dogamesbin ${FILESDIR}/freecraft
-	dosed "s:GENTOO_DATADIR:${GAMES_DATADIR}/${PN}:" ${GAMES_BINDIR}/freecraft
-	dosed "s:GENTOO_LIBDIR:${GAMES_LIBDIR}/${PN}:" ${GAMES_BINDIR}/freecraft
+	exeinto "${GAMES_LIBDIR}/${PN}"
+	doexe freecraft || die "doexe failed"
+	dogamesbin "${FILESDIR}/freecraft" || die "dogamesbin failed"
+	sed -i \
+		-e  "s:GENTOO_DATADIR:${GAMES_DATADIR}/${PN}:" \
+		-e  "s:GENTOO_LIBDIR:${GAMES_LIBDIR}/${PN}:" \
+		"${D}${GAMES_BINDIR}/freecraft" \
+		|| die "sed failed"
 
-	exeinto ${GAMES_DATADIR}/${PN}/tools
-	doexe tools/{build.sh,aledoc,startool,wartool}
+	exeinto "${GAMES_DATADIR}/${PN}/tools"
+	doexe tools/{build.sh,aledoc,startool,wartool} || die "doexe failed"
 
-	dodir ${GAMES_DATADIR}/${PN}/
-	cp -r data ${D}/${GAMES_DATADIR}/${PN}/
-
-	insinto ${GAMES_DATADIR}/${PN}/contrib
-	cp -r contrib ${D}/${GAMES_DATADIR}/${PN}/
+	dodir "${GAMES_DATADIR}/${PN}"
+	cp -r contrib data "${D}/${GAMES_DATADIR}/${PN}/" || die "cp failed"
 
 	dohtml -r doc
 	dodoc README
@@ -63,17 +63,19 @@ src_install() {
 	prepgamesdirs
 
 	# make sure we dont clobber files freecraft and freecraft-fcmp share #39278
-	local fcmpver="`best_version games-strategy/freecraft-fcmp`"
+	local fcmpver="$(best_version games-strategy/freecraft-fcmp)"
 	if [ ! -z "${fcmpver}" ] ; then
-		cd ${D}/${GAMES_DATADIR}/${PN}/data/ccl
-		for f in `grep ${GAMES_DATADIR}/${PN}/data/ccl/ /var/db/pkg/${fcmpver}/CONTENTS` ; do
+		cd "${D}/${GAMES_DATADIR}/${PN}/data/ccl"
+		for f in $(grep ${GAMES_DATADIR}/${PN}/data/ccl/ /var/db/pkg/${fcmpver}/CONTENTS) ; do
 			[ -d "${f}" ] && continue
-			[ -e "${f}" -a -e "${D}/${f}" ] && rm ${D}/${f}
+			[ -e "${f}" -a -e "${D}/${f}" ] && rm "${D}/${f}"
 		done
 	fi
 }
 
 pkg_postinst() {
+	games_pkg_postinst
+	echo
 	einfo "Freecraft is now installed but in order to actually play"
 	einfo "you will need to either use a Warcraft CD or install the"
 	einfo "freecraft-fcmp ebuild.  To use a Warcraft CD:"
@@ -82,8 +84,6 @@ pkg_postinst() {
 	einfo " 3 run tools/build.sh"
 	einfo "This will extract the data files to the correct place."
 	einfo "Note that the CD is still needed for the music.  To"
-	einfo "start a game just run \`playfreecraft\`."
-	einfo "For more info, review \`freecraft --help\`."
-
-	games_pkg_postinst
+	einfo "start a game just run \"playfreecraft\"."
+	einfo "For more info, review \"freecraft --help\"."
 }