From owner-svn-ports-all@FreeBSD.ORG  Sat Feb  2 13:29:09 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 3A0EF9A2;
 Sat,  2 Feb 2013 13:29:09 +0000 (UTC) (envelope-from pgj@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 17004167;
 Sat,  2 Feb 2013 13:29:09 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r12DT8u0059153;
 Sat, 2 Feb 2013 13:29:08 GMT (envelope-from pgj@svn.freebsd.org)
Received: (from pgj@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r12DT82H059151;
 Sat, 2 Feb 2013 13:29:08 GMT (envelope-from pgj@svn.freebsd.org)
Message-Id: <201302021329.r12DT82H059151@svn.freebsd.org>
From: Gabor Pali <pgj@FreeBSD.org>
Date: Sat, 2 Feb 2013 13:29:08 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r311427 - head/lang/ghc
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 <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 02 Feb 2013 13:29:09 -0000

Author: pgj
Date: Sat Feb  2 13:29:08 2013
New Revision: 311427
URL: http://svnweb.freebsd.org/changeset/ports/311427

Log:
  - PKGNAMEPREFIX must appear earlier for bsd.cabal.mk consumers otherwise
    their options are mishandled
  
  Reported by:	sperber
  Obtained from:	FreeBSD Haskell

Modified:
  head/lang/ghc/bsd.cabal.mk
  head/lang/ghc/bsd.cabal.options.mk

Modified: head/lang/ghc/bsd.cabal.mk
==============================================================================
--- head/lang/ghc/bsd.cabal.mk	Sat Feb  2 13:16:30 2013	(r311426)
+++ head/lang/ghc/bsd.cabal.mk	Sat Feb  2 13:29:08 2013	(r311427)
@@ -9,9 +9,6 @@
 # Maintained by: haskell@FreeBSD.org
 #
 
-HSPREFIX=	hs-
-PKGNAMEPREFIX?=	${HSPREFIX}
-
 .if !defined(METAPORT)
 MASTER_SITES?=	http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/
 .else

Modified: head/lang/ghc/bsd.cabal.options.mk
==============================================================================
--- head/lang/ghc/bsd.cabal.options.mk	Sat Feb  2 13:16:30 2013	(r311426)
+++ head/lang/ghc/bsd.cabal.options.mk	Sat Feb  2 13:29:08 2013	(r311427)
@@ -10,6 +10,9 @@
 
 CABALOPTIONSMKINCLUDED=	yes
 
+HSPREFIX=		hs-
+PKGNAMEPREFIX?=		${HSPREFIX}
+
 LOCALBASE?=	/usr/local
 GHC_CMD?=	${LOCALBASE}/bin/ghc
 HADDOCK_CMD?=	${LOCALBASE}/bin/haddock