From rnejdl@tethys.ringofsaturn.com  Wed Sep 26 21:24:40 2012
Return-Path: <rnejdl@tethys.ringofsaturn.com>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 6B6081065670
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 26 Sep 2012 21:24:40 +0000 (UTC)
	(envelope-from rnejdl@tethys.ringofsaturn.com)
Received: from tethys.ringofsaturn.com (tethys.ringofsaturn.com [71.252.219.43])
	by mx1.freebsd.org (Postfix) with ESMTP id 46CF18FC08
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 26 Sep 2012 21:24:40 +0000 (UTC)
Received: from ASSP.nospam (localhost [127.0.0.1])
	by tethys.ringofsaturn.com (8.14.5/8.14.5) with ESMTP id q8QLOdml076986
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 26 Sep 2012 16:24:39 -0500 (CDT)
	(envelope-from rnejdl@tethys.ringofsaturn.com)
Received: from anyhost.local ([127.0.0.1] helo=anyhost.local) by
	ASSP.nospam with ESMTPS(AES256-SHA) (ASSP 1.9); 26 Sep 2012 16:24:38 -0500
Received: (from rnejdl@localhost)
	by tethys.ringofsaturn.com (8.14.5/8.14.5/Submit) id q8QLOchn076985;
	Wed, 26 Sep 2012 16:24:38 -0500 (CDT)
	(envelope-from rnejdl)
Message-Id: <assp.06163e2924.201209262124.q8QLOchn076985@tethys.ringofsaturn.com>
Date: Wed, 26 Sep 2012 16:24:38 -0500 (CDT)
From: Rusty Nejdl <rnejdl@ringofsaturn.com>
Reply-To: Rusty Nejdl <rnejdl@ringofsaturn.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: Update port deskutils/calibre to 0.8.70
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         172099
>Category:       ports
>Synopsis:       Update port deskutils/calibre to 0.8.70
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    bdrewery
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Sep 26 21:30:01 UTC 2012
>Closed-Date:    Thu Oct 04 07:14:35 CDT 2012
>Last-Modified:  Thu Oct  4 12:20:08 UTC 2012
>Originator:     Rusty Nejdl
>Release:        FreeBSD 9.1-PRERELEASE amd64
>Organization:
>Environment:
System: FreeBSD tethys.ringofsaturn.com 9.1-PRERELEASE FreeBSD 9.1-PRERELEASE #0: Sun Sep 23 15:41:42 CDT 2012 root@tethys.ringofsaturn.com:/usr/obj/usr/src/sys/GENERIC amd64


>Description:
	Update port deskutils/calibre from 0.8.68 to 0.8.70.  A changelog can be found at:

http://calibre-ebook.com/whats-new

>How-To-Repeat:

>Fix:

	

--- calibre-0.8.70.diff begins here ---
diff -ruN calibre/Makefile calibre.new/Makefile
--- calibre/Makefile	2012-09-09 22:49:52.000000000 -0500
+++ calibre.new/Makefile	2012-09-26 16:14:52.000000000 -0500
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	calibre
-PORTVERSION=	0.8.68
+PORTVERSION=	0.8.70
 CATEGORIES=	deskutils python
 MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION}/
 
diff -ruN calibre/distinfo calibre.new/distinfo
--- calibre/distinfo	2012-09-09 22:49:52.000000000 -0500
+++ calibre.new/distinfo	2012-09-26 16:15:06.000000000 -0500
@@ -1,2 +1,2 @@
-SHA256 (calibre-0.8.68.tar.xz) = dd5f6ce36d0a013e3043abf543a86f8eac0f842e8c97d702960e1ff9e0bf4b04
-SIZE (calibre-0.8.68.tar.xz) = 26852296
+SHA256 (calibre-0.8.70.tar.xz) = 2f1cc5270f19d9912b73467f7356fb3a27a52714ad3e3198e1d93293d1e55b89
+SIZE (calibre-0.8.70.tar.xz) = 26931608
diff -ruN calibre/pkg-plist calibre.new/pkg-plist
--- calibre/pkg-plist	2012-09-09 22:49:52.000000000 -0500
+++ calibre.new/pkg-plist	2012-09-26 16:20:30.000000000 -0500
@@ -84,6 +84,7 @@
 lib/calibre/calibre/devices/misc.py
 lib/calibre/calibre/devices/mtp/books.py
 lib/calibre/calibre/devices/mtp/__init__.py
+lib/calibre/calibre/devices/mtp/defaults.py
 lib/calibre/calibre/devices/mtp/driver.py
 lib/calibre/calibre/devices/mtp/test.py
 lib/calibre/calibre/devices/mtp/base.py
@@ -627,6 +628,7 @@
 lib/calibre/calibre/gui2/device_drivers/configwidget.py
 lib/calibre/calibre/gui2/device_drivers/configwidget_ui.py
 lib/calibre/calibre/gui2/device_drivers/mtp_config.py
+lib/calibre/calibre/gui2/device_drivers/mtp_folder_browser.py
 lib/calibre/calibre/gui2/dialogs/__init__.py
 lib/calibre/calibre/gui2/dialogs/add_empty_book.py
 lib/calibre/calibre/gui2/dialogs/add_from_isbn.py
@@ -745,6 +747,7 @@
 lib/calibre/calibre/gui2/preferences/email_ui.py
 lib/calibre/calibre/gui2/preferences/emailp.py
 lib/calibre/calibre/gui2/preferences/history.py
+lib/calibre/calibre/gui2/preferences/ignored_devices.py
 lib/calibre/calibre/gui2/preferences/keyboard.py
 lib/calibre/calibre/gui2/preferences/look_feel.py
 lib/calibre/calibre/gui2/preferences/look_feel_ui.py
@@ -792,7 +795,6 @@
 lib/calibre/calibre/gui2/store/stores/amazon_es_plugin.py
 lib/calibre/calibre/gui2/store/stores/amazon_fr_plugin.py
 lib/calibre/calibre/gui2/store/stores/amazon_it_plugin.py
-lib/calibre/calibre/gui2/store/stores/beam_ebooks_de_plugin.py
 lib/calibre/calibre/gui2/store/stores/biblio_plugin.py
 lib/calibre/calibre/gui2/store/stores/ebookpoint_plugin.py
 lib/calibre/calibre/gui2/store/stores/ebooksgratuits_plugin.py
@@ -1221,7 +1223,7 @@
 share/applications/calibre-gui.desktop
 share/applications/calibre-lrfviewer.desktop
 share/applications/calibre-ebook-viewer.desktop
-share/mime/packages/calibre-mimetypes
+share/mime/packages/calibre-mimetypes.xml
 share/icons/hicolor/128x128/apps/calibre-viewer.png
 share/icons/hicolor/128x128/mimetypes/application-lrf.png
 share/icons/hicolor/128x128/mimetypes/gnome-mime-application-lrf.png
@@ -1336,7 +1338,7 @@
 %%DATADIR%%/images/devices/itunes.png
 %%DATADIR%%/images/devices/kindle.jpg
 %%DATADIR%%/images/devices/nook.jpg
-%%DATADIR%%/images/devices/galaxy_s3.png
+%%DATADIR%%/images/devices/tablet.png
 %%DATADIR%%/images/dialog_error.png
 %%DATADIR%%/images/dialog_information.png
 %%DATADIR%%/images/dialog_question.png
@@ -1392,6 +1394,8 @@
 %%DATADIR%%/images/mail.png
 %%DATADIR%%/images/merge_books.png
 %%DATADIR%%/images/metadata.png
+%%DATADIR%%/images/mimetypes/azw2.png
+%%DATADIR%%/images/mimetypes/azw3.png
 %%DATADIR%%/images/mimetypes/bmp.png
 %%DATADIR%%/images/mimetypes/computer.png
 %%DATADIR%%/images/mimetypes/dir.png
@@ -1412,6 +1416,7 @@
 %%DATADIR%%/images/mimetypes/rtf.png
 %%DATADIR%%/images/mimetypes/snb.png
 %%DATADIR%%/images/mimetypes/svg.png
+%%DATADIR%%/images/mimetypes/tpz.png
 %%DATADIR%%/images/mimetypes/txt.png
 %%DATADIR%%/images/mimetypes/unknown.png
 %%DATADIR%%/images/mimetypes/zero.png
--- calibre-0.8.70.diff ends here ---


>Release-Note:
>Audit-Trail:
Class-Changed-From-To: update->maintainer-update 
Class-Changed-By: edwin 
Class-Changed-When: Wed Sep 26 21:30:14 UTC 2012 
Class-Changed-Why:  
Fix category (submitter is maintainer) (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=172099 
Responsible-Changed-From-To: freebsd-ports-bugs->bdrewery 
Responsible-Changed-By: bdrewery 
Responsible-Changed-When: Wed Sep 26 16:35:43 CDT 2012 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=172099 
State-Changed-From-To: open->feedback 
State-Changed-By: bdrewery 
State-Changed-When: Thu Sep 27 17:55:58 CDT 2012 
State-Changed-Why:  
Waiting on feedback 

http://www.freebsd.org/cgi/query-pr.cgi?pr=172099 

From: Bryan Drewery <bdrewery@FreeBSD.org>
To: rnejdl@ringofsaturn.com
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/172099: Update port deskutils/calibre to 0.8.70
Date: Thu, 27 Sep 2012 17:55:12 -0500

 Hi Rusty,
 
 There are PLIST errors. Files leftover after deinstall. Can you please
 take a look?
 
 https://redports.org/~bdrewery/20120926221155-42293-74539/calibre-0.8.70.log
 
 The old 0.8.68 built fine:
 
 https://redports.org/~bdrewery/20120927034950-33561-74616/calibre-0.8.68.log
 
 
 Bryan

From: Rusty Nejdl <rnejdl@ringofsaturn.com>
To: Bryan Drewery <bdrewery@freebsd.org>
Cc: <bug-followup@freebsd.org>
Subject: Re: ports/172099: Update port deskutils/calibre to 0.8.70
Date: Thu, 27 Sep 2012 18:23:15 -0500

 --=_a635afaeb67ac5c248e66cd17ae1b444
 Content-Transfer-Encoding: 7bit
 Content-Type: text/plain; charset=UTF-8;
  format=flowed
 
 On 2012-09-27 17:55, Bryan Drewery wrote:
 > Hi Rusty,
 >
 > There are PLIST errors. Files leftover after deinstall. Can you 
 > please
 > take a look?
 >
 > 
 > https://redports.org/~bdrewery/20120926221155-42293-74539/calibre-0.8.70.log
 >
 > The old 0.8.68 built fine:
 >
 > 
 > https://redports.org/~bdrewery/20120927034950-33561-74616/calibre-0.8.68.log
 >
 >
 > Bryan
 
 This should have that cleaned up properly now.
 
 Rusty
 --=_a635afaeb67ac5c248e66cd17ae1b444
 Content-Transfer-Encoding: base64
 Content-Type: application/octet-stream;
  name=calibre-0.8.70.diff
 Content-Disposition: attachment;
  filename=calibre-0.8.70.diff;
  size=5302
 
 ZGlmZiAtcnVOIGNhbGlicmUvTWFrZWZpbGUgY2FsaWJyZS5uZXcvTWFrZWZpbGUKLS0tIGNhbGli
 cmUvTWFrZWZpbGUJMjAxMi0wOS0wOSAyMTowMzowNC4wMDAwMDAwMDAgLTA1MDAKKysrIGNhbGli
 cmUubmV3L01ha2VmaWxlCTIwMTItMDktMjYgMTY6MjI6NDQuMDAwMDAwMDAwIC0wNTAwCkBAIC02
 LDcgKzYsNyBAQAogIwogCiBQT1JUTkFNRT0JY2FsaWJyZQotUE9SVFZFUlNJT049CTAuOC42OAor
 UE9SVFZFUlNJT049CTAuOC43MAogQ0FURUdPUklFUz0JZGVza3V0aWxzIHB5dGhvbgogTUFTVEVS
 X1NJVEVTPQlTRi8ke1BPUlROQU1FfS8ke1BPUlRWRVJTSU9OfS8KIApkaWZmIC1ydU4gY2FsaWJy
 ZS9kaXN0aW5mbyBjYWxpYnJlLm5ldy9kaXN0aW5mbwotLS0gY2FsaWJyZS9kaXN0aW5mbwkyMDEy
 LTA5LTA5IDIxOjAzOjA0LjAwMDAwMDAwMCAtMDUwMAorKysgY2FsaWJyZS5uZXcvZGlzdGluZm8J
 MjAxMi0wOS0yNiAxNjoyMjo0NC4wMDAwMDAwMDAgLTA1MDAKQEAgLTEsMiArMSwyIEBACi1TSEEy
 NTYgKGNhbGlicmUtMC44LjY4LnRhci54eikgPSBkZDVmNmNlMzZkMGEwMTNlMzA0M2FiZjU0M2E4
 NmY4ZWFjMGY4NDJlOGM5N2Q3MDI5NjBlMWZmOWUwYmY0YjA0Ci1TSVpFIChjYWxpYnJlLTAuOC42
 OC50YXIueHopID0gMjY4NTIyOTYKK1NIQTI1NiAoY2FsaWJyZS0wLjguNzAudGFyLnh6KSA9IDJm
 MWNjNTI3MGYxOWQ5OTEyYjczNDY3ZjczNTZmYjNhMjdhNTI3MTRhZDNlMzE5OGUxZDkzMjkzZDFl
 NTViODkKK1NJWkUgKGNhbGlicmUtMC44LjcwLnRhci54eikgPSAyNjkzMTYwOApkaWZmIC1ydU4g
 Y2FsaWJyZS9wa2ctcGxpc3QgY2FsaWJyZS5uZXcvcGtnLXBsaXN0Ci0tLSBjYWxpYnJlL3BrZy1w
 bGlzdAkyMDEyLTA5LTA5IDIxOjAzOjA0LjAwMDAwMDAwMCAtMDUwMAorKysgY2FsaWJyZS5uZXcv
 cGtnLXBsaXN0CTIwMTItMDktMjcgMTg6MjA6MTcuMDAwMDAwMDAwIC0wNTAwCkBAIC04NCw2ICs4
 NCw3IEBACiBsaWIvY2FsaWJyZS9jYWxpYnJlL2RldmljZXMvbWlzYy5weQogbGliL2NhbGlicmUv
 Y2FsaWJyZS9kZXZpY2VzL210cC9ib29rcy5weQogbGliL2NhbGlicmUvY2FsaWJyZS9kZXZpY2Vz
 L210cC9fX2luaXRfXy5weQorbGliL2NhbGlicmUvY2FsaWJyZS9kZXZpY2VzL210cC9kZWZhdWx0
 cy5weQogbGliL2NhbGlicmUvY2FsaWJyZS9kZXZpY2VzL210cC9kcml2ZXIucHkKIGxpYi9jYWxp
 YnJlL2NhbGlicmUvZGV2aWNlcy9tdHAvdGVzdC5weQogbGliL2NhbGlicmUvY2FsaWJyZS9kZXZp
 Y2VzL210cC9iYXNlLnB5CkBAIC02MjcsNiArNjI4LDcgQEAKIGxpYi9jYWxpYnJlL2NhbGlicmUv
 Z3VpMi9kZXZpY2VfZHJpdmVycy9jb25maWd3aWRnZXQucHkKIGxpYi9jYWxpYnJlL2NhbGlicmUv
 Z3VpMi9kZXZpY2VfZHJpdmVycy9jb25maWd3aWRnZXRfdWkucHkKIGxpYi9jYWxpYnJlL2NhbGli
 cmUvZ3VpMi9kZXZpY2VfZHJpdmVycy9tdHBfY29uZmlnLnB5CitsaWIvY2FsaWJyZS9jYWxpYnJl
 L2d1aTIvZGV2aWNlX2RyaXZlcnMvbXRwX2ZvbGRlcl9icm93c2VyLnB5CiBsaWIvY2FsaWJyZS9j
 YWxpYnJlL2d1aTIvZGlhbG9ncy9fX2luaXRfXy5weQogbGliL2NhbGlicmUvY2FsaWJyZS9ndWky
 L2RpYWxvZ3MvYWRkX2VtcHR5X2Jvb2sucHkKIGxpYi9jYWxpYnJlL2NhbGlicmUvZ3VpMi9kaWFs
 b2dzL2FkZF9mcm9tX2lzYm4ucHkKQEAgLTc0NSw2ICs3NDcsNyBAQAogbGliL2NhbGlicmUvY2Fs
 aWJyZS9ndWkyL3ByZWZlcmVuY2VzL2VtYWlsX3VpLnB5CiBsaWIvY2FsaWJyZS9jYWxpYnJlL2d1
 aTIvcHJlZmVyZW5jZXMvZW1haWxwLnB5CiBsaWIvY2FsaWJyZS9jYWxpYnJlL2d1aTIvcHJlZmVy
 ZW5jZXMvaGlzdG9yeS5weQorbGliL2NhbGlicmUvY2FsaWJyZS9ndWkyL3ByZWZlcmVuY2VzL2ln
 bm9yZWRfZGV2aWNlcy5weQogbGliL2NhbGlicmUvY2FsaWJyZS9ndWkyL3ByZWZlcmVuY2VzL2tl
 eWJvYXJkLnB5CiBsaWIvY2FsaWJyZS9jYWxpYnJlL2d1aTIvcHJlZmVyZW5jZXMvbG9va19mZWVs
 LnB5CiBsaWIvY2FsaWJyZS9jYWxpYnJlL2d1aTIvcHJlZmVyZW5jZXMvbG9va19mZWVsX3VpLnB5
 CkBAIC03OTIsNyArNzk1LDYgQEAKIGxpYi9jYWxpYnJlL2NhbGlicmUvZ3VpMi9zdG9yZS9zdG9y
 ZXMvYW1hem9uX2VzX3BsdWdpbi5weQogbGliL2NhbGlicmUvY2FsaWJyZS9ndWkyL3N0b3JlL3N0
 b3Jlcy9hbWF6b25fZnJfcGx1Z2luLnB5CiBsaWIvY2FsaWJyZS9jYWxpYnJlL2d1aTIvc3RvcmUv
 c3RvcmVzL2FtYXpvbl9pdF9wbHVnaW4ucHkKLWxpYi9jYWxpYnJlL2NhbGlicmUvZ3VpMi9zdG9y
 ZS9zdG9yZXMvYmVhbV9lYm9va3NfZGVfcGx1Z2luLnB5CiBsaWIvY2FsaWJyZS9jYWxpYnJlL2d1
 aTIvc3RvcmUvc3RvcmVzL2JpYmxpb19wbHVnaW4ucHkKIGxpYi9jYWxpYnJlL2NhbGlicmUvZ3Vp
 Mi9zdG9yZS9zdG9yZXMvZWJvb2twb2ludF9wbHVnaW4ucHkKIGxpYi9jYWxpYnJlL2NhbGlicmUv
 Z3VpMi9zdG9yZS9zdG9yZXMvZWJvb2tzZ3JhdHVpdHNfcGx1Z2luLnB5CkBAIC0xMjIxLDE2ICsx
 MjIzLDMwIEBACiBzaGFyZS9hcHBsaWNhdGlvbnMvY2FsaWJyZS1ndWkuZGVza3RvcAogc2hhcmUv
 YXBwbGljYXRpb25zL2NhbGlicmUtbHJmdmlld2VyLmRlc2t0b3AKIHNoYXJlL2FwcGxpY2F0aW9u
 cy9jYWxpYnJlLWVib29rLXZpZXdlci5kZXNrdG9wCi1zaGFyZS9taW1lL3BhY2thZ2VzL2NhbGli
 cmUtbWltZXR5cGVzCitzaGFyZS9taW1lL3BhY2thZ2VzL2NhbGlicmUtbWltZXR5cGVzLnhtbAog
 c2hhcmUvaWNvbnMvaGljb2xvci8xMjh4MTI4L2FwcHMvY2FsaWJyZS12aWV3ZXIucG5nCiBzaGFy
 ZS9pY29ucy9oaWNvbG9yLzEyOHgxMjgvbWltZXR5cGVzL2FwcGxpY2F0aW9uLWxyZi5wbmcKIHNo
 YXJlL2ljb25zL2hpY29sb3IvMTI4eDEyOC9taW1ldHlwZXMvZ25vbWUtbWltZS1hcHBsaWNhdGlv
 bi1scmYucG5nCiBzaGFyZS9pY29ucy9oaWNvbG9yLzEyOHgxMjgvbWltZXR5cGVzL3RleHQtbHJz
 LnBuZwogc2hhcmUvaWNvbnMvaGljb2xvci8xMjh4MTI4L21pbWV0eXBlcy9nbm9tZS1taW1lLXRl
 eHQtbHJzLnBuZworc2hhcmUvaWNvbnMvaGljb2xvci8xMjh4MTI4L21pbWV0eXBlcy9hcHBsaWNh
 dGlvbi14LW1vYmlwb2NrZXQtZWJvb2sucG5nCitzaGFyZS9pY29ucy9oaWNvbG9yLzEyOHgxMjgv
 bWltZXR5cGVzL2FwcGxpY2F0aW9uLXgtdG9wYXotZWJvb2sucG5nCitzaGFyZS9pY29ucy9oaWNv
 bG9yLzEyOHgxMjgvbWltZXR5cGVzL2FwcGxpY2F0aW9uLXgta2luZGxlLWFwcGxpY2F0aW9uLnBu
 Zworc2hhcmUvaWNvbnMvaGljb2xvci8xMjh4MTI4L21pbWV0eXBlcy9hcHBsaWNhdGlvbi14LW1v
 Ymk4LWVib29rLnBuZworc2hhcmUvaWNvbnMvaGljb2xvci8xMjh4MTI4L21pbWV0eXBlcy9nbm9t
 ZS1taW1lLWFwcGxpY2F0aW9uLXgtbW9iaXBvY2tldC1lYm9vay5wbmcKK3NoYXJlL2ljb25zL2hp
 Y29sb3IvMTI4eDEyOC9taW1ldHlwZXMvZ25vbWUtbWltZS1hcHBsaWNhdGlvbi14LXRvcGF6LWVi
 b29rLnBuZworc2hhcmUvaWNvbnMvaGljb2xvci8xMjh4MTI4L21pbWV0eXBlcy9nbm9tZS1taW1l
 LWFwcGxpY2F0aW9uLXgta2luZGxlLWFwcGxpY2F0aW9uLnBuZworc2hhcmUvaWNvbnMvaGljb2xv
 ci8xMjh4MTI4L21pbWV0eXBlcy9nbm9tZS1taW1lLWFwcGxpY2F0aW9uLXgtbW9iaTgtZWJvb2su
 cG5nCiBzaGFyZS9pY29ucy9oaWNvbG9yLzI1NngyNTYvYXBwcy9jYWxpYnJlLWd1aS5wbmcKIHNo
 YXJlL2dub21lL2FwcHMvY2FsaWJyZS1ndWkuZGVza3RvcAogc2hhcmUvZ25vbWUvYXBwcy9jYWxp
 YnJlLWxyZnZpZXdlci5kZXNrdG9wCiBzaGFyZS9nbm9tZS9hcHBzL2NhbGlicmUtZWJvb2stdmll
 d2VyLmRlc2t0b3AKK3NoYXJlL21pbWUvYXBwbGljYXRpb24veC1zb255LWJiZWIueG1sCitzaGFy
 ZS9taW1lL2FwcGxpY2F0aW9uL3gtdG9wYXotZWJvb2sueG1sCitzaGFyZS9taW1lL2FwcGxpY2F0
 aW9uL3gtbW9iaTgtZWJvb2sueG1sCitzaGFyZS9taW1lL2FwcGxpY2F0aW9uL3gta2luZGxlLWFw
 cGxpY2F0aW9uLnhtbAorc2hhcmUvbWltZS9hcHBsaWNhdGlvbi94LW1vYmlwb2NrZXQtc3Vic2Ny
 aXB0aW9uLnhtbAorc2hhcmUvbWltZS90ZXh0L2xycy54bWwKICUlREFUQURJUiUlL2J1aWx0aW5f
 cmVjaXBlcy54bWwKICUlREFUQURJUiUlL2J1aWx0aW5fcmVjaXBlcy56aXAKICUlREFUQURJUiUl
 L2NhbGlicmUtcG9ydGFibGUuYmF0CkBAIC0xMzM2LDcgKzEzNTIsNyBAQAogJSVEQVRBRElSJSUv
 aW1hZ2VzL2RldmljZXMvaXR1bmVzLnBuZwogJSVEQVRBRElSJSUvaW1hZ2VzL2RldmljZXMva2lu
 ZGxlLmpwZwogJSVEQVRBRElSJSUvaW1hZ2VzL2RldmljZXMvbm9vay5qcGcKLSUlREFUQURJUiUl
 L2ltYWdlcy9kZXZpY2VzL2dhbGF4eV9zMy5wbmcKKyUlREFUQURJUiUlL2ltYWdlcy9kZXZpY2Vz
 L3RhYmxldC5wbmcKICUlREFUQURJUiUlL2ltYWdlcy9kaWFsb2dfZXJyb3IucG5nCiAlJURBVEFE
 SVIlJS9pbWFnZXMvZGlhbG9nX2luZm9ybWF0aW9uLnBuZwogJSVEQVRBRElSJSUvaW1hZ2VzL2Rp
 YWxvZ19xdWVzdGlvbi5wbmcKQEAgLTEzOTIsNiArMTQwOCw4IEBACiAlJURBVEFESVIlJS9pbWFn
 ZXMvbWFpbC5wbmcKICUlREFUQURJUiUlL2ltYWdlcy9tZXJnZV9ib29rcy5wbmcKICUlREFUQURJ
 UiUlL2ltYWdlcy9tZXRhZGF0YS5wbmcKKyUlREFUQURJUiUlL2ltYWdlcy9taW1ldHlwZXMvYXp3
 Mi5wbmcKKyUlREFUQURJUiUlL2ltYWdlcy9taW1ldHlwZXMvYXp3My5wbmcKICUlREFUQURJUiUl
 L2ltYWdlcy9taW1ldHlwZXMvYm1wLnBuZwogJSVEQVRBRElSJSUvaW1hZ2VzL21pbWV0eXBlcy9j
 b21wdXRlci5wbmcKICUlREFUQURJUiUlL2ltYWdlcy9taW1ldHlwZXMvZGlyLnBuZwpAQCAtMTQx
 Miw2ICsxNDMwLDcgQEAKICUlREFUQURJUiUlL2ltYWdlcy9taW1ldHlwZXMvcnRmLnBuZwogJSVE
 QVRBRElSJSUvaW1hZ2VzL21pbWV0eXBlcy9zbmIucG5nCiAlJURBVEFESVIlJS9pbWFnZXMvbWlt
 ZXR5cGVzL3N2Zy5wbmcKKyUlREFUQURJUiUlL2ltYWdlcy9taW1ldHlwZXMvdHB6LnBuZwogJSVE
 QVRBRElSJSUvaW1hZ2VzL21pbWV0eXBlcy90eHQucG5nCiAlJURBVEFESVIlJS9pbWFnZXMvbWlt
 ZXR5cGVzL3Vua25vd24ucG5nCiAlJURBVEFESVIlJS9pbWFnZXMvbWltZXR5cGVzL3plcm8ucG5n
 CkBAIC0xOTM4LDMgKzE5NTcsNSBAQAogQGRpcnJtdHJ5IHNoYXJlL2dub21lL2FwcHMKIEBkaXJy
 bXRyeSBzaGFyZS9nbm9tZQogQGRpcnJtdHJ5IHNoYXJlL2Rlc2t0b3AtZGlyZWN0b3JpZXMKK0Bk
 aXJybXRyeSBzaGFyZS9taW1lL2FwcGxpY2F0aW9uCitAZGlycm10cnkgc2hhcmUvbWltZS90ZXh0
 Cg==
 --=_a635afaeb67ac5c248e66cd17ae1b444--
 

From: Rusty Nejdl <rnejdl@ringofsaturn.com>
To: Bryan Drewery <bdrewery@freebsd.org>
Cc: <bug-followup@freebsd.org>
Subject: Re: ports/172099: Update port deskutils/calibre to 0.8.70
Date: Thu, 27 Sep 2012 18:05:15 -0500

 On 2012-09-27 17:55, Bryan Drewery wrote:
 > Hi Rusty,
 >
 > There are PLIST errors. Files leftover after deinstall. Can you 
 > please
 > take a look?
 >
 > 
 > https://redports.org/~bdrewery/20120926221155-42293-74539/calibre-0.8.70.log
 >
 > The old 0.8.68 built fine:
 >
 > 
 > https://redports.org/~bdrewery/20120927034950-33561-74616/calibre-0.8.68.log
 >
 >
 > Bryan
 
 Bryan,
 
 Well drat... I actually think those were left over from the last ports 
 based on the dates of those files on my system (13th).  Let me clean 
 this up and resubmit.
 
 Rusty
State-Changed-From-To: feedback->open 
State-Changed-By: bdrewery 
State-Changed-When: Wed Oct 3 07:21:38 CDT 2012 
State-Changed-Why:  
Feedback/Patch received. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=172099 
State-Changed-From-To: open->closed 
State-Changed-By: bdrewery 
State-Changed-When: Thu Oct 4 07:14:33 CDT 2012 
State-Changed-Why:  
Committed, with minor changes. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=172099 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/172099: commit references a PR
Date: Thu,  4 Oct 2012 12:14:49 +0000 (UTC)

 Author: bdrewery
 Date: Thu Oct  4 12:14:35 2012
 New Revision: 305255
 URL: http://svn.freebsd.org/changeset/ports/305255
 
 Log:
   - Update to 0.8.70 [1]
   - Update to new header
   - Fix PODOFO being missed for options conversion
   
   Changes: http://calibre-ebook.com/whats-new
   
   PR:		ports/172099 [1]
   Submitted by:	Rusty Nejdl <rnejdl@ringofsaturn.com> (maintainer)
 
 Modified:
   head/deskutils/calibre/Makefile
   head/deskutils/calibre/distinfo
   head/deskutils/calibre/pkg-plist
 
 Modified: head/deskutils/calibre/Makefile
 ==============================================================================
 --- head/deskutils/calibre/Makefile	Thu Oct  4 12:06:43 2012	(r305254)
 +++ head/deskutils/calibre/Makefile	Thu Oct  4 12:14:35 2012	(r305255)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	calibre
 -# Date created:		10/11/2009
 -# Whom:			stas
 -#
 +# Created by: stas
  # $FreeBSD$
 -#
  
  PORTNAME=	calibre
 -PORTVERSION=	0.8.68
 +PORTVERSION=	0.8.70
  CATEGORIES=	deskutils python
  MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION}/
  
 @@ -70,7 +66,7 @@ PLIST_SUB+=	USB="@comment "
  MAKE_ENV+=	WITH_USB=yes
  PLIST_SUB+=	USB=""
  .endif
 -.if !defined(WITHOUT_PODOFO) || exists(${LOCALBASE}/lib/libpodofo.so)
 +.if ${PORT_OPTIONS:MPODOFO} || exists(${LOCALBASE}/lib/libpodofo.so)
  LIB_DEPENDS+=	podofo:${PORTSDIR}/graphics/podofo
  MAKE_ENV+=	PODOFO_LIB_DIR="${LOCALBASE}/lib" \
  		PODOFO_INC_DIR="${LOCALBASE}/include/podofo"
 
 Modified: head/deskutils/calibre/distinfo
 ==============================================================================
 --- head/deskutils/calibre/distinfo	Thu Oct  4 12:06:43 2012	(r305254)
 +++ head/deskutils/calibre/distinfo	Thu Oct  4 12:14:35 2012	(r305255)
 @@ -1,2 +1,2 @@
 -SHA256 (calibre-0.8.68.tar.xz) = dd5f6ce36d0a013e3043abf543a86f8eac0f842e8c97d702960e1ff9e0bf4b04
 -SIZE (calibre-0.8.68.tar.xz) = 26852296
 +SHA256 (calibre-0.8.70.tar.xz) = 2f1cc5270f19d9912b73467f7356fb3a27a52714ad3e3198e1d93293d1e55b89
 +SIZE (calibre-0.8.70.tar.xz) = 26931608
 
 Modified: head/deskutils/calibre/pkg-plist
 ==============================================================================
 --- head/deskutils/calibre/pkg-plist	Thu Oct  4 12:06:43 2012	(r305254)
 +++ head/deskutils/calibre/pkg-plist	Thu Oct  4 12:14:35 2012	(r305255)
 @@ -84,6 +84,7 @@ lib/calibre/calibre/devices/mime.py
  lib/calibre/calibre/devices/misc.py
  lib/calibre/calibre/devices/mtp/books.py
  lib/calibre/calibre/devices/mtp/__init__.py
 +lib/calibre/calibre/devices/mtp/defaults.py
  lib/calibre/calibre/devices/mtp/driver.py
  lib/calibre/calibre/devices/mtp/test.py
  lib/calibre/calibre/devices/mtp/base.py
 @@ -627,6 +628,7 @@ lib/calibre/calibre/gui2/device_drivers/
  lib/calibre/calibre/gui2/device_drivers/configwidget.py
  lib/calibre/calibre/gui2/device_drivers/configwidget_ui.py
  lib/calibre/calibre/gui2/device_drivers/mtp_config.py
 +lib/calibre/calibre/gui2/device_drivers/mtp_folder_browser.py
  lib/calibre/calibre/gui2/dialogs/__init__.py
  lib/calibre/calibre/gui2/dialogs/add_empty_book.py
  lib/calibre/calibre/gui2/dialogs/add_from_isbn.py
 @@ -745,6 +747,7 @@ lib/calibre/calibre/gui2/preferences/dev
  lib/calibre/calibre/gui2/preferences/email_ui.py
  lib/calibre/calibre/gui2/preferences/emailp.py
  lib/calibre/calibre/gui2/preferences/history.py
 +lib/calibre/calibre/gui2/preferences/ignored_devices.py
  lib/calibre/calibre/gui2/preferences/keyboard.py
  lib/calibre/calibre/gui2/preferences/look_feel.py
  lib/calibre/calibre/gui2/preferences/look_feel_ui.py
 @@ -792,7 +795,6 @@ lib/calibre/calibre/gui2/store/basic_con
  lib/calibre/calibre/gui2/store/stores/amazon_es_plugin.py
  lib/calibre/calibre/gui2/store/stores/amazon_fr_plugin.py
  lib/calibre/calibre/gui2/store/stores/amazon_it_plugin.py
 -lib/calibre/calibre/gui2/store/stores/beam_ebooks_de_plugin.py
  lib/calibre/calibre/gui2/store/stores/biblio_plugin.py
  lib/calibre/calibre/gui2/store/stores/ebookpoint_plugin.py
  lib/calibre/calibre/gui2/store/stores/ebooksgratuits_plugin.py
 @@ -1221,16 +1223,30 @@ lib/calibre/templite/__init__.py
  share/applications/calibre-gui.desktop
  share/applications/calibre-lrfviewer.desktop
  share/applications/calibre-ebook-viewer.desktop
 -share/mime/packages/calibre-mimetypes
 +share/mime/packages/calibre-mimetypes.xml
  share/icons/hicolor/128x128/apps/calibre-viewer.png
  share/icons/hicolor/128x128/mimetypes/application-lrf.png
  share/icons/hicolor/128x128/mimetypes/gnome-mime-application-lrf.png
  share/icons/hicolor/128x128/mimetypes/text-lrs.png
  share/icons/hicolor/128x128/mimetypes/gnome-mime-text-lrs.png
 +share/icons/hicolor/128x128/mimetypes/application-x-mobipocket-ebook.png
 +share/icons/hicolor/128x128/mimetypes/application-x-topaz-ebook.png
 +share/icons/hicolor/128x128/mimetypes/application-x-kindle-application.png
 +share/icons/hicolor/128x128/mimetypes/application-x-mobi8-ebook.png
 +share/icons/hicolor/128x128/mimetypes/gnome-mime-application-x-mobipocket-ebook.png
 +share/icons/hicolor/128x128/mimetypes/gnome-mime-application-x-topaz-ebook.png
 +share/icons/hicolor/128x128/mimetypes/gnome-mime-application-x-kindle-application.png
 +share/icons/hicolor/128x128/mimetypes/gnome-mime-application-x-mobi8-ebook.png
  share/icons/hicolor/256x256/apps/calibre-gui.png
  share/gnome/apps/calibre-gui.desktop
  share/gnome/apps/calibre-lrfviewer.desktop
  share/gnome/apps/calibre-ebook-viewer.desktop
 +share/mime/application/x-sony-bbeb.xml
 +share/mime/application/x-topaz-ebook.xml
 +share/mime/application/x-mobi8-ebook.xml
 +share/mime/application/x-kindle-application.xml
 +share/mime/application/x-mobipocket-subscription.xml
 +share/mime/text/lrs.xml
  %%DATADIR%%/builtin_recipes.xml
  %%DATADIR%%/builtin_recipes.zip
  %%DATADIR%%/calibre-portable.bat
 @@ -1336,7 +1352,7 @@ share/gnome/apps/calibre-ebook-viewer.de
  %%DATADIR%%/images/devices/itunes.png
  %%DATADIR%%/images/devices/kindle.jpg
  %%DATADIR%%/images/devices/nook.jpg
 -%%DATADIR%%/images/devices/galaxy_s3.png
 +%%DATADIR%%/images/devices/tablet.png
  %%DATADIR%%/images/dialog_error.png
  %%DATADIR%%/images/dialog_information.png
  %%DATADIR%%/images/dialog_question.png
 @@ -1392,6 +1408,8 @@ share/gnome/apps/calibre-ebook-viewer.de
  %%DATADIR%%/images/mail.png
  %%DATADIR%%/images/merge_books.png
  %%DATADIR%%/images/metadata.png
 +%%DATADIR%%/images/mimetypes/azw2.png
 +%%DATADIR%%/images/mimetypes/azw3.png
  %%DATADIR%%/images/mimetypes/bmp.png
  %%DATADIR%%/images/mimetypes/computer.png
  %%DATADIR%%/images/mimetypes/dir.png
 @@ -1412,6 +1430,7 @@ share/gnome/apps/calibre-ebook-viewer.de
  %%DATADIR%%/images/mimetypes/rtf.png
  %%DATADIR%%/images/mimetypes/snb.png
  %%DATADIR%%/images/mimetypes/svg.png
 +%%DATADIR%%/images/mimetypes/tpz.png
  %%DATADIR%%/images/mimetypes/txt.png
  %%DATADIR%%/images/mimetypes/unknown.png
  %%DATADIR%%/images/mimetypes/zero.png
 @@ -1938,3 +1957,5 @@ share/gnome/apps/calibre-ebook-viewer.de
  @dirrmtry share/gnome/apps
  @dirrmtry share/gnome
  @dirrmtry share/desktop-directories
 +@dirrmtry share/mime/application
 +@dirrmtry share/mime/text
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
