From owner-svn-ports-all@FreeBSD.ORG Wed Apr 2 14:42:35 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id AE5271E5; Wed, 2 Apr 2014 14:42:35 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9917AA28; Wed, 2 Apr 2014 14:42:35 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s32EgZOI018074; Wed, 2 Apr 2014 14:42:35 GMT (envelope-from madpilot@svn.freebsd.org) Received: (from madpilot@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s32EgZN2018071; Wed, 2 Apr 2014 14:42:35 GMT (envelope-from madpilot@svn.freebsd.org) Message-Id: <201404021442.s32EgZN2018071@svn.freebsd.org> From: Guido Falsi Date: Wed, 2 Apr 2014 14:42:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r349924 - head/deskutils/calibre X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Apr 2014 14:42:35 -0000 Author: madpilot Date: Wed Apr 2 14:42:34 2014 New Revision: 349924 URL: http://svnweb.freebsd.org/changeset/ports/349924 QAT: https://qat.redports.org/buildarchive/r349924/ Log: - Update to 1.30.0 - Convert to USES=tar - Fix stage orphans PR: ports/188160 Submitted by: me Approved by: Rusty Nejdl (maintainer) Modified: head/deskutils/calibre/Makefile head/deskutils/calibre/distinfo head/deskutils/calibre/pkg-plist Modified: head/deskutils/calibre/Makefile ============================================================================== --- head/deskutils/calibre/Makefile Wed Apr 2 14:39:32 2014 (r349923) +++ head/deskutils/calibre/Makefile Wed Apr 2 14:42:34 2014 (r349924) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= calibre -PORTVERSION= 1.23.0 +PORTVERSION= 1.30.0 CATEGORIES= deskutils python MASTER_SITES= SF/${PORTNAME}/${PORTVERSION}/ @@ -50,11 +50,10 @@ RUN_DEPENDS= xdg-open:${PORTSDIR}/devel/ USE_RC_SUBR= calibre EXTRACT_BEFORE_ARGS= -x -s '/^calibre/~-src/' -f -USES= desktop-file-utils shared-mime-info shebangfix +USES= desktop-file-utils shared-mime-info shebangfix tar:xz SHEBANG_FILES= src/calibre/ebooks/metadata/odt.py \ src/calibre/utils/*.py \ src/odf/*.py -USE_XZ= yes USE_PYTHON= 2 USE_QT4= dbus qmake_build moc_build INSTALLS_ICONS= yes @@ -68,18 +67,22 @@ MAKE_ENV+= FC_INC_DIR="${LOCALBASE}/incl PODOFO_LIB_DIR="${LOCALBASE}/lib" \ PODOFO_INC_DIR="${LOCALBASE}/include/podofo" \ WITH_USB=yes \ - XDG_DATA_DIRS=${STAGEDIR}${PREFIX}/share + XDG_DATA_DIRS=${STAGEDIR}${PREFIX}/share \ + XDG_CONFIG_HOME=${STAGEDIR}/.config do-build: @(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} \ ${PYSETUP} build) do-install: + ${MKDIR} ${STAGEDIR}/.config .for dir in bash-completion desktop-directories gnome/apps mime/packages icons/hicolor/128x128/apps zsh/site-functions ${MKDIR} ${STAGEDIR}${PREFIX}/share/${dir} .endfor ${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PYTHON_VERSION}/site-packages @(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} \ ${PYSETUP} ${INSTALL} --prefix ${PREFIX} --staging-root ${STAGEDIR}${PREFIX}) + @${RM} ${STAGEDIR}${PREFIX}/bin/calibre-uninstall + @${RM} -r ${STAGEDIR}/.config .include Modified: head/deskutils/calibre/distinfo ============================================================================== --- head/deskutils/calibre/distinfo Wed Apr 2 14:39:32 2014 (r349923) +++ head/deskutils/calibre/distinfo Wed Apr 2 14:42:34 2014 (r349924) @@ -1,2 +1,2 @@ -SHA256 (calibre-1.23.0.tar.xz) = a95076588ae047b9f75f036da4c8b1eb573e7f0d8fd8b3afc5d38ac046d9a6ea -SIZE (calibre-1.23.0.tar.xz) = 32690648 +SHA256 (calibre-1.30.0.tar.xz) = 37251589399a31223843b8f4dca7c7a45af133ffed1976dccc9b3887384ff5a1 +SIZE (calibre-1.30.0.tar.xz) = 33064324 Modified: head/deskutils/calibre/pkg-plist ============================================================================== --- head/deskutils/calibre/pkg-plist Wed Apr 2 14:39:32 2014 (r349923) +++ head/deskutils/calibre/pkg-plist Wed Apr 2 14:42:34 2014 (r349924) @@ -317,6 +317,7 @@ lib/calibre/calibre/ebooks/metadata/book lib/calibre/calibre/ebooks/metadata/book/base.py lib/calibre/calibre/ebooks/metadata/book/formatter.py lib/calibre/calibre/ebooks/metadata/book/json_codec.py +lib/calibre/calibre/ebooks/metadata/book/render.py lib/calibre/calibre/ebooks/metadata/cli.py lib/calibre/calibre/ebooks/metadata/docx.py lib/calibre/calibre/ebooks/metadata/epub.py @@ -365,6 +366,7 @@ lib/calibre/calibre/ebooks/metadata/topa lib/calibre/calibre/ebooks/metadata/txt.py lib/calibre/calibre/ebooks/metadata/worker.py lib/calibre/calibre/ebooks/metadata/xisbn.py +lib/calibre/calibre/ebooks/metadata/xmp.py lib/calibre/calibre/ebooks/metadata/zip.py lib/calibre/calibre/ebooks/mobi/__init__.py lib/calibre/calibre/ebooks/mobi/debug/__init__.py @@ -429,8 +431,10 @@ lib/calibre/calibre/ebooks/oeb/polish/cr lib/calibre/calibre/ebooks/oeb/polish/css.py lib/calibre/calibre/ebooks/oeb/polish/embed.py lib/calibre/calibre/ebooks/oeb/polish/errors.py +lib/calibre/calibre/ebooks/oeb/polish/import_book.py lib/calibre/calibre/ebooks/oeb/polish/jacket.py lib/calibre/calibre/ebooks/oeb/polish/main.py +lib/calibre/calibre/ebooks/oeb/polish/opf.py lib/calibre/calibre/ebooks/oeb/polish/parsing.py lib/calibre/calibre/ebooks/oeb/polish/pretty.py lib/calibre/calibre/ebooks/oeb/polish/replace.py @@ -662,8 +666,6 @@ lib/calibre/calibre/gui2/convert/comic_i 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/djvu_input.py -lib/calibre/calibre/gui2/convert/djvu_input_ui.py lib/calibre/calibre/gui2/convert/docx_input.py lib/calibre/calibre/gui2/convert/docx_input_ui.py lib/calibre/calibre/gui2/convert/epub_output.py @@ -940,11 +942,9 @@ lib/calibre/calibre/gui2/store/stores/eb lib/calibre/calibre/gui2/store/stores/ebooks_com_plugin.py lib/calibre/calibre/gui2/store/stores/ebooksgratuits_plugin.py lib/calibre/calibre/gui2/store/stores/ebookshoppe_uk_plugin.py -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/feedbooks_plugin.py -lib/calibre/calibre/gui2/store/stores/foyles_uk_plugin.py lib/calibre/calibre/gui2/store/stores/google_books_plugin.py lib/calibre/calibre/gui2/store/stores/gutenberg_plugin.py lib/calibre/calibre/gui2/store/stores/kobo_plugin.py @@ -1037,6 +1037,7 @@ lib/calibre/calibre/gui2/viewer/config_u lib/calibre/calibre/gui2/viewer/dictionary.py lib/calibre/calibre/gui2/viewer/documentview.py lib/calibre/calibre/gui2/viewer/flip.py +lib/calibre/calibre/gui2/viewer/gestures.py lib/calibre/calibre/gui2/viewer/image_popup.py lib/calibre/calibre/gui2/viewer/inspector.py lib/calibre/calibre/gui2/viewer/javascript.py @@ -1097,6 +1098,7 @@ lib/calibre/calibre/libwand.py lib/calibre/calibre/linux.py lib/calibre/calibre/plugins/_patiencediff_c.so lib/calibre/calibre/plugins/_regex.so +lib/calibre/calibre/plugins/bzzdec.so lib/calibre/calibre/plugins/cPalmdoc.so lib/calibre/calibre/plugins/calibre_style.so lib/calibre/calibre/plugins/chm_extra.so @@ -1106,6 +1108,7 @@ lib/calibre/calibre/plugins/hunspell.so lib/calibre/calibre/plugins/icu.so lib/calibre/calibre/plugins/lzx.so lib/calibre/calibre/plugins/magick.so +lib/calibre/calibre/plugins/matcher.so lib/calibre/calibre/plugins/msdes.so lib/calibre/calibre/plugins/pictureflow.so lib/calibre/calibre/plugins/podofo.so @@ -1164,7 +1167,9 @@ lib/calibre/calibre/utils/fonts/woff/__i lib/calibre/calibre/utils/formatter.py lib/calibre/calibre/utils/formatter_functions.py lib/calibre/calibre/utils/html2text.py +lib/calibre/calibre/utils/https.py lib/calibre/calibre/utils/icu.py +lib/calibre/calibre/utils/icu_test.py lib/calibre/calibre/utils/imghdr.py lib/calibre/calibre/utils/ipc/__init__.py lib/calibre/calibre/utils/ipc/job.py @@ -1182,6 +1187,7 @@ lib/calibre/calibre/utils/logging.py lib/calibre/calibre/utils/magick/__init__.py lib/calibre/calibre/utils/magick/draw.py lib/calibre/calibre/utils/magick/generate.py +lib/calibre/calibre/utils/matcher.py lib/calibre/calibre/utils/mdns.py lib/calibre/calibre/utils/mem.py lib/calibre/calibre/utils/monotonic.py @@ -1417,6 +1423,8 @@ share/applications/calibre-gui.desktop share/applications/calibre-lrfviewer.desktop %%DATADIR%%/builtin_recipes.xml %%DATADIR%%/builtin_recipes.zip +%%DATADIR%%/calibre-ebook-root-CA.crt +%%DATADIR%%/calibre-mimetypes.xml %%DATADIR%%/calibre-portable.bat %%DATADIR%%/calibre-portable.sh %%DATADIR%%/catalog/DefaultCover.jpg @@ -1495,6 +1503,7 @@ share/applications/calibre-lrfviewer.des %%DATADIR%%/images/auto-reload.png %%DATADIR%%/images/auto_author_sort.png %%DATADIR%%/images/back.png +%%DATADIR%%/images/beautify.png %%DATADIR%%/images/blank.png %%DATADIR%%/images/book.png %%DATADIR%%/images/bookmarks.png @@ -1699,6 +1708,7 @@ share/applications/calibre-lrfviewer.des %%DATADIR%%/jacket/stylesheet.css %%DATADIR%%/jacket/template.xhtml %%DATADIR%%/jquery.simulate.js +%%DATADIR%%/localization/iso3166.pickle %%DATADIR%%/localization/iso639.pickle %%DATADIR%%/localization/locales.zip %%DATADIR%%/localization/pykakasi/itaijidict2.pickle @@ -1923,8 +1933,6 @@ share/gnome/apps/calibre-ebook-edit.desk share/gnome/apps/calibre-ebook-viewer.desktop share/gnome/apps/calibre-gui.desktop share/gnome/apps/calibre-lrfviewer.desktop -share/icons/hicolor/128x128/apps/calibre-ebook-edit.png -share/icons/hicolor/128x128/apps/calibre-viewer.png share/icons/hicolor/128x128/mimetypes/application-lrf.png share/icons/hicolor/128x128/mimetypes/application-x-kindle-application.png share/icons/hicolor/128x128/mimetypes/application-x-mobi8-ebook.png @@ -1937,7 +1945,9 @@ share/icons/hicolor/128x128/mimetypes/gn share/icons/hicolor/128x128/mimetypes/gnome-mime-application-x-topaz-ebook.png share/icons/hicolor/128x128/mimetypes/gnome-mime-text-lrs.png share/icons/hicolor/128x128/mimetypes/text-lrs.png +share/icons/hicolor/256x256/apps/calibre-ebook-edit.png share/icons/hicolor/256x256/apps/calibre-gui.png +share/icons/hicolor/256x256/apps/calibre-viewer.png share/mime/application/epub+zip.xml share/mime/application/x-kindle-application.xml share/mime/application/x-mobi8-ebook.xml