svn commit: r317936 - in head/games: doom-data duke3d-data quake-data quake2-data quake3-data

[Alexey Dokuchaev]

Author: danfe
Date: Sun May 12 08:39:29 2013
New Revision: 317936
URL: http://svnweb.freebsd.org/changeset/ports/317936

Log:
  Toughen the check and unbreak INDEX.

Modified:
  head/games/doom-data/Makefile.include
  head/games/duke3d-data/Makefile.include
  head/games/quake-data/Makefile.include
  head/games/quake2-data/Makefile.include
  head/games/quake3-data/Makefile.include

Modified: head/games/doom-data/Makefile.include
==============================================================================
--- head/games/doom-data/Makefile.include	Sun May 12 08:38:48 2013	(r317935)
+++ head/games/doom-data/Makefile.include	Sun May 12 08:39:29 2013	(r317936)
@@ -3,7 +3,7 @@
 DMPKGNAMEPREFIX?=	doom-
 DMDIR?=		${LOCALBASE}/share/doom
 
-.if ${PKGNAMEPREFIX} == ${DMPKGNAMEPREFIX} && defined(OPTIONSMKINCLUDED)
+.if defined(PKGNAMEPREFIX) && ${PKGNAMEPREFIX} == ${DMPKGNAMEPREFIX} && defined(OPTIONSMKINCLUDED)
 .  error include before <bsd.port.options.mk> if using DMPKGNAMEPREFIX
 .endif
 

Modified: head/games/duke3d-data/Makefile.include
==============================================================================
--- head/games/duke3d-data/Makefile.include	Sun May 12 08:38:48 2013	(r317935)
+++ head/games/duke3d-data/Makefile.include	Sun May 12 08:39:29 2013	(r317936)
@@ -16,7 +16,7 @@
 DN3DPKGNAMEPREFIX?=	duke3d-
 DN3DDIR?=	${LOCALBASE}/share/duke3d
 
-.if ${PKGNAMEPREFIX} == ${DN3DPKGNAMEPREFIX} && defined(OPTIONSMKINCLUDED)
+.if defined(PKGNAMEPREFIX) && ${PKGNAMEPREFIX} == ${DN3DPKGNAMEPREFIX} && defined(OPTIONSMKINCLUDED)
 .  error include before <bsd.port.options.mk> if using DN3DPKGNAMEPREFIX
 .endif
 

Modified: head/games/quake-data/Makefile.include
==============================================================================
--- head/games/quake-data/Makefile.include	Sun May 12 08:38:48 2013	(r317935)
+++ head/games/quake-data/Makefile.include	Sun May 12 08:39:29 2013	(r317936)
@@ -4,7 +4,7 @@
 Q1PKGNAMEPREFIX?=	quake-
 Q1DIR?=		${LOCALBASE}/share/quake
 
-.if ${PKGNAMEPREFIX} == ${Q1PKGNAMEPREFIX} && defined(OPTIONSMKINCLUDED)
+.if defined(PKGNAMEPREFIX) && ${PKGNAMEPREFIX} == ${Q1PKGNAMEPREFIX} && defined(OPTIONSMKINCLUDED)
 .  error include before <bsd.port.options.mk> if using Q1PKGNAMEPREFIX
 .endif
 

Modified: head/games/quake2-data/Makefile.include
==============================================================================
--- head/games/quake2-data/Makefile.include	Sun May 12 08:38:48 2013	(r317935)
+++ head/games/quake2-data/Makefile.include	Sun May 12 08:39:29 2013	(r317936)
@@ -48,7 +48,7 @@
 Q2PKGNAMEPREFIX?=	quake2-
 Q2DIR?=		${LOCALBASE}/share/quake2
 
-.if ${PKGNAMEPREFIX} == ${Q2PKGNAMEPREFIX} && defined(OPTIONSMKINCLUDED)
+.if defined(PKGNAMEPREFIX) && ${PKGNAMEPREFIX} == "${Q2PKGNAMEPREFIX}" && defined(OPTIONSMKINCLUDED)
 .  error include before <bsd.port.options.mk> if using Q2PKGNAMEPREFIX
 .endif
 

Modified: head/games/quake3-data/Makefile.include
==============================================================================
--- head/games/quake3-data/Makefile.include	Sun May 12 08:38:48 2013	(r317935)
+++ head/games/quake3-data/Makefile.include	Sun May 12 08:39:29 2013	(r317936)
@@ -4,7 +4,7 @@
 Q3PKGNAMEPREFIX?=	quake3-
 Q3DIR?=		${LOCALBASE}/share/quake3
 
-.if ${PKGNAMEPREFIX} == ${Q3PKGNAMEPREFIX} && defined(OPTIONSMKINCLUDED)
+.if defined(PKGNAMEPREFIX) && ${PKGNAMEPREFIX} == ${Q3PKGNAMEPREFIX} && defined(OPTIONSMKINCLUDED)
 .  error include before <bsd.port.options.mk> if using Q3PKGNAMEPREFIX
 .endif