From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Jun 28 09:10:13 2012 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 75DE41065675 for ; Thu, 28 Jun 2012 09:10:13 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 460418FC14 for ; Thu, 28 Jun 2012 09:10:13 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q5S9ADZq035292 for ; Thu, 28 Jun 2012 09:10:13 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q5S9ADDw035291; Thu, 28 Jun 2012 09:10:13 GMT (envelope-from gnats) Resent-Date: Thu, 28 Jun 2012 09:10:13 GMT Resent-Message-Id: <201206280910.q5S9ADDw035291@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, John Marshall Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 33DBE106568C for ; Thu, 28 Jun 2012 09:01:27 +0000 (UTC) (envelope-from john.marshall@riverwillow.com.au) Received: from mail1.riverwillow.net.au (mail1.riverwillow.net.au [203.58.93.36]) by mx1.freebsd.org (Postfix) with ESMTP id AB4C58FC24 for ; Thu, 28 Jun 2012 09:01:26 +0000 (UTC) Received: from rwpc15.mby.riverwillow.net.au (rwpc15.mby.riverwillow.net.au [172.25.24.201]) (authenticated bits=0) by mail1.riverwillow.net.au (8.14.5/8.14.5) with ESMTP id q5S91NhR012907 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 28 Jun 2012 19:01:23 +1000 (AEST) Received: from rwpc15.mby.riverwillow.net.au (john@localhost [127.0.0.1]) by rwpc15.mby.riverwillow.net.au (8.14.5/8.14.5) with ESMTP id q5S91MaG026132 for ; Thu, 28 Jun 2012 19:01:22 +1000 (AEST) (envelope-from john.marshall@riverwillow.com.au) Received: (from john@localhost) by rwpc15.mby.riverwillow.net.au (8.14.5/8.14.5/Submit) id q5S91MsU026131; Thu, 28 Jun 2012 19:01:22 +1000 (AEST) (envelope-from john) Message-Id: <201206280901.q5S91MsU026131@rwpc15.mby.riverwillow.net.au> Date: Thu, 28 Jun 2012 19:01:22 +1000 (AEST) From: John Marshall To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/169514: [PATCH] misc/xiphos Add dependencies and options X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: John Marshall List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Jun 2012 09:10:13 -0000 >Number: 169514 >Category: ports >Synopsis: [PATCH] misc/xiphos Add dependencies and options >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu Jun 28 09:10:12 UTC 2012 >Closed-Date: >Last-Modified: >Originator: John Marshall >Release: FreeBSD 9.0-RELEASE-p3 i386 >Organization: Riverwillow Pty Ltd >Environment: System: FreeBSD rwpc15 9.0-RELEASE-p3 FreeBSD 9.0-RELEASE-p3 #0: Wed Jun 13 08:38:32 AEST 2012 root@rwpc15:/usr/obj/build/src/sys/RWPC15 i386 >Description: YELP DEPENDENCY Xiphos uses yelp to display its manual. The port includes all the help files but does not pull in the x11/yelp dependency. Add x11/yelp to RUN_DEPENDS. RENDERING ENGINE Xiphos preferred rendering engine is webkit but the port builds Xiphos with --backend=gtkhtml. Add knobs to allow building with a choice of webkit/gtkhtml/libxul backends, with webkit as the default. Unless webkit is used as the backend, a lot of new functionality is missing - particularly context menus. Perhaps it might be better just to build with webkit and leave out the knobs? Over to the Maintainer... >How-To-Repeat: >Fix: --- xiphos_3.1.5_2.diff begins here --- --- Makefile.orig 2012-06-11 04:42:05.000000000 +1000 +++ Makefile 2012-06-23 21:33:10.000000000 +1000 @@ -7,7 +7,7 @@ PORTNAME= xiphos PORTVERSION= 3.1.5 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= misc gnome MASTER_SITES= SF/gnomesword/Xiphos/${PORTVERSION} @@ -16,7 +16,8 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${LOCALBASE}/lib/libsword-1.6.2.so:${PORTSDIR}/misc/sword +RUN_DEPENDS= ${LOCALBASE}/lib/libsword-1.6.2.so:${PORTSDIR}/misc/sword \ + yelp:${PORTSDIR}/x11/yelp BUILD_DEPENDS:= ${RUN_DEPENDS} \ docbook2html:${PORTSDIR}/textproc/docbook-utils \ gnome-doc-tool:${PORTSDIR}/textproc/gnome-doc-utils \ @@ -28,10 +29,34 @@ INSTALLS_ICONS= yes USE_GNOME= gnomehack gnomeprefix gtkhtml3 intlhack libgsf +OPTIONS_SINGLE= BACKEND +OPTIONS_SINGLE_BACKEND= GTKHTML LIBXUL WEBKIT +GTKHTML_DESC= Use gtkhtml for rendering +LIBXUL_DESC= Use xulrunner for rendering +WEBKIT_DESC= Use webkit for rendering (preferred) + +OPTIONS_DEFAULT= WEBKIT + +.include + +.if ${PORT_OPTIONS:MWEBKIT} +WAF_CONFIGURE_ARGS= --backend=webkit +LIB_DEPENDS= webkitgtk:${PORTSDIR}/www/webkit-gtk2 +.endif + +.if ${PORT_OPTIONS:MLIBXUL} +WAF_CONFIGURE_ARGS= --backend=xulrunner +USE_GECKO= libxul +.endif + +.if ${PORT_OPTIONS:MGTKHTML} +WAF_CONFIGURE_ARGS= --backend=gtkhtml +.endif + do-configure: @cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ./waf configure \ --prefix=${PREFIX} --destdir=${PREFIX} \ - --backend gtkhtml --gtk=2 + ${WAF_CONFIGURE_ARGS} --gtk=2 do-build: @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./waf build --- xiphos_3.1.5_2.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: