View | Details | Raw Unified | Return to bug 180046 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-2 / +5 lines)
Lines 2-8 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	calibre
4
PORTNAME=	calibre
5
PORTVERSION=	0.9.30
5
PORTVERSION=	0.9.37
6
CATEGORIES=	deskutils python
6
CATEGORIES=	deskutils python
7
MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION}/
7
MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION}/
8
8
Lines 46-57 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
50
EXTRACT_BEFORE_ARGS=	-x -s '/^calibre/~-src/' -f
51
49
USES=		shared-mime-info
52
USES=		shared-mime-info
50
USE_XZ=		yes
53
USE_XZ=		yes
51
USE_PYTHON=	2.7
54
USE_PYTHON=	2.7
52
USE_QT4=	qmake_build moc_build
55
USE_QT4=	qmake_build moc_build
53
INSTALLS_ICONS=	yes
56
INSTALLS_ICONS=	yes
54
WRKSRC=		${WRKDIR}/${PORTNAME}
57
WRKSRC=		${WRKDIR}/${PORTNAME}-src
55
CFLAGS+=	-I${LOCALBASE}/include
58
CFLAGS+=	-I${LOCALBASE}/include
56
LDFLAGS+=	-L${LOCALBASE}/lib
59
LDFLAGS+=	-L${LOCALBASE}/lib
57
MAKE_ENV+=	FC_INC_DIR="${LOCALBASE}/include/fontconfig" \
60
MAKE_ENV+=	FC_INC_DIR="${LOCALBASE}/include/fontconfig" \
(-)distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (calibre-0.9.30.tar.xz) = eab88d0d5ade70dd1bae9522f444ddd3ab71b2d57a159d6ecc6276cd674fc927
1
SHA256 (calibre-0.9.37.tar.xz) = b0c88ae578b192a4906f40c497c075fcf5edc887e1878a8800512abcdd255daf
2
SIZE (calibre-0.9.30.tar.xz) = 28894864
2
SIZE (calibre-0.9.37.tar.xz) = 29203040
(-)files/calibre.in (+66 lines)
Line 0 Link Here
1
#!/bin/sh
2
#
3
# $FreeBSD: madpilot/trunk/deskutils/calibre/files/calibre.in 845 2013-06-30 22:32:12Z mad $
4
#
5
# PROVIDE: calibre
6
# REQUIRE: DAEMON
7
# KEYWORD: shutdown
8
#
9
# Add the following lines to /etc/rc.conf to enable calibre_server:
10
#
11
# calibre_enable (bool):        Set it to "YES" to enable calibre
12
#                               Default is "NO".
13
# calibre_port (int):		port that calibre_server listens on
14
#				Default is 8080
15
# calibre_user (string):	user that calibre_server runs as
16
#				Default is calibre
17
# calibre_username (string):	username for calibre authentication
18
#				Default is calibre
19
# calibre_password (string):	If set then access is restricted
20
#				default is unrestricted
21
# calibre_url_prefix (string):  prefix to append to all URLs
22
#				default is unset
23
# calibre_library (string):	path to library folder to serve content from
24
#
25
#
26
##########################################################
27
28
. /etc/rc.subr
29
30
name=calibre
31
rcvar=calibre_enable
32
33
load_rc_config $name
34
35
: ${calibre_enable:=NO}
36
: ${calibre_user:=calibre}
37
: ${calibre_library:=/nonexistent}
38
39
pidfile=/var/run/${name}/${name}.pid
40
command=/usr/local/bin/calibre-server
41
command_interpreter=python2.7
42
required_dirs=${calibre_library}
43
44
start_cmd=${name}_start
45
46
start_precmd="install -d -o ${calibre_user} -m755 /var/run/${name}"
47
48
calibre_start()
49
{
50
	if [ ! -z "${calibre_port}" ]; then
51
		command_args="${command_args} --port=${calibre_port}"
52
	fi
53
	if [ ! -z "${calibre_username}" ]; then
54
		command_args="${command_args} --username=${calibre_username}"
55
	fi
56
	if [ ! -z "${calibre_password}" ]; then
57
		command_args="${command_args} --password=${calibre_password}"
58
	fi
59
	if [ ! -z "${calibre_url_prefix}" ]; then
60
		command_args="${command_args} --url_prefx=${calibre_url_prefix}"
61
	fi
62
63
	/usr/sbin/daemon -f -u ${calibre_user} -p ${pidfile} ${command} ${command_args} --with-library ${calibre_library}
64
}
65
66
run_rc_command "$1"
(-)pkg-plist (-4 / +22 lines)
Lines 82-87 Link Here
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 396-401 Link Here
396
lib/calibre/calibre/ebooks/oeb/stylizer.py
409
lib/calibre/calibre/ebooks/oeb/stylizer.py
397
lib/calibre/calibre/ebooks/oeb/transforms/__init__.py
410
lib/calibre/calibre/ebooks/oeb/transforms/__init__.py
398
lib/calibre/calibre/ebooks/oeb/transforms/cover.py
411
lib/calibre/calibre/ebooks/oeb/transforms/cover.py
412
lib/calibre/calibre/ebooks/oeb/transforms/embed_fonts.py
399
lib/calibre/calibre/ebooks/oeb/transforms/filenames.py
413
lib/calibre/calibre/ebooks/oeb/transforms/filenames.py
400
lib/calibre/calibre/ebooks/oeb/transforms/flatcss.py
414
lib/calibre/calibre/ebooks/oeb/transforms/flatcss.py
401
lib/calibre/calibre/ebooks/oeb/transforms/guide.py
415
lib/calibre/calibre/ebooks/oeb/transforms/guide.py
Lines 451-456 Link Here
451
lib/calibre/calibre/ebooks/pdf/render/links.py
465
lib/calibre/calibre/ebooks/pdf/render/links.py
452
lib/calibre/calibre/ebooks/pdf/render/serialize.py
466
lib/calibre/calibre/ebooks/pdf/render/serialize.py
453
lib/calibre/calibre/ebooks/pdf/render/test.py
467
lib/calibre/calibre/ebooks/pdf/render/test.py
468
lib/calibre/calibre/ebooks/pdf/render/toc.py
454
lib/calibre/calibre/ebooks/pdf/writer.py
469
lib/calibre/calibre/ebooks/pdf/writer.py
455
lib/calibre/calibre/ebooks/pml/__init__.py
470
lib/calibre/calibre/ebooks/pml/__init__.py
456
lib/calibre/calibre/ebooks/pml/pmlconverter.py
471
lib/calibre/calibre/ebooks/pml/pmlconverter.py
Lines 604-609 Link Here
604
lib/calibre/calibre/gui2/convert/comic_input_ui.py
619
lib/calibre/calibre/gui2/convert/comic_input_ui.py
605
lib/calibre/calibre/gui2/convert/debug.py
620
lib/calibre/calibre/gui2/convert/debug.py
606
lib/calibre/calibre/gui2/convert/debug_ui.py
621
lib/calibre/calibre/gui2/convert/debug_ui.py
622
lib/calibre/calibre/gui2/convert/docx_input_ui.py
623
lib/calibre/calibre/gui2/convert/docx_input.py
607
lib/calibre/calibre/gui2/convert/djvu_input.py
624
lib/calibre/calibre/gui2/convert/djvu_input.py
608
lib/calibre/calibre/gui2/convert/djvu_input_ui.py
625
lib/calibre/calibre/gui2/convert/djvu_input_ui.py
609
lib/calibre/calibre/gui2/convert/epub_output.py
626
lib/calibre/calibre/gui2/convert/epub_output.py
Lines 873-879 Link Here
873
lib/calibre/calibre/gui2/store/stores/eharlequin_plugin.py
890
lib/calibre/calibre/gui2/store/stores/eharlequin_plugin.py
874
lib/calibre/calibre/gui2/store/stores/eknigi_plugin.py
891
lib/calibre/calibre/gui2/store/stores/eknigi_plugin.py
875
lib/calibre/calibre/gui2/store/stores/empik_plugin.py
892
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
893
lib/calibre/calibre/gui2/store/stores/feedbooks_plugin.py
878
lib/calibre/calibre/gui2/store/stores/foyles_uk_plugin.py
894
lib/calibre/calibre/gui2/store/stores/foyles_uk_plugin.py
879
lib/calibre/calibre/gui2/store/stores/google_books_plugin.py
895
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
920
lib/calibre/calibre/gui2/store/stores/rw2010_plugin.py
905
lib/calibre/calibre/gui2/store/stores/smashwords_plugin.py
921
lib/calibre/calibre/gui2/store/stores/smashwords_plugin.py
906
lib/calibre/calibre/gui2/store/stores/sony_plugin.py
922
lib/calibre/calibre/gui2/store/stores/sony_plugin.py
923
lib/calibre/calibre/gui2/store/stores/sony_au_plugin.py
907
lib/calibre/calibre/gui2/store/stores/virtualo_plugin.py
924
lib/calibre/calibre/gui2/store/stores/virtualo_plugin.py
908
lib/calibre/calibre/gui2/store/stores/waterstones_uk_plugin.py
925
lib/calibre/calibre/gui2/store/stores/waterstones_uk_plugin.py
909
lib/calibre/calibre/gui2/store/stores/weightless_books_plugin.py
926
lib/calibre/calibre/gui2/store/stores/weightless_books_plugin.py
Lines 943-948 Link Here
943
lib/calibre/calibre/gui2/viewer/table_popup.py
960
lib/calibre/calibre/gui2/viewer/table_popup.py
944
lib/calibre/calibre/gui2/viewer/toc.py
961
lib/calibre/calibre/gui2/viewer/toc.py
945
lib/calibre/calibre/gui2/widgets.py
962
lib/calibre/calibre/gui2/widgets.py
963
lib/calibre/calibre/gui2/widgets2.py
946
lib/calibre/calibre/gui2/wizard/__init__.py
964
lib/calibre/calibre/gui2/wizard/__init__.py
947
lib/calibre/calibre/gui2/wizard/device_ui.py
965
lib/calibre/calibre/gui2/wizard/device_ui.py
948
lib/calibre/calibre/gui2/wizard/finish_ui.py
966
lib/calibre/calibre/gui2/wizard/finish_ui.py
Lines 1008-1015 Link Here
1008
lib/calibre/calibre/ptempfile.py
1026
lib/calibre/calibre/ptempfile.py
1009
lib/calibre/calibre/startup.py
1027
lib/calibre/calibre/startup.py
1010
lib/calibre/calibre/test_build.py
1028
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
1029
lib/calibre/calibre/translations/__init__.py
1014
lib/calibre/calibre/translations/dynamic.py
1030
lib/calibre/calibre/translations/dynamic.py
1015
lib/calibre/calibre/translations/msgfmt.py
1031
lib/calibre/calibre/translations/msgfmt.py
Lines 1120-1125 Link Here
1120
lib/calibre/calibre/web/__init__.py
1136
lib/calibre/calibre/web/__init__.py
1121
lib/calibre/calibre/web/feeds/__init__.py
1137
lib/calibre/calibre/web/feeds/__init__.py
1122
lib/calibre/calibre/web/feeds/feedparser.py
1138
lib/calibre/calibre/web/feeds/feedparser.py
1139
lib/calibre/calibre/web/feeds/jsnews.py
1123
lib/calibre/calibre/web/feeds/news.py
1140
lib/calibre/calibre/web/feeds/news.py
1124
lib/calibre/calibre/web/feeds/recipes/__init__.py
1141
lib/calibre/calibre/web/feeds/recipes/__init__.py
1125
lib/calibre/calibre/web/feeds/recipes/collection.py
1142
lib/calibre/calibre/web/feeds/recipes/collection.py
Lines 1126-1131 Link Here
1126
lib/calibre/calibre/web/feeds/recipes/model.py
1143
lib/calibre/calibre/web/feeds/recipes/model.py
1127
lib/calibre/calibre/web/feeds/templates.py
1144
lib/calibre/calibre/web/feeds/templates.py
1128
lib/calibre/calibre/web/fetch/__init__.py
1145
lib/calibre/calibre/web/fetch/__init__.py
1146
lib/calibre/calibre/web/fetch/javascript.py
1129
lib/calibre/calibre/web/fetch/simple.py
1147
lib/calibre/calibre/web/fetch/simple.py
1130
lib/calibre/calibre/web/jsbrowser/__init__.py
1148
lib/calibre/calibre/web/jsbrowser/__init__.py
1131
lib/calibre/calibre/web/jsbrowser/browser.py
1149
lib/calibre/calibre/web/jsbrowser/browser.py
Lines 1932-1938 Link Here
1932
@dirrm lib/calibre/calibre/utils/chm
1950
@dirrm lib/calibre/calibre/utils/chm
1933
@dirrm lib/calibre/calibre/utils
1951
@dirrm lib/calibre/calibre/utils
1934
@dirrm lib/calibre/calibre/translations
1952
@dirrm lib/calibre/calibre/translations
1935
@dirrm lib/calibre/calibre/trac
1936
@dirrm lib/calibre/calibre/plugins
1953
@dirrm lib/calibre/calibre/plugins
1937
@dirrm lib/calibre/calibre/library/server
1954
@dirrm lib/calibre/calibre/library/server
1938
@dirrm lib/calibre/calibre/library/catalogs
1955
@dirrm lib/calibre/calibre/library/catalogs
Lines 2039-2044 Link Here
2039
@dirrm lib/calibre/calibre/devices/iriver
2056
@dirrm lib/calibre/calibre/devices/iriver
2040
@dirrm lib/calibre/calibre/devices/irexdr
2057
@dirrm lib/calibre/calibre/devices/irexdr
2041
@dirrm lib/calibre/calibre/devices/iliad
2058
@dirrm lib/calibre/calibre/devices/iliad
2059
@dirrm lib/calibre/calibre/devices/idevice
2042
@dirrm lib/calibre/calibre/devices/hanvon
2060
@dirrm lib/calibre/calibre/devices/hanvon
2043
@dirrm lib/calibre/calibre/devices/hanlin
2061
@dirrm lib/calibre/calibre/devices/hanlin
2044
@dirrm lib/calibre/calibre/devices/folder_device
2062
@dirrm lib/calibre/calibre/devices/folder_device

Return to bug 180046