From owner-svn-ports-head@FreeBSD.ORG  Wed Oct 17 09:07:27 2012
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 637C3ABC;
 Wed, 17 Oct 2012 09:07:27 +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 4C46E8FC16;
 Wed, 17 Oct 2012 09:07:27 +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 q9H97RHW036687;
 Wed, 17 Oct 2012 09:07:27 GMT (envelope-from pgj@svn.freebsd.org)
Received: (from pgj@localhost)
 by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9H97RUb036685;
 Wed, 17 Oct 2012 09:07:27 GMT (envelope-from pgj@svn.freebsd.org)
Message-Id: <201210170907.q9H97RUb036685@svn.freebsd.org>
From: Gabor Pali <pgj@FreeBSD.org>
Date: Wed, 17 Oct 2012 09:07:27 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r306005 - head/net-p2p/jigdo
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: Wed, 17 Oct 2012 09:07:27 -0000

Author: pgj
Date: Wed Oct 17 09:07:26 2012
New Revision: 306005
URL: http://svn.freebsd.org/changeset/ports/306005

Log:
  - Convert options to the new format
  
  PR:		ports/172549
  Submitted by:	pgj
  Approved by:	maintainer
  Feature safe:	yes

Modified:
  head/net-p2p/jigdo/Makefile

Modified: head/net-p2p/jigdo/Makefile
==============================================================================
--- head/net-p2p/jigdo/Makefile	Wed Oct 17 09:03:39 2012	(r306004)
+++ head/net-p2p/jigdo/Makefile	Wed Oct 17 09:07:26 2012	(r306005)
@@ -1,9 +1,5 @@
-# ports collection makefile for:	jigdo
-# Date created:				23 July 2002
-# Whom:					Attila Nagy <bra@fsn.hu>
-#
+# Created by: Attila Nagy <bra@fsn.hu>
 # $FreeBSD$
-#
 
 PORTNAME=	jigdo
 PORTVERSION=	0.7.3
@@ -26,13 +22,15 @@ WITH_BDB_VER?=	43
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 
-OPTIONS=	GUI "Build the gtk2 gui" off \
-		BDB "Build with Berkeley DB support (for jigdo-file cache)" on \
-		NLS "Native Language Support" on
+OPTIONS_DEFINE=		GUI BDB NLS
+OPTIONS_DEFAULT=	BDB NLS
 
-.include <bsd.port.pre.mk>
+GUI_DESC=		Build the gtk2 gui
+BDB_DESC=		Build with Berkeley DB support (for jigdo-file cache)
 
-.if defined(WITH_GUI)
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MGUI}
 CONFIGURE_ARGS+=	--with-gui
 LIB_DEPENDS+=	gtk-x11-2.0:${PORTSDIR}/x11-toolkits/gtk20 \
 		curl:${PORTSDIR}/ftp/curl
@@ -43,7 +41,7 @@ CONFIGURE_ARGS+=--without-gui
 PLIST_SUB+=	GUI="@comment "
 .endif
 
-.if !defined(WITHOUT_BDB)
+.if ${PORT_OPTIONS:MBDB}
 CONFIGURE_ENV+=	LIBS=-L${BDB_LIB_DIR}
 CPPFLAGS+=	-I${BDB_INCLUDE_DIR}
 CONFIGURE_ARGS+=--with-libdb=-l${BDB_LIB_CXX_NAME}
@@ -52,7 +50,7 @@ USE_BDB=	${WITH_BDB_VER}
 CONFIGURE_ARGS+=--without-libdb
 .endif
 
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
 USE_GETTEXT=	yes
 CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	NLS=""
@@ -64,4 +62,4 @@ PLIST_SUB+=	NLS="@comment "
 post-install:
 	@${STRIP_CMD} ${PREFIX}/bin/jigdo-file
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>