From owner-svn-ports-all@FreeBSD.ORG  Tue Mar 26 07:46:54 2013
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:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 456AC99A;
 Tue, 26 Mar 2013 07:46:54 +0000 (UTC)
 (envelope-from bapt@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 1E39E3DE;
 Tue, 26 Mar 2013 07:46:54 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2Q7ks2s063114;
 Tue, 26 Mar 2013 07:46:54 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2Q7krdG063113;
 Tue, 26 Mar 2013 07:46:53 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201303260746.r2Q7krdG063113@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Tue, 26 Mar 2013 07:46:53 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r315267 - head/french/verbiste
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/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: Tue, 26 Mar 2013 07:46:54 -0000

Author: bapt
Date: Tue Mar 26 07:46:53 2013
New Revision: 315267
URL: http://svnweb.freebsd.org/changeset/ports/315267

Log:
  Finish converting french to new options framework

Modified:
  head/french/verbiste/Makefile

Modified: head/french/verbiste/Makefile
==============================================================================
--- head/french/verbiste/Makefile	Tue Mar 26 07:43:14 2013	(r315266)
+++ head/french/verbiste/Makefile	Tue Mar 26 07:46:53 2013	(r315267)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	verbiste
-# Date created:				16 November 2005
-# Whom:					Dan Phillips <dan-ports@dp.id.au>
-#
+# Created by: Dan Phillips <dan-ports@dp.id.au>
 # $FreeBSD$
-#
 
 PORTNAME=	verbiste
 PORTVERSION=	0.1.33
@@ -13,15 +9,16 @@ MASTER_SITES=	http://perso.b2b2c.ca/sarr
 MAINTAINER=	dereckson@gmail.com
 COMMENT=	French verb conjugator/deconjugator
 
-OPTIONS=	GTK	"With GTK+ application"		no	\
-		GNOME	"With GNOME application"	no
+OPTIONS_DEFINE=	GTK2 GNOME
 
 LICENSE=	GPLv2
 
+USES=		pathfix
 USE_AUTOTOOLS=	libtool
-USE_GNOME=	gnomehack ltverhack libxml2
+USE_GNOME=	ltverhack libxml2
 USE_ICONV=	yes
 USE_LDCONFIG=	yes
+USE_PKGCONFIG=	build
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
@@ -30,9 +27,9 @@ MAN1=		french-conjugator.1 french-deconj
 MAN3=		verbiste.3
 MANLANG=	"" fr
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_GTK)
+.if ${PORT_OPTIONS:MGTK2}
 CONFIGURE_ARGS+=--with-gtk-app
 USE_GNOME+=	gtk20
 PLIST_SUB+=	HASGTK=""
@@ -40,7 +37,7 @@ PLIST_SUB+=	HASGTK=""
 PLIST_SUB+=	HASGTK="@comment "
 .endif
 
-.if defined(WITH_GNOME)
+.if ${PORT_OPTIONS:MGNOME}
 CONFIGURE_ARGS+=--with-gnome-app
 USE_GNOME+=	gnomeprefix libgnomeui
 PLIST_SUB+=	HASGNOME=""
@@ -48,7 +45,7 @@ PLIST_SUB+=	HASGNOME=""
 PLIST_SUB+=	HASGNOME="@comment "
 .endif
 
-.if defined(WITH_GTK) || defined(WITH_GNOME)
+.if ${PORT_OPTIONS:MGTK2} || ${PORT_OPTIONS:MGNOME}
 USE_GETTEXT=	yes
 PLIST_SUB+=	HASGUI=""
 .else
@@ -62,4 +59,4 @@ post-install:
 .endfor
 	${INSTALL_SCRIPT} ${WRKSRC}/examples/*.pl ${EXAMPLESDIR}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>