Date: Thu, 27 Jun 2013 19:55:02 -0500 (CDT) From: Rusty Nejdl <rnejdl@ringofsaturn.com> To: FreeBSD-gnats-submit@freebsd.org Cc: anthony@found-it.net Subject: ports/180046: Update ports deskutils/calibre to 0.9.36 Message-ID: <201306280055.r5S0t2Zn045445@tethys.ringofsaturn.com> Resent-Message-ID: <201306280100.r5S100ca065355@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 180046
>Category: ports
>Synopsis: Update ports deskutils/calibre to 0.9.36
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Fri Jun 28 01:00:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: Rusty Nejdl
>Release: FreeBSD 9.1-STABLE amd64
>Organization:
>Environment:
System: FreeBSD tethys.ringofsaturn.com 9.1-STABLE FreeBSD 9.1-STABLE #0 r252030: Thu Jun 20 08:24:54 CDT 2013 root@tethys.ringofsaturn.com:/usr/obj/usr/src/sys/SATURN amd64
>Description:
This updates calibre to 0.9.36 and also adds a new startup script submitted by anthony@found-it.net.
>How-To-Repeat:
>Fix:
--- calibre-0.9.36.diff begins here ---
diff -ruN calibre/Makefile calibre.new/Makefile
--- calibre/Makefile 2013-06-06 07:46:40.000000000 -0500
+++ calibre.new/Makefile 2013-06-27 19:50:24.000000000 -0500
@@ -2,7 +2,7 @@
# $FreeBSD: head/deskutils/calibre/Makefile 320036 2013-06-05 22:24:16Z bdrewery $
PORTNAME= calibre
-PORTVERSION= 0.9.30
+PORTVERSION= 0.9.36
CATEGORIES= deskutils python
MASTER_SITES= SF/${PORTNAME}/${PORTVERSION}/
@@ -46,6 +46,8 @@
pdftohtml:${PORTSDIR}/graphics/poppler-utils \
lshal:${PORTSDIR}/sysutils/hal
+USE_RC_SUBR= calibre.sh
+
USES= shared-mime-info
USE_XZ= yes
USE_PYTHON= 2.7
diff -ruN calibre/distinfo calibre.new/distinfo
--- calibre/distinfo 2013-06-06 07:46:40.000000000 -0500
+++ calibre.new/distinfo 2013-06-21 08:34:46.000000000 -0500
@@ -1,2 +1,2 @@
-SHA256 (calibre-0.9.30.tar.xz) = eab88d0d5ade70dd1bae9522f444ddd3ab71b2d57a159d6ecc6276cd674fc927
-SIZE (calibre-0.9.30.tar.xz) = 28894864
+SHA256 (calibre-0.9.36.tar.xz) = 4e0522d61ff5578777603b70d911450badb1b41801dbfd6303eeea196006cbaa
+SIZE (calibre-0.9.36.tar.xz) = 29117576
diff -ruN calibre/files/calibre.sh.in calibre.new/files/calibre.sh.in
--- calibre/files/calibre.sh.in 1969-12-31 18:00:00.000000000 -0600
+++ calibre.new/files/calibre.sh.in 2013-06-21 08:33:10.000000000 -0500
@@ -0,0 +1,64 @@
+#!/bin/sh
+
+#
+# PROVIDE: calibre
+# REQUIRE: DAEMON
+# KEYWORD: shutdown
+#
+# Add the following lines to /etc/rc.conf to enable calibre_server:
+#
+# calibre_enable (bool): Set it to "YES" to enable calibre
+# Default is "NO".
+# calibre_port (int): port that calibre_server listens on
+# Default is 8080
+# calibre_user (string): user that calibre_server runs as
+# Default is calibre
+# calibre_username (string): username for calibre authentication
+# Default is calibre
+# calibre_password (string): If set then access is restricted
+# default is unrestricted
+# calibre_url_prefix (string): prefix to append to all URLs
+# default is unset
+# calibre_library (string): path to library folder to serve content from
+#
+#
+##########################################################
+
+
+. /etc/rc.subr
+
+name=calibre
+rcvar=`set_rcvar`
+
+
+load_rc_config $name
+
+: ${calibre_enable:=NO}
+
+if [ -z ${calibre_user} ]; then
+ calibre_user=calibre
+fi
+
+pidfile=/var/run/${name}/${name}.pid
+command="/usr/local/bin/calibre-server"
+command_interpreter=python2.7
+command_args="--with-library ${calibre_library}"
+
+if [ ! -z "${calibre_port}" ]; then
+ command_args="${command_args} --port=${calibre_port}"
+fi
+if [ ! -z "${calibre_username}" ]; then
+ command_args="${command_args} --username=${calibre_username}"
+fi
+if [ ! -z "${calibre_password}" ]; then
+ command_args="${command_args} --password=${calibre_password}"
+fi
+if [ ! -z "${calibre_url_prefix}" ]; then
+ command_args="${command_args} --url_prefx=${calibre_url_prefix}"
+fi
+
+start_cmd="/usr/sbin/daemon -f -u ${calibre_user} -p ${pidfile} ${command} ${command_args}"
+
+start_precmd="install -d -o ${name} -m755 /var/run/${name}"
+
+run_rc_command "$1"
diff -ruN calibre/pkg-plist calibre.new/pkg-plist
--- calibre/pkg-plist 2013-06-06 07:46:40.000000000 -0500
+++ calibre.new/pkg-plist 2013-06-21 08:47:15.000000000 -0500
@@ -82,6 +82,9 @@
lib/calibre/calibre/devices/hanlin/driver.py
lib/calibre/calibre/devices/hanvon/__init__.py
lib/calibre/calibre/devices/hanvon/driver.py
+lib/calibre/calibre/devices/idevice/libimobiledevice.py
+lib/calibre/calibre/devices/idevice/parse_xml.py
+lib/calibre/calibre/devices/idevice/__init__.py
lib/calibre/calibre/devices/iliad/__init__.py
lib/calibre/calibre/devices/iliad/driver.py
lib/calibre/calibre/devices/interface.py
@@ -166,6 +169,7 @@
lib/calibre/calibre/ebooks/conversion/plugins/chm_input.py
lib/calibre/calibre/ebooks/conversion/plugins/comic_input.py
lib/calibre/calibre/ebooks/conversion/plugins/djvu_input.py
+lib/calibre/calibre/ebooks/conversion/plugins/docx_input.py
lib/calibre/calibre/ebooks/conversion/plugins/epub_input.py
lib/calibre/calibre/ebooks/conversion/plugins/epub_output.py
lib/calibre/calibre/ebooks/conversion/plugins/fb2_input.py
@@ -209,8 +213,17 @@
lib/calibre/calibre/ebooks/docx/styles.py
lib/calibre/calibre/ebooks/docx/__init__.py
lib/calibre/calibre/ebooks/docx/char_styles.py
+lib/calibre/calibre/ebooks/docx/cleanup.py
lib/calibre/calibre/ebooks/docx/container.py
+lib/calibre/calibre/ebooks/docx/dump.py
+lib/calibre/calibre/ebooks/docx/fonts.py
+lib/calibre/calibre/ebooks/docx/footnotes.py
+lib/calibre/calibre/ebooks/docx/images.py
+lib/calibre/calibre/ebooks/docx/numbering.py
+lib/calibre/calibre/ebooks/docx/tables.py
+lib/calibre/calibre/ebooks/docx/theme.py
lib/calibre/calibre/ebooks/docx/to_html.py
+lib/calibre/calibre/ebooks/docx/toc.py
lib/calibre/calibre/ebooks/docx/block_styles.py
lib/calibre/calibre/ebooks/docx/lcid.py
lib/calibre/calibre/ebooks/epub/__init__.py
@@ -451,6 +464,7 @@
lib/calibre/calibre/ebooks/pdf/render/links.py
lib/calibre/calibre/ebooks/pdf/render/serialize.py
lib/calibre/calibre/ebooks/pdf/render/test.py
+lib/calibre/calibre/ebooks/pdf/render/toc.py
lib/calibre/calibre/ebooks/pdf/writer.py
lib/calibre/calibre/ebooks/pml/__init__.py
lib/calibre/calibre/ebooks/pml/pmlconverter.py
@@ -604,6 +618,8 @@
lib/calibre/calibre/gui2/convert/comic_input_ui.py
lib/calibre/calibre/gui2/convert/debug.py
lib/calibre/calibre/gui2/convert/debug_ui.py
+lib/calibre/calibre/gui2/convert/docx_input_ui.py
+lib/calibre/calibre/gui2/convert/docx_input.py
lib/calibre/calibre/gui2/convert/djvu_input.py
lib/calibre/calibre/gui2/convert/djvu_input_ui.py
lib/calibre/calibre/gui2/convert/epub_output.py
@@ -873,7 +889,6 @@
lib/calibre/calibre/gui2/store/stores/eharlequin_plugin.py
lib/calibre/calibre/gui2/store/stores/eknigi_plugin.py
lib/calibre/calibre/gui2/store/stores/empik_plugin.py
-lib/calibre/calibre/gui2/store/stores/escapemagazine_plugin.py
lib/calibre/calibre/gui2/store/stores/feedbooks_plugin.py
lib/calibre/calibre/gui2/store/stores/foyles_uk_plugin.py
lib/calibre/calibre/gui2/store/stores/google_books_plugin.py
@@ -904,6 +919,7 @@
lib/calibre/calibre/gui2/store/stores/rw2010_plugin.py
lib/calibre/calibre/gui2/store/stores/smashwords_plugin.py
lib/calibre/calibre/gui2/store/stores/sony_plugin.py
+lib/calibre/calibre/gui2/store/stores/sony_au_plugin.py
lib/calibre/calibre/gui2/store/stores/virtualo_plugin.py
lib/calibre/calibre/gui2/store/stores/waterstones_uk_plugin.py
lib/calibre/calibre/gui2/store/stores/weightless_books_plugin.py
@@ -943,6 +959,7 @@
lib/calibre/calibre/gui2/viewer/table_popup.py
lib/calibre/calibre/gui2/viewer/toc.py
lib/calibre/calibre/gui2/widgets.py
+lib/calibre/calibre/gui2/widgets2.py
lib/calibre/calibre/gui2/wizard/__init__.py
lib/calibre/calibre/gui2/wizard/device_ui.py
lib/calibre/calibre/gui2/wizard/finish_ui.py
@@ -1008,8 +1025,6 @@
lib/calibre/calibre/ptempfile.py
lib/calibre/calibre/startup.py
lib/calibre/calibre/test_build.py
-lib/calibre/calibre/trac/__init__.py
-lib/calibre/calibre/trac/bzr_commit_plugin.py
lib/calibre/calibre/translations/__init__.py
lib/calibre/calibre/translations/dynamic.py
lib/calibre/calibre/translations/msgfmt.py
@@ -1120,12 +1135,14 @@
lib/calibre/calibre/web/__init__.py
lib/calibre/calibre/web/feeds/__init__.py
lib/calibre/calibre/web/feeds/feedparser.py
+lib/calibre/calibre/web/feeds/jsnews.py
lib/calibre/calibre/web/feeds/news.py
lib/calibre/calibre/web/feeds/recipes/__init__.py
lib/calibre/calibre/web/feeds/recipes/collection.py
lib/calibre/calibre/web/feeds/recipes/model.py
lib/calibre/calibre/web/feeds/templates.py
lib/calibre/calibre/web/fetch/__init__.py
+lib/calibre/calibre/web/fetch/javascript.py
lib/calibre/calibre/web/fetch/simple.py
lib/calibre/calibre/web/jsbrowser/__init__.py
lib/calibre/calibre/web/jsbrowser/browser.py
@@ -1932,7 +1949,6 @@
@dirrm lib/calibre/calibre/utils/chm
@dirrm lib/calibre/calibre/utils
@dirrm lib/calibre/calibre/translations
-@dirrm lib/calibre/calibre/trac
@dirrm lib/calibre/calibre/plugins
@dirrm lib/calibre/calibre/library/server
@dirrm lib/calibre/calibre/library/catalogs
@@ -2039,6 +2055,7 @@
@dirrm lib/calibre/calibre/devices/iriver
@dirrm lib/calibre/calibre/devices/irexdr
@dirrm lib/calibre/calibre/devices/iliad
+@dirrm lib/calibre/calibre/devices/idevice
@dirrm lib/calibre/calibre/devices/hanvon
@dirrm lib/calibre/calibre/devices/hanlin
@dirrm lib/calibre/calibre/devices/folder_device
--- calibre-0.9.36.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?201306280055.r5S0t2Zn045445>