From stolz@i2.informatik.rwth-aachen.de  Wed Feb 18 05:20:42 2004
Return-Path: <stolz@i2.informatik.rwth-aachen.de>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 8157016A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 18 Feb 2004 05:20:42 -0800 (PST)
Received: from atlas.informatik.rwth-aachen.de (atlas.Informatik.RWTH-Aachen.DE [137.226.194.2])
	by mx1.FreeBSD.org (Postfix) with ESMTP id C384443D2D
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 18 Feb 2004 05:20:41 -0800 (PST)
	(envelope-from stolz@i2.informatik.rwth-aachen.de)
Received: from menelaos.informatik.rwth-aachen.de (menelaos.Informatik.RWTH-Aachen.DE [137.226.194.73])
	by atlas.informatik.rwth-aachen.de (8.11.3/8.11.3/SuSE Linux 8.11.1-0.5-michaelw-20030918) with ESMTP id i1IDKem31707
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 18 Feb 2004 14:20:40 +0100
Received: (from stolz@localhost)
	by menelaos.informatik.rwth-aachen.de (8.12.10/8.12.10/Submit) id i1IDKeVK013699;
	Wed, 18 Feb 2004 14:20:40 +0100 (CET)
	(envelope-from stolz)
Message-Id: <200402181320.i1IDKeVK013699@menelaos.informatik.rwth-aachen.de>
Date: Wed, 18 Feb 2004 14:20:40 +0100 (CET)
From: Volker Stolz <stolz@i2.informatik.rwth-aachen.de>
Reply-To: Volker Stolz <stolz@i2.informatik.rwth-aachen.de>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [patch] games/uhexen: Unbreak, OPTIONS & PLISTify (bento)
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         63012
>Category:       ports
>Synopsis:       [patch] games/uhexen: Unbreak, OPTIONS & PLISTify (bento)
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Feb 18 05:30:12 PST 2004
>Closed-Date:    Mon Feb 23 13:13:58 PST 2004
>Last-Modified:  Mon Feb 23 13:13:58 PST 2004
>Originator:     Volker Stolz
>Release:        FreeBSD 4.9-STABLE i386
>Organization:
Lehrstuhl fr Informatik II
>Environment:
System: FreeBSD menelaos.informatik.rwth-aachen.de 4.9-STABLE FreeBSD 4.9-STABLE #12: Mon Dec 8 15:14:27 CET 2003 root@menelaos.informatik.rwth-aachen.de:/usr/obj/usr/src/sys/MENELAOS i386


>Description:
- Fix PLIST
- Use PLIST_* while here
- Use OPTIONS while here. The old option is kept for backwards
    compatibility.

Noticed by: bento/kris
>How-To-Repeat:
http://bento.freebsd.org/errorlogs/i386-5-latest/uhexen-0.601_1.log
>Fix:
Removed file: pkg-plist

--- uhexen begins here ---
diff -urN /usr/ports/games/uhexen/Makefile uhexen/Makefile
--- /usr/ports/games/uhexen/Makefile	Wed Feb 11 14:24:11 2004
+++ uhexen/Makefile	Wed Feb 18 14:08:49 2004
@@ -19,29 +19,38 @@
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Yet another port of Hexen, popular game from Raven Softrware
 
+OPTIONS=	NOWAD "Don't install WAD file" off
+
+USE_SDL=	mixer sdl
+USE_X_PREFIX=	yes
+USE_GMAKE=	yes
+
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_NOWAD)
+WITHOUT_WAD=	yes
+.endif
+
 .if !defined(WITHOUT_WAD)
 EXTRACT_DEPENDS=unzip:${PORTSDIR}/archivers/unzip
 .endif
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+PLIST_FILES=	bin/uhexen %%DATADIR%%/.keep_me %%WAD%%%%DATADIR%%/hexen.wad
+PLIST_DIRS=	%%DATADIR%%
 
-USE_SDL=	mixer sdl
-USE_X_PREFIX=	yes
-USE_GMAKE=	yes
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 .if defined(WITHOUT_WAD)
-PLIST_SUB=	WAD:="@comment "
+PLIST_SUB=	WAD="@comment "
 .else
-PLIST_SUB=	WAD:=""
+PLIST_SUB=	WAD=""
 .endif
 
-BROKEN=		"Broken pkg-plist"
-
 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 @@
 .endif
 	${TOUCH} ${DATADIR}/.keep_me
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
--- uhexen ends here ---
>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: pav 
State-Changed-When: Mon Feb 23 13:13:51 PST 2004 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=63012 
>Unformatted:
