Attachment 75944 Details for Bug 109587 – wargus.diff

[patch] wargus.diff

wargus.diff (text/plain), 16.27 KB, created by Alejandro Pulver on 2007-02-27 02:40:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alejandro Pulver

Created: 2007-02-27 02:40:11 UTC

Size: 16.27 KB

patch

obsolete

>Index: wargus/Makefile
>===================================================================
>RCS file: /home/pcvs/ports/games/wargus/Makefile,v
>retrieving revision 1.7
>diff -u -r1.7 Makefile
>--- wargus/Makefile	7 May 2006 23:45:40 -0000	1.7
>+++ wargus/Makefile	27 Feb 2007 02:07:35 -0000
>@@ -6,76 +6,36 @@
> #
> 
> PORTNAME=	wargus
>-PORTVERSION=	2.1
>-PORTREVISION=	3
>+PORTVERSION=	2.2.2
> CATEGORIES=	games
>-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
>-MASTER_SITE_SUBDIR=	${PORTNAME}
>-DISTNAME=	${PORTNAME}-${PORTVERSION}-src
>+MASTER_SITES=	SF
>+EXTRACT_SUFX=	-src.tar.gz
> 
> MAINTAINER=	tlp@liquidx.org
> COMMENT=	Warcraft 2 mod that allows you to play Warcraft 2 with Stratagus
> 
> LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png
>-RUN_DEPENDS=	${LOCALBASE}/bin/stratagus:${PORTSDIR}/games/stratagus
>+RUN_DEPENDS=	stratagus:${PORTSDIR}/games/stratagus
> 
>+NOT_FOR_ARCHS=	sparc64
> USE_GMAKE=	yes
>-
>-PKGMESSAGE=	${WRKDIR}/pkg-message
> WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
> 
>-.include <bsd.port.pre.mk>
>-
>-.if ${ARCH} == "sparc64"
>-BROKEN=		"Does not compile on sparc64"
>-.endif
>-
>-post-patch:
>-	@${REINPLACE_CMD} -e 's|^$CC$|#\1|; \
>-		s|^$CFLAGS =$|\1 ${CFLAGS}|; \
>-		s|\/usr\/local$\/cross$|${PREFIX}\1|; \
>-		s|$-I$\/usr\/local|\1${LOCALBASE}|; \
>-		s|$-L$\/usr\/local|\1${LOCALBASE}|; \
>-		s|-static||' \
>-		${WRKSRC}/Makefile
>+SUB_FILES=	${PORTNAME} pkg-message
> 
> do-install:
>-	${MKDIR} ${DATADIR}
>-	${MKDIR} ${DATADIR}/campaigns
>-	${MKDIR} ${DATADIR}/campaigns/human
>-	${MKDIR} ${DATADIR}/campaigns/human-exp
>-	${MKDIR} ${DATADIR}/campaigns/orc
>-	${MKDIR} ${DATADIR}/campaigns/orc-exp
>-	${MKDIR} ${DATADIR}/contrib
>-	${MKDIR} ${DATADIR}/maps
>-	${MKDIR} ${DATADIR}/maps/multi
>-	${MKDIR} ${DATADIR}/scripts
>-	${MKDIR} ${DATADIR}/scripts/ai
>-	${MKDIR} ${DATADIR}/scripts/human
>-	${MKDIR} ${DATADIR}/scripts/orc
>-	${MKDIR} ${DATADIR}/scripts/tilesets
>-	${INSTALL_DATA} ${WRKSRC}/campaigns/human/* ${DATADIR}/campaigns/human
>-	${INSTALL_DATA} ${WRKSRC}/campaigns/human-exp/* ${DATADIR}/campaigns/human-exp
>-	${INSTALL_DATA} ${WRKSRC}/campaigns/orc/* ${DATADIR}/campaigns/orc
>-	${INSTALL_DATA} ${WRKSRC}/campaigns/orc-exp/* ${DATADIR}/campaigns/orc-exp
>-	${INSTALL_DATA} ${WRKSRC}/contrib/* ${DATADIR}/contrib
>-	${INSTALL_DATA} ${WRKSRC}/maps/multi/* ${DATADIR}/maps/multi
>-	${INSTALL_DATA} ${WRKSRC}/scripts/*.lua ${DATADIR}/scripts
>-	${INSTALL_DATA} ${WRKSRC}/scripts/ai/* ${DATADIR}/scripts/ai
>-	${INSTALL_DATA} ${WRKSRC}/scripts/human/* ${DATADIR}/scripts/human
>-	${INSTALL_DATA} ${WRKSRC}/scripts/orc/* ${DATADIR}/scripts/orc
>-	${INSTALL_DATA} ${WRKSRC}/scripts/tilesets/* ${DATADIR}/scripts/tilesets
>-	${INSTALL_SCRIPT} ${WRKSRC}/build.sh ${DATADIR}/build.sh
>-	${INSTALL_PROGRAM} ${WRKSRC}/wartool ${DATADIR}/wartool
>-	${INSTALL_SCRIPT} ${WRKDIR}/wargus ${PREFIX}/bin/wargus
>-
>-post-build:
>-	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' ${WRKSRC}/Makefile
>-	@(cp ${FILESDIR}/wargus.in ${WRKDIR}/wargus)
>-	@${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},g' ${WRKDIR}/wargus
>-	@${SED} 's|%%PREFIX%%|${PREFIX}|g' ${FILESDIR}/pkg-message.in > ${PKGMESSAGE}
>+	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${PREFIX}/bin
>+	cd ${WRKSRC} && \
>+		${FIND} campaigns contrib maps scripts -type d \
>+		-exec ${MKDIR} "${DATADIR}/{}" \; && \
>+		${FIND} campaigns contrib maps scripts -type f \
>+		-exec ${INSTALL_DATA} "{}" "${DATADIR}/{}" \;
>+	${INSTALL_PROGRAM} ${WRKSRC}/wartool ${DATADIR}
>+	${INSTALL_SCRIPT} ${WRKSRC}/build.sh ${DATADIR}
> 
> post-install:
>+	@${ECHO_CMD}
> 	@${CAT} ${PKGMESSAGE}
>+	@${ECHO_CMD}
> 
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>
>Index: wargus/distinfo
>===================================================================
>RCS file: /home/pcvs/ports/games/wargus/distinfo,v
>retrieving revision 1.2
>diff -u -r1.2 distinfo
>--- wargus/distinfo	22 Jan 2006 11:18:47 -0000	1.2
>+++ wargus/distinfo	27 Feb 2007 02:07:35 -0000
>@@ -1,3 +1,3 @@
>-MD5 (wargus-2.1-src.tar.gz) = 571363cc79c5c532c48f31ad5c06398d
>-SHA256 (wargus-2.1-src.tar.gz) = cfd920660fc801eab7bc0c261447067d10a4f66b991655dcb78a41b745ddee78
>-SIZE (wargus-2.1-src.tar.gz) = 542211
>+MD5 (wargus-2.2.2-src.tar.gz) = 7cbcfd055fbff964ea2143975c5cd87f
>+SHA256 (wargus-2.2.2-src.tar.gz) = b451d6a46ab501e29648cac3eedf91552fd2ccdd9093f229d36d77ea84dc816b
>+SIZE (wargus-2.2.2-src.tar.gz) = 574443
>Index: wargus/pkg-plist
>===================================================================
>RCS file: /home/pcvs/ports/games/wargus/pkg-plist,v
>retrieving revision 1.2
>diff -u -r1.2 pkg-plist
>--- wargus/pkg-plist	10 Nov 2004 08:42:25 -0000	1.2
>+++ wargus/pkg-plist	27 Feb 2007 02:07:35 -0000
>@@ -1,57 +1,57 @@
> bin/wargus
> %%DATADIR%%/build.sh
>-%%DATADIR%%/campaigns/human-exp/levelx01h.cm
>-%%DATADIR%%/campaigns/human-exp/levelx02h.cm
>-%%DATADIR%%/campaigns/human-exp/levelx03h.cm
>-%%DATADIR%%/campaigns/human-exp/levelx04h.cm
>-%%DATADIR%%/campaigns/human-exp/levelx05h.cm
>-%%DATADIR%%/campaigns/human-exp/levelx06h.cm
>-%%DATADIR%%/campaigns/human-exp/levelx07h.cm
>-%%DATADIR%%/campaigns/human-exp/levelx08h.cm
>-%%DATADIR%%/campaigns/human-exp/levelx09h.cm
>-%%DATADIR%%/campaigns/human-exp/levelx10h.cm
>-%%DATADIR%%/campaigns/human-exp/levelx11h.cm
>-%%DATADIR%%/campaigns/human-exp/levelx12h.cm
>-%%DATADIR%%/campaigns/human/level01h.cm
>-%%DATADIR%%/campaigns/human/level02h.cm
>-%%DATADIR%%/campaigns/human/level03h.cm
>-%%DATADIR%%/campaigns/human/level04h.cm
>-%%DATADIR%%/campaigns/human/level05h.cm
>-%%DATADIR%%/campaigns/human/level06h.cm
>-%%DATADIR%%/campaigns/human/level07h.cm
>-%%DATADIR%%/campaigns/human/level08h.cm
>-%%DATADIR%%/campaigns/human/level09h.cm
>-%%DATADIR%%/campaigns/human/level10h.cm
>-%%DATADIR%%/campaigns/human/level11h.cm
>-%%DATADIR%%/campaigns/human/level12h.cm
>-%%DATADIR%%/campaigns/human/level13h.cm
>-%%DATADIR%%/campaigns/human/level14h.cm
>-%%DATADIR%%/campaigns/orc-exp/levelx01o.cm
>-%%DATADIR%%/campaigns/orc-exp/levelx02o.cm
>-%%DATADIR%%/campaigns/orc-exp/levelx03o.cm
>-%%DATADIR%%/campaigns/orc-exp/levelx04o.cm
>-%%DATADIR%%/campaigns/orc-exp/levelx05o.cm
>-%%DATADIR%%/campaigns/orc-exp/levelx06o.cm
>-%%DATADIR%%/campaigns/orc-exp/levelx07o.cm
>-%%DATADIR%%/campaigns/orc-exp/levelx08o.cm
>-%%DATADIR%%/campaigns/orc-exp/levelx09o.cm
>-%%DATADIR%%/campaigns/orc-exp/levelx10o.cm
>-%%DATADIR%%/campaigns/orc-exp/levelx11o.cm
>-%%DATADIR%%/campaigns/orc-exp/levelx12o.cm
>-%%DATADIR%%/campaigns/orc/level01o.cm
>-%%DATADIR%%/campaigns/orc/level02o.cm
>-%%DATADIR%%/campaigns/orc/level03o.cm
>-%%DATADIR%%/campaigns/orc/level04o.cm
>-%%DATADIR%%/campaigns/orc/level05o.cm
>-%%DATADIR%%/campaigns/orc/level06o.cm
>-%%DATADIR%%/campaigns/orc/level07o.cm
>-%%DATADIR%%/campaigns/orc/level08o.cm
>-%%DATADIR%%/campaigns/orc/level09o.cm
>-%%DATADIR%%/campaigns/orc/level10o.cm
>-%%DATADIR%%/campaigns/orc/level11o.cm
>-%%DATADIR%%/campaigns/orc/level12o.cm
>-%%DATADIR%%/campaigns/orc/level13o.cm
>-%%DATADIR%%/campaigns/orc/level14o.cm
>+%%DATADIR%%/campaigns/human-exp/levelx01h_c.sms
>+%%DATADIR%%/campaigns/human-exp/levelx02h_c.sms
>+%%DATADIR%%/campaigns/human-exp/levelx03h_c.sms
>+%%DATADIR%%/campaigns/human-exp/levelx04h_c.sms
>+%%DATADIR%%/campaigns/human-exp/levelx05h_c.sms
>+%%DATADIR%%/campaigns/human-exp/levelx06h_c.sms
>+%%DATADIR%%/campaigns/human-exp/levelx07h_c.sms
>+%%DATADIR%%/campaigns/human-exp/levelx08h_c.sms
>+%%DATADIR%%/campaigns/human-exp/levelx09h_c.sms
>+%%DATADIR%%/campaigns/human-exp/levelx10h_c.sms
>+%%DATADIR%%/campaigns/human-exp/levelx11h_c.sms
>+%%DATADIR%%/campaigns/human-exp/levelx12h_c.sms
>+%%DATADIR%%/campaigns/human/level01h_c.sms
>+%%DATADIR%%/campaigns/human/level02h_c.sms
>+%%DATADIR%%/campaigns/human/level03h_c.sms
>+%%DATADIR%%/campaigns/human/level04h_c.sms
>+%%DATADIR%%/campaigns/human/level05h_c.sms
>+%%DATADIR%%/campaigns/human/level06h_c.sms
>+%%DATADIR%%/campaigns/human/level07h_c.sms
>+%%DATADIR%%/campaigns/human/level08h_c.sms
>+%%DATADIR%%/campaigns/human/level09h_c.sms
>+%%DATADIR%%/campaigns/human/level10h_c.sms
>+%%DATADIR%%/campaigns/human/level11h_c.sms
>+%%DATADIR%%/campaigns/human/level12h_c.sms
>+%%DATADIR%%/campaigns/human/level13h_c.sms
>+%%DATADIR%%/campaigns/human/level14h_c.sms
>+%%DATADIR%%/campaigns/orc-exp/levelx01o_c.sms
>+%%DATADIR%%/campaigns/orc-exp/levelx02o_c.sms
>+%%DATADIR%%/campaigns/orc-exp/levelx03o_c.sms
>+%%DATADIR%%/campaigns/orc-exp/levelx04o_c.sms
>+%%DATADIR%%/campaigns/orc-exp/levelx05o_c.sms
>+%%DATADIR%%/campaigns/orc-exp/levelx06o_c.sms
>+%%DATADIR%%/campaigns/orc-exp/levelx07o_c.sms
>+%%DATADIR%%/campaigns/orc-exp/levelx08o_c.sms
>+%%DATADIR%%/campaigns/orc-exp/levelx09o_c.sms
>+%%DATADIR%%/campaigns/orc-exp/levelx10o_c.sms
>+%%DATADIR%%/campaigns/orc-exp/levelx11o_c.sms
>+%%DATADIR%%/campaigns/orc-exp/levelx12o_c.sms
>+%%DATADIR%%/campaigns/orc/level01o_c.sms
>+%%DATADIR%%/campaigns/orc/level02o_c.sms
>+%%DATADIR%%/campaigns/orc/level03o_c.sms
>+%%DATADIR%%/campaigns/orc/level04o_c.sms
>+%%DATADIR%%/campaigns/orc/level05o_c.sms
>+%%DATADIR%%/campaigns/orc/level06o_c.sms
>+%%DATADIR%%/campaigns/orc/level07o_c.sms
>+%%DATADIR%%/campaigns/orc/level08o_c.sms
>+%%DATADIR%%/campaigns/orc/level09o_c.sms
>+%%DATADIR%%/campaigns/orc/level10o_c.sms
>+%%DATADIR%%/campaigns/orc/level11o_c.sms
>+%%DATADIR%%/campaigns/orc/level12o_c.sms
>+%%DATADIR%%/campaigns/orc/level13o_c.sms
>+%%DATADIR%%/campaigns/orc/level14o_c.sms
> %%DATADIR%%/contrib/cross.png
> %%DATADIR%%/contrib/food.png
> %%DATADIR%%/contrib/health.png
>@@ -63,6 +63,8 @@
> %%DATADIR%%/contrib/score.png
> %%DATADIR%%/contrib/stratagus.png
> %%DATADIR%%/contrib/toccata.mod.gz
>+%%DATADIR%%/contrib/wargus.ico
>+%%DATADIR%%/contrib/wargus.png
> %%DATADIR%%/maps/multi/(3)little-ambush.pud.gz
> %%DATADIR%%/maps/multi/(3)little-ambush.txt
> %%DATADIR%%/maps/multi/(4)4-corners.pud.gz
>@@ -71,7 +73,6 @@
> %%DATADIR%%/maps/multi/(4)4-isl.txt
> %%DATADIR%%/maps/multi/(4)chop-the-trees.pud.gz
> %%DATADIR%%/maps/multi/(4)chop-the-trees.txt
>-%%DATADIR%%/maps/multi/(4)civ-decadente-v17.pud.gz
> %%DATADIR%%/maps/multi/(4)criss_cross.pud.gz
> %%DATADIR%%/maps/multi/(4)criss_cross2.pud.gz
> %%DATADIR%%/maps/multi/(4)criss_cross2.txt
>@@ -97,13 +98,15 @@
> %%DATADIR%%/scripts/ai/sea_attack.lua
> %%DATADIR%%/scripts/anim.lua
> %%DATADIR%%/scripts/buttons.lua
>-%%DATADIR%%/scripts/campaigns.lua
> %%DATADIR%%/scripts/cheats.lua
>+%%DATADIR%%/scripts/commands.lua
> %%DATADIR%%/scripts/constructions.lua
> %%DATADIR%%/scripts/credits.lua
> %%DATADIR%%/scripts/editor.lua
> %%DATADIR%%/scripts/fonts.lua
>+%%DATADIR%%/scripts/guichan.lua
> %%DATADIR%%/scripts/helpers.lua
>+%%DATADIR%%/scripts/human/anim.lua
> %%DATADIR%%/scripts/human/buttons.lua
> %%DATADIR%%/scripts/human/campaign1.lua
> %%DATADIR%%/scripts/human/campaign2.lua
>@@ -114,7 +117,21 @@
> %%DATADIR%%/scripts/icons.lua
> %%DATADIR%%/scripts/keystrokes.lua
> %%DATADIR%%/scripts/menus.lua
>+%%DATADIR%%/scripts/menus/campaign.lua
>+%%DATADIR%%/scripts/menus/credits.lua
>+%%DATADIR%%/scripts/menus/diplomacy.lua
>+%%DATADIR%%/scripts/menus/endscenario.lua
>+%%DATADIR%%/scripts/menus/game.lua
>+%%DATADIR%%/scripts/menus/help.lua
>+%%DATADIR%%/scripts/menus/load.lua
>+%%DATADIR%%/scripts/menus/network.lua
>+%%DATADIR%%/scripts/menus/objectives.lua
>+%%DATADIR%%/scripts/menus/options.lua
>+%%DATADIR%%/scripts/menus/replay.lua
>+%%DATADIR%%/scripts/menus/results.lua
>+%%DATADIR%%/scripts/menus/save.lua
> %%DATADIR%%/scripts/missiles.lua
>+%%DATADIR%%/scripts/orc/anim.lua
> %%DATADIR%%/scripts/orc/buttons.lua
> %%DATADIR%%/scripts/orc/campaign1.lua
> %%DATADIR%%/scripts/orc/campaign2.lua
>@@ -123,6 +140,7 @@
> %%DATADIR%%/scripts/orc/units.lua
> %%DATADIR%%/scripts/orc/upgrade.lua
> %%DATADIR%%/scripts/ranks.lua
>+%%DATADIR%%/scripts/scripts.lua
> %%DATADIR%%/scripts/sound.lua
> %%DATADIR%%/scripts/spells.lua
> %%DATADIR%%/scripts/stratagus.lua
>@@ -136,9 +154,11 @@
> %%DATADIR%%/scripts/units.lua
> %%DATADIR%%/scripts/upgrade.lua
> %%DATADIR%%/scripts/wc2.lua
>+%%DATADIR%%/scripts/widgets.lua
> %%DATADIR%%/wartool
> @dirrm %%DATADIR%%/scripts/tilesets
> @dirrm %%DATADIR%%/scripts/orc
>+@dirrm %%DATADIR%%/scripts/menus
> @dirrm %%DATADIR%%/scripts/human
> @dirrm %%DATADIR%%/scripts/ai
> @dirrm %%DATADIR%%/scripts
>Index: wargus/files/patch-Makefile
>===================================================================
>RCS file: wargus/files/patch-Makefile
>diff -N wargus/files/patch-Makefile
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ wargus/files/patch-Makefile	27 Feb 2007 02:07:35 -0000
>@@ -0,0 +1,22 @@
>+--- ./Makefile.orig	Sun Jan 14 21:40:52 2007
>++++ ./Makefile	Mon Feb 26 14:31:39 2007
>+@@ -1,11 +1,11 @@
>+ 
>+-CC = gcc
>++CC ?= gcc
>+ 
>+ CROSSDIR = /usr/local/cross
>+ STRATAGUSPATH = ../stratagus/
>+ 
>+-CFLAGS = -I/usr/local/include -Wall -Wsign-compare
>+-LDFLAGS = -lz -lpng -lm -L/usr/local/lib
>++CFLAGS += -I$(LOCALBASE)/include -Wall -Wsign-compare
>++LDFLAGS += -lz -lpng -lm -L$(LOCALBASE)/lib
>+ 
>+ all: wartool pudconvert
>+ 
>+@@ -47,3 +47,4 @@
>+ 	for i in `cat .list`; do echo $$i; done | cpio -pdml --quiet wargus-$(ver);\
>+ 	tar -zcf wargus-$(ver)-linux.tar.gz wargus-$(ver); \
>+ 	rm -rf wargus-$(ver) .list stratagus;
>++
>Index: wargus/files/pkg-message.in
>===================================================================
>RCS file: /home/pcvs/ports/games/wargus/files/pkg-message.in,v
>retrieving revision 1.2
>diff -u -r1.2 pkg-message.in
>--- wargus/files/pkg-message.in	13 Oct 2005 18:13:16 -0000	1.2
>+++ wargus/files/pkg-message.in	27 Feb 2007 02:07:35 -0000
>@@ -1,7 +1,8 @@
>--------------------------------------------------------------------------------
>-The Wargus tool has been installed to %%PREFIX%%/share/wargus/
>+------------------------------------------------------------------------------
> 
>-You can now use this tool to extract Warcraft 2 data for use with the 
>+The Wargus tool has been installed to "%%DATADIR%%".
>+
>+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)
>@@ -12,13 +13,14 @@
> * German Expansion
> * Spanish Original
> 
>-If you have one of the above CDs mounted on /cdrom, su to root and change to 
>-the %%PREFIX%%/share/wargus/ directory and try executing: 
>+If you have one of the above CDs mounted on /cdrom, 'su' to root, change to
>+the "%%DATADIR%%" directory and try executing:
>+
>+$ ./build.sh -p /cdrom
> 
>-./build.sh -p /cdrom
>+After your Warcraft 2 data has been successfully extracted, run 'wargus' as
>+the user you intend to play the game with.
> 
>-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/
> 
>-For more information, please visit: http://wargus.sourceforge.net
>--------------------------------------------------------------------------------
>+------------------------------------------------------------------------------
>Index: wargus/files/wargus.in
>===================================================================
>RCS file: /home/pcvs/ports/games/wargus/files/wargus.in,v
>retrieving revision 1.4
>diff -u -r1.4 wargus.in
>--- wargus/files/wargus.in	13 Oct 2005 18:13:16 -0000	1.4
>+++ wargus/files/wargus.in	27 Feb 2007 02:07:35 -0000
>@@ -6,46 +6,17 @@
> #
> # 2004 Travis Poppe <tlp@LiquidX.org>
> 
>-DATADIR=%%PREFIX%%/share/wargus/data.wc2
>-
>-if [ ! -d $DATADIR ]; then
>-	echo "Warcraft 2 data not found in $DATADIR/"
>-	echo ""
>-	echo "Did you run build.sh yet?"
>-	echo ""
>-	echo "Giving you instructions in 5 seconds..."
>-	sleep 5
>-	echo ""
>-	echo "The Wargus tool has been installed to %%PREFIX%%/share/wargus/"
>-	echo ""
>-	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)"
>-	echo "* US Original (both MAC/DOS)"
>-	echo "* UK/Australian Original"
>-	echo "* UK/Australian Expansion"
>-	echo "* German Original"
>-	echo "* German Expansion"
>-	echo "* Spanish Original"
>-	echo ""
>-	echo "If you have one of the above CDs mounted on /cdrom, su to root and change to"
>-	echo "the %%PREFIX%%/share/wargus/ directory and try executing:"
>-	echo ""
>-	echo "./build.sh -p /cdrom"
>- 	echo ""
>-	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"
>-	exit
>-fi
>+DATADIR="%%DATADIR%%/data.wc2"
> 
> if [ -d $DATADIR ]; then
>-	echo "Warcraft 2 data found in $DATADIR/"
>+	echo "Running Stratagus with Warcraft 2 data found in \"$DATADIR\"."
>+	echo ""
>+	exec stratagus -d $DATADIR "$@"
>+else
>+	echo "ERROR: Warcraft 2 data not found in \"$DATADIR\"."
> 	echo ""
>-	echo "Attempting to run Stratagus with Warcraft 2 data"
>+	echo "Please follow the instructions from the installation message:"
> 	echo ""
>-	stratagus -d $DATADIR $*
>-	exit
>+	pkg_info -D "wargus-[0-9]*"
>+	exit 1
> fi

Actions: View | Diff

Attachments on bug 109587: 75944