[pkgsrc/trunk]: pkgsrc/graphics/comix Update to 4.0.0:

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/337c2cc5b2fd
branches:  trunk
changeset: 551083:337c2cc5b2fd
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Sat Dec 06 18:40:33 2008 +0000

description:
Update to 4.0.0:

Comix 4.0.0

    - Comix has been completely rewritten from scratch. On the surface things
    look quite a bit like they used to, but the internal workings are
    entirely new. There are too many changes for them all to be mentioned
    here, but a couple of highlights are a much more functional library and a
    new archive editing dialog. The work on this new version of Comix has
    been going on in rather sporadic phases for almost two years, and during
    that time I have received help from lots of different people. Now, I must
    admit, I can no longer remember them all. So instead of trying to list as
    many as I can here, I will instead simply say thank you to everyone who
    have contributed fixes, patches, suggestions or encouraging words. Thanks!

diffstat:

 graphics/comix/Makefile         |   13 +-
 graphics/comix/PLIST            |  175 +++++++++++++++++++++++++++----------
 graphics/comix/distinfo         |   10 +-
 graphics/comix/patches/patch-aa |  117 -------------------------
 graphics/comix/patches/patch-ab |  182 ----------------------------------------
 5 files changed, 137 insertions(+), 360 deletions(-)

diffs (truncated from 549 to 300 lines):

diff -r a7fea9401049 -r 337c2cc5b2fd graphics/comix/Makefile
--- a/graphics/comix/Makefile   Sat Dec 06 18:18:03 2008 +0000
+++ b/graphics/comix/Makefile   Sat Dec 06 18:40:33 2008 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2008/08/10 16:05:28 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2008/12/06 18:40:33 wiz Exp $
 #
 
-DISTNAME=              comix-3.6.4
-PKGREVISION=           2
+DISTNAME=              comix-4.0.0
 CATEGORIES=            graphics python
 MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=comix/}
 
@@ -23,17 +22,19 @@
 SUBST_FILES.install-path=      install.py
 SUBST_SED.install-path=                -e "s,share/man/man,${PKGMANDIR}/man,g"
 
-PYTHON_PATCH_SCRIPTS=          comix mime/comicthumb
+PYTHON_PATCH_SCRIPTS=          src/comix.py mime/comicthumb
 
 do-build:
 
 do-install:
-       cd ${WRKSRC} && ${PYTHONBIN} install.py install --installdir ${DESTDIR}${PREFIX}
+       cd ${WRKSRC} && ${PYTHONBIN} install.py install --dir ${DESTDIR}${PREFIX}
 
-.include "../../databases/shared-mime-info/buildlink3.mk"
+.include "../../databases/shared-mime-info/mimedb.mk"
 .include "../../devel/GConf/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+BUILDLINK_API_DEPENDS.pyimaging+=      ${PYPKGPREFIX}-imaging>=1.1.5
 .include "../../graphics/py-imaging/buildlink3.mk"
 .include "../../lang/python/application.mk"
+BUILDLINK_API_DEPENDS.pygtk2+= ${PYPKGPREFIX}-gtk2>=2.12
 .include "../../x11/py-gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r a7fea9401049 -r 337c2cc5b2fd graphics/comix/PLIST
--- a/graphics/comix/PLIST      Sat Dec 06 18:18:03 2008 +0000
+++ b/graphics/comix/PLIST      Sat Dec 06 18:40:33 2008 +0000
@@ -1,60 +1,137 @@
-@comment $NetBSD: PLIST,v 1.7 2007/06/01 00:45:49 wiz Exp $
+@comment $NetBSD: PLIST,v 1.8 2008/12/06 18:40:33 wiz Exp $
 bin/comicthumb
 bin/comix
 man/man1/comicthumb.1
 man/man1/comix.1
 share/applications/comix.desktop
+share/comix/images/16x16/comix.png
+share/comix/images/comix.svg
+share/comix/images/comments.png
+share/comix/images/double-page.png
+share/comix/images/fitbest.png
+share/comix/images/fitheight.png
+share/comix/images/fitmanual.png
+share/comix/images/fitwidth.png
+share/comix/images/gimp-flip-horizontal.png
+share/comix/images/gimp-flip-vertical.png
+share/comix/images/gimp-rotate-180.png
+share/comix/images/gimp-rotate-270.png
+share/comix/images/gimp-rotate-90.png
+share/comix/images/gimp-thumbnails.png
+share/comix/images/gimp-transform.png
+share/comix/images/lens.png
+share/comix/images/library.png
+share/comix/images/manga.png
+share/comix/images/tango-add-bookmark.png
+share/comix/images/tango-archive.png
+share/comix/images/tango-enhance-image.png
+share/comix/images/tango-image.png
+share/comix/images/zoom.png
+share/comix/src/about.py
+share/comix/src/about.pyc
+share/comix/src/archive.py
+share/comix/src/archive.pyc
+share/comix/src/bookmark.py
+share/comix/src/bookmark.pyc
+share/comix/src/comix.py
+share/comix/src/comment.py
+share/comix/src/comment.pyc
+share/comix/src/constants.py
+share/comix/src/constants.pyc
+share/comix/src/cursor.py
+share/comix/src/cursor.pyc
+share/comix/src/deprecated.py
+share/comix/src/deprecated.pyc
+share/comix/src/edit.py
+share/comix/src/edit.pyc
+share/comix/src/encoding.py
+share/comix/src/encoding.pyc
+share/comix/src/enhance.py
+share/comix/src/enhance.pyc
+share/comix/src/event.py
+share/comix/src/event.pyc
+share/comix/src/filechooser.py
+share/comix/src/filechooser.pyc
+share/comix/src/filehandler.py
+share/comix/src/filehandler.pyc
+share/comix/src/histogram.py
+share/comix/src/histogram.pyc
+share/comix/src/icons.py
+share/comix/src/icons.pyc
+share/comix/src/image.py
+share/comix/src/image.pyc
+share/comix/src/labels.py
+share/comix/src/labels.pyc
+share/comix/src/lens.py
+share/comix/src/lens.pyc
+share/comix/src/library.py
+share/comix/src/library.pyc
+share/comix/src/librarybackend.py
+share/comix/src/librarybackend.pyc
+share/comix/src/main.py
+share/comix/src/main.pyc
+share/comix/src/preferences.py
+share/comix/src/preferences.pyc
+share/comix/src/process.py
+share/comix/src/process.pyc
+share/comix/src/properties.py
+share/comix/src/properties.pyc
+share/comix/src/recent.py
+share/comix/src/recent.pyc
+share/comix/src/slideshow.py
+share/comix/src/slideshow.pyc
+share/comix/src/status.py
+share/comix/src/status.pyc
+share/comix/src/thumbbar.py
+share/comix/src/thumbbar.pyc
+share/comix/src/thumbnail.py
+share/comix/src/thumbnail.pyc
+share/comix/src/thumbremover.py
+share/comix/src/thumbremover.pyc
+share/comix/src/ui.py
+share/comix/src/ui.pyc
+share/icons/hicolor/16x16/apps/comix.png
+share/icons/hicolor/16x16/mimetypes/application-x-cbr.png
+share/icons/hicolor/16x16/mimetypes/application-x-cbt.png
+share/icons/hicolor/16x16/mimetypes/application-x-cbz.png
+share/icons/hicolor/22x22/apps/comix.png
+share/icons/hicolor/22x22/mimetypes/application-x-cbr.png
+share/icons/hicolor/22x22/mimetypes/application-x-cbt.png
+share/icons/hicolor/22x22/mimetypes/application-x-cbz.png
+share/icons/hicolor/24x24/apps/comix.png
+share/icons/hicolor/24x24/mimetypes/application-x-cbr.png
+share/icons/hicolor/24x24/mimetypes/application-x-cbt.png
+share/icons/hicolor/24x24/mimetypes/application-x-cbz.png
+share/icons/hicolor/32x32/apps/comix.png
+share/icons/hicolor/32x32/mimetypes/application-x-cbr.png
+share/icons/hicolor/32x32/mimetypes/application-x-cbt.png
+share/icons/hicolor/32x32/mimetypes/application-x-cbz.png
 share/icons/hicolor/48x48/apps/comix.png
+share/icons/hicolor/48x48/mimetypes/application-x-cbr.png
+share/icons/hicolor/48x48/mimetypes/application-x-cbt.png
+share/icons/hicolor/48x48/mimetypes/application-x-cbz.png
 share/icons/hicolor/scalable/apps/comix.svg
-share/locale/ca/LC_MESSAGES/comix.mo
-share/locale/de/LC_MESSAGES/comix.mo
-share/locale/el/LC_MESSAGES/comix.mo
+share/locale/cs/LC_MESSAGES/comix.mo
 share/locale/es/LC_MESSAGES/comix.mo
-share/locale/fr/LC_MESSAGES/comix.mo
-share/locale/hr/LC_MESSAGES/comix.mo
-share/locale/hu/LC_MESSAGES/comix.mo
-share/locale/it/LC_MESSAGES/comix.mo
+share/locale/id/LC_MESSAGES/comix.mo
 share/locale/ja/LC_MESSAGES/comix.mo
-share/locale/nl/LC_MESSAGES/comix.mo
-share/locale/pl/LC_MESSAGES/comix.mo
-share/locale/pt_BR/LC_MESSAGES/comix.mo
-share/locale/ru/LC_MESSAGES/comix.mo
+share/locale/ko/LC_MESSAGES/comix.mo
 share/locale/sv/LC_MESSAGES/comix.mo
-share/locale/zh_CN/LC_MESSAGES/comix.mo
-share/locale/zh_TW/LC_MESSAGES/comix.mo
 share/mime/packages/comix.xml
-share/pixmaps/comix.png
-share/pixmaps/comix/cbr.png
-share/pixmaps/comix/cbt.png
-share/pixmaps/comix/cbz.png
-share/pixmaps/comix/double-page.png
-share/pixmaps/comix/fitheight.png
-share/pixmaps/comix/fitnone.png
-share/pixmaps/comix/fitscreen.png
-share/pixmaps/comix/fitwidth.png
-share/pixmaps/comix/flip-horizontal-jpeg.png
-share/pixmaps/comix/flip-horizontal.png
-share/pixmaps/comix/flip-vertical-jpeg.png
-share/pixmaps/comix/flip-vertical.png
-share/pixmaps/comix/lens.png
-share/pixmaps/comix/manga.png
-share/pixmaps/comix/rotate-180.png
-share/pixmaps/comix/rotate-270-jpeg.png
-share/pixmaps/comix/rotate-270.png
-share/pixmaps/comix/rotate-90-jpeg.png
-share/pixmaps/comix/rotate-90.png
-share/pixmaps/comix/silk-bookmarks.png
-share/pixmaps/comix/silk-colour-adjust.png
-share/pixmaps/comix/silk-desaturate.png
-share/pixmaps/comix/silk-edit-bookmarks.png
-share/pixmaps/comix/silk-file-operations.png
-share/pixmaps/comix/silk-library-add.png
-share/pixmaps/comix/silk-library.png
-share/pixmaps/comix/silk-recent-files.png
-share/pixmaps/comix/silk-slideshow.png
-share/pixmaps/comix/silk-thumbnails.png
-share/pixmaps/comix/silk-toolbars.png
-share/pixmaps/comix/silk-transform.png
-share/pixmaps/comix/silk-view.png
-share/pixmaps/comix/silk-zoom.png
-@dirrm share/pixmaps/comix
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/scalable/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/48x48/mimetypes
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/48x48/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/32x32/mimetypes
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/32x32/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/24x24/mimetypes
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/24x24/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/22x22/mimetypes
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/22x22/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/16x16/mimetypes
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/16x16/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor
+@dirrm share/comix/src
+@dirrm share/comix/images/16x16
+@dirrm share/comix/images
+@dirrm share/comix
+@comment in xdg-dirs: @dirrm share/applications
diff -r a7fea9401049 -r 337c2cc5b2fd graphics/comix/distinfo
--- a/graphics/comix/distinfo   Sat Dec 06 18:18:03 2008 +0000
+++ b/graphics/comix/distinfo   Sat Dec 06 18:40:33 2008 +0000
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.10 2008/04/19 14:28:46 tonnerre Exp $
+$NetBSD: distinfo,v 1.11 2008/12/06 18:40:33 wiz Exp $
 
-SHA1 (comix-3.6.4.tar.gz) = c14a1ba9d931436eb7215f8065f1bbda22f00409
-RMD160 (comix-3.6.4.tar.gz) = 8cd0f6459f56efb35cea7b7a899e4420796535d7
-Size (comix-3.6.4.tar.gz) = 398202 bytes
-SHA1 (patch-aa) = 2bb137273d14134c5c040ae7fd6b83d665cbaeb8
-SHA1 (patch-ab) = 4445829d4c9f20ca783adc26089ab042488288bf
+SHA1 (comix-4.0.0.tar.gz) = 554513f8ac04d862b84ff66e5483101f999a2733
+RMD160 (comix-4.0.0.tar.gz) = 98d1af837f0e734c68456620b02ec703084d78b3
+Size (comix-4.0.0.tar.gz) = 338650 bytes
diff -r a7fea9401049 -r 337c2cc5b2fd graphics/comix/patches/patch-aa
--- a/graphics/comix/patches/patch-aa   Sat Dec 06 18:18:03 2008 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,117 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2008/04/19 14:28:46 tonnerre Exp $
-
-Fix insecure temporary file handling in comicthumb utility.
-Eliminate insufficient escaping on shell calls for rar archives/jpegtran.
-
---- mime/comicthumb.orig
-+++ mime/comicthumb
-@@ -22,6 +22,10 @@
- import StringIO
- import re
- import shutil
-+
-+import subprocess
-+import tempfile
-+
- try:
-     import Image
- except:
-@@ -48,9 +52,13 @@
-     sys.exit(1)
- 
- # temp directory needed for multiple archives
--if not os.path.exists('/tmp/comicthumb/'):
--    os.makedirs('/tmp/comicthumb/')
--    os.chmod('/tmp/comicthumb/', 0700)
-+#if not os.path.exists('/tmp/comicthumb/'):
-+#    os.makedirs('/tmp/comicthumb/')
-+#    os.chmod('/tmp/comicthumb/', 0700)
-+_tmp_dir = tempfile.mkdtemp(prefix='comixthumb', suffix=os.sep, 
-+        dir = '/tmp')
-+_tmp_dir += "/"
-+
- 
- # return the first image in the list
- def first_image (filelist):
-@@ -101,10 +109,10 @@
-         else:
-             subarchive = first_archive(zipfiles)
-             if subarchive:
--                output = open("/tmp/comicthumb/archive%d" % (depth), "wb")
-+                output = open( _tmp_dir + "archive%d" % (depth), "wb")
-                 output.write(zip.read(subarchive))
-                 output.close()
--                return get_image("/tmp/comicthumb/archive%d" % (depth),
-+                return get_image( _tmp_dir + "archive%d" % (depth),
-                     depth + 1)
-     elif tarfile.is_tarfile(compressed_file):
-         TYPE = TYPE or 'cbt'
-@@ -119,10 +127,10 @@
-         else:
-             subarchive = first_archive(tarfiles)
-             if subarchive:
--                output = open("/tmp/comicthumb/archive%d" % (depth), "wb")
-+                output = open( _tmp_dir + "archive%d" % (depth), "wb")