Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 3 Aug 2012 03:45:16 +0000 (UTC)
From:      Gabor Pali <pgj@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r301933 - head/lang/ohugs
Message-ID:  <201208030345.q733jGeV067125@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: pgj
Date: Fri Aug  3 03:45:16 2012
New Revision: 301933
URL: http://svn.freebsd.org/changeset/ports/301933

Log:
  - Use the new options framework
  
  Obtained from:	FreeBSD Haskell

Modified:
  head/lang/ohugs/Makefile

Modified: head/lang/ohugs/Makefile
==============================================================================
--- head/lang/ohugs/Makefile	Fri Aug  3 03:44:20 2012	(r301932)
+++ head/lang/ohugs/Makefile	Fri Aug  3 03:45:16 2012	(r301933)
@@ -6,7 +6,7 @@
 
 PORTNAME=	ohugs
 PORTVERSION=	0.5
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	lang haskell
 MASTER_SITES=	http://www.math.chalmers.se/~nordland/ohugs/
 DISTNAME=	${PORTNAME}-${PORTVERSION}.src
@@ -14,8 +14,12 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}.src
 MAINTAINER=	haskell@FreeBSD.org
 COMMENT=	Interpreter for Haskell with object-oriented features
 
+OPTIONS_DEFINE=		X11
+
+.include <bsd.port.options.mk>
+
 LIB_DEPENDS=	readline.6:${PORTSDIR}/devel/readline
-.if !defined(WITHOUT_X11)
+.if empty(PORT_OPTIONS:MX11)
 LIB_DEPENDS=	Tix8.4.3.0:${PORTSDIR}/x11-toolkits/tix
 .endif
 
@@ -23,7 +27,7 @@ WRKSRC=		${WRKDIR}/${DISTNAME:S/.src//}
 BUILD_WRKSRC=	${WRKSRC}/src
 USE_BISON=	build
 LDFLAGS+=	-lm -lreadline -ltermcap
-.if !defined(WITHOUT_X11)
+.if empty(PORT_OPTIONS:MX11)
 USE_TK=		84+
 CFLAGS+=	-I${TK_INCLUDEDIR} -I${TCL_INCLUDEDIR} -I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib -ltk${TK_VER:S/.//} -ltcl${TCL_VER:S/.//} -lTix8.4.3
@@ -31,11 +35,9 @@ LDFLAGS+=	-L${LOCALBASE}/lib -ltk${TK_VE
 MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
 		INSTBIN=${PREFIX}/bin INSTLIB=${PREFIX}/lib/ohugs
 
-.include <bsd.port.pre.mk>
-
 post-patch:
-.if defined(WITHOUT_X11)
+.if empty(PORT_OPTIONS:MX11)
 	@${PATCH} ${PATCH_ARGS} < ${FILESDIR}/extra-patch-src::prelude.h
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201208030345.q733jGeV067125>