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

[Alexey Dokuchaev]

Author: danfe
Date: Sun May 12 08:06:32 2013
New Revision: 317934
URL: http://svnweb.freebsd.org/changeset/ports/317934

Log:
  If port is setting PKGNAMEPREFIX=${FOOPKGNAMEPREFIX}, but .include's this
  file before <bsd.port.options.mk>, options handling gets broken because
  options will be loaded from OPTIONSFILE which is based on UNIQUENAME and
  thus PKGNAMEPREFIX, which is empty at that point.  Prevent this: ensure
  that FOOPKGNAMEPREFIX is defined in advance for ports that use it to set
  their PKGNAMEPREFIX and having OPTIONS.

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 06:35:05 2013	(r317933)
+++ head/games/doom-data/Makefile.include	Sun May 12 08:06:32 2013	(r317934)
@@ -3,6 +3,10 @@
 DMPKGNAMEPREFIX?=	doom-
 DMDIR?=		${LOCALBASE}/share/doom
 
+.if ${PKGNAMEPREFIX} == ${DMPKGNAMEPREFIX} && defined(OPTIONSMKINCLUDED)
+.  error include before <bsd.port.options.mk> if using DMPKGNAMEPREFIX
+.endif
+
 MAKE_ENV+=	DMDIR="${DMDIR}"
 PLIST_SUB+=	DMDIR="${DMDIR:S/${LOCALBASE}\///}"
 SUB_LIST+=	DMDIR="${DMDIR}"

Modified: head/games/duke3d-data/Makefile.include
==============================================================================
--- head/games/duke3d-data/Makefile.include	Sun May 12 06:35:05 2013	(r317933)
+++ head/games/duke3d-data/Makefile.include	Sun May 12 08:06:32 2013	(r317934)
@@ -16,6 +16,10 @@
 DN3DPKGNAMEPREFIX?=	duke3d-
 DN3DDIR?=	${LOCALBASE}/share/duke3d
 
+.if ${PKGNAMEPREFIX} == ${DN3DPKGNAMEPREFIX} && defined(OPTIONSMKINCLUDED)
+.  error include before <bsd.port.options.mk> if using DN3DPKGNAMEPREFIX
+.endif
+
 MAKE_ENV+=	DN3DDIR="${DN3DDIR}"
 PLIST_SUB+=	DN3DDIR="${DN3DDIR:S/${LOCALBASE}\///}"
 SUB_LIST+=	DN3DDIR="${DN3DDIR}"

Modified: head/games/quake-data/Makefile.include
==============================================================================
--- head/games/quake-data/Makefile.include	Sun May 12 06:35:05 2013	(r317933)
+++ head/games/quake-data/Makefile.include	Sun May 12 08:06:32 2013	(r317934)
@@ -4,6 +4,10 @@
 Q1PKGNAMEPREFIX?=	quake-
 Q1DIR?=		${LOCALBASE}/share/quake
 
+.if ${PKGNAMEPREFIX} == ${Q1PKGNAMEPREFIX} && defined(OPTIONSMKINCLUDED)
+.  error include before <bsd.port.options.mk> if using Q1PKGNAMEPREFIX
+.endif
+
 MAKE_ENV+=	Q1DIR="${Q1DIR}"
 PLIST_SUB+=	Q1DIR="${Q1DIR:S/${LOCALBASE}\///}"
 SUB_LIST+=	Q1DIR="${Q1DIR}"

Modified: head/games/quake2-data/Makefile.include
==============================================================================
--- head/games/quake2-data/Makefile.include	Sun May 12 06:35:05 2013	(r317933)
+++ head/games/quake2-data/Makefile.include	Sun May 12 08:06:32 2013	(r317934)
@@ -11,7 +11,7 @@
 # Q2DIR			- The Quake II data directory (also added to
 #			  MAKE_ENV, PLIST_SUB, and SUB_LIST)
 #
-# Some notes for making such kind of ports:
+# Some notes for making this kind of ports:
 #
 # - The game engines should be modified to add ${Q2DIR} as the first search
 #   path (it's a stack so new paths override previous ones), and add
@@ -42,12 +42,16 @@
 #   it as an option (off by default). If the engine is not compatible with
 #   the game.so files provided by the ports then ignore this rule.
 #
-# For the examples please see existing ports.
+# For the examples, please see existing ports.
 #
 
 Q2PKGNAMEPREFIX?=	quake2-
 Q2DIR?=		${LOCALBASE}/share/quake2
 
+.if ${PKGNAMEPREFIX} == ${Q2PKGNAMEPREFIX} && defined(OPTIONSMKINCLUDED)
+.  error include before <bsd.port.options.mk> if using Q2PKGNAMEPREFIX
+.endif
+
 MAKE_ENV+=	Q2DIR="${Q2DIR}"
 PLIST_SUB+=	Q2DIR="${Q2DIR:S/${LOCALBASE}\///}"
 SUB_LIST+=	Q2DIR="${Q2DIR}"

Modified: head/games/quake3-data/Makefile.include
==============================================================================
--- head/games/quake3-data/Makefile.include	Sun May 12 06:35:05 2013	(r317933)
+++ head/games/quake3-data/Makefile.include	Sun May 12 08:06:32 2013	(r317934)
@@ -4,6 +4,10 @@
 Q3PKGNAMEPREFIX?=	quake3-
 Q3DIR?=		${LOCALBASE}/share/quake3
 
+.if ${PKGNAMEPREFIX} == ${Q3PKGNAMEPREFIX} && defined(OPTIONSMKINCLUDED)
+.  error include before <bsd.port.options.mk> if using Q3PKGNAMEPREFIX
+.endif
+
 MAKE_ENV+=	Q3DIR="${Q3DIR}"
 PLIST_SUB+=	Q3DIR="${Q3DIR:S/${LOCALBASE}\///}"
 SUB_LIST+=	Q3DIR="${Q3DIR}"