svn commit: r311427 - head/lang/ghc

[Gabor Pali]

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 at 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