- Complete the rename of games/warzone2100 to games/warzone.

PR:		ports/102398

7 files changed, 2 insertions, 93 deletions

diff --git a/games/Makefile b/games/Makefile
index 55197794d51..8233a3dc21b 100644
--- a/games/Makefile
+++ b/games/Makefile
@@ -726,7 +726,7 @@
     SUBDIR += wargus
     SUBDIR += warsow
     SUBDIR += warsow-data
-    SUBDIR += warzone2100
+    SUBDIR += warzone
     SUBDIR += wesnoth
     SUBDIR += wmeyes
     SUBDIR += wmfortune
diff --git a/games/warzone/Makefile b/games/warzone/Makefile
index 61635a8097a..efad4a62f2c 100644
--- a/games/warzone/Makefile
+++ b/games/warzone/Makefile
@@ -5,11 +5,10 @@
 # $FreeBSD$
 #
 
-PORTNAME=	warzone2100
+PORTNAME=	warzone
 PORTVERSION=	2.0.3
 CATEGORIES=	games
 MASTER_SITES=	http://download.gna.org/warzone/releases/2.0/
-DISTNAME=	warzone-${PORTVERSION}
 
 MAINTAINER=	alepulver@FreeBSD.org
 COMMENT=	Innovative 3D real-time strategy game
@@ -34,8 +33,6 @@ CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
 		LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib" \
 		LIBS="${PTHREAD_LIBS}"
 
-DATADIR=	${PREFIX}/share/warzone
-
 post-patch:
 	@${REINPLACE_CMD} -e '/stdint.h/d' ${WRKSRC}/lib/ivis_opengl/screen.c
 	@${REINPLACE_CMD} -e 's|-m32||' \
diff --git a/games/warzone2100/Makefile b/games/warzone2100/Makefile
deleted file mode 100644
index 61635a8097a..00000000000
--- a/games/warzone2100/Makefile
+++ /dev/null
@@ -1,55 +0,0 @@
-# New ports collection makefile for:	warzone2100
-# Date created:				21 Aug 2005
-# Whom:					Alejandro Pulver <alejandro@varnet.biz>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	warzone2100
-PORTVERSION=	2.0.3
-CATEGORIES=	games
-MASTER_SITES=	http://download.gna.org/warzone/releases/2.0/
-DISTNAME=	warzone-${PORTVERSION}
-
-MAINTAINER=	alepulver@FreeBSD.org
-COMMENT=	Innovative 3D real-time strategy game
-
-BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip
-LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
-		mad.2:${PORTSDIR}/audio/libmad \
-		ogg.5:${PORTSDIR}/audio/libogg \
-		openal.0:${PORTSDIR}/audio/openal \
-		physfs-1.0.1:${PORTSDIR}/devel/physfs \
-		png.5:${PORTSDIR}/graphics/png \
-		vorbis.3:${PORTSDIR}/audio/libvorbis
-
-USE_BZIP2=	yes
-USE_BISON=	yes
-USE_GL=		yes
-USE_SDL=	net sdl
-
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--program-transform-name=""
-CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
-		LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib" \
-		LIBS="${PTHREAD_LIBS}"
-
-DATADIR=	${PREFIX}/share/warzone
-
-post-patch:
-	@${REINPLACE_CMD} -e '/stdint.h/d' ${WRKSRC}/lib/ivis_opengl/screen.c
-	@${REINPLACE_CMD} -e 's|-m32||' \
-		-e 's|/usr/local|${LOCALBASE}|; s|/usr/X11R6|${X11BASE}|' \
-		${WRKSRC}/configure
-.for f in configure *.c *.h
-	@${FIND} ${WRKSRC} -type f -name "${f}" -print0 | \
-		${XARGS} -0 ${REINPLACE_CMD} -e 's|SDL/||'
-.endfor
-
-.if !defined(NOPORTDOCS)
-post-install:
-	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
-.endif
-
-.include <bsd.port.mk>
diff --git a/games/warzone2100/distinfo b/games/warzone2100/distinfo
deleted file mode 100644
index 8768b95f71b..00000000000
--- a/games/warzone2100/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (warzone-2.0.3.tar.bz2) = 2396e0def69e5e48902448d04944927a
-SHA256 (warzone-2.0.3.tar.bz2) = 7668f6b794faad8d7ae66dbd0c7317df2521b33593f29174ab3fecb647326749
-SIZE (warzone-2.0.3.tar.bz2) = 19902273
diff --git a/games/warzone2100/files/patch-src__game.c b/games/warzone2100/files/patch-src__game.c
deleted file mode 100644
index 36a9d5503fa..00000000000
--- a/games/warzone2100/files/patch-src__game.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/game.c.bak	Thu Aug 17 18:52:11 2006
-+++ src/game.c	Thu Aug 17 18:52:44 2006
-@@ -2832,7 +2832,7 @@
- 	aFileName[strlen(aFileName) - 4] = '\0';
- 
- 	//create dir will fail if directory already exists but don't care!
--	(void) PHYSFS_mkdir(aFileName);
-+	(void) PHYSFS_mkdir(unix_path(aFileName));
- 
- 	//save the map file
- 	strcat(aFileName, "/");
diff --git a/games/warzone2100/pkg-descr b/games/warzone2100/pkg-descr
deleted file mode 100644
index c22cf0226aa..00000000000
--- a/games/warzone2100/pkg-descr
+++ /dev/null
@@ -1,13 +0,0 @@
-Warzone 2100 was an innovative 3D real-time strategy game back in 1999, and
-most will agree it didn't enjoy the commercial success it should have had. The
-game's source code was liberated on December 6th, 2004, under a GPL license
-(see COPYING in this directory for details). Soon after that, the Warzone 2100
-ReDev project was formed to take care of its future.
-
-Our goal is to make warzone run on all possible platforms. Therefore, we
-stripped the original code of all proprietary technologies and replaced them
-with cross-platform and free equivalents, like OpenGL, OpenAL, etc... Right
-now, Warzone 2100 works very well on Windows and GNU/Linux, and we have even
-heard of it running on BSD with no particular issue.
-
-WWW: http://wz.rootzilla.de/site/
diff --git a/games/warzone2100/pkg-plist b/games/warzone2100/pkg-plist
deleted file mode 100644
index 6006146bbb7..00000000000
--- a/games/warzone2100/pkg-plist
+++ /dev/null
@@ -1,6 +0,0 @@
-bin/warzone
-%%DATADIR%%/mp.wz
-%%DATADIR%%/warzone.wz
-%%PORTDOCS%%%%DOCSDIR%%/README
-@dirrm %%DATADIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%