From 22ac137ba106297b5a5e33a59c9e33f5d7f01036 Mon Sep 17 00:00:00 2001
From: kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059>
Date: Thu, 6 Jun 2013 16:09:58 +0000
Subject: Sync with ports, mostly OptionsNG conversion and some diff
 reductions.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@18518 df743ca5-7f9a-e211-a948-0013205c9059
---
 www/epiphany3/Makefile | 36 ++++++++++++++----------------------
 1 file changed, 14 insertions(+), 22 deletions(-)

(limited to 'www/epiphany3/Makefile')

diff --git a/www/epiphany3/Makefile b/www/epiphany3/Makefile
index a9de90883..96a26977e 100644
--- a/www/epiphany3/Makefile
+++ b/www/epiphany3/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
 
 MAINTAINER=	gnome@FreeBSD.org
-COMMENT?=	An extremely lightweight and simple web browser for GNOME 3
+COMMENT?=	Extremely lightweight and simple web browser for GNOME 3
 
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \
 		gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas \
@@ -31,10 +31,10 @@ CONFLICTS=	epiphany-2.[0-9]*
 LATEST_LINK=	epiphany3
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
-USES=		gettext pathfix pkgconfig desktop-file-utils
 USE_XZ=		yes
 USE_PYTHON=	yes
-USE_SQLITE=	yes
+USE_SQLITE=	3
+USES=		desktop-file-utils gettext pathfix pkgconfig
 USE_GNOME=	gnomeprefix intlhack gnomedocutils libxml2
 USE_XORG=	ice x11 sm
 GNU_CONFIGURE=	yes
@@ -54,43 +54,35 @@ PLIST_SUB+=	EPHY_VERSION="${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}"
 
 MAN1=		epiphany.1
 
-OPTIONS=	NSS "Import passwords from 2.26 and older on first run" off \
-		AVAHI "Enable zeroconf bookmark support" on \
-		SPELLCHECK "Enable spell checking by default" on \
-		SEED "Enable seed (JavaScript) support" on
+OPTIONS_DEFINE=	AVAHI NSS SPELLCHECK SEED
+OPTIONS_DEFAULT=AVAHI NSS SPELLCHECK
+NSS_DESC=	Import passwords from 2.26 and older
+SPELLCHECK_DESC=Enable spell checking by default
+SEED_DESC=	Seed (JavaScript) support
 
-.if defined(PACKAGE_BUILDING)
-.undef WITHOUT_GNOME
-WITH_GNOME=	yes
-.endif
-
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-NO_WERROR=	yes
-# allow build with more warnings enabled
-.if defined(NO_WERROR)
 CONFIGURE_ARGS+=	--enable-compile-warnings=no
-.endif
 
-.if defined(WITH_NSS)
+.if ${PORT_OPTIONS:MNSS}
 LIB_DEPENDS+=	nss3:${PORTSDIR}/security/nss
 CONFIGURE_ARGS+=--enable-nss
 .else
 CONFIGURE_ARGS+=--disable-nss
 .endif
 
-.if defined(WITH_AVAHI)
+.if ${PORT_OPTIONS:MAVAHI}
 LIB_DEPENDS+=	avahi-gobject:${PORTSDIR}/net/avahi-app
 .else
 CONFIGURE_ARGS+=--disable-zeroconf
 .endif
 
-.if defined(WITH_SEED)
+.if ${PORT_OPTIONS:MSEED}
 LIB_DEPENDS+=	seed-gtk3:${PORTSDIR}/devel/seed3
 CONFIGURE_ARGS+=--enable-seed
 .endif
 
-.if defined(WITH_SPELLCHECK)
+.if ${PORT_OPTIONS:MSPELLCHECK}
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-embed_ephy-embed-prefs.c
 .endif
 
@@ -101,4 +93,4 @@ post-patch:
 	    	s|-ldl"$$|"|g' \
 		${WRKSRC}/configure
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
-- 
cgit v1.2.3