From dfab67693fda780672553182b37c7eaccfca1da1 Mon Sep 17 00:00:00 2001
From: Pav Lucistnik <pav@FreeBSD.org>
Date: Mon, 23 Feb 2004 21:13:26 +0000
Subject: [PATCH] - Unbreak (fix pkg-plist) - Use PLIST_* - Use OPTIONS

PR:		ports/63012
Submitted by:	Volker Stolz <stolz@i2.informatik.rwth-aachen.de>
---
 games/uhexen/Makefile  | 33 +++++++++++++++++++++------------
 games/uhexen/pkg-plist |  4 ----
 2 files changed, 21 insertions(+), 16 deletions(-)
 delete mode 100644 games/uhexen/pkg-plist

diff --git a/games/uhexen/Makefile b/games/uhexen/Makefile
index 6b4785616641..f35f4638be85 100644
--- a/games/uhexen/Makefile
+++ b/games/uhexen/Makefile
@@ -19,29 +19,38 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Yet another port of Hexen, popular game from Raven Softrware
 
-.if !defined(WITHOUT_WAD)
-EXTRACT_DEPENDS=unzip:${PORTSDIR}/archivers/unzip
-.endif
-
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+OPTIONS=	NOWAD "Don't install WAD file" off
 
 USE_SDL=	mixer sdl
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 
-.if defined(WITHOUT_WAD)
-PLIST_SUB=	WAD:="@comment "
-.else
-PLIST_SUB=	WAD:=""
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_NOWAD)
+WITHOUT_WAD=	yes
 .endif
 
-BROKEN=		"Broken pkg-plist"
+.if !defined(WITHOUT_WAD)
+EXTRACT_DEPENDS=unzip:${PORTSDIR}/archivers/unzip
+.endif
+
+PLIST_FILES=	bin/uhexen %%DATADIR%%/.keep_me %%WAD%%%%DATADIR%%/hexen.wad
+PLIST_DIRS=	%%DATADIR%%
+
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+
+.if defined(WITHOUT_WAD)
+PLIST_SUB=	WAD="@comment "
+.else
+PLIST_SUB=	WAD=""
+.endif
 
 pre-everything::
 	@${ECHO} ""
 	@${ECHO} "You may use the following build options:"
 	@${ECHO} ""
-	@${ECHO} "      WITHOUT_WAD=yes   Don't install the wad file."
+	@${ECHO} "      WITH_NOWAD=yes   Don't install the wad file."
 	@${ECHO} ""
 
 post-extract:
@@ -58,4 +67,4 @@ do-install:
 .endif
 	${TOUCH} ${DATADIR}/.keep_me
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/games/uhexen/pkg-plist b/games/uhexen/pkg-plist
deleted file mode 100644
index c4b4999ec93f..000000000000
--- a/games/uhexen/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-bin/uhexen
-%%DATADIR%%/.keep_me
-%%WAD%%%%DATADIR%%/hexen.wad
-@dirrm %%DATADIR%%