deskutils/calibre (new)

[randy1]

Quite trivial: just copy deskutils/calibre from freebsd-ports, add small patch:

--- /dev/null   2013-11-10 19:21:18.414239296 +0100
+++ deskutils/calibre/files/patch-setup__init__.py      2013-11-10 18:29:36.123484000 +0100
@@ -0,0 +1,12 @@
+--- setup/__init__.py.orig     2013-11-10 17:44:37.600263000 +0100
++++ setup/__init__.py  2013-11-10 17:48:07.246624000 +0100
+@@ -13,7 +13,8 @@
+ isosx = 'darwin' in sys.platform
+ isfreebsd = 'freebsd' in sys.platform
+ isnetbsd = 'netbsd' in sys.platform
+-isbsd = isnetbsd or isfreebsd
++isdragonflybsd = 'dragonfly' in sys.platform
++isbsd = isnetbsd or isfreebsd or isdragonflybsd
+ islinux = not isosx and not iswindows and not isbsd
+ SRC = os.path.abspath('src')
+ sys.path.insert(0, SRC)

Btw, this patch has already been merged in calibre

[randy1]

Updated to 1.10.0 with patch:

diff --git a/deskutils/calibre/Makefile b/deskutils/calibre/Makefile
index a456156..e4a1774 100644
--- a/deskutils/calibre/Makefile
+++ b/deskutils/calibre/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=      calibre
-PORTVERSION=   1.2.0
+PORTVERSION=   1.10.0
 CATEGORIES=    deskutils python
 MASTER_SITES=  SF/${PORTNAME}/${PORTVERSION}/

diff --git a/deskutils/calibre/distinfo b/deskutils/calibre/distinfo
index 51f6f99..3dc45a4 100644
--- a/deskutils/calibre/distinfo
+++ b/deskutils/calibre/distinfo
@@ -1,2 +1,2 @@
-SHA256 (calibre-1.2.0.tar.xz) = d27fdbe981620aa63f5c70909c63a3a7b747ced1da2ee7065879f07b8a75ca40
-SIZE (calibre-1.2.0.tar.xz) = 29652528
+SHA256 (calibre-1.10.0.tar.xz) = 2d7c2c56e8abda0ddeedb9b977d2305992a7828d49243fe3e5db1fd1b121d098
+SIZE (calibre-1.10.0.tar.xz) = 30531340
diff --git a/deskutils/calibre/files/patch-setup_install.py b/deskutils/calibre/files/patch-setup_install.py
deleted file mode 100644
index ce8c5dd..0000000
--- a/deskutils/calibre/files/patch-setup_install.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- setup/install.py.orig      2013-09-06 06:28:39.000000000 +0200
-+++ setup/install.py   2013-09-10 22:34:23.970135119 +0200
-@@ -160,7 +160,7 @@
-         self.info('Installing mount helper to '+ dest)
-         cflags = os.environ.get('OVERRIDE_CFLAGS', '-Wall -pedantic')
-         cflags = shlex.split(cflags)
--        p = subprocess.Popen(['gcc']+cflags+[src, '-o', dest])
-+        p = subprocess.Popen([os.getenv('CC', 'gcc')]+cflags+[src, '-o', dest])
-         ret = p.wait()
-         if ret != 0:
-             return warn()

[jrmarino]

we don't override the version in ports without a good reason. The first one I can handle, but if you want version 1.10 then the best thing to do is just submit this as a PR to freebsd (including the dragonfly support) ( http://www.freebsd.org/send-pr.html ). If the maintainer agrees (and it passes the tests) we can commit it there.

[jrmarino]

ah, I see why you did this. dragonfly fixes are already upstream.
I still think a freebsd PR is the way for this. Open one and I'll "claim" it.

[jrmarino]

calibre 1.2 is in dports now https://github.com/jrmarino/DPorts/commit/5165dbe1df2c3f7bfab7af4e58e6671a683b251b

[randy1]

Thanks for the integration!

Now calibre version is 1.12.0 (i.e. with upstream patch, so no more need special dfly patching): http://pastie.org/8500967

[jrmarino]

Yes, but I talked about this earlier. The ports version is still at 1.2. So the best thing to do is update ports directly and let the fix drop back to us. As I said above, submit your patch as a PR via http://www.freebsd.org/send-pr.html so the ports maintainer can approve it for integration into the FreeBSD tree.

[randy1]

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