- Improve OPTIONS handling; sort things around the Makefile a bit

- Reformat port description so the right edge is not that ragged (fmt -w 77)
- Relinquish to the pool; port is stable enough to fly solo

2 files changed, 24 insertions, 23 deletions

diff --git a/games/tremulous/Makefile b/games/tremulous/Makefile
index 471dffa4e0f4..848ed2829810 100644
--- a/games/tremulous/Makefile
+++ b/games/tremulous/Makefile
@@ -7,7 +7,7 @@ PORTREVISION=	9
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:R}
 
-MAINTAINER=	danfe@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Free FPS game featuring two opposing teams: humans and aliens
 
 LICENSE=	GPLv2
@@ -19,12 +19,15 @@ MAKE_ENV=	DEFAULT_BASEDIR="${DATADIR}" PTHREAD_LIBS="${PTHREAD_LIBS}"
 WRKSRC=		${WRKDIR}/${PORTNAME}
 BUILD_WRKSRC=	${WRKSRC}/${DISTNAME}-src
 
-OPTIONS_DEFINE=		GAMELIBS MASTER_SERVER OPENAL OPENAL_DLOPEN \
-			OPTIMIZED_CFLAGS SDL_AUDIO SDL_VIDEO VORBIS
-OPTIONS_MULTI=		TYPE
-OPTIONS_MULTI_TYPE=	CLIENT DEDICATED SMP_CLIENT
+VM_ARCHS=	amd64 i386
+
+OPTIONS_DEFINE=		GAMELIBS OPENAL OPENAL_DLOPEN OPTIMIZED_CFLAGS \
+			SDL_AUDIO SDL_VIDEO VORBIS
+OPTIONS_MULTI=		FLAVOR
+OPTIONS_MULTI_FLAVOR=	CLIENT DEDICATED SMP_CLIENT MASTER_SERVER
 OPTIONS_DEFAULT=	CLIENT DEDICATED OPTIMIZED_CFLAGS SMP_CLIENT
 
+FLAVOR_DESC=		Clients and servers
 CLIENT_DESC=		Build client
 GAMELIBS_DESC=		Force building game libraries
 DEDICATED_DESC=		Build dedicated server
@@ -34,8 +37,6 @@ SDL_AUDIO_DESC=		Use SDL for audio
 SDL_VIDEO_DESC=		Use SDL for video
 SMP_CLIENT_DESC=	Build SMP (threaded) client
 
-VM_ARCHS=	amd64 i386
-
 .include <bsd.port.options.mk>
 
 .for arch in ${ARCH}
diff --git a/games/tremulous/pkg-descr b/games/tremulous/pkg-descr
index 27e0d8f0dd58..353a5596eb24 100644
--- a/games/tremulous/pkg-descr
+++ b/games/tremulous/pkg-descr
@@ -1,21 +1,21 @@
 Tremulous is a free, open source game that blends a team based FPS with
-elements of an RTS. Players can choose from 2 unique races, aliens and humans.
-Players on both teams are able to build working structures in-game like an
-RTS. These structures provide many functions, the most important being
-spawning. The designated builders must ensure there are spawn structures or
-other players will not be able to rejoin the game after death. Other
-structures provide automated base defense (to some degree), healing functions
-and much more...
+elements of an RTS.  Players can choose from 2 unique races: aliens and
+humans.  Players on both teams are able to build working structures in-game
+like an RTS.  These structures provide many functions, the most important
+being spawning.  The designated builders must ensure there are spawn
+structures or other players will not be able to rejoin the game after death.
+Other structures provide automated base defense (to some degree), healing
+functions, and much more.
 
-Player advancement is different depending on which team you are on. As a
-human, players are rewarded with credits for each alien kill. These credits
-may be used to purchase new weapons and upgrades from the "Armoury". The alien
-team advances quite differently. Upon killing a human foe, the alien is able
-to evolve into a new class. The more kills gained the more powerful the
-classes available.
+Player advancement is different depending on which team you are on.  As a
+human, players are rewarded with credits for each alien kill.  These credits
+may be used to purchase new weapons and upgrades from the "Armoury".  The
+alien team advances quite differently.  Upon killing a human foe, the alien
+is able to evolve into a new class.  The more kills gained the more powerful
+the classes available.
 
-The overall objective behind Tremulous is to eliminate the opposing team. This
-is achieved by not only killing the opposing players but also removing their
-ability to respawn by destroying their spawn structures.
+The overall objective behind Tremulous is to eliminate the opposing team.
+This is achieved by not only killing the opposing players but also removing
+their ability to respawn by destroying their spawn structures.
 
 WWW: http://www.tremulous.net/