- Remove PKGMESSAGE override (SUB_FILES does that).

- Fix OPTIONS handling.
- Remove USE_REINPLACE.
- Bump PORTREVISION.

Approved by:	garga (mentor)

2 files changed, 3 insertions, 4 deletions

diff --git a/games/quake3-data/Makefile b/games/quake3-data/Makefile
index c258cf3d1352..375e8d04fbfb 100644
--- a/games/quake3-data/Makefile
+++ b/games/quake3-data/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	data
 DISTVERSION=	1.32b-3
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_IDSOFTWARE}
 MASTER_SITE_SUBDIR=	quake3/linux
@@ -25,7 +26,6 @@ OPTIONS=	TEAMARENA "Install Quake III Team Arena data files" on
 DATADIR=	${Q3DIR}
 
 SUB_FILES=	pkg-message
-PKGMESSAGE=	${WRKDIR}/pkg-message
 
 do-extract:
 	@${RM} -rf ${WRKDIR}
@@ -37,7 +37,7 @@ do-extract:
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_TEAMARENA)
+.if !defined(WITHOUT_TEAMARENA)
 PLIST_SUB+=	TEAMARENA=""
 .else
 PLIST_SUB+=	TEAMARENA="@comment "
@@ -48,7 +48,7 @@ do-install:
 	@${CP} -R ${WRKSRC}/baseq3 ${DATADIR}
 	@${MKDIR} ${PREFIX}/share/pixmaps
 	@${INSTALL_DATA} ${WRKSRC}/quake3.xpm ${PREFIX}/share/pixmaps
-.if defined(WITH_TEAMARENA)
+.if !defined(WITHOUT_TEAMARENA)
 	@${CP} -R ${WRKSRC}/missionpack ${DATADIR}
 .endif
 
diff --git a/games/quake3-data/Makefile.include b/games/quake3-data/Makefile.include
index e2a071493c47..798e545a4268 100644
--- a/games/quake3-data/Makefile.include
+++ b/games/quake3-data/Makefile.include
@@ -23,7 +23,6 @@ RUN_DEPENDS+=	${Q3DIR}/baseq3/pak1.pk3:${PORTSDIR}/games/quake3-data
 .   if defined(USE_ZIP)
 EXTRACT_BEFORE_ARGS=	-aqo
 .   else
-USE_REINPLACE=	yes
 pre-patch:
 	@${FIND} ${WRKDIR} -type f -print0 | \
 		${XARGS} -0 ${FILE} | ${GREP} 'CRLF' | \