Attachment #147755 for bug #193397




You should get into the habit of checking this file for changes each time
you update your ports collection, before attempting any port upgrades.

20140928:
  AFFECTS: users of deskutils/calibre
  AUTHOR: madpilot@FreeBSD.org

  The dependency on graphics/py-imaging in calibre has been changed
  to using the graphics/py-pillow port.

  Due to this change automatic updating of the port will not work
  correctly.

  It is suggested to remove calibre and py-imaging from the system
  and then reinstall calibre again using binary packages or ports.

20140927:
  AFFECTS: users of net/foreman-proxy
  AUTHOR: mm@FreeBSD.org




# $FreeBSD$

PORTNAME=	calibre
PORTVERSION=	1.48.0
PORTREVISION=	2
CATEGORIES=	deskutils python
MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION}/


		${PYTHON_PKGNAMEPREFIX}qt4-network>=0:${PORTSDIR}/net/py-qt4-network \
		${PYTHON_PKGNAMEPREFIX}qt4-webkit>=0:${PORTSDIR}/www/py-qt4-webkit \
		${PYTHON_PKGNAMEPREFIX}dateutil>=0:${PORTSDIR}/devel/py-dateutil \
		${PYTHON_PKGNAMEPREFIX}pillow>=0:${PORTSDIR}/graphics/py-pillow \
		${PYTHON_PKGNAMEPREFIX}lxml>=0:${PORTSDIR}/devel/py-lxml
RUN_DEPENDS=	xdg-open:${PORTSDIR}/devel/xdg-utils \
		${PYTHON_PKGNAMEPREFIX}cssutils>=0.9.9:${PORTSDIR}/www/py-cssutils \

		${PYTHON_PKGNAMEPREFIX}dnspython>=0:${PORTSDIR}/dns/py-dnspython \
		${PYTHON_PKGNAMEPREFIX}dateutil>=0:${PORTSDIR}/devel/py-dateutil \
		${PYTHON_SITELIBDIR}/BeautifulSoup.py:${PORTSDIR}/www/py-beautifulsoup32 \
		${PYTHON_PKGNAMEPREFIX}pillow>=0:${PORTSDIR}/graphics/py-pillow \
		${PYTHON_PKGNAMEPREFIX}lxml>=0:${PORTSDIR}/devel/py-lxml \
		${PYTHON_PKGNAMEPREFIX}mechanize>=0:${PORTSDIR}/www/py-mechanize \
		${PYTHON_PKGNAMEPREFIX}sqlite3>=0:${PORTSDIR}/databases/py-sqlite3 \

USE_RC_SUBR=	calibre
EXTRACT_BEFORE_ARGS=	-x -s '/^calibre/~-src/' -f

USES=		desktop-file-utils pkgconfig python:2 shared-mime-info shebangfix tar:xz
SHEBANG_FILES=	src/calibre/ebooks/metadata/odt.py \
		src/calibre/utils/*.py \
		src/odf/*.py
USE_PYTHON=	2
USE_QT4=	dbus qmake_build moc_build
INSTALLS_ICONS=	yes
WRKSRC=		${WRKDIR}/${PORTNAME}-src

Lines 1-2 Link Here

(-)deskutils/calibre/distinfo (-2 / +2 lines)
1	SHA256 (calibre-1.47.0.tar.xz) = efeb71a5bb4742a9c0a99038fdd97baa55c35e8ba5312e19e422c004bbf5b8c2	1	SHA256 (calibre-1.48.0.tar.xz) = e704090f6611c5e374252c3f1b58e077ccd3170a3ea39893e5bf687287abf472
2	SIZE (calibre-1.47.0.tar.xz) = 36581960	2	SIZE (calibre-1.48.0.tar.xz) = 35126680




lib/calibre/calibre/gui2/update.py
lib/calibre/calibre/gui2/viewer/__init__.py
lib/calibre/calibre/gui2/viewer/bookmarkmanager.py
lib/calibre/calibre/gui2/viewer/bookmarkmanager_ui.py
lib/calibre/calibre/gui2/viewer/config.py
lib/calibre/calibre/gui2/viewer/config_ui.py
lib/calibre/calibre/gui2/viewer/documentview.py

lib/calibre/calibre/gui2/viewer/javascript.py
lib/calibre/calibre/gui2/viewer/keys.py
lib/calibre/calibre/gui2/viewer/main.py
lib/calibre/calibre/gui2/viewer/main_ui.py
lib/calibre/calibre/gui2/viewer/position.py
lib/calibre/calibre/gui2/viewer/printing.py
lib/calibre/calibre/gui2/viewer/table_popup.py
lib/calibre/calibre/gui2/viewer/toc.py
lib/calibre/calibre/gui2/viewer/ui.py
lib/calibre/calibre/gui2/widgets.py
lib/calibre/calibre/gui2/widgets2.py
lib/calibre/calibre/gui2/wizard/__init__.py

Return to bug 193397

Lines 5-10 Link Here

(-)UPDATING (+13 lines)
5	You should get into the habit of checking this file for changes each time	5	You should get into the habit of checking this file for changes each time
6	you update your ports collection, before attempting any port upgrades.	6	you update your ports collection, before attempting any port upgrades.
7		7
		8	20140928:
		9	AFFECTS: users of deskutils/calibre
		10	AUTHOR: madpilot@FreeBSD.org
		11
		12	The dependency on graphics/py-imaging in calibre has been changed
		13	to using the graphics/py-pillow port.
		14
		15	Due to this change automatic updating of the port will not work
		16	correctly.
		17
		18	It is suggested to remove calibre and py-imaging from the system
		19	and then reinstall calibre again using binary packages or ports.
		20
8	20140927:	21	20140927:
9	AFFECTS: users of net/foreman-proxy	22	AFFECTS: users of net/foreman-proxy
10	AUTHOR: mm@FreeBSD.org	23	AUTHOR: mm@FreeBSD.org

Lines 2-9 Link Here

(-)deskutils/calibre/Makefile (-6 / +4 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= calibre	4	PORTNAME= calibre
5	PORTVERSION= 1.47.0	5	PORTVERSION= 1.48.0
6	PORTREVISION= 2
7	CATEGORIES= deskutils python	6	CATEGORIES= deskutils python
8	MASTER_SITES= SF/${PORTNAME}/${PORTVERSION}/	7	MASTER_SITES= SF/${PORTNAME}/${PORTVERSION}/
9		8
Lines 24-30 Link Here
24	${PYTHON_PKGNAMEPREFIX}qt4-network>=0:${PORTSDIR}/net/py-qt4-network \	23	${PYTHON_PKGNAMEPREFIX}qt4-network>=0:${PORTSDIR}/net/py-qt4-network \
25	${PYTHON_PKGNAMEPREFIX}qt4-webkit>=0:${PORTSDIR}/www/py-qt4-webkit \	24	${PYTHON_PKGNAMEPREFIX}qt4-webkit>=0:${PORTSDIR}/www/py-qt4-webkit \
26	${PYTHON_PKGNAMEPREFIX}dateutil>=0:${PORTSDIR}/devel/py-dateutil \	25	${PYTHON_PKGNAMEPREFIX}dateutil>=0:${PORTSDIR}/devel/py-dateutil \
27	${PYTHON_PKGNAMEPREFIX}imaging>=0:${PORTSDIR}/graphics/py-imaging \	26	${PYTHON_PKGNAMEPREFIX}pillow>=0:${PORTSDIR}/graphics/py-pillow \
28	${PYTHON_PKGNAMEPREFIX}lxml>=0:${PORTSDIR}/devel/py-lxml	27	${PYTHON_PKGNAMEPREFIX}lxml>=0:${PORTSDIR}/devel/py-lxml
29	RUN_DEPENDS= xdg-open:${PORTSDIR}/devel/xdg-utils \	28	RUN_DEPENDS= xdg-open:${PORTSDIR}/devel/xdg-utils \
30	${PYTHON_PKGNAMEPREFIX}cssutils>=0.9.9:${PORTSDIR}/www/py-cssutils \	29	${PYTHON_PKGNAMEPREFIX}cssutils>=0.9.9:${PORTSDIR}/www/py-cssutils \
Lines 31-37 Link Here
31	${PYTHON_PKGNAMEPREFIX}dnspython>=0:${PORTSDIR}/dns/py-dnspython \	30	${PYTHON_PKGNAMEPREFIX}dnspython>=0:${PORTSDIR}/dns/py-dnspython \
32	${PYTHON_PKGNAMEPREFIX}dateutil>=0:${PORTSDIR}/devel/py-dateutil \	31	${PYTHON_PKGNAMEPREFIX}dateutil>=0:${PORTSDIR}/devel/py-dateutil \
33	${PYTHON_SITELIBDIR}/BeautifulSoup.py:${PORTSDIR}/www/py-beautifulsoup32 \	32	${PYTHON_SITELIBDIR}/BeautifulSoup.py:${PORTSDIR}/www/py-beautifulsoup32 \
34	${PYTHON_PKGNAMEPREFIX}imaging>=0:${PORTSDIR}/graphics/py-imaging \	33	${PYTHON_PKGNAMEPREFIX}pillow>=0:${PORTSDIR}/graphics/py-pillow \
35	${PYTHON_PKGNAMEPREFIX}lxml>=0:${PORTSDIR}/devel/py-lxml \	34	${PYTHON_PKGNAMEPREFIX}lxml>=0:${PORTSDIR}/devel/py-lxml \
36	${PYTHON_PKGNAMEPREFIX}mechanize>=0:${PORTSDIR}/www/py-mechanize \	35	${PYTHON_PKGNAMEPREFIX}mechanize>=0:${PORTSDIR}/www/py-mechanize \
37	${PYTHON_PKGNAMEPREFIX}sqlite3>=0:${PORTSDIR}/databases/py-sqlite3 \	36	${PYTHON_PKGNAMEPREFIX}sqlite3>=0:${PORTSDIR}/databases/py-sqlite3 \
Lines 51-61 Link Here
51	USE_RC_SUBR= calibre	50	USE_RC_SUBR= calibre
52	EXTRACT_BEFORE_ARGS= -x -s '/^calibre/~-src/' -f	51	EXTRACT_BEFORE_ARGS= -x -s '/^calibre/~-src/' -f
53		52
54	USES= desktop-file-utils pkgconfig shared-mime-info shebangfix tar:xz	53	USES= desktop-file-utils pkgconfig python:2 shared-mime-info shebangfix tar:xz
55	SHEBANG_FILES= src/calibre/ebooks/metadata/odt.py \	54	SHEBANG_FILES= src/calibre/ebooks/metadata/odt.py \
56	src/calibre/utils/*.py \	55	src/calibre/utils/*.py \
57	src/odf/*.py	56	src/odf/*.py
58	USE_PYTHON= 2
59	USE_QT4= dbus qmake_build moc_build	57	USE_QT4= dbus qmake_build moc_build
60	INSTALLS_ICONS= yes	58	INSTALLS_ICONS= yes
61	WRKSRC= ${WRKDIR}/${PORTNAME}-src	59	WRKSRC= ${WRKDIR}/${PORTNAME}-src

Lines 1045-1051 Link Here

(-)deskutils/calibre/pkg-plist (-2 / +1 lines)
1045	lib/calibre/calibre/gui2/update.py	1045	lib/calibre/calibre/gui2/update.py
1046	lib/calibre/calibre/gui2/viewer/__init__.py	1046	lib/calibre/calibre/gui2/viewer/__init__.py
1047	lib/calibre/calibre/gui2/viewer/bookmarkmanager.py	1047	lib/calibre/calibre/gui2/viewer/bookmarkmanager.py
1048	lib/calibre/calibre/gui2/viewer/bookmarkmanager_ui.py
1049	lib/calibre/calibre/gui2/viewer/config.py	1048	lib/calibre/calibre/gui2/viewer/config.py
1050	lib/calibre/calibre/gui2/viewer/config_ui.py	1049	lib/calibre/calibre/gui2/viewer/config_ui.py
1051	lib/calibre/calibre/gui2/viewer/documentview.py	1050	lib/calibre/calibre/gui2/viewer/documentview.py
Lines 1056-1066 Link Here
1056	lib/calibre/calibre/gui2/viewer/javascript.py	1055	lib/calibre/calibre/gui2/viewer/javascript.py
1057	lib/calibre/calibre/gui2/viewer/keys.py	1056	lib/calibre/calibre/gui2/viewer/keys.py
1058	lib/calibre/calibre/gui2/viewer/main.py	1057	lib/calibre/calibre/gui2/viewer/main.py
1059	lib/calibre/calibre/gui2/viewer/main_ui.py
1060	lib/calibre/calibre/gui2/viewer/position.py	1058	lib/calibre/calibre/gui2/viewer/position.py
1061	lib/calibre/calibre/gui2/viewer/printing.py	1059	lib/calibre/calibre/gui2/viewer/printing.py
1062	lib/calibre/calibre/gui2/viewer/table_popup.py	1060	lib/calibre/calibre/gui2/viewer/table_popup.py
1063	lib/calibre/calibre/gui2/viewer/toc.py	1061	lib/calibre/calibre/gui2/viewer/toc.py
		1062	lib/calibre/calibre/gui2/viewer/ui.py
1064	lib/calibre/calibre/gui2/widgets.py	1063	lib/calibre/calibre/gui2/widgets.py
1065	lib/calibre/calibre/gui2/widgets2.py	1064	lib/calibre/calibre/gui2/widgets2.py
1066	lib/calibre/calibre/gui2/wizard/__init__.py	1065	lib/calibre/calibre/gui2/wizard/__init__.py