Attachment #135234 for bug #180046

Lines 2-8 Link Here

(-)calibre.new/Makefile (-1 / +3 lines)
2	# $FreeBSD: head/deskutils/calibre/Makefile 320036 2013-06-05 22:24:16Z bdrewery $	2	# $FreeBSD: head/deskutils/calibre/Makefile 320036 2013-06-05 22:24:16Z bdrewery $
3		3
4	PORTNAME= calibre	4	PORTNAME= calibre
5	PORTVERSION= 0.9.30	5	PORTVERSION= 0.9.36
6	CATEGORIES= deskutils python	6	CATEGORIES= deskutils python
7	MASTER_SITES= SF/${PORTNAME}/${PORTVERSION}/	7	MASTER_SITES= SF/${PORTNAME}/${PORTVERSION}/
8		8
Lines 46-51 Link Here
46	pdftohtml:${PORTSDIR}/graphics/poppler-utils \	46	pdftohtml:${PORTSDIR}/graphics/poppler-utils \
47	lshal:${PORTSDIR}/sysutils/hal	47	lshal:${PORTSDIR}/sysutils/hal
48		48
		49	USE_RC_SUBR= calibre.sh
		50
49	USES= shared-mime-info	51	USES= shared-mime-info
50	USE_XZ= yes	52	USE_XZ= yes
51	USE_PYTHON= 2.7	53	USE_PYTHON= 2.7

Lines 1-2 Link Here

(-)calibre.new/distinfo (-2 / +2 lines)
1	SHA256 (calibre-0.9.30.tar.xz) = eab88d0d5ade70dd1bae9522f444ddd3ab71b2d57a159d6ecc6276cd674fc927	1	SHA256 (calibre-0.9.36.tar.xz) = 4e0522d61ff5578777603b70d911450badb1b41801dbfd6303eeea196006cbaa
2	SIZE (calibre-0.9.30.tar.xz) = 28894864	2	SIZE (calibre-0.9.36.tar.xz) = 29117576




#!/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"

Return to bug 180046

Line 0 Link Here

(-)calibre.new/files/calibre.sh.in (+64 lines)
	1	#!/bin/sh
	2
	3	#
	4	# PROVIDE: calibre
	5	# REQUIRE: DAEMON
	6	# KEYWORD: shutdown
	7	#
	8	# Add the following lines to /etc/rc.conf to enable calibre_server:
	9	#
	10	# calibre_enable (bool): Set it to "YES" to enable calibre
	11	# Default is "NO".
	12	# calibre_port (int): port that calibre_server listens on
	13	# Default is 8080
	14	# calibre_user (string): user that calibre_server runs as
	15	# Default is calibre
	16	# calibre_username (string): username for calibre authentication
	17	# Default is calibre
	18	# calibre_password (string): If set then access is restricted
	19	# default is unrestricted
	20	# calibre_url_prefix (string): prefix to append to all URLs
	21	# default is unset
	22	# calibre_library (string): path to library folder to serve content from
	23	#
	24	#
	25	##########################################################
	26
	27
	28	. /etc/rc.subr
	29
	30	name=calibre
	31	rcvar=`set_rcvar`
	32
	33
	34	load_rc_config $name
	35
	36	: ${calibre_enable:=NO}
	37
	38	if [ -z ${calibre_user} ]; then
	39	calibre_user=calibre
	40	fi
	41
	42	pidfile=/var/run/${name}/${name}.pid
	43	command="/usr/local/bin/calibre-server"
	44	command_interpreter=python2.7
	45	command_args="--with-library ${calibre_library}"
	46
	47	if [ ! -z "${calibre_port}" ]; then
	48	command_args="${command_args} --port=${calibre_port}"
	49	fi
	50	if [ ! -z "${calibre_username}" ]; then
	51	command_args="${command_args} --username=${calibre_username}"
	52	fi
	53	if [ ! -z "${calibre_password}" ]; then
	54	command_args="${command_args} --password=${calibre_password}"
	55	fi
	56	if [ ! -z "${calibre_url_prefix}" ]; then
	57	command_args="${command_args} --url_prefx=${calibre_url_prefix}"
	58	fi
	59
	60	start_cmd="/usr/sbin/daemon -f -u ${calibre_user} -p ${pidfile} ${command} ${command_args}"
	61
	62	start_precmd="install -d -o ${name} -m755 /var/run/${name}"
	63
	64	run_rc_command "$1"

Lines 82-87 Link Here

(-)calibre.new/pkg-plist (-4 / +21 lines)
82	lib/calibre/calibre/devices/hanlin/driver.py	82	lib/calibre/calibre/devices/hanlin/driver.py
83	lib/calibre/calibre/devices/hanvon/__init__.py	83	lib/calibre/calibre/devices/hanvon/__init__.py
84	lib/calibre/calibre/devices/hanvon/driver.py	84	lib/calibre/calibre/devices/hanvon/driver.py
		85	lib/calibre/calibre/devices/idevice/libimobiledevice.py
		86	lib/calibre/calibre/devices/idevice/parse_xml.py
		87	lib/calibre/calibre/devices/idevice/__init__.py
85	lib/calibre/calibre/devices/iliad/__init__.py	88	lib/calibre/calibre/devices/iliad/__init__.py
86	lib/calibre/calibre/devices/iliad/driver.py	89	lib/calibre/calibre/devices/iliad/driver.py
87	lib/calibre/calibre/devices/interface.py	90	lib/calibre/calibre/devices/interface.py
Lines 166-171 Link Here
166	lib/calibre/calibre/ebooks/conversion/plugins/chm_input.py	169	lib/calibre/calibre/ebooks/conversion/plugins/chm_input.py
167	lib/calibre/calibre/ebooks/conversion/plugins/comic_input.py	170	lib/calibre/calibre/ebooks/conversion/plugins/comic_input.py
168	lib/calibre/calibre/ebooks/conversion/plugins/djvu_input.py	171	lib/calibre/calibre/ebooks/conversion/plugins/djvu_input.py
		172	lib/calibre/calibre/ebooks/conversion/plugins/docx_input.py
169	lib/calibre/calibre/ebooks/conversion/plugins/epub_input.py	173	lib/calibre/calibre/ebooks/conversion/plugins/epub_input.py
170	lib/calibre/calibre/ebooks/conversion/plugins/epub_output.py	174	lib/calibre/calibre/ebooks/conversion/plugins/epub_output.py
171	lib/calibre/calibre/ebooks/conversion/plugins/fb2_input.py	175	lib/calibre/calibre/ebooks/conversion/plugins/fb2_input.py
Lines 209-216 Link Here
209	lib/calibre/calibre/ebooks/docx/styles.py	213	lib/calibre/calibre/ebooks/docx/styles.py
210	lib/calibre/calibre/ebooks/docx/__init__.py	214	lib/calibre/calibre/ebooks/docx/__init__.py
211	lib/calibre/calibre/ebooks/docx/char_styles.py	215	lib/calibre/calibre/ebooks/docx/char_styles.py
		216	lib/calibre/calibre/ebooks/docx/cleanup.py
212	lib/calibre/calibre/ebooks/docx/container.py	217	lib/calibre/calibre/ebooks/docx/container.py
		218	lib/calibre/calibre/ebooks/docx/dump.py
		219	lib/calibre/calibre/ebooks/docx/fonts.py
		220	lib/calibre/calibre/ebooks/docx/footnotes.py
		221	lib/calibre/calibre/ebooks/docx/images.py
		222	lib/calibre/calibre/ebooks/docx/numbering.py
		223	lib/calibre/calibre/ebooks/docx/tables.py
		224	lib/calibre/calibre/ebooks/docx/theme.py
213	lib/calibre/calibre/ebooks/docx/to_html.py	225	lib/calibre/calibre/ebooks/docx/to_html.py
		226	lib/calibre/calibre/ebooks/docx/toc.py
214	lib/calibre/calibre/ebooks/docx/block_styles.py	227	lib/calibre/calibre/ebooks/docx/block_styles.py
215	lib/calibre/calibre/ebooks/docx/lcid.py	228	lib/calibre/calibre/ebooks/docx/lcid.py
216	lib/calibre/calibre/ebooks/epub/__init__.py	229	lib/calibre/calibre/ebooks/epub/__init__.py
Lines 451-456 Link Here
451	lib/calibre/calibre/ebooks/pdf/render/links.py	464	lib/calibre/calibre/ebooks/pdf/render/links.py
452	lib/calibre/calibre/ebooks/pdf/render/serialize.py	465	lib/calibre/calibre/ebooks/pdf/render/serialize.py
453	lib/calibre/calibre/ebooks/pdf/render/test.py	466	lib/calibre/calibre/ebooks/pdf/render/test.py
		467	lib/calibre/calibre/ebooks/pdf/render/toc.py
454	lib/calibre/calibre/ebooks/pdf/writer.py	468	lib/calibre/calibre/ebooks/pdf/writer.py
455	lib/calibre/calibre/ebooks/pml/__init__.py	469	lib/calibre/calibre/ebooks/pml/__init__.py
456	lib/calibre/calibre/ebooks/pml/pmlconverter.py	470	lib/calibre/calibre/ebooks/pml/pmlconverter.py
Lines 604-609 Link Here
604	lib/calibre/calibre/gui2/convert/comic_input_ui.py	618	lib/calibre/calibre/gui2/convert/comic_input_ui.py
605	lib/calibre/calibre/gui2/convert/debug.py	619	lib/calibre/calibre/gui2/convert/debug.py
606	lib/calibre/calibre/gui2/convert/debug_ui.py	620	lib/calibre/calibre/gui2/convert/debug_ui.py
		621	lib/calibre/calibre/gui2/convert/docx_input_ui.py
		622	lib/calibre/calibre/gui2/convert/docx_input.py
607	lib/calibre/calibre/gui2/convert/djvu_input.py	623	lib/calibre/calibre/gui2/convert/djvu_input.py
608	lib/calibre/calibre/gui2/convert/djvu_input_ui.py	624	lib/calibre/calibre/gui2/convert/djvu_input_ui.py
609	lib/calibre/calibre/gui2/convert/epub_output.py	625	lib/calibre/calibre/gui2/convert/epub_output.py
Lines 873-879 Link Here
873	lib/calibre/calibre/gui2/store/stores/eharlequin_plugin.py	889	lib/calibre/calibre/gui2/store/stores/eharlequin_plugin.py
874	lib/calibre/calibre/gui2/store/stores/eknigi_plugin.py	890	lib/calibre/calibre/gui2/store/stores/eknigi_plugin.py
875	lib/calibre/calibre/gui2/store/stores/empik_plugin.py	891	lib/calibre/calibre/gui2/store/stores/empik_plugin.py
876	lib/calibre/calibre/gui2/store/stores/escapemagazine_plugin.py
877	lib/calibre/calibre/gui2/store/stores/feedbooks_plugin.py	892	lib/calibre/calibre/gui2/store/stores/feedbooks_plugin.py
878	lib/calibre/calibre/gui2/store/stores/foyles_uk_plugin.py	893	lib/calibre/calibre/gui2/store/stores/foyles_uk_plugin.py
879	lib/calibre/calibre/gui2/store/stores/google_books_plugin.py	894	lib/calibre/calibre/gui2/store/stores/google_books_plugin.py
Lines 904-909 Link Here
904	lib/calibre/calibre/gui2/store/stores/rw2010_plugin.py	919	lib/calibre/calibre/gui2/store/stores/rw2010_plugin.py
905	lib/calibre/calibre/gui2/store/stores/smashwords_plugin.py	920	lib/calibre/calibre/gui2/store/stores/smashwords_plugin.py
906	lib/calibre/calibre/gui2/store/stores/sony_plugin.py	921	lib/calibre/calibre/gui2/store/stores/sony_plugin.py
		922	lib/calibre/calibre/gui2/store/stores/sony_au_plugin.py
907	lib/calibre/calibre/gui2/store/stores/virtualo_plugin.py	923	lib/calibre/calibre/gui2/store/stores/virtualo_plugin.py
908	lib/calibre/calibre/gui2/store/stores/waterstones_uk_plugin.py	924	lib/calibre/calibre/gui2/store/stores/waterstones_uk_plugin.py
909	lib/calibre/calibre/gui2/store/stores/weightless_books_plugin.py	925	lib/calibre/calibre/gui2/store/stores/weightless_books_plugin.py
Lines 943-948 Link Here
943	lib/calibre/calibre/gui2/viewer/table_popup.py	959	lib/calibre/calibre/gui2/viewer/table_popup.py
944	lib/calibre/calibre/gui2/viewer/toc.py	960	lib/calibre/calibre/gui2/viewer/toc.py
945	lib/calibre/calibre/gui2/widgets.py	961	lib/calibre/calibre/gui2/widgets.py
		962	lib/calibre/calibre/gui2/widgets2.py
946	lib/calibre/calibre/gui2/wizard/__init__.py	963	lib/calibre/calibre/gui2/wizard/__init__.py
947	lib/calibre/calibre/gui2/wizard/device_ui.py	964	lib/calibre/calibre/gui2/wizard/device_ui.py
948	lib/calibre/calibre/gui2/wizard/finish_ui.py	965	lib/calibre/calibre/gui2/wizard/finish_ui.py
Lines 1008-1015 Link Here
1008	lib/calibre/calibre/ptempfile.py	1025	lib/calibre/calibre/ptempfile.py
1009	lib/calibre/calibre/startup.py	1026	lib/calibre/calibre/startup.py
1010	lib/calibre/calibre/test_build.py	1027	lib/calibre/calibre/test_build.py
1011	lib/calibre/calibre/trac/__init__.py
1012	lib/calibre/calibre/trac/bzr_commit_plugin.py
1013	lib/calibre/calibre/translations/__init__.py	1028	lib/calibre/calibre/translations/__init__.py
1014	lib/calibre/calibre/translations/dynamic.py	1029	lib/calibre/calibre/translations/dynamic.py
1015	lib/calibre/calibre/translations/msgfmt.py	1030	lib/calibre/calibre/translations/msgfmt.py
Lines 1120-1131 Link Here
1120	lib/calibre/calibre/web/__init__.py	1135	lib/calibre/calibre/web/__init__.py
1121	lib/calibre/calibre/web/feeds/__init__.py	1136	lib/calibre/calibre/web/feeds/__init__.py
1122	lib/calibre/calibre/web/feeds/feedparser.py	1137	lib/calibre/calibre/web/feeds/feedparser.py
		1138	lib/calibre/calibre/web/feeds/jsnews.py
1123	lib/calibre/calibre/web/feeds/news.py	1139	lib/calibre/calibre/web/feeds/news.py
1124	lib/calibre/calibre/web/feeds/recipes/__init__.py	1140	lib/calibre/calibre/web/feeds/recipes/__init__.py
1125	lib/calibre/calibre/web/feeds/recipes/collection.py	1141	lib/calibre/calibre/web/feeds/recipes/collection.py
1126	lib/calibre/calibre/web/feeds/recipes/model.py	1142	lib/calibre/calibre/web/feeds/recipes/model.py
1127	lib/calibre/calibre/web/feeds/templates.py	1143	lib/calibre/calibre/web/feeds/templates.py
1128	lib/calibre/calibre/web/fetch/__init__.py	1144	lib/calibre/calibre/web/fetch/__init__.py
		1145	lib/calibre/calibre/web/fetch/javascript.py
1129	lib/calibre/calibre/web/fetch/simple.py	1146	lib/calibre/calibre/web/fetch/simple.py
1130	lib/calibre/calibre/web/jsbrowser/__init__.py	1147	lib/calibre/calibre/web/jsbrowser/__init__.py
1131	lib/calibre/calibre/web/jsbrowser/browser.py	1148	lib/calibre/calibre/web/jsbrowser/browser.py
Lines 1932-1938 Link Here
1932	@dirrm lib/calibre/calibre/utils/chm	1949	@dirrm lib/calibre/calibre/utils/chm
1933	@dirrm lib/calibre/calibre/utils	1950	@dirrm lib/calibre/calibre/utils
1934	@dirrm lib/calibre/calibre/translations	1951	@dirrm lib/calibre/calibre/translations
1935	@dirrm lib/calibre/calibre/trac
1936	@dirrm lib/calibre/calibre/plugins	1952	@dirrm lib/calibre/calibre/plugins
1937	@dirrm lib/calibre/calibre/library/server	1953	@dirrm lib/calibre/calibre/library/server
1938	@dirrm lib/calibre/calibre/library/catalogs	1954	@dirrm lib/calibre/calibre/library/catalogs
Lines 2039-2044 Link Here
2039	@dirrm lib/calibre/calibre/devices/iriver	2055	@dirrm lib/calibre/calibre/devices/iriver
2040	@dirrm lib/calibre/calibre/devices/irexdr	2056	@dirrm lib/calibre/calibre/devices/irexdr
2041	@dirrm lib/calibre/calibre/devices/iliad	2057	@dirrm lib/calibre/calibre/devices/iliad
		2058	@dirrm lib/calibre/calibre/devices/idevice
2042	@dirrm lib/calibre/calibre/devices/hanvon	2059	@dirrm lib/calibre/calibre/devices/hanvon
2043	@dirrm lib/calibre/calibre/devices/hanlin	2060	@dirrm lib/calibre/calibre/devices/hanlin
2044	@dirrm lib/calibre/calibre/devices/folder_device	2061	@dirrm lib/calibre/calibre/devices/folder_device