From owner-svn-ports-head@FreeBSD.ORG  Sun Jan  6 11:13:14 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@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 953F2723;
 Sun,  6 Jan 2013 11:13:14 +0000 (UTC)
 (envelope-from mandree@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 6F742AB9;
 Sun,  6 Jan 2013 11:13:14 +0000 (UTC)
Received: from svn.freebsd.org (svn.FreeBSD.org [8.8.178.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r06BDEn7015816;
 Sun, 6 Jan 2013 11:13:14 GMT (envelope-from mandree@svn.freebsd.org)
Received: (from mandree@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r06BDEYq015815;
 Sun, 6 Jan 2013 11:13:14 GMT (envelope-from mandree@svn.freebsd.org)
Message-Id: <201301061113.r06BDEYq015815@svn.freebsd.org>
From: Matthias Andree <mandree@FreeBSD.org>
Date: Sun, 6 Jan 2013 11:13:14 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r309977 - head/mail/bogofilter
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 06 Jan 2013 11:13:14 -0000

Author: mandree
Date: Sun Jan  6 11:13:13 2013
New Revision: 309977
URL: http://svnweb.freebsd.org/changeset/ports/309977

Log:
  Convert to Options NG.
  Clean up Makefile header.

Modified:
  head/mail/bogofilter/Makefile

Modified: head/mail/bogofilter/Makefile
==============================================================================
--- head/mail/bogofilter/Makefile	Sun Jan  6 10:50:51 2013	(r309976)
+++ head/mail/bogofilter/Makefile	Sun Jan  6 11:13:13 2013	(r309977)
@@ -1,9 +1,5 @@
-# ports collection Makefile for: bogofilter
-# Whom:		Matthias Andree <matthias.andree@gmx.de>
-# Date created:	2002-10-17
-#
+# Created by: Matthias Andree <matthias.andree@gmx.de>
 # $FreeBSD$
-#
 
 PORTNAME=	bogofilter
 PORTVERSION=	1.2.3
@@ -19,8 +15,10 @@ COMMENT=	Fast, teachable, learning spam 
 USE_BDB=	41+
 .endif
 
-OPTIONS=	GSL     "Link with system-wide GSL dynamically (recommended)" on
-OPTIONS+=	UNICODE "Normalize tokens to Unicode (UTF-8)" on
+OPTIONS_DEFINE=		GSL UNICODE
+OPTIONS_DEFAULT=	GSL UNICODE
+GSL_DESC=		Link with system-wide GSL dynamically (recommended)
+UNICODE_DESC=		Normalize tokens to Unicode (UTF-8) (recommended)
 
 CONFLICTS_INSTALL?=	bogofilter-sqlite-[0-9]* bogofilter-qdbm-[0-9]* bogofilter-tc-[0-9]* [a-z][a-z]-bogofilter-[0-9]*
 
@@ -40,13 +38,13 @@ BROKEN=		Fails to package on sparc64: fa
 BF_LIBS?=		-l${BDB_LIB_NAME}
 BF_CPPFLAGS?=		-I${BDB_INCLUDE_DIR} -I${LOCALBASE}/include
 CONFIGURE_ARGS+=	--sysconfdir=${PREFIX}/etc
-.if !defined(WITHOUT_UNICODE)
+.if ${PORT_OPTIONS:MUNICODE}
 CONFIGURE_ARGS+=	--enable-unicode
 USE_ICONV=		yes
 BF_LIBS+=		-liconv
 .endif
-.if !defined(WITHOUT_GSL)
-LIB_DEPENDS+=		gsl.16:${PORTSDIR}/math/gsl
+.if ${PORT_OPTIONS:MGSL}
+LIB_DEPENDS+=		gsl:${PORTSDIR}/math/gsl
 .else
 CONFIGURE_ARGS+=	--with-included-gsl
 .endif
@@ -66,7 +64,7 @@ post-patch:
 	${REINPLACE_CMD} -e 's/INTEGRITY_TESTS = t.lock1 t.lock3 t.valgrind/INTEGRITY_TESTS = t.lock1/' \
 		${WRKSRC}/src/tests/Makefile.in
 
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 PORTDOCS=	*
 PLIST_SUB=	CONTRIB="@comment "
 .else
@@ -78,7 +76,7 @@ post-build::
 
 post-install::
 	@${MKDIR} ${DOCSDIR}/contrib
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 .for i in html programmer xml
 	@${MKDIR} ${DOCSDIR}/${i}
 .endfor