From owner-svn-ports-head@FreeBSD.ORG  Sat Mar 16 17:33:55 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id BAC4DBAA;
 Sat, 16 Mar 2013 17:33:55 +0000 (UTC) (envelope-from kwm@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 AC35FA71;
 Sat, 16 Mar 2013 17:33:55 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2GHXtJ4043062;
 Sat, 16 Mar 2013 17:33:55 GMT (envelope-from kwm@svn.freebsd.org)
Received: (from kwm@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2GHXtsX043061;
 Sat, 16 Mar 2013 17:33:55 GMT (envelope-from kwm@svn.freebsd.org)
Message-Id: <201303161733.r2GHXtsX043061@svn.freebsd.org>
From: Koop Mast <kwm@FreeBSD.org>
Date: Sat, 16 Mar 2013 17:33:55 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r314378 - head/graphics/gimp-app
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: Sat, 16 Mar 2013 17:33:55 -0000

Author: kwm
Date: Sat Mar 16 17:33:54 2013
New Revision: 314378
URL: http://svnweb.freebsd.org/changeset/ports/314378

Log:
  Now that webkit-gtk2 was updated, reenable the helpbrowser plugin.

Modified:
  head/graphics/gimp-app/Makefile

Modified: head/graphics/gimp-app/Makefile
==============================================================================
--- head/graphics/gimp-app/Makefile	Sat Mar 16 17:17:37 2013	(r314377)
+++ head/graphics/gimp-app/Makefile	Sat Mar 16 17:33:54 2013	(r314378)
@@ -60,11 +60,10 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 
 .if !defined(GIMP_SLAVE)
 
-OPTIONS_DEFINE?=	AA DBUS LIBEXIF GHOSTSCRIPT GVFS JASPER \
+OPTIONS_DEFINE?=	AA DBUS LIBEXIF GHOSTSCRIPT GVFS HELPBROWSER JASPER \
 			LIBMNG LIBRSVG2 POPPLER SIMD WMF
-OPTIONS_DEFAULT=	AA DBUS LIBEXIF GVFS LIBMNG LIBRSVG2 \
+OPTIONS_DEFAULT=	AA DBUS LIBEXIF GVFS HELPBROWSER LIBMNG LIBRSVG2 \
 			POPPLER WMF
-# HELPBROWSER (default on) needs webkit 1.6+
 AA_DESC=		Ascii-art Plug-in
 HELPBROWSER_DESC=	Internal help browser
 
@@ -122,14 +121,14 @@ LIB_DEPENDS+=		curl:${PORTSDIR}/ftp/curl
 CONFIGURE_ARGS+=	--without-gvfs
 .endif
 
-#.if ${PORT_OPTIONS:MHELPBROWSER}
-#LIB_DEPENDS+=		webkitgtk-1.0:${PORTSDIR}/www/webkit-gtk2
-#CONFIGURE_ARGS+=	--with-webkit
-#PLIST_SUB+=		HELPBROWSER=""
-#.else
+.if ${PORT_OPTIONS:MHELPBROWSER}
+LIB_DEPENDS+=		webkitgtk-1.0:${PORTSDIR}/www/webkit-gtk2
+CONFIGURE_ARGS+=	--with-webkit
+PLIST_SUB+=		HELPBROWSER=""
+.else
 CONFIGURE_ARGS+=	--without-webkit
 PLIST_SUB+=		HELPBROWSER="@comment "
-#.endif
+.endif
 
 .if ${PORT_OPTIONS:MJASPER}
 LIB_DEPENDS+=		jasper:${PORTSDIR}/graphics/jasper