From owner-svn-ports-head@FreeBSD.ORG Sun Mar 17 13:30:39 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id D5A847C5; Sun, 17 Mar 2013 13:30:39 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id BB7D3179; Sun, 17 Mar 2013 13:30:39 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2HDUdK1008174; Sun, 17 Mar 2013 13:30:39 GMT (envelope-from danfe@svn.freebsd.org) Received: (from danfe@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2HDUcV1008168; Sun, 17 Mar 2013 13:30:38 GMT (envelope-from danfe@svn.freebsd.org) Message-Id: <201303171330.r2HDUcV1008168@svn.freebsd.org> From: Alexey Dokuchaev Date: Sun, 17 Mar 2013 13:30:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r314433 - in head/games: quake2-rogue quake2-rogue/files quake2-xatrix quake2-xatrix/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Mar 2013 13:30:39 -0000 Author: danfe Date: Sun Mar 17 13:30:38 2013 New Revision: 314433 URL: http://svnweb.freebsd.org/changeset/ports/314433 Log: Cleanup Makefiles, port descriptions and message files for two official Quake II mission pack ports, and remove gratuitous differences between them. Modified: head/games/quake2-rogue/Makefile head/games/quake2-rogue/files/pkg-message.in head/games/quake2-rogue/pkg-descr head/games/quake2-xatrix/Makefile head/games/quake2-xatrix/files/pkg-message.in head/games/quake2-xatrix/pkg-descr Modified: head/games/quake2-rogue/Makefile ============================================================================== --- head/games/quake2-rogue/Makefile Sun Mar 17 13:27:42 2013 (r314432) +++ head/games/quake2-rogue/Makefile Sun Mar 17 13:30:38 2013 (r314433) @@ -1,9 +1,5 @@ -# New ports collection makefile for: quake2-rogue -# Date created: 26 Jul 2006 -# Whom: alepulver -# +# Created by: Alejandro Pulver # $FreeBSD$ -# PORTNAME= rogue PORTVERSION= 3.20 @@ -15,36 +11,28 @@ DISTNAME= ${PORTNAME}src${PORTVERSION:S/ EXTRACT_SUFX= .shar.Z MAINTAINER= danfe@FreeBSD.org -COMMENT= Quake II Ground Zero (Rogue) Mission Pack +COMMENT= Quake II: Ground Zero (Rogue) official mission pack NO_WRKSUBDIR= yes - -LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME} +SUB_FILES= pkg-message PLIST_FILES= %%Q2DIR%%/${PORTNAME}/game.so PLIST_DIRS= %%Q2DIR%%/${PORTNAME} -SUB_FILES= pkg-message - -.include "${.CURDIR}/../quake2-data/Makefile.include" - -.include - do-extract: @${MKDIR} ${WRKDIR} - @cd ${WRKDIR} && \ - uncompress -c ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} | \ + @cd ${WRKDIR} && uncompress -c ${DISTDIR}/${DISTFILES} | \ ${TAIL} +454 | ${SH} post-extract: @${CP} ${FILESDIR}/${MAKEFILE} ${WRKSRC} post-patch: - @${REINPLACE_CMD} -e '/#include /d' ${WRKSRC}/g_local.h + @${REINPLACE_CMD} -e '/#include /d' ${WRKSRC}/g_local.h @${REINPLACE_CMD} -e 's/__linux__/__unix__/' ${WRKSRC}/q_shared.[ch] do-install: - ${MKDIR} ${Q2DIR}/${PORTNAME} + @${MKDIR} ${Q2DIR}/${PORTNAME} ${INSTALL_PROGRAM} ${WRKSRC}/game.so ${Q2DIR}/${PORTNAME} post-install: @@ -52,4 +40,5 @@ post-install: @${CAT} ${PKGMESSAGE} @${ECHO_CMD} -.include +.include "${.CURDIR}/../quake2-data/Makefile.include" +.include Modified: head/games/quake2-rogue/files/pkg-message.in ============================================================================== --- head/games/quake2-rogue/files/pkg-message.in Sun Mar 17 13:27:42 2013 (r314432) +++ head/games/quake2-rogue/files/pkg-message.in Sun Mar 17 13:30:38 2013 (r314433) @@ -2,7 +2,7 @@ To complete the installation of this port you need to copy the file "rogue/pak0.pak" and the directory "rogue/video" with its contents from the -original Quake II: Ground Zero (Rogue) Mission Pack distribution to -"%%Q2DIR%%/rogue". +original Quake II: Ground Zero (Rogue) mission pack distribution to +%%Q2DIR%%/rogue. ============================================================================== Modified: head/games/quake2-rogue/pkg-descr ============================================================================== --- head/games/quake2-rogue/pkg-descr Sun Mar 17 13:27:42 2013 (r314432) +++ head/games/quake2-rogue/pkg-descr Sun Mar 17 13:30:38 2013 (r314433) @@ -1,19 +1,20 @@ -Quake II: Ground Zero (Rogue) Mission Pack. +This is the second official Quake II expansion: Ground Zero (also known as +Rogue, as developed by Rogue Entertainment). Take out the Big Gun sounded simple enough, except the Strogg were waiting. -You, and a few marines like you, are the lucky ones. You've made it down in -one piece and are still able to contact the fleet. The Gravity Well, the -Strogg's newest weapon in its arsenal against mankind, is operational. With +You, and a few marines like you, are the lucky ones. You've made it down in +one piece and are still able to contact the fleet. The Gravity Well, the +Strogg's newest weapon in its arsenal against mankind, is operational. With the fleet around Stroggos, 5% of ground forces surviving, and that number -dwindling by the second, your orders have change: free your comrades. Destroy -the Gravity Well. +dwindling by the second, your orders have change: free your comrades. +Destroy the Gravity Well. -- New Enemies -- The Stalker, Turrets, Daedalus, Medic Commander, Carrier, and - the Black Widow. -- 14 Entirely new levels and 10 new deathmatch levels. -- New Power-Ups -- Deathmatch specific power-ups: Vengeance Sphere, Hunter - Sphere, and Anti-matter bomb. -- New Weapons -- The Chainsaw, ETF Rifle and Plasma Beam. + - New enemies -- The Stalker, Turrets, Daedalus, Medic Commander, Carrier, + and the Black Widow. + - 14 entirely new levels and 10 new deathmatch levels + - New power-ups -- deathmatch specific power-ups: Vengeance Sphere, Hunter + Sphere, and Anti-matter bomb + - New weapons -- The Chainsaw, ETF Rifle, and Plasma Beam This port installs the game.so file, but you still need the original data. Modified: head/games/quake2-xatrix/Makefile ============================================================================== --- head/games/quake2-xatrix/Makefile Sun Mar 17 13:27:42 2013 (r314432) +++ head/games/quake2-xatrix/Makefile Sun Mar 17 13:30:38 2013 (r314433) @@ -1,9 +1,5 @@ -# New ports collection makefile for: quake2-xatrix -# Date created: 26 Jul 2006 -# Whom: alepulver -# +# Created by: Alejandro Pulver # $FreeBSD$ -# PORTNAME= xatrix PORTVERSION= 3.20 @@ -15,25 +11,17 @@ DISTNAME= ${PORTNAME}src${PORTVERSION:S/ EXTRACT_SUFX= .shar.Z MAINTAINER= danfe@FreeBSD.org -COMMENT= Quake II: The Reckoning (Xatrix) Mission Pack +COMMENT= Quake II: The Reckoning (Xatrix) official mission pack NO_WRKSUBDIR= yes - -LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME} +SUB_FILES= pkg-message PLIST_FILES= %%Q2DIR%%/${PORTNAME}/game.so PLIST_DIRS= %%Q2DIR%%/${PORTNAME} -SUB_FILES= pkg-message - -.include "${.CURDIR}/../quake2-data/Makefile.include" - -.include - do-extract: @${MKDIR} ${WRKDIR} - @cd ${WRKDIR} && \ - uncompress -c ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} | \ + @cd ${WRKDIR} && uncompress -c ${DISTDIR}/${DISTFILES} | \ ${TAIL} +441 | ${SH} post-extract: @@ -43,7 +31,7 @@ post-patch: @${REINPLACE_CMD} -e 's/__linux__/__unix__/' ${WRKSRC}/q_shared.[ch] do-install: - ${MKDIR} ${Q2DIR}/${PORTNAME} + @${MKDIR} ${Q2DIR}/${PORTNAME} ${INSTALL_PROGRAM} ${WRKSRC}/game.so ${Q2DIR}/${PORTNAME} post-install: @@ -51,4 +39,5 @@ post-install: @${CAT} ${PKGMESSAGE} @${ECHO_CMD} -.include +.include "${.CURDIR}/../quake2-data/Makefile.include" +.include Modified: head/games/quake2-xatrix/files/pkg-message.in ============================================================================== --- head/games/quake2-xatrix/files/pkg-message.in Sun Mar 17 13:27:42 2013 (r314432) +++ head/games/quake2-xatrix/files/pkg-message.in Sun Mar 17 13:30:38 2013 (r314433) @@ -1,8 +1,8 @@ ============================================================================== To complete the installation of this port you need to copy the file -"xatrix/pak0.pak" and the directory "xatrix/video" with its contents from the -original Quake II: The Reckoning (Xatrix) Mission Pack distribution to -"%%Q2DIR%%/xatrix". +"xatrix/pak0.pak" and the directory "xatrix/video" with its contents from +the original Quake II: The Reckoning (Xatrix) mission pack distribution to +%%Q2DIR%%/xatrix. ============================================================================== Modified: head/games/quake2-xatrix/pkg-descr ============================================================================== --- head/games/quake2-xatrix/pkg-descr Sun Mar 17 13:27:42 2013 (r314432) +++ head/games/quake2-xatrix/pkg-descr Sun Mar 17 13:30:38 2013 (r314433) @@ -1,14 +1,15 @@ -Quake II: The Reckoning (Xatrix) Mission Pack. +This is the first official Quake II expansion: The Reckoning (also known as +Xatrix, as developed by Xatrix Entertainment). -You are part of an elite commando foce that must infiltrate a hostile alien -cite. Once inside, you must scour industrial landscapes, crawl through +You are part of an elite commando force that must infiltrate a hostile alien +cite. Once inside, you must scour industrial landscapes, crawl through waterways and air ducts, navigate treacherous canyons teeming with vicious -mutants, stow away on an alien spacecraft, and destroy the enemy's secret moon -base. +mutants, stow away on an alien spacecraft, and destroy the enemy's secret +moon base. This mission pack features: -- 18 Arduous Levels to Conquer. -- Added Weapons. -- New Enemies. + - 18 arduous levels to conquer + - Added weapons + - New enemies This port installs the game.so file, but you still need the original data.