Index: head/deskutils/calibre/Makefile =================================================================== --- head/deskutils/calibre/Makefile (revision 403722) +++ head/deskutils/calibre/Makefile (revision 403723) @@ -1,102 +1,102 @@ # Created by: stas # $FreeBSD$ PORTNAME= calibre -PORTVERSION= 1.48.0 -PORTREVISION= 9 +PORTVERSION= 2.46.0 CATEGORIES= deskutils python -MASTER_SITES= SF/${PORTNAME}/${PORTVERSION}/ +MASTER_SITES= http://download.calibre-ebook.com/${PORTVERSION}/ MAINTAINER= madpilot@FreeBSD.org COMMENT= Ebook management application LIB_DEPENDS= libMagickWand-6.so:${PORTSDIR}/graphics/ImageMagick \ libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \ - libpoppler-qt4.so:${PORTSDIR}/graphics/poppler-qt4 \ + libpoppler-qt5.so:${PORTSDIR}/graphics/poppler-qt5 \ libwmflite.so:${PORTSDIR}/graphics/libwmf \ libchm.so:${PORTSDIR}/misc/chmlib \ libicudata.so:${PORTSDIR}/devel/icu \ - libpodofo.so:${PORTSDIR}/graphics/podofo + libpodofo.so:${PORTSDIR}/graphics/podofo \ + libmtp.so:${PORTSDIR}/multimedia/libmtp BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sip>=0:${PORTSDIR}/devel/py-sip \ ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:${PORTSDIR}/databases/py-sqlite3 \ - ${PYTHON_PKGNAMEPREFIX}qt4-core>=0:${PORTSDIR}/devel/py-qt4-core \ - ${PYTHON_PKGNAMEPREFIX}qt4-gui>=0:${PORTSDIR}/x11-toolkits/py-qt4-gui \ - ${PYTHON_PKGNAMEPREFIX}qt4-network>=0:${PORTSDIR}/net/py-qt4-network \ - ${PYTHON_PKGNAMEPREFIX}qt4-webkit>=0:${PORTSDIR}/www/py-qt4-webkit \ + ${PYTHON_PKGNAMEPREFIX}qt5-core>=0:${PORTSDIR}/devel/py-qt5-core \ + ${PYTHON_PKGNAMEPREFIX}qt5-gui>=0:${PORTSDIR}/x11-toolkits/py-qt5-gui \ + ${PYTHON_PKGNAMEPREFIX}qt5-network>=0:${PORTSDIR}/net/py-qt5-network \ + ${PYTHON_PKGNAMEPREFIX}qt5-webkit>=0:${PORTSDIR}/www/py-qt5-webkit \ + ${PYTHON_PKGNAMEPREFIX}qt5-widgets>=0:${PORTSDIR}/x11-toolkits/py-qt5-widgets \ + ${PYTHON_PKGNAMEPREFIX}qt5-webkitwidgets>=0:${PORTSDIR}/www/py-qt5-webkitwidgets \ ${PYTHON_PKGNAMEPREFIX}dateutil>=0:${PORTSDIR}/devel/py-dateutil \ ${PYTHON_PKGNAMEPREFIX}pillow>=0:${PORTSDIR}/graphics/py-pillow \ - ${PYTHON_PKGNAMEPREFIX}lxml>=0:${PORTSDIR}/devel/py-lxml \ - ${NONEXISTENT}:${PORTSDIR}/x11-toolkits/qt4-gui:patch + ${PYTHON_PKGNAMEPREFIX}psutil>=2.0.0:${PORTSDIR}/sysutils/py-psutil \ + ${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}beautifulsoup32>=0:${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 \ - ${PYTHON_PKGNAMEPREFIX}qt4-core>=0:${PORTSDIR}/devel/py-qt4-core \ - ${PYTHON_PKGNAMEPREFIX}qt4-gui>=0:${PORTSDIR}/x11-toolkits/py-qt4-gui \ - ${PYTHON_PKGNAMEPREFIX}qt4-network>=0:${PORTSDIR}/net/py-qt4-network \ - ${PYTHON_PKGNAMEPREFIX}qt4-svg>=0:${PORTSDIR}/graphics/py-qt4-svg \ - ${PYTHON_PKGNAMEPREFIX}qt4-webkit>=0:${PORTSDIR}/www/py-qt4-webkit \ - ${PYTHON_PKGNAMEPREFIX}qt4-xml>=0:${PORTSDIR}/textproc/py-qt4-xml \ + ${PYTHON_PKGNAMEPREFIX}qt5-core>=0:${PORTSDIR}/devel/py-qt5-core \ + ${PYTHON_PKGNAMEPREFIX}qt5-gui>=0:${PORTSDIR}/x11-toolkits/py-qt5-gui \ + ${PYTHON_PKGNAMEPREFIX}qt5-network>=0:${PORTSDIR}/net/py-qt5-network \ + ${PYTHON_PKGNAMEPREFIX}qt5-svg>=0:${PORTSDIR}/graphics/py-qt5-svg \ + ${PYTHON_PKGNAMEPREFIX}qt5-webkit>=0:${PORTSDIR}/www/py-qt5-webkit \ + ${PYTHON_PKGNAMEPREFIX}qt5-widgets>=0:${PORTSDIR}/x11-toolkits/py-qt5-widgets \ + ${PYTHON_PKGNAMEPREFIX}qt5-webkitwidgets>=0:${PORTSDIR}/www/py-qt5-webkitwidgets \ + ${PYTHON_PKGNAMEPREFIX}qt5-xmlpatterns>=0:${PORTSDIR}/textproc/py-qt5-xmlpatterns \ ${PYTHON_PKGNAMEPREFIX}dbus>=0:${PORTSDIR}/devel/py-dbus \ ${PYTHON_PKGNAMEPREFIX}netifaces>=0:${PORTSDIR}/net/py-netifaces \ ${PYTHON_PKGNAMEPREFIX}cssselect>=0:${PORTSDIR}/www/py-cssselect \ ${PYTHON_PKGNAMEPREFIX}apsw>=0:${PORTSDIR}/databases/py-apsw \ pdftohtml:${PORTSDIR}/graphics/poppler-utils 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_QT4= dbus qmake_build moc_build -USE_GNOME= gtk20 -INSTALLS_ICONS= yes -WRKSRC= ${WRKDIR}/${PORTNAME}-src +USE_QT5= buildtools_build dbus qmake_build +WRKSRC= ${WRKDIR}/${PORTNAME}-src-${PORTVERSION} CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib MAKE_ENV+= FC_INC_DIR="${LOCALBASE}/include/fontconfig" \ FC_LIB_DIR="${LOCALBASE}/lib" \ OVERRIDE_CFLAGS="${CFLAGS}" \ OVERRIDE_LDFLAGS="${LDFLAGS}" \ PODOFO_LIB_DIR="${LOCALBASE}/lib" \ PODOFO_INC_DIR="${LOCALBASE}/include/podofo" \ WITH_USB=yes \ CALIBRE_CONFIG_DIRECTORY=${WRKDIR}/calibre-config \ XDG_DATA_DIRS=${STAGEDIR}${PREFIX}/share \ XDG_CONFIG_HOME=${WRKDIR}/xdg-config \ - XDG_UTILS_INSTALL_MODE=system + XDG_UTILS_INSTALL_MODE=system \ + QMAKE=${QMAKE} .include -QTGUI_WRKSRC!= cd ${PORTSDIR}/x11-toolkits/qt4-gui && ${MAKE} -V WRKSRC - post-patch: @${FIND} ${WRKSRC}/resources/content_server -name "*.orig" -delete - @${REINPLACE_CMD} -e "/^qt_private_inc =/s|\[]|[ '${QTGUI_WRKSRC}/include/QtGui', '${QTGUI_WRKSRC}/include/QtCore' ]|" \ - ${WRKSRC}/setup/build_environment.py do-build: @${MKDIR} ${WRKDIR}/calibre-config ${WRKDIR}/xdg-config @(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} \ ${PYSETUP} build) do-install: -.for dir in bash-completion gnome/apps mime/packages \ - icons/hicolor/128x128 zsh/site-functions - ${MKDIR} ${STAGEDIR}${PREFIX}/share/${dir} -.endfor - ${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PYTHON_VERSION}/site-packages + @${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PYTHON_VERSION}/site-packages \ + ${STAGEDIR}${PREFIX}/share/icons/hicolor \ + ${STAGEDIR}${PREFIX}/share/applications \ + ${STAGEDIR}${PREFIX}/share/desktop-directories \ + ${STAGEDIR}${PREFIX}/share/mime/packages (cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} \ ${PYSETUP} install --prefix ${PREFIX} \ --staging-root ${STAGEDIR}${PREFIX}) @${RM} ${STAGEDIR}${PREFIX}/bin/calibre-uninstall + @${RMDIR} ${STAGEDIR}${PREFIX}/share/desktop-directories @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/calibre/calibre/plugins/* .include Index: head/deskutils/calibre/distinfo =================================================================== --- head/deskutils/calibre/distinfo (revision 403722) +++ head/deskutils/calibre/distinfo (revision 403723) @@ -1,2 +1,2 @@ -SHA256 (calibre-1.48.0.tar.xz) = e704090f6611c5e374252c3f1b58e077ccd3170a3ea39893e5bf687287abf472 -SIZE (calibre-1.48.0.tar.xz) = 35126680 +SHA256 (calibre-2.46.0.tar.xz) = 6b529b7893400cc07dbb2f76d3238bbe250ee5ac218dc7a135f4142eccbae145 +SIZE (calibre-2.46.0.tar.xz) = 38789944 Index: head/deskutils/calibre/files/patch-calibre_browse.html =================================================================== --- head/deskutils/calibre/files/patch-calibre_browse.html (revision 403722) +++ head/deskutils/calibre/files/patch-calibre_browse.html (nonexistent) @@ -1,20 +0,0 @@ ---- resources/content_server/browse/browse.html.orig 2014-07-18 13:16:04.000000000 -0500 -+++ resources/content_server/browse/browse.html 2014-07-18 13:17:42.000000000 -0500 -@@ -6,7 +6,7 @@ - - ..:: calibre {library} ::.. {title} - -- -+ - - - -@@ -62,8 +62,6 @@ - -- - - - Property changes on: head/deskutils/calibre/files/patch-calibre_browse.html ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/deskutils/calibre/files/patch-calibre_content.py =================================================================== --- head/deskutils/calibre/files/patch-calibre_content.py (revision 403722) +++ head/deskutils/calibre/files/patch-calibre_content.py (nonexistent) @@ -1,10 +0,0 @@ ---- src/calibre/library/server/content.py.orig 2014-07-18 13:13:33.000000000 -0500 -+++ src/calibre/library/server/content.py 2014-07-18 13:14:11.000000000 -0500 -@@ -111,6 +111,7 @@ - 'png' : 'image/png', - 'gif' : 'image/gif', - 'html' : 'text/html', -+ 'ico' : 'image/x-icon', - }[fname.rpartition('.')[-1].lower()] - except KeyError: - raise cherrypy.HTTPError(404, '%r not a valid resource type'%name) Property changes on: head/deskutils/calibre/files/patch-calibre_content.py ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/deskutils/calibre/files/patch-setup_extensions.py =================================================================== --- head/deskutils/calibre/files/patch-setup_extensions.py (revision 403722) +++ head/deskutils/calibre/files/patch-setup_extensions.py (nonexistent) @@ -1,13 +0,0 @@ ---- setup/extensions.py.orig 2013-11-22 10:29:37.000000000 -0600 -+++ setup/extensions.py 2013-11-22 10:30:39.000000000 -0600 -@@ -496,8 +489,9 @@ - - pro = textwrap.dedent(''' - TEMPLATE = lib -- CONFIG += qt plugin release -+ CONFIG += qt plugin release link_pkgconfig - CONFIG -= embed_manifest_dll -+ PKGCONFIG += glib-2.0 gtk+-2.0 - VERSION = 1.0.0 - DESTDIR = . - TARGET = calibre Property changes on: head/deskutils/calibre/files/patch-setup_extensions.py ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/deskutils/calibre/files/patch-calibre_index.html =================================================================== --- head/deskutils/calibre/files/patch-calibre_index.html (revision 403722) +++ head/deskutils/calibre/files/patch-calibre_index.html (nonexistent) @@ -1,11 +0,0 @@ ---- resources/content_server/index.html.orig 2014-07-18 13:18:05.000000000 -0500 -+++ resources/content_server/index.html 2014-07-18 13:18:28.000000000 -0500 -@@ -8,7 +8,7 @@ - - - -- -+ - - - + + Property changes on: head/deskutils/calibre/files/patch-resources_content__server_browse_browse.html ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/deskutils/calibre/files/patch-resources_content__server_index.html =================================================================== --- head/deskutils/calibre/files/patch-resources_content__server_index.html (nonexistent) +++ head/deskutils/calibre/files/patch-resources_content__server_index.html (revision 403723) @@ -0,0 +1,17 @@ +--- resources/content_server/index.html.orig 2015-02-20 03:34:13 UTC ++++ resources/content_server/index.html +@@ -1,4 +1,4 @@ +- ++ + + + +@@ -9,7 +9,7 @@ + + + +- ++ + + +