From owner-svn-ports-all@FreeBSD.ORG Sun May 12 08:06:33 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 99B8A52C; Sun, 12 May 2013 08:06:33 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 8B535F96; Sun, 12 May 2013 08:06:33 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4C86Xq8001724; Sun, 12 May 2013 08:06:33 GMT (envelope-from danfe@svn.freebsd.org) Received: (from danfe@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4C86W9X001716; Sun, 12 May 2013 08:06:32 GMT (envelope-from danfe@svn.freebsd.org) Message-Id: <201305120806.r4C86W9X001716@svn.freebsd.org> From: Alexey Dokuchaev Date: Sun, 12 May 2013 08:06:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r317934 - in head/games: doom-data duke3d-data quake-data quake2-data quake3-data X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 May 2013 08:06:33 -0000 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 , 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 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 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 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 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 if using Q3PKGNAMEPREFIX +.endif + MAKE_ENV+= Q3DIR="${Q3DIR}" PLIST_SUB+= Q3DIR="${Q3DIR:S/${LOCALBASE}\///}" SUB_LIST+= Q3DIR="${Q3DIR}"