Date: Thu, 13 Oct 2005 11:15:09 -0600 From: Travis Poppe <tlp@liquidx.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/87392: [MAINTAINER UPDATE]: games/wargus statically links to png, fix this. Message-ID: <200510131115.10081.tlp@liquidx.org> Resent-Message-ID: <200510131720.j9DHKGov027395@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 87392
>Category: ports
>Synopsis: [MAINTAINER UPDATE] games/wargus statically links to png, fix this.
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Thu Oct 13 17:20:16 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Travis Poppe
>Release:
>Organization:
>Environment:
>Description:
Volker Stolz <vs@freebsd.org> contacted me and made me aware that the 'wargus' port
statically links to libpng. The following patch should fix this. I've also taken the time out to
be nitpicky about the wording in pkg-descr, the comment, the pkg-message and the
wrapper script.
>How-To-Repeat:
>Fix:
diff -ruN wargus.orig/Makefile wargus/Makefile
--- wargus.orig/Makefile Sat Mar 26 19:11:07 2005
+++ wargus/Makefile Thu Oct 13 11:04:23 2005
@@ -14,7 +14,7 @@
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
RUN_DEPENDS= ${LOCALBASE}/bin/stratagus:${PORTSDIR}/games/stratagus
@@ -36,7 +36,8 @@
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 -ruN wargus.orig/files/pkg-message.in wargus/files/pkg-message.in
--- wargus.orig/files/pkg-message.in Sat Jul 3 23:29:25 2004
+++ wargus/files/pkg-message.in Thu Oct 13 11:05:09 2005
@@ -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 @@
./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 -ruN wargus.orig/files/wargus.in wargus/files/wargus.in
--- wargus.orig/files/wargus.in Fri Jul 9 01:29:31 2004
+++ wargus/files/wargus.in Thu Oct 13 11:06:04 2005
@@ -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 @@
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 @@
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 @@
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 -ruN wargus.orig/pkg-descr wargus/pkg-descr
--- wargus.orig/pkg-descr Sat Jul 3 23:29:25 2004
+++ wargus/pkg-descr Thu Oct 13 11:10:50 2005
@@ -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
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200510131115.10081.tlp>