- Don't link statically to libpng.

- s/Warcraft2/Warcraft 2/g on some various files.

PR:		ports/87392
Submitted by:	maintainer

4 files changed, 20 insertions, 22 deletions

diff --git a/games/wargus/Makefile b/games/wargus/Makefile
index 3c485f967c90..4da7f11bc282 100644
--- a/games/wargus/Makefile
+++ b/games/wargus/Makefile
@@ -7,16 +7,16 @@
 
 PORTNAME=	wargus
 PORTVERSION=	2.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
 MAINTAINER=	tlp@liquidx.org
-COMMENT=	Warcraft2 Mod that allows you to play Warcraft2 with Stratagus
+COMMENT=	Warcraft 2 mod that allows you to play Warcraft 2 with Stratagus
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libpng.a:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png
 RUN_DEPENDS=	${LOCALBASE}/bin/stratagus:${PORTSDIR}/games/stratagus
 
 USE_GMAKE=	yes
@@ -36,7 +36,8 @@ post-patch:
 		s|^\(CFLAGS =\)|\1 ${CFLAGS}|; \
 		s|\/usr\/local\(\/cross\)|${PREFIX}\1|; \
 		s|\(-I\)\/usr\/local|\1${LOCALBASE}|; \
-		s|\(-L\)\/usr\/local|\1${LOCALBASE}|' \
+		s|\(-L\)\/usr\/local|\1${LOCALBASE}|; \
+		s|-static||' \
 		${WRKSRC}/Makefile
 
 do-install:
diff --git a/games/wargus/files/pkg-message.in b/games/wargus/files/pkg-message.in
index ad1e4ddd8cee..2def70d82ba1 100644
--- a/games/wargus/files/pkg-message.in
+++ b/games/wargus/files/pkg-message.in
@@ -1,7 +1,7 @@
 -------------------------------------------------------------------------------
 The Wargus tool has been installed to %%PREFIX%%/share/wargus/
 
-You can now use this tool to extract Warcraft2 data for use with the 
+You can now use this tool to extract Warcraft 2 data for use with the 
 Stratagus engine from the following CDs:
 
 * US Expansion (both MAC/DOS)
@@ -17,7 +17,7 @@ the %%PREFIX%%/share/wargus/ directory and try executing:
 
 ./build.sh -p /cdrom
 
-After your Warcraft2 data has been successfully extracted, run 'wargus' as the
+After your Warcraft 2 data has been successfully extracted, run 'wargus' as the
 user you intend to play the game with.
 
 For more information, please visit: http://wargus.sourceforge.net
diff --git a/games/wargus/files/wargus.in b/games/wargus/files/wargus.in
index 287050df82c9..51ae95a7a386 100644
--- a/games/wargus/files/wargus.in
+++ b/games/wargus/files/wargus.in
@@ -9,7 +9,7 @@
 DATADIR=%%PREFIX%%/share/wargus/data.wc2
 
 if [ ! -d $DATADIR ]; then
-	echo "Warcraft2 data not found in $DATADIR/"
+	echo "Warcraft 2 data not found in $DATADIR/"
 	echo ""
 	echo "Did you run build.sh yet?"
 	echo ""
@@ -18,7 +18,7 @@ if [ ! -d $DATADIR ]; then
 	echo ""
 	echo "The Wargus tool has been installed to %%PREFIX%%/share/wargus/"
 	echo ""
-	echo "You can now use this tool to extract Warcraft2 data for use with the"
+	echo "You can now use this tool to extract Warcraft 2 data for use with the"
 	echo "Stratagus engine from the following CDs:"
 	echo ""
 	echo "* US Expansion (both MAC/DOS)"
@@ -34,7 +34,7 @@ if [ ! -d $DATADIR ]; then
 	echo ""
 	echo "./build.sh -p /cdrom"
  	echo ""
-	echo "After your Warcraft2 data has been successfully extracted, run 'wargus' as the"
+	echo "After your Warcraft 2 data has been successfully extracted, run 'wargus' as the"
 	echo "user you intend to play the game with."
  	echo ""
 	echo "For more information, please visit: http://wargus.sourceforge.net"
@@ -42,9 +42,9 @@ if [ ! -d $DATADIR ]; then
 fi
 
 if [ -d $DATADIR ]; then
-	echo "Warcraft2 data found in $DATADIR/"
+	echo "Warcraft 2 data found in $DATADIR/"
 	echo ""
-	echo "Attempting to run Stratagus with Warcraft2 data"
+	echo "Attempting to run Stratagus with Warcraft 2 data"
 	echo ""
 	stratagus -d $DATADIR $*
 	exit
diff --git a/games/wargus/pkg-descr b/games/wargus/pkg-descr
index fd982af5de2b..ae8bb126ab59 100644
--- a/games/wargus/pkg-descr
+++ b/games/wargus/pkg-descr
@@ -1,16 +1,13 @@
-Wargus is a Warcraft2 Mod that allows you to play Warcraft2 with the 
-Stratagus engine, as opposed to playing it with the original Warcraft2 
+Wargus is a Warcraft 2 mod that allows you to play Warcraft 2 with the 
+Stratagus engine, as opposed to playing it with the original Warcraft 2 
 one. 
 
-So unless you have a legal copy of Warcraft2 (original DOS Version required,
-won't work with the battle.net edition) Wargus will be pretty useless to you, 
-since it doesn't come with any graphics or sounds itself.
+You will need a legal copy of Warcraft 2 (original DOS version required,
+won't work with the Battle.net Edition) since Wargus doesn't come with 
+any graphics or sounds itself.
 
-Since Wargus uses a different engine, not all things will work 100% the same 
-as they did in the original Warcraft2. If you want the original unchanged 
-Warcraft2 experience, you will still have to play the original.
+Since Wargus uses a different engine, not all things will work the same
+as they did in the original game. If you want an absolutely unchanged 
+Warcraft 2 experience, you will still have to play the original.
 
 WWW: http://wargus.sourceforge.net
-
-- Travis Poppe
-tlp@liquidx.org