Fri May 16 12:08:30 2014 UTC ()
Update to 1.37.0:

- version: 1.37.0

  date: 2014-05-16

  new features:

    - title: "Edit Book: Live spell checking in the code view. Now
    spelling errors are highlighted in the code view for convenient
    correction as you type. This can be turned off via
    Preferences->Editor."

    - title: "E-book viewer: When using the tap and hold gesture
    on a touchscreen, allow lookup of the word currently under
    the finger in the dictionary or online."
      tickets: [1318242]

    - title: "Edit Book: Allow putting the editor into replace mode
    by pressing the Insert key"

    - title: "Content server: Add more descriptive titles to the
    OPDS feeds, where possible."

    - title: "Edit Book: Update the Table of Contents view
    automatically when the ncx file is edited."

    - title: "Edit book: Insert tag button: Allow entering attributes
    along with the tag name to make it easy to repeatedly insert,
    for example, <span class='special'></span>."

    - title: "Windows driver for Woxter Scriba 190."
      tickets: [1317892]

    - title: "Edit Book: Add an entry to the context menu of the
    preview panel to open external URLs when a link is right clicked
    on"

  bug fixes:

    - title: "Edit Book: Fix error in the Check Book tool when
    items in the opf have paths starting with a leading slash."
      tickets: [1319378]

    - title: "Book polishing: Fix publisher field in epub not being
    cleared when updating metadata."
      tickets: [1319732]

    - title: "Kobo driver: Update to handle changes to annotation
    processing in newer Kobo firmware."

    - title: "DOCX Input: Handle docx files with index fields that
    have their field names incorrectly lower cased."
      tickets: [1318670]

    - title: "Edit book: Fix incorrect syntax highlighting on linux
    if the text contains non-BMP unicode characters."

    - title: "Edit book: Fix regression that caused an error when
    trying to edit files with no defined syntax, such as plain .txt
    files."
      tickets: [1318139]

  improved recipes:

    - Wall Street Journal


(wiz)
diff -r1.76 -r1.77 pkgsrc/misc/calibre/Makefile
diff -r1.20 -r1.21 pkgsrc/misc/calibre/distinfo
cvs diff -r1.76 -r1.77 pkgsrc/misc/calibre/Makefile (switch to unified diff)

--- pkgsrc/misc/calibre/Makefile 2014/05/09 16:53:16 1.76
+++ pkgsrc/misc/calibre/Makefile 2014/05/16 12:08:30 1.77
@@ -1,267 +1,267 @@ @@ -1,267 +1,267 @@
1# $NetBSD: Makefile,v 1.76 2014/05/09 16:53:16 wiz Exp $ 1# $NetBSD: Makefile,v 1.77 2014/05/16 12:08:30 wiz Exp $
2 2
3DISTNAME= calibre-1.36.0 3DISTNAME= calibre-1.37.0
4CATEGORIES= misc 4CATEGORIES= misc
5MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=calibre/} 5MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=calibre/}
6EXTRACT_SUFX= .tar.xz 6EXTRACT_SUFX= .tar.xz
7DISTFILES= ${DISTNAME}${EXTRACT_SUFX} 7DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.calibre-ebook.com/ 10HOMEPAGE= http://www.calibre-ebook.com/
11COMMENT= E-book library management application 11COMMENT= E-book library management application
12LICENSE= gnu-gpl-v3 12LICENSE= gnu-gpl-v3
13 13
14DEPENDS+= help2man>=1.36.4:../../converters/help2man 14DEPENDS+= help2man>=1.36.4:../../converters/help2man
15DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3 15DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3
16DEPENDS+= xdg-utils>=1.0.2:../../misc/xdg-utils 16DEPENDS+= xdg-utils>=1.0.2:../../misc/xdg-utils
17DEPENDS+= poppler-utils-[0-9]*:../../print/poppler-utils 17DEPENDS+= poppler-utils-[0-9]*:../../print/poppler-utils
18DEPENDS+= ${PYPKGPREFIX}-lxml>=2.2.1:../../textproc/py-lxml 18DEPENDS+= ${PYPKGPREFIX}-lxml>=2.2.1:../../textproc/py-lxml
19DEPENDS+= ${PYPKGPREFIX}-beautifulsoup>=3.0.5:../../www/py-beautifulsoup 19DEPENDS+= ${PYPKGPREFIX}-beautifulsoup>=3.0.5:../../www/py-beautifulsoup
20DEPENDS+= ${PYPKGPREFIX}-mechanize>=0.1.11nb1:../../www/py-mechanize 20DEPENDS+= ${PYPKGPREFIX}-mechanize>=0.1.11nb1:../../www/py-mechanize
21DEPENDS+= ${PYPKGPREFIX}-cssselect>=0.7.1:../../textproc/py-cssselect 21DEPENDS+= ${PYPKGPREFIX}-cssselect>=0.7.1:../../textproc/py-cssselect
22DEPENDS+= ${PYPKGPREFIX}-cssutils>=0.9.9:../../textproc/py-cssutils 22DEPENDS+= ${PYPKGPREFIX}-cssutils>=0.9.9:../../textproc/py-cssutils
23# Let's depend on the ones we have in pkgsrc instead of the bundled ones. 23# Let's depend on the ones we have in pkgsrc instead of the bundled ones.
24DEPENDS+= ${PYPKGPREFIX}-Pdf-[0-9]*:../../print/py-Pdf 24DEPENDS+= ${PYPKGPREFIX}-Pdf-[0-9]*:../../print/py-Pdf
25DEPENDS+= ${PYPKGPREFIX}-cherrypy-[0-9]*:../../www/py-cherrypy 25DEPENDS+= ${PYPKGPREFIX}-cherrypy-[0-9]*:../../www/py-cherrypy
26DEPENDS+= ${PYPKGPREFIX}-html5lib-[0-9]*:../../textproc/py-html5lib 26DEPENDS+= ${PYPKGPREFIX}-html5lib-[0-9]*:../../textproc/py-html5lib
27DEPENDS+= ${PYPKGPREFIX}-chardet-[0-9]*:../../converters/py-chardet 27DEPENDS+= ${PYPKGPREFIX}-chardet-[0-9]*:../../converters/py-chardet
28DEPENDS+= ${PYPKGPREFIX}-netifaces-[0-9]*:../../net/py-netifaces 28DEPENDS+= ${PYPKGPREFIX}-netifaces-[0-9]*:../../net/py-netifaces
29DEPENDS+= ${PYPKGPREFIX}-apsw-[0-9]*:../../databases/py-apsw 29DEPENDS+= ${PYPKGPREFIX}-apsw-[0-9]*:../../databases/py-apsw
30 30
31PYTHON_VERSIONED_DEPENDENCIES= dateutil dns 31PYTHON_VERSIONED_DEPENDENCIES= dateutil dns
32 32
33# We also need the distfile for qt4-libs to extract some private header files 33# We also need the distfile for qt4-libs to extract some private header files
34# If QTVERSION changes, the distinfo file needs to be updated too. 34# If QTVERSION changes, the distinfo file needs to be updated too.
35QTVERSION= 4.8.5 # from ../../x11/qt4/Makefile.common 35QTVERSION= 4.8.5 # from ../../x11/qt4/Makefile.common
36# Including that file to avoid hardcoding the version number won't work, 36# Including that file to avoid hardcoding the version number won't work,
37# since it will occur in the distinfo anyway. 37# since it will occur in the distinfo anyway.
38QTNAME= qt-everywhere-opensource-src-${QTVERSION} 38QTNAME= qt-everywhere-opensource-src-${QTVERSION}
39DISTFILES+= ${QTNAME}.tar.gz 39DISTFILES+= ${QTNAME}.tar.gz
40MASTER_SITES+= http://releases.qt-project.org/qt4/source/ 40MASTER_SITES+= http://releases.qt-project.org/qt4/source/
41EXTRACT_USING= bsdtar 41EXTRACT_USING= bsdtar
42 42
43USE_LANGUAGES= c c++ 43USE_LANGUAGES= c c++
44USE_TOOLS+= pkg-config pax 44USE_TOOLS+= pkg-config pax
45PYTHON_VERSIONS_ACCEPTED= 27 45PYTHON_VERSIONS_ACCEPTED= 27
46PYTHON_VERSIONS_INCOMPATIBLE= 33 34 # py-mechanize, py-beautifulsoup, py-imaging, py-netifaces 46PYTHON_VERSIONS_INCOMPATIBLE= 33 34 # py-mechanize, py-beautifulsoup, py-imaging, py-netifaces
47PYDISTUTILSPKG= yes 47PYDISTUTILSPKG= yes
48PYSETUPOPTARGS= # empty 48PYSETUPOPTARGS= # empty
49PYSETUPINSTALLARGS= --prefix=${PREFIX} --root=${DESTDIR:Q}${PREFIX} 49PYSETUPINSTALLARGS= --prefix=${PREFIX} --root=${DESTDIR:Q}${PREFIX}
50WRKSRC= ${WRKDIR}/calibre 50WRKSRC= ${WRKDIR}/calibre
51 51
52INSTALLATION_DIRS= share/applications 52INSTALLATION_DIRS= share/applications
53INSTALLATION_DIRS= share/icons 53INSTALLATION_DIRS= share/icons
54INSTALLATION_DIRS= share/calibre/recipes 54INSTALLATION_DIRS= share/calibre/recipes
55 55
56FIX_PYTHON_PATHS+= *.py 56FIX_PYTHON_PATHS+= *.py
57FIX_PYTHON_PATHS+= recipes/*.recipe 57FIX_PYTHON_PATHS+= recipes/*.recipe
58FIX_PYTHON_PATHS+= resources/*.py 58FIX_PYTHON_PATHS+= resources/*.py
59FIX_PYTHON_PATHS+= resources/catalog/*.py 59FIX_PYTHON_PATHS+= resources/catalog/*.py
60FIX_PYTHON_PATHS+= setup/*.py 60FIX_PYTHON_PATHS+= setup/*.py
61FIX_PYTHON_PATHS+= setup/installer/*.py 61FIX_PYTHON_PATHS+= setup/installer/*.py
62FIX_PYTHON_PATHS+= setup/installer/linux/*.py 62FIX_PYTHON_PATHS+= setup/installer/linux/*.py
63FIX_PYTHON_PATHS+= setup/installer/osx/*.py 63FIX_PYTHON_PATHS+= setup/installer/osx/*.py
64FIX_PYTHON_PATHS+= setup/installer/osx/app/*.py 64FIX_PYTHON_PATHS+= setup/installer/osx/app/*.py
65FIX_PYTHON_PATHS+= setup/installer/windows/*.py 65FIX_PYTHON_PATHS+= setup/installer/windows/*.py
66FIX_PYTHON_PATHS+= src/calibre/*.py 66FIX_PYTHON_PATHS+= src/calibre/*.py
67FIX_PYTHON_PATHS+= src/calibre/customize/*.py 67FIX_PYTHON_PATHS+= src/calibre/customize/*.py
68FIX_PYTHON_PATHS+= src/calibre/db/*.py 68FIX_PYTHON_PATHS+= src/calibre/db/*.py
69FIX_PYTHON_PATHS+= src/calibre/db/tests/*.py 69FIX_PYTHON_PATHS+= src/calibre/db/tests/*.py
70FIX_PYTHON_PATHS+= src/calibre/devices/*.py 70FIX_PYTHON_PATHS+= src/calibre/devices/*.py
71FIX_PYTHON_PATHS+= src/calibre/devices/android/*.py 71FIX_PYTHON_PATHS+= src/calibre/devices/android/*.py
72FIX_PYTHON_PATHS+= src/calibre/devices/eslick/*.py 72FIX_PYTHON_PATHS+= src/calibre/devices/eslick/*.py
73FIX_PYTHON_PATHS+= src/calibre/devices/folder_device/*.py 73FIX_PYTHON_PATHS+= src/calibre/devices/folder_device/*.py
74FIX_PYTHON_PATHS+= src/calibre/devices/idevice/*.py 74FIX_PYTHON_PATHS+= src/calibre/devices/idevice/*.py
75FIX_PYTHON_PATHS+= src/calibre/devices/iriver/*.py 75FIX_PYTHON_PATHS+= src/calibre/devices/iriver/*.py
76FIX_PYTHON_PATHS+= src/calibre/devices/kobo/*.py 76FIX_PYTHON_PATHS+= src/calibre/devices/kobo/*.py
77FIX_PYTHON_PATHS+= src/calibre/devices/mtp/*.py 77FIX_PYTHON_PATHS+= src/calibre/devices/mtp/*.py
78FIX_PYTHON_PATHS+= src/calibre/devices/mtp/unix/*.py 78FIX_PYTHON_PATHS+= src/calibre/devices/mtp/unix/*.py
79FIX_PYTHON_PATHS+= src/calibre/devices/mtp/unix/upstream/*.py 79FIX_PYTHON_PATHS+= src/calibre/devices/mtp/unix/upstream/*.py
80FIX_PYTHON_PATHS+= src/calibre/devices/mtp/windows/*.py 80FIX_PYTHON_PATHS+= src/calibre/devices/mtp/windows/*.py
81FIX_PYTHON_PATHS+= src/calibre/devices/prs505/*.py 81FIX_PYTHON_PATHS+= src/calibre/devices/prs505/*.py
82FIX_PYTHON_PATHS+= src/calibre/devices/prst1/*.py 82FIX_PYTHON_PATHS+= src/calibre/devices/prst1/*.py
83FIX_PYTHON_PATHS+= src/calibre/devices/smart_device_app/*.py 83FIX_PYTHON_PATHS+= src/calibre/devices/smart_device_app/*.py
84FIX_PYTHON_PATHS+= src/calibre/devices/teclast/*.py 84FIX_PYTHON_PATHS+= src/calibre/devices/teclast/*.py
85FIX_PYTHON_PATHS+= src/calibre/ebooks/*.py 85FIX_PYTHON_PATHS+= src/calibre/ebooks/*.py
86FIX_PYTHON_PATHS+= src/calibre/ebooks/chm/*.py 86FIX_PYTHON_PATHS+= src/calibre/ebooks/chm/*.py
87FIX_PYTHON_PATHS+= src/calibre/ebooks/comic/*.py 87FIX_PYTHON_PATHS+= src/calibre/ebooks/comic/*.py
88FIX_PYTHON_PATHS+= src/calibre/ebooks/compression/*.py 88FIX_PYTHON_PATHS+= src/calibre/ebooks/compression/*.py
89FIX_PYTHON_PATHS+= src/calibre/ebooks/conversion/*.py 89FIX_PYTHON_PATHS+= src/calibre/ebooks/conversion/*.py
90FIX_PYTHON_PATHS+= src/calibre/ebooks/conversion/plugins/*.py 90FIX_PYTHON_PATHS+= src/calibre/ebooks/conversion/plugins/*.py
91FIX_PYTHON_PATHS+= src/calibre/ebooks/djvu/*.py 91FIX_PYTHON_PATHS+= src/calibre/ebooks/djvu/*.py
92FIX_PYTHON_PATHS+= src/calibre/ebooks/docx/*.py 92FIX_PYTHON_PATHS+= src/calibre/ebooks/docx/*.py
93FIX_PYTHON_PATHS+= src/calibre/ebooks/docx/writer/*.py 93FIX_PYTHON_PATHS+= src/calibre/ebooks/docx/writer/*.py
94FIX_PYTHON_PATHS+= src/calibre/ebooks/epub/*.py 94FIX_PYTHON_PATHS+= src/calibre/ebooks/epub/*.py
95FIX_PYTHON_PATHS+= src/calibre/ebooks/fb2/__init__.py 95FIX_PYTHON_PATHS+= src/calibre/ebooks/fb2/__init__.py
96FIX_PYTHON_PATHS+= src/calibre/ebooks/html/*.py 96FIX_PYTHON_PATHS+= src/calibre/ebooks/html/*.py
97FIX_PYTHON_PATHS+= src/calibre/ebooks/iterator/*.py 97FIX_PYTHON_PATHS+= src/calibre/ebooks/iterator/*.py
98FIX_PYTHON_PATHS+= src/calibre/ebooks/lit/*.py 98FIX_PYTHON_PATHS+= src/calibre/ebooks/lit/*.py
99FIX_PYTHON_PATHS+= src/calibre/ebooks/lrf/*.py 99FIX_PYTHON_PATHS+= src/calibre/ebooks/lrf/*.py
100FIX_PYTHON_PATHS+= src/calibre/ebooks/lrf/html/*.py 100FIX_PYTHON_PATHS+= src/calibre/ebooks/lrf/html/*.py
101FIX_PYTHON_PATHS+= src/calibre/ebooks/lrf/pylrs/*.py 101FIX_PYTHON_PATHS+= src/calibre/ebooks/lrf/pylrs/*.py
102FIX_PYTHON_PATHS+= src/calibre/ebooks/markdown/extensions/*.py 102FIX_PYTHON_PATHS+= src/calibre/ebooks/markdown/extensions/*.py
103FIX_PYTHON_PATHS+= src/calibre/ebooks/metadata/*.py 103FIX_PYTHON_PATHS+= src/calibre/ebooks/metadata/*.py
104FIX_PYTHON_PATHS+= src/calibre/ebooks/metadata/book/*.py 104FIX_PYTHON_PATHS+= src/calibre/ebooks/metadata/book/*.py
105FIX_PYTHON_PATHS+= src/calibre/ebooks/metadata/sources/*.py 105FIX_PYTHON_PATHS+= src/calibre/ebooks/metadata/sources/*.py
106FIX_PYTHON_PATHS+= src/calibre/ebooks/mobi/*.py 106FIX_PYTHON_PATHS+= src/calibre/ebooks/mobi/*.py
107FIX_PYTHON_PATHS+= src/calibre/ebooks/mobi/debug/*.py 107FIX_PYTHON_PATHS+= src/calibre/ebooks/mobi/debug/*.py
108FIX_PYTHON_PATHS+= src/calibre/ebooks/mobi/reader/*.py 108FIX_PYTHON_PATHS+= src/calibre/ebooks/mobi/reader/*.py
109FIX_PYTHON_PATHS+= src/calibre/ebooks/mobi/writer2/*.py 109FIX_PYTHON_PATHS+= src/calibre/ebooks/mobi/writer2/*.py
110FIX_PYTHON_PATHS+= src/calibre/ebooks/mobi/writer8/*.py 110FIX_PYTHON_PATHS+= src/calibre/ebooks/mobi/writer8/*.py
111FIX_PYTHON_PATHS+= src/calibre/ebooks/odt/__init__.py 111FIX_PYTHON_PATHS+= src/calibre/ebooks/odt/__init__.py
112FIX_PYTHON_PATHS+= src/calibre/ebooks/oeb/*.py 112FIX_PYTHON_PATHS+= src/calibre/ebooks/oeb/*.py
113FIX_PYTHON_PATHS+= src/calibre/ebooks/oeb/display/*.py 113FIX_PYTHON_PATHS+= src/calibre/ebooks/oeb/display/*.py
114FIX_PYTHON_PATHS+= src/calibre/ebooks/oeb/display/test-cfi/*.py 114FIX_PYTHON_PATHS+= src/calibre/ebooks/oeb/display/test-cfi/*.py
115FIX_PYTHON_PATHS+= src/calibre/ebooks/oeb/iterator/*.py 115FIX_PYTHON_PATHS+= src/calibre/ebooks/oeb/iterator/*.py
116FIX_PYTHON_PATHS+= src/calibre/ebooks/oeb/polish/*.py 116FIX_PYTHON_PATHS+= src/calibre/ebooks/oeb/polish/*.py
117FIX_PYTHON_PATHS+= src/calibre/ebooks/oeb/polish/check/*.py 117FIX_PYTHON_PATHS+= src/calibre/ebooks/oeb/polish/check/*.py
118FIX_PYTHON_PATHS+= src/calibre/ebooks/oeb/polish/tests/*.py 118FIX_PYTHON_PATHS+= src/calibre/ebooks/oeb/polish/tests/*.py
119FIX_PYTHON_PATHS+= src/calibre/ebooks/oeb/transforms/*.py 119FIX_PYTHON_PATHS+= src/calibre/ebooks/oeb/transforms/*.py
120FIX_PYTHON_PATHS+= src/calibre/ebooks/pdb/haodoo/__init__.py 120FIX_PYTHON_PATHS+= src/calibre/ebooks/pdb/haodoo/__init__.py
121FIX_PYTHON_PATHS+= src/calibre/ebooks/pdf/*.py 121FIX_PYTHON_PATHS+= src/calibre/ebooks/pdf/*.py
122FIX_PYTHON_PATHS+= src/calibre/ebooks/pdf/__init__.py 122FIX_PYTHON_PATHS+= src/calibre/ebooks/pdf/__init__.py
123FIX_PYTHON_PATHS+= src/calibre/ebooks/pdf/reflow.py 123FIX_PYTHON_PATHS+= src/calibre/ebooks/pdf/reflow.py
124FIX_PYTHON_PATHS+= src/calibre/ebooks/pdf/render/*.py 124FIX_PYTHON_PATHS+= src/calibre/ebooks/pdf/render/*.py
125FIX_PYTHON_PATHS+= src/calibre/ebooks/readability/*.py 125FIX_PYTHON_PATHS+= src/calibre/ebooks/readability/*.py
126FIX_PYTHON_PATHS+= src/calibre/ebooks/rtf/*.py 126FIX_PYTHON_PATHS+= src/calibre/ebooks/rtf/*.py
127FIX_PYTHON_PATHS+= src/calibre/ebooks/rtf2xml/*.py 127FIX_PYTHON_PATHS+= src/calibre/ebooks/rtf2xml/*.py
128FIX_PYTHON_PATHS+= src/calibre/ebooks/snb/*.py 128FIX_PYTHON_PATHS+= src/calibre/ebooks/snb/*.py
129FIX_PYTHON_PATHS+= src/calibre/ebooks/textile/*.py 129FIX_PYTHON_PATHS+= src/calibre/ebooks/textile/*.py
130FIX_PYTHON_PATHS+= src/calibre/ebooks/txt/*.py 130FIX_PYTHON_PATHS+= src/calibre/ebooks/txt/*.py
131FIX_PYTHON_PATHS+= src/calibre/gui2/*.py 131FIX_PYTHON_PATHS+= src/calibre/gui2/*.py
132FIX_PYTHON_PATHS+= src/calibre/gui2/actions/*.py 132FIX_PYTHON_PATHS+= src/calibre/gui2/actions/*.py
133FIX_PYTHON_PATHS+= src/calibre/gui2/add_wizard/*.py 133FIX_PYTHON_PATHS+= src/calibre/gui2/add_wizard/*.py
134FIX_PYTHON_PATHS+= src/calibre/gui2/catalog/*.py 134FIX_PYTHON_PATHS+= src/calibre/gui2/catalog/*.py
135FIX_PYTHON_PATHS+= src/calibre/gui2/convert/*.py 135FIX_PYTHON_PATHS+= src/calibre/gui2/convert/*.py
136FIX_PYTHON_PATHS+= src/calibre/gui2/device_drivers/*.py 136FIX_PYTHON_PATHS+= src/calibre/gui2/device_drivers/*.py
137FIX_PYTHON_PATHS+= src/calibre/gui2/dialogs/*.py 137FIX_PYTHON_PATHS+= src/calibre/gui2/dialogs/*.py
138FIX_PYTHON_PATHS+= src/calibre/gui2/library/*.py 138FIX_PYTHON_PATHS+= src/calibre/gui2/library/*.py
139FIX_PYTHON_PATHS+= src/calibre/gui2/metadata/*.py 139FIX_PYTHON_PATHS+= src/calibre/gui2/metadata/*.py
140FIX_PYTHON_PATHS+= src/calibre/gui2/preferences/*.py 140FIX_PYTHON_PATHS+= src/calibre/gui2/preferences/*.py
141FIX_PYTHON_PATHS+= src/calibre/gui2/progress_indicator/*.py 141FIX_PYTHON_PATHS+= src/calibre/gui2/progress_indicator/*.py
142FIX_PYTHON_PATHS+= src/calibre/gui2/store/loader.py 142FIX_PYTHON_PATHS+= src/calibre/gui2/store/loader.py
143FIX_PYTHON_PATHS+= src/calibre/gui2/store/stores/*.py 143FIX_PYTHON_PATHS+= src/calibre/gui2/store/stores/*.py
144FIX_PYTHON_PATHS+= src/calibre/gui2/tag_browser/*.py 144FIX_PYTHON_PATHS+= src/calibre/gui2/tag_browser/*.py
145FIX_PYTHON_PATHS+= src/calibre/gui2/toc/*.py 145FIX_PYTHON_PATHS+= src/calibre/gui2/toc/*.py
146FIX_PYTHON_PATHS+= src/calibre/gui2/tweak_book/*.py 146FIX_PYTHON_PATHS+= src/calibre/gui2/tweak_book/*.py
147FIX_PYTHON_PATHS+= src/calibre/gui2/tweak_book/diff/*.py 147FIX_PYTHON_PATHS+= src/calibre/gui2/tweak_book/diff/*.py
148FIX_PYTHON_PATHS+= src/calibre/gui2/tweak_book/editor/*.py 148FIX_PYTHON_PATHS+= src/calibre/gui2/tweak_book/editor/*.py
149FIX_PYTHON_PATHS+= src/calibre/gui2/tweak_book/editor/smart/*.py 149FIX_PYTHON_PATHS+= src/calibre/gui2/tweak_book/editor/smart/*.py
150FIX_PYTHON_PATHS+= src/calibre/gui2/tweak_book/editor/syntax/*.py 150FIX_PYTHON_PATHS+= src/calibre/gui2/tweak_book/editor/syntax/*.py
151FIX_PYTHON_PATHS+= src/calibre/gui2/viewer/*.py 151FIX_PYTHON_PATHS+= src/calibre/gui2/viewer/*.py
152FIX_PYTHON_PATHS+= src/calibre/gui2/wizard/*.py 152FIX_PYTHON_PATHS+= src/calibre/gui2/wizard/*.py
153FIX_PYTHON_PATHS+= src/calibre/library/*.py 153FIX_PYTHON_PATHS+= src/calibre/library/*.py
154FIX_PYTHON_PATHS+= src/calibre/library/catalogs/*.py 154FIX_PYTHON_PATHS+= src/calibre/library/catalogs/*.py
155FIX_PYTHON_PATHS+= src/calibre/library/server/*.py 155FIX_PYTHON_PATHS+= src/calibre/library/server/*.py
156FIX_PYTHON_PATHS+= src/calibre/spell/*.py 156FIX_PYTHON_PATHS+= src/calibre/spell/*.py
157FIX_PYTHON_PATHS+= src/calibre/translations/*.py 157FIX_PYTHON_PATHS+= src/calibre/translations/*.py
158FIX_PYTHON_PATHS+= src/calibre/utils/*.py 158FIX_PYTHON_PATHS+= src/calibre/utils/*.py
159FIX_PYTHON_PATHS+= src/calibre/utils/fonts/*.py 159FIX_PYTHON_PATHS+= src/calibre/utils/fonts/*.py
160FIX_PYTHON_PATHS+= src/calibre/utils/fonts/sfnt/*.py 160FIX_PYTHON_PATHS+= src/calibre/utils/fonts/sfnt/*.py
161FIX_PYTHON_PATHS+= src/calibre/utils/fonts/sfnt/cff/*.py 161FIX_PYTHON_PATHS+= src/calibre/utils/fonts/sfnt/cff/*.py
162FIX_PYTHON_PATHS+= src/calibre/utils/fonts/woff/__init__.py 162FIX_PYTHON_PATHS+= src/calibre/utils/fonts/woff/__init__.py
163FIX_PYTHON_PATHS+= src/calibre/utils/ipc/*.py 163FIX_PYTHON_PATHS+= src/calibre/utils/ipc/*.py
164FIX_PYTHON_PATHS+= src/calibre/utils/magick/*.py 164FIX_PYTHON_PATHS+= src/calibre/utils/magick/*.py
165FIX_PYTHON_PATHS+= src/calibre/utils/podofo/*.py 165FIX_PYTHON_PATHS+= src/calibre/utils/podofo/*.py
166FIX_PYTHON_PATHS+= src/calibre/utils/pyconsole/*.py 166FIX_PYTHON_PATHS+= src/calibre/utils/pyconsole/*.py
167FIX_PYTHON_PATHS+= src/calibre/utils/spell/__init__.py 167FIX_PYTHON_PATHS+= src/calibre/utils/spell/__init__.py
168FIX_PYTHON_PATHS+= src/calibre/utils/wmf/*.py 168FIX_PYTHON_PATHS+= src/calibre/utils/wmf/*.py
169FIX_PYTHON_PATHS+= src/calibre/web/feeds/*.py 169FIX_PYTHON_PATHS+= src/calibre/web/feeds/*.py
170FIX_PYTHON_PATHS+= src/calibre/web/feeds/recipes/*.py 170FIX_PYTHON_PATHS+= src/calibre/web/feeds/recipes/*.py
171FIX_PYTHON_PATHS+= src/calibre/web/fetch/*.py 171FIX_PYTHON_PATHS+= src/calibre/web/fetch/*.py
172FIX_PYTHON_PATHS+= src/calibre/web/jsbrowser/*.py 172FIX_PYTHON_PATHS+= src/calibre/web/jsbrowser/*.py
173FIX_PYTHON_PATHS+= src/qtcurve/test_rendering.py 173FIX_PYTHON_PATHS+= src/qtcurve/test_rendering.py
174FIX_PYTHON_PATHS+= src/templite/*.py 174FIX_PYTHON_PATHS+= src/templite/*.py
175SUBST_CLASSES+= prefix 175SUBST_CLASSES+= prefix
176SUBST_SED.prefix= -e "s,^QMAKE =.*,QMAKE = '${PREFIX}/qt4/bin/qmake'," 176SUBST_SED.prefix= -e "s,^QMAKE =.*,QMAKE = '${PREFIX}/qt4/bin/qmake',"
177SUBST_MESSAGE.prefix= Fixing path to QMAKE 177SUBST_MESSAGE.prefix= Fixing path to QMAKE
178SUBST_STAGE.prefix= post-patch 178SUBST_STAGE.prefix= post-patch
179SUBST_FILES.prefix= setup/build_environment.py 179SUBST_FILES.prefix= setup/build_environment.py
180 180
181# This one is for /usr/bin/env python (or even /usr/bin/env Python or /usr/bin/python2) 181# This one is for /usr/bin/env python (or even /usr/bin/env Python or /usr/bin/python2)
182SUBST_CLASSES+= path 182SUBST_CLASSES+= path
183SUBST_SED.path= -e "s,\#! */usr/bin/env *[Pp]ython[0-9.]*,\#!${PYTHONBIN}," 183SUBST_SED.path= -e "s,\#! */usr/bin/env *[Pp]ython[0-9.]*,\#!${PYTHONBIN},"
184SUBST_MESSAGE.path= Fixing path to python. 184SUBST_MESSAGE.path= Fixing path to python.
185SUBST_STAGE.path= post-patch 185SUBST_STAGE.path= post-patch
186SUBST_FILES.path= ${FIX_PYTHON_PATHS} 186SUBST_FILES.path= ${FIX_PYTHON_PATHS}
187 187
188# These ones are for replacing python[0-9*] with PYTHONBIN 188# These ones are for replacing python[0-9*] with PYTHONBIN
189REPLACE_PYTHON+= recipes/animal_politico.recipe 189REPLACE_PYTHON+= recipes/animal_politico.recipe
190REPLACE_PYTHON+= recipes/kompiutierra.recipe 190REPLACE_PYTHON+= recipes/kompiutierra.recipe
191REPLACE_PYTHON+= recipes/trouw.recipe 191REPLACE_PYTHON+= recipes/trouw.recipe
192REPLACE_PYTHON+= src/calibre/ebooks/markdown/extensions/*.py 192REPLACE_PYTHON+= src/calibre/ebooks/markdown/extensions/*.py
193REPLACE_PYTHON+= src/calibre/ebooks/metadata/odt.py 193REPLACE_PYTHON+= src/calibre/ebooks/metadata/odt.py
194REPLACE_PYTHON+= src/calibre/utils/*.py 194REPLACE_PYTHON+= src/calibre/utils/*.py
195REPLACE_PYTHON+= src/odf/*.py 195REPLACE_PYTHON+= src/odf/*.py
196 196
197MAKE_ENV+= FC_INC_DIR=${BUILDLINK_PREFIX.fontconfig}/include/fontconfig 197MAKE_ENV+= FC_INC_DIR=${BUILDLINK_PREFIX.fontconfig}/include/fontconfig
198MAKE_ENV+= FC_LIB_DIR=${BUILDLINK_PREFIX.fontconfig}/lib 198MAKE_ENV+= FC_LIB_DIR=${BUILDLINK_PREFIX.fontconfig}/lib
199MAKE_ENV+= PODOFO_INC_DIR=${BUILDLINK_PREFIX.podofo}/include/podofo 199MAKE_ENV+= PODOFO_INC_DIR=${BUILDLINK_PREFIX.podofo}/include/podofo
200MAKE_ENV+= PODOFO_LIB_DIR=${BUILDLINK_PREFIX.podofo}/lib 200MAKE_ENV+= PODOFO_LIB_DIR=${BUILDLINK_PREFIX.podofo}/lib
201#MAKE_ENV+= WITH_USB=no 201#MAKE_ENV+= WITH_USB=no
202 202
203# Let's depend on the ones we have in pkgsrc instead of the bundled ones. 203# Let's depend on the ones we have in pkgsrc instead of the bundled ones.
204pre-configure: 204pre-configure:
205 cd ${WRKSRC} && rm -rf src/cherrypy src/pyPdf src/html5lib src/chardet 205 cd ${WRKSRC} && rm -rf src/cherrypy src/pyPdf src/html5lib src/chardet
206 206
207# Turn off x bits on non-executable files. 207# Turn off x bits on non-executable files.
208post-extract: 208post-extract:
209 find ${WRKSRC}/src/calibre/devices ${WRKSRC}/src/calibre/ebooks ${WRKSRC}/src/calibre/web -name '*.py' -exec chmod a-x \{} \; 209 find ${WRKSRC}/src/calibre/devices ${WRKSRC}/src/calibre/ebooks ${WRKSRC}/src/calibre/web -name '*.py' -exec chmod a-x \{} \;
210 find ${WRKSRC}/resources/images/mimetypes -name '*.png' -exec chmod a-x \{} \; 210 find ${WRKSRC}/resources/images/mimetypes -name '*.png' -exec chmod a-x \{} \;
211 chmod a-x ${WRKSRC}/src/calibre/utils/Zeroconf.py 211 chmod a-x ${WRKSRC}/src/calibre/utils/Zeroconf.py
212 chmod a-x ${WRKSRC}/src/calibre/utils/smtplib.py 212 chmod a-x ${WRKSRC}/src/calibre/utils/smtplib.py
213 213
214# Get access to (some of) the Qt4 private header files (for qt_hack). 214# Get access to (some of) the Qt4 private header files (for qt_hack).
215post-wrapper: 215post-wrapper:
216 cd ${WRKDIR}/.buildlink/qt4/include/QtGui && \ 216 cd ${WRKDIR}/.buildlink/qt4/include/QtGui && \
217 ln -s ../../../../${QTNAME}/include/QtGui/private . 217 ln -s ../../../../${QTNAME}/include/QtGui/private .
218 cd ${WRKDIR}/.buildlink/qt4/include/QtCore && \ 218 cd ${WRKDIR}/.buildlink/qt4/include/QtCore && \
219 ln -s ../../../../${QTNAME}/include/QtCore/private . 219 ln -s ../../../../${QTNAME}/include/QtCore/private .
220 220
221post-install: 221post-install:
222 cd ${WRKSRC}/recipes && pax -wr -pma *.recipe \ 222 cd ${WRKSRC}/recipes && pax -wr -pma *.recipe \
223 ${DESTDIR}${PREFIX}/share/calibre/recipes 223 ${DESTDIR}${PREFIX}/share/calibre/recipes
224 cd ${WRKSRC} && pax -wr -pma Changelog* README.md \ 224 cd ${WRKSRC} && pax -wr -pma Changelog* README.md \
225 COPYRIGHT INSTALL LICENSE.* \ 225 COPYRIGHT INSTALL LICENSE.* \
226 ${DESTDIR}${PREFIX}/share/doc/calibre 226 ${DESTDIR}${PREFIX}/share/doc/calibre
227 227
228.include "../../lang/python/application.mk" 228.include "../../lang/python/application.mk"
229.include "../../lang/python/versioned_dependencies.mk" 229.include "../../lang/python/versioned_dependencies.mk"
230.include "../../databases/sqlite3/buildlink3.mk" 230.include "../../databases/sqlite3/buildlink3.mk"
231.include "../../devel/chmlib/buildlink3.mk" 231.include "../../devel/chmlib/buildlink3.mk"
232BUILDLINK_API_DEPENDS.libusb+= libusb>=0.1.12 232BUILDLINK_API_DEPENDS.libusb+= libusb>=0.1.12
233.include "../../devel/libusb/buildlink3.mk" 233.include "../../devel/libusb/buildlink3.mk"
234.include "../../fonts/fontconfig/buildlink3.mk" 234.include "../../fonts/fontconfig/buildlink3.mk"
235BUILDLINK_API_DEPENDS.ImageMagick+= ImageMagick>=6.5.9 235BUILDLINK_API_DEPENDS.ImageMagick+= ImageMagick>=6.5.9
236.include "../../graphics/ImageMagick/buildlink3.mk" 236.include "../../graphics/ImageMagick/buildlink3.mk"
237BUILDLINK_API_DEPENDS.pyimaging+= ${PYPKGPREFIX}-imaging>=1.1.6 237BUILDLINK_API_DEPENDS.pyimaging+= ${PYPKGPREFIX}-imaging>=1.1.6
238.include "../../graphics/py-imaging/buildlink3.mk" 238.include "../../graphics/py-imaging/buildlink3.mk"
239BUILDLINK_API_DEPENDS.libwmf+= libwmf>=0.2.8 239BUILDLINK_API_DEPENDS.libwmf+= libwmf>=0.2.8
240.include "../../graphics/libwmf/buildlink3.mk" 240.include "../../graphics/libwmf/buildlink3.mk"
241.include "../../lang/python/egg.mk" 241.include "../../lang/python/egg.mk"
242_PYSETUPTOOLSINSTALLARGS= # empty 242_PYSETUPTOOLSINSTALLARGS= # empty
243# Get rid of --root=${DESTDIR}, use our own version from above instead. 243# Get rid of --root=${DESTDIR}, use our own version from above instead.
244# because the setup.py is not the standard one and behaves differently. 244# because the setup.py is not the standard one and behaves differently.
245_PYSETUPINSTALLARGS= ${PYSETUPINSTALLARGS} ${PYSETUPOPTARGS} ${_PYSETUPTOOLSINSTALLARGS} 245_PYSETUPINSTALLARGS= ${PYSETUPINSTALLARGS} ${PYSETUPOPTARGS} ${_PYSETUPTOOLSINSTALLARGS}
246#.include "../../lang/python/extension.mk" 246#.include "../../lang/python/extension.mk"
247.include "../../print/podofo/buildlink3.mk" 247.include "../../print/podofo/buildlink3.mk"
248# ??? BUILDLINK_API_DEPENDS.podofo+= podofo>=0.8.2 248# ??? BUILDLINK_API_DEPENDS.podofo+= podofo>=0.8.2
249.include "../../print/poppler-includes/buildlink3.mk" 249.include "../../print/poppler-includes/buildlink3.mk"
250.include "../../print/poppler/buildlink3.mk" 250.include "../../print/poppler/buildlink3.mk"
251BUILDLINK_API_DEPENDS.poppler-qt4+= poppler-qt4>=0.12.0 251BUILDLINK_API_DEPENDS.poppler-qt4+= poppler-qt4>=0.12.0
252.include "../../print/poppler-qt4/buildlink3.mk" 252.include "../../print/poppler-qt4/buildlink3.mk"
253.include "../../sysutils/desktop-file-utils/desktopdb.mk" 253.include "../../sysutils/desktop-file-utils/desktopdb.mk"
254.include "../../sysutils/hal/buildlink3.mk" 254.include "../../sysutils/hal/buildlink3.mk"
255BUILDLINK_API_DEPENDS.py-dbus+= ${PYPKGPREFIX}-dbus>=0.82.2 255BUILDLINK_API_DEPENDS.py-dbus+= ${PYPKGPREFIX}-dbus>=0.82.2
256.include "../../sysutils/py-dbus/buildlink3.mk" 256.include "../../sysutils/py-dbus/buildlink3.mk"
257.include "../../textproc/icu/buildlink3.mk" 257.include "../../textproc/icu/buildlink3.mk"
258.include "../../databases/shared-mime-info/mimedb.mk" 258.include "../../databases/shared-mime-info/mimedb.mk"
259.include "../../textproc/py-elementtree/buildlink3.mk" 259.include "../../textproc/py-elementtree/buildlink3.mk"
260.include "../../x11/py-sip/buildlink3.mk" 260.include "../../x11/py-sip/buildlink3.mk"
261BUILDLINK_API_DEPENDS.py-qt4+= ${PYPKGPREFIX}-qt4>=4.7.0 261BUILDLINK_API_DEPENDS.py-qt4+= ${PYPKGPREFIX}-qt4>=4.7.0
262.include "../../x11/py-qt4/buildlink3.mk" 262.include "../../x11/py-qt4/buildlink3.mk"
263BUILDLINK_API_DEPENDS.qt4-tools+= qt4-tools>=4.7.0 263BUILDLINK_API_DEPENDS.qt4-tools+= qt4-tools>=4.7.0
264.include "../../x11/qt4-tools/buildlink3.mk" 264.include "../../x11/qt4-tools/buildlink3.mk"
265BUILDLINK_API_DEPENDS.qt4-qdbus+= qt4-qdbus>=4.7.0 265BUILDLINK_API_DEPENDS.qt4-qdbus+= qt4-qdbus>=4.7.0
266.include "../../x11/qt4-qdbus/buildlink3.mk" 266.include "../../x11/qt4-qdbus/buildlink3.mk"
267.include "../../mk/bsd.pkg.mk" 267.include "../../mk/bsd.pkg.mk"
cvs diff -r1.20 -r1.21 pkgsrc/misc/calibre/distinfo (switch to unified diff)

--- pkgsrc/misc/calibre/distinfo 2014/05/09 16:53:16 1.20
+++ pkgsrc/misc/calibre/distinfo 2014/05/16 12:08:30 1.21
@@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
1$NetBSD: distinfo,v 1.20 2014/05/09 16:53:16 wiz Exp $ 1$NetBSD: distinfo,v 1.21 2014/05/16 12:08:30 wiz Exp $
2 2
3SHA1 (calibre-1.36.0.tar.xz) = d32e054d2ad23419df739327da2ae89b671deb2b 3SHA1 (calibre-1.37.0.tar.xz) = 418781e06dbd5de90fb9072ba87010821e2ccd83
4RMD160 (calibre-1.36.0.tar.xz) = d0464b301c93e3ac3c5fbdc68337e4d790148c37 4RMD160 (calibre-1.37.0.tar.xz) = ecfcc26dae2697446d8ed038a6d7bc983c96590f
5Size (calibre-1.36.0.tar.xz) = 34023596 bytes 5Size (calibre-1.37.0.tar.xz) = 34093504 bytes
6SHA1 (qt-everywhere-opensource-src-4.8.5.tar.gz) = 745f9ebf091696c0d5403ce691dc28c039d77b9e 6SHA1 (qt-everywhere-opensource-src-4.8.5.tar.gz) = 745f9ebf091696c0d5403ce691dc28c039d77b9e
7RMD160 (qt-everywhere-opensource-src-4.8.5.tar.gz) = 1e7bb099d5d1cda0b663cebe207c846c8d04750d 7RMD160 (qt-everywhere-opensource-src-4.8.5.tar.gz) = 1e7bb099d5d1cda0b663cebe207c846c8d04750d
8Size (qt-everywhere-opensource-src-4.8.5.tar.gz) = 241491467 bytes 8Size (qt-everywhere-opensource-src-4.8.5.tar.gz) = 241491467 bytes
9SHA1 (patch-setup_extensions.py) = 285ab1aff5b0d5f7c0a016f68e705d312a120d65 9SHA1 (patch-setup_extensions.py) = 285ab1aff5b0d5f7c0a016f68e705d312a120d65
10SHA1 (patch-src_calibre_linux.py) = 06e953e3a437ae76783d80bf0986bbbece991431 10SHA1 (patch-src_calibre_linux.py) = 06e953e3a437ae76783d80bf0986bbbece991431