ports/162384: Update port deskutils/calibre to latest version

Rusty Nejdl rnejdl at ringofsaturn.com
Tue Nov 8 20:00:28 UTC 2011


>Number:         162384
>Category:       ports
>Synopsis:       Update port deskutils/calibre to latest version
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Nov 08 20:00:25 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Rusty Nejdl
>Release:        FreeBSD 8.2-STABLE amd64
>Organization:
>Environment:
System: FreeBSD tethys.ringofsaturn.com 8.2-STABLE FreeBSD 8.2-STABLE #0: Thu Oct 13 15:19:03 CDT 2011 root at tethys.ringofsaturn.com:/usr/obj/usr/src/sys/GENERIC amd64


>Description:
	Update calibre to 0.8.25 from 0.8.21
>How-To-Repeat:
	
>Fix:

	

--- calibre.diff begins here ---
diff -ruN calibre/Makefile calibre.new/Makefile
--- calibre/Makefile	2011-10-31 07:54:21.000000000 -0500
+++ calibre.new/Makefile	2011-11-08 12:16:54.000000000 -0600
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	calibre
-PORTVERSION=	0.8.21
-PORTREVISION=	1
+PORTVERSION=	0.8.25
 CATEGORIES=	deskutils python
 MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION}/
 
diff -ruN calibre/distinfo calibre.new/distinfo
--- calibre/distinfo	2011-10-13 10:32:16.000000000 -0500
+++ calibre.new/distinfo	2011-11-08 12:17:51.000000000 -0600
@@ -1,2 +1,2 @@
-SHA256 (calibre-0.8.21.tar.gz) = a688cfce1cc168e74fe28c0320b6e7534d238460211055ba5e2f544d31d2719c
-SIZE (calibre-0.8.21.tar.gz) = 37419648
+SHA256 (calibre-0.8.25.tar.gz) = 529ab5a9c404ea28f332562714f55d4e45a299930f00086f0e4e168571f048b1
+SIZE (calibre-0.8.25.tar.gz) = 37734837
diff -ruN calibre/files/patch-device.py calibre.new/files/patch-device.py
--- calibre/files/patch-device.py	2011-07-16 09:08:19.000000000 -0500
+++ calibre.new/files/patch-device.py	2011-11-08 13:24:38.000000000 -0600
@@ -1,6 +1,6 @@
---- src/calibre/devices/usbms/device.py.orig	2011-07-08 12:29:30.000000000 -0500
-+++ src/calibre/devices/usbms/device.py	2011-07-12 20:02:45.000000000 -0500
-@@ -704,14 +704,12 @@
+--- src/calibre/devices/usbms/device.py.orig	2011-11-08 13:13:25.000000000 -0600
++++ src/calibre/devices/usbms/device.py	2011-11-08 13:23:54.000000000 -0600
+@@ -700,14 +700,12 @@
  # ------------------------------------------------------
  #
  #  open for FreeBSD
@@ -21,16 +21,35 @@
  #
      def open_freebsd(self):
  
-@@ -722,81 +720,68 @@
-         if not d.serial:
-             raise DeviceError("Device has no S/N.  Can't continue")
-             return False
--
-+        
+@@ -721,81 +719,67 @@
+ 
          devs={}
          di=0
 -        ndevs=4     # number of possible devices per reader (main, carda, cardb, launcher)
--
++        # delay for user to set device if necessary
++        time.sleep(5)
++
++        # get list of disk devices and
++        # see if we can get a S/N from the actual device node
++        #dsks=['/dev/da1', '/dev/da3s1']
++        dsks=glob.glob('/dev/da*')
++        dsks.sort()
++        for ndvc in dsks:
++            dvc = ndvc.replace('/dev/', '')
++            print "FBSD:       Checking ", dvc
++            #sn="08004610011F550C"
++            try:
++                sn=subprocess.Popen("/sbin/camcontrol inquiry "+dvc+" -S", shell=True, stdout=subprocess.PIPE).communicate()[0]
++            except:
++                print "FBSD:   inquiry failed:"
++            sn=sn[0:-1]             # drop the trailing newline
++            print "FBSD:       S/N = ", sn
++            if sn and d.match_serial(sn):
++                # we have a matching s/n, record this device node
++                print "FBSD:   match found: ", dvc
++                devs[di]=dvc
++                di += 1
+ 
 -        #get list of disk devices
 -        p=subprocess.Popen(["sysctl", "kern.disks"], stdout=subprocess.PIPE)
 -        kdsks=subprocess.Popen(["sed", "s/kern.disks: //"], stdin=p.stdout, stdout=subprocess.PIPE).communicate()[0]
@@ -61,33 +80,8 @@
 -                    devs[j-1]=devs[j]
 -                    devs[j]=x
 -        #print devs
-+        
-+        # delay for user to set device if necessary
-+        time.sleep(5)
++        print "FBSD:   ", devs
  
-+        # get list of disk devices and
-+        # see if we can get a S/N from the actual device node
-+        #dsks=['/dev/da1', '/dev/da3s1']
-+        dsks=glob.glob('/dev/da*')
-+        dsks.sort()
-+        for ndvc in dsks:
-+            dvc = ndvc.replace('/dev/', '')
-+            print "FBSD:	Checking ", dvc
-+            #sn="08004610011F550C"
-+            try:
-+                sn=subprocess.Popen("/sbin/camcontrol inquiry "+dvc+" -S", shell=True, stdout=subprocess.PIPE).communicate()[0]
-+            except:
-+                print "FBSD:	inquiry failed:"
-+            sn=sn[0:-1]             # drop the trailing newline
-+            print "FBSD:	S/N = ", sn
-+            if sn and d.match_serial(sn):
-+                # we have a matching s/n, record this device node
-+                print "FBSD:	match found: ", dvc
-+                devs[di]=dvc
-+                di += 1
-+        
-+        print "FBSD:	", devs
-+        
          # now we need to see if any of these have slices/partitions
          mtd=0
 -        label="READER"      # could use something more unique, like S/N or productID...
@@ -104,84 +98,74 @@
              # try all the nodes to see what we can mount
              for dev in devs[i].split():
 -                mp='/media/'+label+'-'+dev
--                #print "trying ", dev, "on", mp
+-                mmp = mp
 +                mp='/mnt/'+label+'-'+dev+'/'
-+                print "FBSD:	trying ", dev, "on", mp
++                print "FBSD:   trying ", dev, "on", mp
+                 if mmp.endswith('/'):
+                     mmp = mmp[:-1]
+                 #print "trying ", dev, "on", mp
                  try:
--                    p = subprocess.Popen(cmd + ["/dev/"+dev, mp])
+-                    p = subprocess.Popen(cmd + ["/dev/"+dev, mmp])
 -                except OSError:
 -                    raise DeviceError(_('Could not find mount helper: %s.')%cmd[0])
 +                    p = subprocess.Popen([cmd, "mount", "/dev/"+dev, mp])
 +                except:
-+                    print "FBSD:	mount failed:"
++                    print "FBSD:       mount failed:"
                  while p.poll() is None:
                      time.sleep(0.1)
--
-+    
+ 
                  if p.returncode == 0:
 -                    #print "  mounted", dev
 -                    if i == 0:
-+                    print "FBSD:	  mounted", dev, "on", mp
++                    print "FBSD:         mounted", dev, "on", mp
 +                    if mtd == 0:
                          self._main_prefix = mp
                          self._main_dev = "/dev/"+dev
 -                        #print "main = ", self._main_dev, self._main_prefix
 -                    if i == 1:
-+                        print "FBSD:	main = ", self._main_dev, self._main_prefix
++                        print "FBSD:   main = ", self._main_dev, self._main_prefix
 +                    if mtd == 1:
                          self._card_a_prefix = mp
                          self._card_a_dev = "/dev/"+dev
 -                        #print "card a = ", self._card_a_dev, self._card_a_prefix
 -                    if i == 2:
-+                        print "FBSD:	card a = ", self._card_a_dev, self._card_a_prefix
++                        print "FBSD:   card a = ", self._card_a_dev, self._card_a_prefix
 +                    if mtd == 2:
                          self._card_b_prefix = mp
                          self._card_b_dev = "/dev/"+dev
 -                        #print "card b = ", self._card_b_dev, self._card_b_prefix
 -
-+                        print "FBSD:	card b = ", self._card_b_dev, self._card_b_prefix
++                        print "FBSD:   card b = ", self._card_b_dev, self._card_b_prefix
 +                        break
                      mtd += 1
 -                    break
  
          if mtd > 0:
              return True
-@@ -805,16 +790,16 @@
- #
- # ------------------------------------------------------
- #
--#   this one is pretty simple:
--#       just umount each of the previously
--#       mounted filesystems, using the mount helper
-+#    this one is pretty simple:
-+#        just umount each of the previously
-+#        mounted filesystems, using the mount helper
- #
-     def eject_freebsd(self):
-         cmd = '/usr/local/bin/calibre-mount-helper'
+@@ -813,7 +797,7 @@
          cmd = [cmd, 'eject']
  
          if self._main_prefix:
 -            #print "umount main:", cmd, self._main_dev, self._main_prefix
-+            print "FBSD:	umount main:", cmd, self._main_dev, self._main_prefix
++            print "FBSD:       umount main:", cmd, self._main_dev, self._main_prefix
              try:
                  p = subprocess.Popen(cmd + [self._main_dev, self._main_prefix])
              except OSError:
-@@ -824,7 +809,7 @@
+@@ -823,7 +807,7 @@
                  time.sleep(0.1)
  
          if self._card_a_prefix:
 -            #print "umount card a:", cmd, self._card_a_dev, self._card_a_prefix
-+            print "FBSD:	umount card a:", cmd, self._card_a_dev, self._card_a_prefix
++            print "FBSD:       umount card a:", cmd, self._card_a_dev, self._card_a_prefix
              try:
                  p = subprocess.Popen(cmd + [self._card_a_dev,  self._card_a_prefix])
              except OSError:
-@@ -834,7 +819,7 @@
+@@ -833,7 +817,7 @@
                  time.sleep(0.1)
  
          if self._card_b_prefix:
 -            #print "umount card b:", cmd, self._card_b_dev, self._card_b_prefix
-+            print "FBSD:	umount card b:", cmd, self._card_b_dev, self._card_b_prefix
++            print "FBSD:       umount card b:", cmd, self._card_b_dev, self._card_b_prefix
              try:
                  p = subprocess.Popen(cmd + [self._card_b_dev, self._card_b_prefix])
              except OSError:
diff -ruN calibre/files/patch-src_calibre_ebooks_pdf_reflow.cpp calibre.new/files/patch-src_calibre_ebooks_pdf_reflow.cpp
--- calibre/files/patch-src_calibre_ebooks_pdf_reflow.cpp	2011-10-31 04:53:13.000000000 -0500
+++ calibre.new/files/patch-src_calibre_ebooks_pdf_reflow.cpp	1969-12-31 18:00:00.000000000 -0600
@@ -1,14 +0,0 @@
---- src/calibre/ebooks/pdf/reflow.cpp.orig	2011-10-26 01:52:43.000000000 +0000
-+++ src/calibre/ebooks/pdf/reflow.cpp	2011-10-26 12:02:17.000000000 +0000
-@@ -625,11 +625,7 @@ static string get_link_dest(LinkAction *
-   return oss.str();
- }
- 
--#if (POPPLER_MAJOR_VERSION == 0) && (POPPLER_MINOR_VERSION < 17)
--void XMLOutputDev::process_link(Link* link){
--#else
- void XMLOutputDev::process_link(AnnotLink* link){
--#endif
- 
-   double _x1, _y1, _x2, _y2;
-   int x1, y1, x2, y2;
diff -ruN calibre/files/patch-src_calibre_ebooks_pdf_reflow.h calibre.new/files/patch-src_calibre_ebooks_pdf_reflow.h
--- calibre/files/patch-src_calibre_ebooks_pdf_reflow.h	2011-10-31 04:53:13.000000000 -0500
+++ calibre.new/files/patch-src_calibre_ebooks_pdf_reflow.h	1969-12-31 18:00:00.000000000 -0600
@@ -1,14 +0,0 @@
---- src/calibre/ebooks/pdf/reflow.h.orig	2011-10-26 12:04:54.000000000 +0000
-+++ src/calibre/ebooks/pdf/reflow.h	2011-10-26 12:09:04.000000000 +0000
-@@ -244,11 +244,7 @@ class XMLOutputDev : public OutputDev {
-     XMLImages *images;
-     PDFDoc *doc;
- 
--#if (POPPLER_MAJOR_VERSION == 0) && (POPPLER_MINOR_VERSION < 17)
--    void process_link(Link* link);
--#else
-     void process_link(AnnotLink* link);
--#endif
- 
- };
- }
diff -ruN calibre/pkg-plist calibre.new/pkg-plist
--- calibre/pkg-plist	2011-10-13 10:32:16.000000000 -0500
+++ calibre.new/pkg-plist	2011-11-08 13:50:32.000000000 -0600
@@ -77,6 +77,7 @@
 lib/calibre/calibre/devices/kobo/__init__.py
 lib/calibre/calibre/devices/kobo/books.py
 lib/calibre/calibre/devices/kobo/driver.py
+lib/calibre/calibre/devices/kobo/bookmark.py
 lib/calibre/calibre/devices/libusb.py
 lib/calibre/calibre/devices/manager.py
 lib/calibre/calibre/devices/mime.py
@@ -96,6 +97,8 @@
 lib/calibre/calibre/devices/prs505/__init__.py
 lib/calibre/calibre/devices/prs505/driver.py
 lib/calibre/calibre/devices/prs505/sony_cache.py
+lib/calibre/calibre/devices/prst1/__init__.py
+lib/calibre/calibre/devices/prst1/driver.py
 lib/calibre/calibre/devices/scanner.py
 lib/calibre/calibre/devices/sne/__init__.py
 lib/calibre/calibre/devices/sne/driver.py
@@ -179,6 +182,10 @@
 lib/calibre/calibre/ebooks/conversion/preprocess.py
 lib/calibre/calibre/ebooks/conversion/utils.py
 lib/calibre/calibre/ebooks/cssselect.py
+lib/calibre/calibre/ebooks/djvu/__init__.py
+lib/calibre/calibre/ebooks/djvu/djvubzzdec.py
+lib/calibre/calibre/ebooks/djvu/djvu.py
+lib/calibre/calibre/ebooks/djvu/input.py
 lib/calibre/calibre/ebooks/epub/__init__.py
 lib/calibre/calibre/ebooks/epub/fix/__init__.py
 lib/calibre/calibre/ebooks/epub/fix/container.py
@@ -546,6 +553,8 @@
 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_ui.py
+lib/calibre/calibre/gui2/convert/djvu_input.py
 lib/calibre/calibre/gui2/convert/epub_output.py
 lib/calibre/calibre/gui2/convert/epub_output_ui.py
 lib/calibre/calibre/gui2/convert/fb2_input.py
@@ -766,7 +775,9 @@
 lib/calibre/calibre/gui2/store/opensearch_store.py
 lib/calibre/calibre/gui2/store/web_store_dialog.py
 lib/calibre/calibre/gui2/store/basic_config_widget_ui.py
+lib/calibre/calibre/gui2/store/stores/amazon_fr_plugin.py
 lib/calibre/calibre/gui2/store/stores/beam_ebooks_de_plugin.py
+lib/calibre/calibre/gui2/store/stores/ebookpoint_plugin.py
 lib/calibre/calibre/gui2/store/stores/escapemagazine_plugin.py
 lib/calibre/calibre/gui2/store/stores/gandalf_plugin.py
 lib/calibre/calibre/gui2/store/stores/pragmatic_bookshelf_plugin.py
@@ -1218,6 +1229,7 @@
 share/calibre/images/debug.png
 share/calibre/images/default_cover.png
 share/calibre/images/devices/bambook.png
+share/calibre/images/devices/boox.jpg
 share/calibre/images/devices/folder.png
 share/calibre/images/devices/ipad.png
 share/calibre/images/devices/italica.png
@@ -1548,6 +1560,7 @@
 @dirrm lib/calibre/calibre/ebooks/fb2
 @dirrm lib/calibre/calibre/ebooks/epub/fix
 @dirrm lib/calibre/calibre/ebooks/epub
+ at dirrm lib/calibre/calibre/ebooks/djvu
 @dirrm lib/calibre/calibre/ebooks/conversion
 @dirrm lib/calibre/calibre/ebooks/compression
 @dirrm lib/calibre/calibre/ebooks/comic
@@ -1565,6 +1578,7 @@
 @dirrm lib/calibre/calibre/devices/prs505
 @dirrm lib/calibre/calibre/devices/prs500/cli
 @dirrm lib/calibre/calibre/devices/prs500
+ at dirrm lib/calibre/calibre/devices/prst1
 @dirrm lib/calibre/calibre/devices/nuut2
 @dirrm lib/calibre/calibre/devices/nook
 @dirrm lib/calibre/calibre/devices/nokia
--- calibre.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted:



More information about the freebsd-ports-bugs mailing list