From owner-svn-ports-head@FreeBSD.ORG Sat Jul 12 15:19:16 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B01C33CC; Sat, 12 Jul 2014 15:19:16 +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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 914872AD2; Sat, 12 Jul 2014 15:19:16 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6CFJGM6054156; Sat, 12 Jul 2014 15:19:16 GMT (envelope-from madpilot@svn.freebsd.org) Received: (from madpilot@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6CFJFS4054151; Sat, 12 Jul 2014 15:19:15 GMT (envelope-from madpilot@svn.freebsd.org) Message-Id: <201407121519.s6CFJFS4054151@svn.freebsd.org> From: Guido Falsi Date: Sat, 12 Jul 2014 15:19:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r361620 - in head/deskutils/calibre: . files 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.18 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Jul 2014 15:19:16 -0000 Author: madpilot Date: Sat Jul 12 15:19:15 2014 New Revision: 361620 URL: http://svnweb.freebsd.org/changeset/ports/361620 QAT: https://qat.redports.org/buildarchive/r361620/ Log: - Update to 1.44.0 - rc script fixes and variable to run the server from home directorry. PR: 191806 Submitted by: rnejdl@ringofsaturn.com (maintainer) Modified: head/deskutils/calibre/Makefile head/deskutils/calibre/distinfo head/deskutils/calibre/files/calibre.in head/deskutils/calibre/pkg-plist Modified: head/deskutils/calibre/Makefile ============================================================================== --- head/deskutils/calibre/Makefile Sat Jul 12 15:14:36 2014 (r361619) +++ head/deskutils/calibre/Makefile Sat Jul 12 15:19:15 2014 (r361620) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= calibre -PORTVERSION= 1.43.0 +PORTVERSION= 1.44.0 CATEGORIES= deskutils python MASTER_SITES= SF/${PORTNAME}/${PORTVERSION}/ Modified: head/deskutils/calibre/distinfo ============================================================================== --- head/deskutils/calibre/distinfo Sat Jul 12 15:14:36 2014 (r361619) +++ head/deskutils/calibre/distinfo Sat Jul 12 15:19:15 2014 (r361620) @@ -1,2 +1,2 @@ -SHA256 (calibre-1.43.0.tar.xz) = 3c4ef17591e033e39ba804d18442f63c3ebc1683da776833d47d8aa2900f724d -SIZE (calibre-1.43.0.tar.xz) = 35549180 +SHA256 (calibre-1.44.0.tar.xz) = b2a49485ece16454169dfdd9da7481fabf0ae644b8e53f3fd114de4ceecf6992 +SIZE (calibre-1.44.0.tar.xz) = 36438768 Modified: head/deskutils/calibre/files/calibre.in ============================================================================== --- head/deskutils/calibre/files/calibre.in Sat Jul 12 15:14:36 2014 (r361619) +++ head/deskutils/calibre/files/calibre.in Sat Jul 12 15:19:15 2014 (r361620) @@ -14,6 +14,8 @@ # Default is 8080 # calibre_user (string): user that calibre_server runs as # Default is calibre +# calibre_home (string): home directory for calibre_server +# Default is the home directory of calibre_user # calibre_username (string): username for calibre authentication # Default is calibre # calibre_password (string): If set then access is restricted @@ -38,7 +40,7 @@ load_rc_config $name pidfile=/var/run/${name}/${name}.pid command=/usr/local/bin/calibre-server -command_interpreter=python2.7 +command_interpreter=python2 required_dirs=${calibre_library} start_cmd=${name}_start @@ -57,9 +59,11 @@ calibre_start() command_args="${command_args} --password=${calibre_password}" fi if [ ! -z "${calibre_url_prefix}" ]; then - command_args="${command_args} --url_prefx=${calibre_url_prefix}" + command_args="${command_args} --url-prefx=${calibre_url_prefix}" fi + calibre_home=${calibre_home:-$(getent passwd ${calibre_user} | awk -F: '{print $6}')} + HOME=${calibre_home:-/nonexistent} /usr/sbin/daemon -f -u ${calibre_user} -p ${pidfile} ${command} ${command_args} --with-library ${calibre_library} } Modified: head/deskutils/calibre/pkg-plist ============================================================================== --- head/deskutils/calibre/pkg-plist Sat Jul 12 15:14:36 2014 (r361619) +++ head/deskutils/calibre/pkg-plist Sat Jul 12 15:19:15 2014 (r361620) @@ -1026,6 +1026,7 @@ lib/calibre/calibre/gui2/tweak_book/job. lib/calibre/calibre/gui2/tweak_book/live_css.py lib/calibre/calibre/gui2/tweak_book/main.py lib/calibre/calibre/gui2/tweak_book/manage_fonts.py +lib/calibre/calibre/gui2/tweak_book/plugin.py lib/calibre/calibre/gui2/tweak_book/polish.py lib/calibre/calibre/gui2/tweak_book/preferences.py lib/calibre/calibre/gui2/tweak_book/preview.py @@ -1767,7 +1768,9 @@ share/applications/calibre-lrfviewer.des %%DATADIR%%/localization/stats.pickle %%DATADIR%%/metadata_sqlite.sql %%DATADIR%%/mime.types -%%DATADIR%%/quick_start.epub +%%DATADIR%%/quick_start/deu.epub +%%DATADIR%%/quick_start/eng.epub +%%DATADIR%%/quick_start/fra.epub %%DATADIR%%/scripts.pickle %%DATADIR%%/template-functions.json %%DATADIR%%/templates/book_details.css @@ -1978,7 +1981,7 @@ share/applications/calibre-lrfviewer.des %%DATADIR%%/viewer/mathjax/jax/output/SVG/fonts/TeX/fontdata.js %%DATADIR%%/viewer/mathjax/jax/output/SVG/jax.js %%DATADIR%%/viewer/referencing.js -share/bash-completion/calibre +share/bash-completion/completions/calibre share/gnome/apps/calibre-ebook-edit.desktop share/gnome/apps/calibre-ebook-viewer.desktop share/gnome/apps/calibre-gui.desktop @@ -2007,7 +2010,6 @@ share/mime/application/x-sony-bbeb.xml share/mime/application/x-topaz-ebook.xml share/mime/packages/calibre-mimetypes.xml share/mime/text/lrs.xml -share/zsh/site-functions/_calibre @dirrmtry share/mime/text @dirrmtry share/mime/packages @dirrmtry share/mime/application @@ -2075,6 +2077,7 @@ share/zsh/site-functions/_calibre @dirrm %%DATADIR%%/viewer/hyphenate @dirrm %%DATADIR%%/viewer @dirrm %%DATADIR%%/templates +@dirrm %%DATADIR%%/quick_start @dirrm %%DATADIR%%/localization/pykakasi @dirrm %%DATADIR%%/localization @dirrm %%DATADIR%%/jacket