[122193] trunk/dports/graphics/comix

petr at macports.org petr at macports.org
Thu Jul 17 08:36:30 PDT 2014


Revision: 122193
          https://trac.macports.org/changeset/122193
Author:   petr at macports.org
Date:     2014-07-17 08:36:29 -0700 (Thu, 17 Jul 2014)
Log Message:
-----------
graphics/comix @4.0.4_2: switch from py*-pil to path-based dependency, add patch, revision bump due to patch, some reformating, ticket #44284

Modified Paths:
--------------
    trunk/dports/graphics/comix/Portfile

Added Paths:
-----------
    trunk/dports/graphics/comix/files/
    trunk/dports/graphics/comix/files/patch-pillow-compat.diff

Modified: trunk/dports/graphics/comix/Portfile
===================================================================
--- trunk/dports/graphics/comix/Portfile	2014-07-17 13:11:57 UTC (rev 122192)
+++ trunk/dports/graphics/comix/Portfile	2014-07-17 15:36:29 UTC (rev 122193)
@@ -4,10 +4,11 @@
 
 name                comix
 version             4.0.4
-revision            2
+revision            3
 categories          graphics
 maintainers         perry openmaintainer
 platforms           darwin
+license             GPL-2
 
 description         Comix is a user-friendly, customizable image viewer.
 long_description    ${description} It is specifically designed to handle comic \
@@ -15,28 +16,39 @@
                     images in ZIP, RAR or tar archives (also gzip or bzip2 \
                     compressed) as well as plain image files. It is written in \
                     Python and uses GTK+ through the PyGTK bindings.
-license             GPL-2
+
 homepage            http://comix.sourceforge.net/
 
+master_sites        sourceforge
+
+checksums           rmd160 48e4fba57697feed1d71977c1a0693a1aa6c3caf
+
 livecheck.regex     {Comix (.*) released}
 livecheck.type      regex
 livecheck.url       ${homepage}
 
-depends_lib         port:py26-pygtk port:py26-pil port:python26 port:unrar
+set python.version  26
+set python.branch   "[string range ${python.version} 0 end-1].[string index ${python.version} end]"
+set python.pkgd     ${frameworks_dir}/Python.framework/Versions/${python.branch}/lib/python${python.branch}/site-packages
+set python.bin      ${prefix}/bin/python${python.branch}
 
-master_sites        sourceforge
+depends_lib         port:py${python.version}-pygtk \
+	            path:${python.pkgd}/PIL:py${python.version}-Pillow \
+                    port:python${python.version} \
+                    port:unrar
 
-checksums           rmd160 48e4fba57697feed1d71977c1a0693a1aa6c3caf
+patchfiles          patch-pillow-compat.diff
 
 use_configure       no
 
 build               {}
 
-set python.bin      ${prefix}/bin/python2.6
-
 pre-destroot {
-    reinplace "s|^#!/usr/bin/env python\$|#!${python.bin}|" ${worksrcpath}/src/comix.py
+    reinplace "s|^#!/usr/bin/env python\$|#!${python.bin}|" \
+	${worksrcpath}/src/comix.py
 }
 
-destroot.cmd        ${python.bin} install.py --dir ${destroot}${prefix} --no-mime
+destroot.cmd        \
+	${python.bin} install.py --dir ${destroot}${prefix} --no-mime
+
 destroot.destdir    {}

Added: trunk/dports/graphics/comix/files/patch-pillow-compat.diff
===================================================================
--- trunk/dports/graphics/comix/files/patch-pillow-compat.diff	                        (rev 0)
+++ trunk/dports/graphics/comix/files/patch-pillow-compat.diff	2014-07-17 15:36:29 UTC (rev 122193)
@@ -0,0 +1,113 @@
+--- install.py.old	2014-07-10 20:19:31.000000000 +0200
++++ install.py	2014-07-10 20:20:08.000000000 +0200
+@@ -240,7 +240,7 @@
+         print '    !!! PyGTK .................... Not found'
+         required_found = False
+     try:
+-        import Image
++        from PIL import Image
+         assert Image.VERSION >= '1.1.5'
+         print '    Python Imaging Library ....... OK'
+     except ImportError:
+--- mime/comicthumb.old	2014-07-10 20:19:32.000000000 +0200
++++ mime/comicthumb	2014-07-10 20:20:08.000000000 +0200
+@@ -22,7 +22,7 @@
+ import subprocess
+ 
+ try:
+-    import Image
++    from PIL import Image
+ except ImportError:
+     print '! Could not import the Image module (PIL).'
+     print __doc__
+--- src/comix.py.old	2014-07-10 20:19:32.000000000 +0200
++++ src/comix.py	2014-07-10 20:20:08.000000000 +0200
+@@ -49,7 +49,7 @@
+     sys.exit(1)
+ 
+ try:
+-    import Image
++    from PIL import Image
+     assert Image.VERSION >= '1.1.5'
+ except AssertionError:
+     print "You don't have the required version of the Python Imaging",
+--- src/histogram.py.old	2014-07-10 20:19:32.000000000 +0200
++++ src/histogram.py	2014-07-10 20:20:08.000000000 +0200
+@@ -1,9 +1,9 @@
+ """histogram.py - Draw histograms (RGB) from pixbufs."""
+ 
+ import gtk
+-import Image
+-import ImageDraw
+-import ImageOps
++from PIL import Image
++from PIL import ImageDraw
++from PIL import ImageOps
+ 
+ import image
+ 
+--- src/image.py.old	2014-07-10 20:19:32.000000000 +0200
++++ src/image.py	2014-07-10 20:20:08.000000000 +0200
+@@ -1,10 +1,10 @@
+ """image.py - Various image manipulations."""
+ 
+ import gtk
+-import Image
+-import ImageEnhance
+-import ImageOps
+-import ImageStat
++from PIL import Image
++from PIL import ImageEnhance
++from PIL import ImageOps
++from PIL import ImageStat
+ 
+ from preferences import prefs
+ 
+--- src/library.py.old	2014-07-10 20:19:32.000000000 +0200
++++ src/library.py	2014-07-10 20:20:08.000000000 +0200
+@@ -8,8 +8,8 @@
+ import gtk
+ import gobject
+ import pango
+-import Image
+-import ImageDraw
++from PIL import Image
++from PIL import ImageDraw
+ 
+ import archive
+ import encoding
+--- src/thumbbar.py.old	2014-07-10 20:19:32.000000000 +0200
++++ src/thumbbar.py	2014-07-10 20:20:08.000000000 +0200
+@@ -4,8 +4,8 @@
+ 
+ import gtk
+ import gobject
+-import Image
+-import ImageDraw
++from PIL import Image
++from PIL import ImageDraw
+ 
+ import image
+ from preferences import prefs
+--- src/thumbnail.py.old	2014-07-10 20:19:32.000000000 +0200
++++ src/thumbnail.py	2014-07-10 20:20:08.000000000 +0200
+@@ -15,7 +15,7 @@
+ import tempfile
+ 
+ import gtk
+-import Image
++from PIL import Image
+ 
+ import archive
+ import constants
+--- src/thumbremover.py.old	2014-07-10 20:19:32.000000000 +0200
++++ src/thumbremover.py	2014-07-10 20:20:08.000000000 +0200
+@@ -7,7 +7,7 @@
+ 
+ import gtk
+ import pango
+-import Image
++from PIL import Image
+ 
+ import encoding
+ import labels
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140717/189325fc/attachment.html>


More information about the macports-changes mailing list