Date: Thu, 28 Jun 2012 19:01:22 +1000 (AEST) From: John Marshall <john.marshall@riverwillow.com.au> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/169514: [PATCH] misc/xiphos Add dependencies and options Message-ID: <201206280901.q5S91MsU026131@rwpc15.mby.riverwillow.net.au> Resent-Message-ID: <201206280910.q5S9ADDw035291@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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 <bsd.port.options.mk>
+
+.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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201206280901.q5S91MsU026131>