From owner-svn-ports-all@FreeBSD.ORG Thu Jan 16 20:45:26 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 248E970D; Thu, 16 Jan 2014 20:45:26 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 101B2174B; Thu, 16 Jan 2014 20:45:26 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0GKjPiG091893; Thu, 16 Jan 2014 20:45:25 GMT (envelope-from tabthorpe@svn.freebsd.org) Received: (from tabthorpe@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0GKjPAL091890; Thu, 16 Jan 2014 20:45:25 GMT (envelope-from tabthorpe@svn.freebsd.org) Message-Id: <201401162045.s0GKjPAL091890@svn.freebsd.org> From: Thomas Abthorpe Date: Thu, 16 Jan 2014 20:45:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r339986 - head/misc/xiphos 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.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Jan 2014 20:45:26 -0000 Author: tabthorpe Date: Thu Jan 16 20:45:25 2014 New Revision: 339986 URL: http://svnweb.freebsd.org/changeset/ports/339986 QAT: https://qat.redports.org/buildarchive/r339986/ Log: - Update to 3.1.6 - Support STAGEDIR Modified: head/misc/xiphos/Makefile head/misc/xiphos/distinfo (contents, props changed) head/misc/xiphos/pkg-plist Modified: head/misc/xiphos/Makefile ============================================================================== --- head/misc/xiphos/Makefile Thu Jan 16 20:44:43 2014 (r339985) +++ head/misc/xiphos/Makefile Thu Jan 16 20:45:25 2014 (r339986) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= xiphos -PORTVERSION= 3.1.5 -PORTREVISION= 4 +PORTVERSION= 3.1.6 CATEGORIES= misc gnome MASTER_SITES= SF/gnomesword/Xiphos/${PORTVERSION} @@ -11,12 +10,13 @@ COMMENT= A bible interface utilizing the LICENSE= GPLv2 -RUN_DEPENDS= ${LOCALBASE}/lib/libsword-1.6.2.so:${PORTSDIR}/misc/sword \ +RUN_DEPENDS= ${LOCALBASE}/lib/libsword-1.7.2.so:${PORTSDIR}/misc/sword17 \ yelp:${PORTSDIR}/x11/yelp BUILD_DEPENDS:= ${RUN_DEPENDS} \ docbook2html:${PORTSDIR}/textproc/docbook-utils \ gnome-doc-tool:${PORTSDIR}/textproc/gnome-doc-utils \ nspr>=4.8:${PORTSDIR}/devel/nspr +LIB_DEPENDS= webkitgtk-1.0:${PORTSDIR}/www/webkit-gtk2 USE_PYTHON_BUILD= yes USES= gettext pkgconfig @@ -24,29 +24,10 @@ INSTALLS_OMF= yes INSTALLS_ICONS= yes USE_GNOME= gnomehack gnomeprefix gtkhtml3 intlhack libgsf -OPTIONS_SINGLE= BACKEND -OPTIONS_SINGLE_BACKEND= GTKHTML WEBKIT -GTKHTML_DESC= Use gtkhtml for rendering -WEBKIT_DESC= Use webkit for rendering (preferred) - -OPTIONS_DEFAULT= WEBKIT - -NO_STAGE= yes -.include - -.if ${PORT_OPTIONS:MWEBKIT} -WAF_CONFIGURE_ARGS= --backend=webkit -LIB_DEPENDS= webkitgtk:${PORTSDIR}/www/webkit-gtk2 -.endif - -.if ${PORT_OPTIONS:MGTKHTML} -WAF_CONFIGURE_ARGS= --backend=gtkhtml -.endif - do-configure: @cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ./waf configure \ - --prefix=${PREFIX} --destdir=${PREFIX} \ - ${WAF_CONFIGURE_ARGS} --gtk=2 + --prefix=${STAGEDIR}${PREFIX} --destdir=${STAGEDIR}${PREFIX} \ + ${WAF_CONFIGURE_ARGS} do-build: @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./waf build Modified: head/misc/xiphos/distinfo ============================================================================== --- head/misc/xiphos/distinfo Thu Jan 16 20:44:43 2014 (r339985) +++ head/misc/xiphos/distinfo Thu Jan 16 20:45:25 2014 (r339986) @@ -1,2 +1,2 @@ -SHA256 (xiphos-3.1.5.tar.gz) = 2887426908e269f25d2d191be445112027b2b7e80356823d4942b1803a359d8c -SIZE (xiphos-3.1.5.tar.gz) = 6720533 +SHA256 (xiphos-3.1.6.tar.gz) = 21f0024d57b3976526093279ef7ab7f3ed8afe07436ab983bd3049a14c3bdfe5 +SIZE (xiphos-3.1.6.tar.gz) = 6873107 Modified: head/misc/xiphos/pkg-plist ============================================================================== --- head/misc/xiphos/pkg-plist Thu Jan 16 20:44:43 2014 (r339985) +++ head/misc/xiphos/pkg-plist Thu Jan 16 20:45:25 2014 (r339986) @@ -1,15 +1,15 @@ bin/xiphos bin/xiphos-nav share/applications/xiphos.desktop -%%DOCSDIR%%/AUTHORS -%%DOCSDIR%%/COPYING -%%DOCSDIR%%/ChangeLog -%%DOCSDIR%%/INSTALL -%%DOCSDIR%%/NEWS -%%DOCSDIR%%/README -%%DOCSDIR%%/RELEASE-NOTES -%%DOCSDIR%%/TODO -%%DOCSDIR%%/Xiphos.ogg +%%PORTDOCS%%%%DOCSDIR%%/AUTHORS +%%PORTDOCS%%%%DOCSDIR%%/COPYING +%%PORTDOCS%%%%DOCSDIR%%/ChangeLog +%%PORTDOCS%%%%DOCSDIR%%/INSTALL +%%PORTDOCS%%%%DOCSDIR%%/NEWS +%%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%%%DOCSDIR%%/RELEASE-NOTES +%%PORTDOCS%%%%DOCSDIR%%/TODO +%%PORTDOCS%%%%DOCSDIR%%/Xiphos.ogg share/gnome/help/xiphos/C/figures/first_start.png share/gnome/help/xiphos/C/figures/gtkhtml3-vs-mozembed.png share/gnome/help/xiphos/C/figures/interface.png @@ -121,6 +121,7 @@ share/gnome/help/xiphos/fr/figures/sword share/gnome/help/xiphos/fr/figures/sword_remove.png share/gnome/help/xiphos/fr/figures/sword_sources.png share/gnome/help/xiphos/fr/xiphos.xml +share/icons/hicolor/icon-theme.cache share/icons/hicolor/scalable/apps/xiphos.svg share/locale/ar/LC_MESSAGES/xiphos.mo share/locale/cs/LC_MESSAGES/xiphos.mo @@ -184,6 +185,8 @@ share/omf/xiphos/xiphos-fr.omf %%DATADIR%%/gs2-48x48.ico %%DATADIR%%/gs2-48x48.png %%DATADIR%%/gs2.xpm +%%DATADIR%%/gtk2_webedit.ui +%%DATADIR%%/gtk_webedit.ui %%DATADIR%%/indexed-16.png %%DATADIR%%/indexed.png %%DATADIR%%/init-settings.png @@ -219,14 +222,145 @@ share/omf/xiphos/xiphos-fr.omf %%DATADIR%%/xiphos-button-125.png %%DATADIR%%/xiphos-x-16.png %%DATADIR%%/xiphos.xpm -@dirrm %%DATADIR%% -@dirrm share/pixmaps/xiphos -@dirrm share/omf/xiphos -@dirrm share/gnome/help/xiphos/fr/figures -@dirrm share/gnome/help/xiphos/fr -@dirrm share/gnome/help/xiphos/fa/figures -@dirrm share/gnome/help/xiphos/fa -@dirrm share/gnome/help/xiphos/C/figures -@dirrm share/gnome/help/xiphos/C -@dirrm share/gnome/help/xiphos -@dirrm %%DOCSDIR%% +@dirrmtry share/xmodmap +@dirrmtry %%DATADIR%% +@dirrmtry share/vfolders +@dirrmtry share/vala/vapi +@dirrmtry share/vala +@dirrmtry share/sounds +@dirrmtry share/sgml/docbook/gnome-customization-0.1 +@dirrmtry share/sgml/docbook +@dirrmtry share/pixmaps/splash +@dirrmtry share/pixmaps/document-icons +@dirrmtry share/omf/xiphos +@dirrmtry share/omf +@dirrmtry share/oaf +@dirrmtry share/mime-info +@dirrmtry share/mc/templates +@dirrmtry share/mc +@dirrmtry share/mate/help +@dirrmtry share/mate-control-center/keybindings +@dirrmtry share/mate-control-center +@dirrmtry share/mate-2.0/ui +@dirrmtry share/mate-2.0 +@dirrmtry share/mate +@dirrmtry share/images +@dirrmtry share/icons/hicolor/scalable/apps +@dirrmtry share/icons/hicolor/scalable +@dirrmtry share/icons/hicolor +@dirrmtry share/icons +@dirrmtry share/gnome/wm-properties +@dirrmtry share/gnome/ui +@dirrmtry share/gnome/panel +@dirrmtry share/gnome/help/xiphos/fr/figures +@dirrmtry share/gnome/help/xiphos/fr +@dirrmtry share/gnome/help/xiphos/fa/figures +@dirrmtry share/gnome/help/xiphos/fa +@dirrmtry share/gnome/help/xiphos/C/figures +@dirrmtry share/gnome/help/xiphos/C +@dirrmtry share/gnome/help/xiphos +@dirrmtry share/gnome/help/lgpl/C +@dirrmtry share/gnome/help/lgpl +@dirrmtry share/gnome/help/gpl/C +@dirrmtry share/gnome/help/gpl +@dirrmtry share/gnome/help/fdl/C +@dirrmtry share/gnome/help/fdl +@dirrmtry share/gnome/help +@dirrmtry share/gnome/autostart +@dirrmtry share/gnome/apps/Utilities +@dirrmtry share/gnome/apps/System +@dirrmtry share/gnome/apps/Settings/Session +@dirrmtry share/gnome/apps/Settings/Peripherals +@dirrmtry share/gnome/apps/Settings/Documents +@dirrmtry share/gnome/apps/Settings/Desktop +@dirrmtry share/gnome/apps/Settings +@dirrmtry share/gnome/apps/Multimedia +@dirrmtry share/gnome/apps/Internet +@dirrmtry share/gnome/apps/Graphics +@dirrmtry share/gnome/apps/Games +@dirrmtry share/gnome/apps/Development +@dirrmtry share/gnome/apps/Audio +@dirrmtry share/gnome/apps/Applications +@dirrmtry share/gnome/apps +@dirrmtry share/gnome-settings-daemon-3.0 +@dirrmtry share/gnome-control-center/keybindings +@dirrmtry share/gnome-control-center +@dirrmtry share/gnome-about +@dirrmtry share/gnome-2.0/ui +@dirrmtry share/gnome-2.0 +@dirrmtry share/gnome +@dirrmtry share/gir-1.0 +%%PORTDOCS%%@dirrmtry %%DOCSDIR%% +@dirrmtry share/doc/libgda +@dirrmtry share/control-center/keybindings/gtk-modules +@dirrmtry share/control-center/keybindings +@dirrmtry share/control-center/capplets +@dirrmtry share/control-center/Session +@dirrmtry share/control-center/Peripherals +@dirrmtry share/control-center/Documents +@dirrmtry share/control-center/Desktop +@dirrmtry share/control-center-2.0/capplets +@dirrmtry share/control-center-2.0 +@dirrmtry share/control-center +@dirrmtry share/capplets +@dirrmtry share/application-registry +@dirrmtry share/applets/Utility +@dirrmtry share/applets/Network +@dirrmtry share/applets/Multimedia +@dirrmtry share/applets/Monitors +@dirrmtry share/applets/Clocks +@dirrmtry share/applets/Amusements +@dirrmtry share/applets +@dirrmtry share/MateConf/gsettings +@dirrmtry share/MateConf +@dirrmtry libdata/matecomponent/servers +@dirrmtry libdata/matecomponent +@dirrmtry libdata/bonobo/servers +@dirrmtry libdata/bonobo +@dirrmtry lib/vfs/modules +@dirrmtry lib/vfs +@dirrmtry lib/matecomponent/monikers +@dirrmtry lib/matecomponent-2.0/samples +@dirrmtry lib/matecomponent-2.0 +@dirrmtry lib/matecomponent +@dirrmtry lib/mate-vfs-2.0/modules +@dirrmtry lib/mate-vfs-2.0 +@dirrmtry lib/gnome-vfs-2.0/modules +@dirrmtry lib/gnome-vfs-2.0 +@dirrmtry lib/girepository-1.0 +@dirrmtry lib/bonobo/plugin +@dirrmtry lib/bonobo/monikers +@dirrmtry lib/bonobo +@dirrmtry lib/GConf +@dirrmtry include/gnome-1.0 +@dirrmtry include/gdkcardimage +@dirrmtry include/gconf +@dirrmtry etc/xdg/autostart +@dirrmtry etc/xdg +@dirrmtry etc/vfs/modules +@dirrmtry etc/vfs +@dirrmtry etc/sound/events +@dirrmtry etc/sound +@dirrmtry etc/mateconf/schemas +@dirrmtry etc/mateconf/mateconf.xml.system +@dirrmtry etc/mateconf/mateconf.xml.mandatory +@dirrmtry etc/mateconf/mateconf.xml.defaults +@dirrmtry etc/mateconf +@dirrmtry etc/gnome/config +@dirrmtry etc/gnome-vfs-2.0/modules +@dirrmtry etc/gnome-vfs-2.0 +@dirrmtry etc/gnome +@dirrmtry etc/gconf/schemas +@dirrmtry etc/gconf/gconf.xml.system +@dirrmtry etc/gconf/gconf.xml.mandatory +@dirrmtry etc/gconf/gconf.xml.defaults +@dirrmtry etc/gconf +@dirrmtry etc/dconf/profile +@dirrmtry etc/dconf/db +@dirrmtry etc/dconf +@dirrmtry etc/X11/sysconfig +@dirrmtry etc/X11/starthere +@dirrmtry etc/X11/serverconfig +@dirrmtry etc/X11 +@dirrmtry etc/CORBA/servers +@dirrmtry etc/CORBA