From owner-svn-ports-all@FreeBSD.ORG  Fri Aug  3 02:32:11 2012
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:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 55F19106564A;
	Fri,  3 Aug 2012 02:32:11 +0000 (UTC) (envelope-from pgj@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 279AB8FC0A;
	Fri,  3 Aug 2012 02:32:11 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q732WBlg057707;
	Fri, 3 Aug 2012 02:32:11 GMT (envelope-from pgj@svn.freebsd.org)
Received: (from pgj@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q732WA0b057705;
	Fri, 3 Aug 2012 02:32:10 GMT (envelope-from pgj@svn.freebsd.org)
Message-Id: <201208030232.q732WA0b057705@svn.freebsd.org>
From: Gabor Pali <pgj@FreeBSD.org>
Date: Fri, 3 Aug 2012 02:32:10 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
	svn-ports-head@freebsd.org
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r301880 - head/devel/hs-drift
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/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: Fri, 03 Aug 2012 02:32:11 -0000

Author: pgj
Date: Fri Aug  3 02:32:10 2012
New Revision: 301880
URL: http://svn.freebsd.org/changeset/ports/301880

Log:
  - Use the new options framework
  - Drop support for GHC
  
  Obtained from:	FreeBSD Haskell

Modified:
  head/devel/hs-drift/Makefile

Modified: head/devel/hs-drift/Makefile
==============================================================================
--- head/devel/hs-drift/Makefile	Fri Aug  3 02:30:07 2012	(r301879)
+++ head/devel/hs-drift/Makefile	Fri Aug  3 02:32:10 2012	(r301880)
@@ -6,7 +6,7 @@
 
 PORTNAME=	drift
 PORTVERSION=	2.2.3
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	devel haskell
 MASTER_SITES=	http://repetae.net/computer/haskell/DrIFT/drop/
 PKGNAMEPREFIX=	hs-
@@ -15,18 +15,28 @@ DISTNAME=	DrIFT-${PORTVERSION}
 MAINTAINER=	haskell@FreeBSD.org
 COMMENT=	A type sensitive preprocessor for Haskell
 
-OPTIONS=	NHC98 "Build with nhc98" off \
-		GHC   "Build with ghc"   on
+OPTIONS_SINGLE=			COMPILER
+OPTIONS_SINGLE_COMPILER=	NHC98 GHC
+OPTIONS_DEFAULT=		GHC
 
-.include <bsd.port.pre.mk>
+NHC98_DESC=	Build with NHC98
+GHC_DESC=	Build with GHC
 
-.if !defined(WITH_NHC98)
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MGHC}
 BUILD_DEPENDS=	ghc:${PORTSDIR}/lang/ghc \
 		hs-random>=0:${PORTSDIR}/devel/hs-random
 LIB_DEPENDS=	gmp.10:${PORTSDIR}/math/gmp
-.else
+
+CONFIGURE_ARGS+=	--with-hc=ghc
+.endif
+
+.if ${PORT_OPTIONS:MNHC98}
 BUILD_DEPENDS=	nhc98:${PORTSDIR}/lang/nhc98
 BROKEN=		Does not build
+
+CONFIGURE_ARGS+=	--with-hc=nhc98
 .endif
 
 USE_GMAKE=	yes
@@ -35,20 +45,7 @@ GNU_CONFIGURE=	yes
 INFO=	drift
 PLIST_FILES=	bin/DrIFT bin/drift-ghc
 
-.if !defined(WITH_NHC98)
-CONFIGURE_ARGS+=	--with-hc=ghc
-.else
-CONFIGURE_ARGS+=	--with-hc=nhc98
-.endif
-
-.if !defined(WITH_GHC)
-pre-everything::
-	@${ECHO} ""
-	@${ECHO} " DrIFT will be build with ghc"
-	@${ECHO} " Define WITH_NHC98 to build with nhc98."
-	@${ECHO} ""
-
-.else
+.if ${PORT_OPTIONS:MGHC}
 post-patch:
 	@${REINPLACE_CMD} 's|import List|import Data.List| ; \
 		s|import Char|import Data.Char| ; \
@@ -63,4 +60,4 @@ post-patch:
 		`${FIND} ${WRKSRC} -name '*.*hs'`
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>