Update to 4.0.0.

4 files changed, 203 insertions, 78 deletions

diff --git a/graphics/comix/Makefile b/graphics/comix/Makefile
index 52307cd6b5a8..644b542bfea2 100644
--- a/graphics/comix/Makefile
+++ b/graphics/comix/Makefile
@@ -7,16 +7,16 @@
 #
 
 PORTNAME=	comix
-PORTVERSION=	3.6.5
+PORTVERSION=	4.0.0
 CATEGORIES=	graphics
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	mezz@FreeBSD.org
 COMMENT=	A GTK2 comic book viewer for .cbz, .cbr and .cbt files
 
 RUN_DEPENDS=	unrar:${PORTSDIR}/archivers/unrar \
-		${PYTHON_SITELIBDIR}/PIL/__init__.py:${PORTSDIR}/graphics/py-imaging
+		${PYTHON_SITELIBDIR}/PIL/__init__.py:${PORTSDIR}/graphics/py-imaging \
+		${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3
 
 NO_BUILD=	yes
 USE_GNOME=	desktopfileutils pygtk2
@@ -42,28 +42,27 @@ PLIST_SUB+=	THUMBNAILS:="@comment "
 
 post-extract:
 	@${FIND} ${WRKSRC} -name \*.gz | ${XARGS} ${GUNZIP_CMD}
+	@${RM} -f ${WRKSRC}/src/*.pyc
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|share/man|man|g ; s|1.gz|1|g ; \
-		s|/usr/share/mime|${PREFIX}/share/mime|g ; \
-		s|'/usr'|'${PREFIX}'|g ; \
 		s|%%GCONF_CONFIG_SOURCE%%|${GCONF_CONFIG_SOURCE}|g" \
 			${WRKSRC}/install.py
-	@${REINPLACE_CMD} -e "s|/usr/local|${PREFIX}|g" \
-		${WRKSRC}/comix
+	@${REINPLACE_CMD} -e "s|\[base,.*\]:|\[base, '/usr/local'\]:|g" \
+		${WRKSRC}/src/about.py ${WRKSRC}/src/icons.py
 
 do-install:
 .if defined(THUMBNAILS_ENABLED)
 	@${MKDIR} ${PREFIX}/share/mime/packages
 	@(cd ${WRKSRC} ; \
-		${PYTHON_CMD} install.py install --installdir ${PREFIX})
+		${PYTHON_CMD} install.py install --dir ${PREFIX})
 	@${MKDIR} ${PREFIX}/etc/gconf/schemas
 	@${INSTALL_DATA} ${WRKSRC}/mime/comicbook.schemas \
 		${PREFIX}/etc/gconf/schemas/
 .else
 	@(cd ${WRKSRC} ; \
 		${PYTHON_CMD} install.py install \
-			--installdir ${PREFIX} --no-mime)
+			--dir ${PREFIX} --no-mime)
 .endif
 
 post-install:
@@ -74,5 +73,6 @@ post-install:
 	@${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
 .endfor
 .endif
+	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${DATADIR}/src
 
 .include <bsd.port.post.mk>
diff --git a/graphics/comix/distinfo b/graphics/comix/distinfo
index b2a39528600b..d0ec0f7425ff 100644
--- a/graphics/comix/distinfo
+++ b/graphics/comix/distinfo
@@ -1,3 +1,3 @@
-MD5 (comix-3.6.5.tar.gz) = 4f6210ee04b5b01cb37ab58638278a03
-SHA256 (comix-3.6.5.tar.gz) = 79c67d1d1d7cd3244b820879af26d203b6268805d63b0eebd34810be651e8101
-SIZE (comix-3.6.5.tar.gz) = 459165
+MD5 (comix-4.0.0.tar.gz) = 1db52410c986b98a49537f9e1797416f
+SHA256 (comix-4.0.0.tar.gz) = 66d3e480328c694551ad21771631f2c2772bbed231a65a89f6a252b06b6d9fff
+SIZE (comix-4.0.0.tar.gz) = 338650
diff --git a/graphics/comix/files/patch-install.py b/graphics/comix/files/patch-install.py
index 46d2173854b4..8b02a557c088 100644
--- a/graphics/comix/files/patch-install.py
+++ b/graphics/comix/files/patch-install.py
@@ -1,13 +1,80 @@
---- install.py.orig	2008-07-08 15:03:56.000000000 -0500
-+++ install.py	2008-07-08 15:04:27.000000000 -0500
-@@ -181,8 +181,8 @@
-         print "Updated mime database."
-         schemas = \
-             no_balloon and "comicbook-no-balloon.schemas" or "comicbook.schemas"
--        os.popen("export GCONF_CONFIG_SOURCE=`gconftool-2 "
--                 "--get-default-source 2>/dev/null` && gconftool-2 "
-+        os.popen("export GCONF_CONFIG_SOURCE=%%GCONF_CONFIG_SOURCE%% "
-+                 "&& gconftool-2 "
-                  "--makefile-install-rule ./mime/%s 2>/dev/null" % schemas)
-         print
-         print "Registered comic archive thumbnailer in gconf (if available)."
+--- install.py.orig	2008-12-04 11:57:28.000000000 -0600
++++ install.py	2008-12-04 12:02:45.000000000 -0600
+@@ -36,68 +36,37 @@
+ 
+ # Files to be installed, as (source file, destination directory)
+ FILES = (("src/about.py", "share/comix/src"),
+-         ("src/about.pyc", "share/comix/src"),
+          ("src/archive.py", "share/comix/src"),
+-         ("src/archive.pyc", "share/comix/src"),
+          ("src/bookmark.py", "share/comix/src"),
+-         ("src/bookmark.pyc", "share/comix/src"),
+          ("src/comix.py", "share/comix/src"),
+          ("src/comment.py", "share/comix/src"),
+-         ("src/comment.pyc", "share/comix/src"),
+          ("src/constants.py", "share/comix/src"),
+-         ("src/constants.pyc", "share/comix/src"),
+          ("src/cursor.py", "share/comix/src"),
+-         ("src/cursor.pyc", "share/comix/src"),
+          ("src/deprecated.py", "share/comix/src"),
+-         ("src/deprecated.pyc", "share/comix/src"),
+          ("src/edit.py", "share/comix/src"),
+-         ("src/edit.pyc", "share/comix/src"),
+          ("src/encoding.py", "share/comix/src"),
+-         ("src/encoding.pyc", "share/comix/src"),
+          ("src/enhance.py", "share/comix/src"),
+-         ("src/enhance.pyc", "share/comix/src"),
+          ("src/event.py", "share/comix/src"),
+-         ("src/event.pyc", "share/comix/src"),
+          ("src/filechooser.py", "share/comix/src"),
+-         ("src/filechooser.pyc", "share/comix/src"),
+          ("src/filehandler.py", "share/comix/src"),
+-         ("src/filehandler.pyc", "share/comix/src"),
+          ("src/histogram.py", "share/comix/src"),
+-         ("src/histogram.pyc", "share/comix/src"),
+          ("src/icons.py", "share/comix/src"),
+-         ("src/icons.pyc", "share/comix/src"),
+          ("src/image.py", "share/comix/src"),
+-         ("src/image.pyc", "share/comix/src"),
+          ("src/labels.py", "share/comix/src"),
+-         ("src/labels.pyc", "share/comix/src"),
+          ("src/lens.py", "share/comix/src"),
+-         ("src/lens.pyc", "share/comix/src"),
+          ("src/library.py", "share/comix/src"),
+-         ("src/library.pyc", "share/comix/src"),
+          ("src/librarybackend.py", "share/comix/src"),
+-         ("src/librarybackend.pyc", "share/comix/src"),
+          ("src/main.py", "share/comix/src"),
+-         ("src/main.pyc", "share/comix/src"),
+          ("src/preferences.py", "share/comix/src"),
+-         ("src/preferences.pyc", "share/comix/src"),
+          ("src/process.py", "share/comix/src"),
+-         ("src/process.pyc", "share/comix/src"),
+          ("src/properties.py", "share/comix/src"),
+-         ("src/properties.pyc", "share/comix/src"),
+          ("src/recent.py", "share/comix/src"),
+-         ("src/recent.pyc", "share/comix/src"),
+          ("src/slideshow.py", "share/comix/src"),
+-         ("src/slideshow.pyc", "share/comix/src"),
+          ("src/status.py", "share/comix/src"),
+-         ("src/status.pyc", "share/comix/src"),
+          ("src/thumbbar.py", "share/comix/src"),
+-         ("src/thumbbar.pyc", "share/comix/src"),
+          ("src/thumbnail.py", "share/comix/src"),
+-         ("src/thumbnail.pyc", "share/comix/src"),
+          ("src/thumbremover.py", "share/comix/src"),
+-         ("src/thumbremover.pyc", "share/comix/src"),
+          ("src/ui.py", "share/comix/src"),
+-         ("src/ui.pyc", "share/comix/src"),
+          ("images/16x16/comix.png", "share/comix/images/16x16"),
+          ("images/comix.svg", "share/comix/images"),
+          ("images/double-page.png", "share/comix/images"),
+@@ -313,7 +282,7 @@
+             os.path.join(install_dir, 'share/mime'))
+         print '\nUpdated mime database (added .cbz, .cbr and .cbt file types.)'
+         schema = os.path.join(source_dir, 'mime/comicbook.schemas')
+-        os.popen('GCONF_CONFIG_SOURCE=$(gconftool-2 --get-default-source) '
++        os.popen('GCONF_CONFIG_SOURCE=%%GCONF_CONFIG_SOURCE%% '
+                  'gconftool-2 --makefile-install-rule "%s" 2>/dev/null' %
+                     schema)
+         print '\nRegistered comic archive thumbnailer in gconf (if available).'
diff --git a/graphics/comix/pkg-plist b/graphics/comix/pkg-plist
index b45ba9857ef0..45029b8b05b2 100644
--- a/graphics/comix/pkg-plist
+++ b/graphics/comix/pkg-plist
@@ -1,71 +1,129 @@
 %%THUMBNAILS:%%bin/comicthumb
 bin/comix
 share/applications/comix.desktop
+%%DATADIR%%/images/16x16/comix.png
+%%DATADIR%%/images/comix.svg
+%%DATADIR%%/images/comments.png
+%%DATADIR%%/images/double-page.png
+%%DATADIR%%/images/fitbest.png
+%%DATADIR%%/images/fitheight.png
+%%DATADIR%%/images/fitmanual.png
+%%DATADIR%%/images/fitwidth.png
+%%DATADIR%%/images/gimp-flip-horizontal.png
+%%DATADIR%%/images/gimp-flip-vertical.png
+%%DATADIR%%/images/gimp-rotate-180.png
+%%DATADIR%%/images/gimp-rotate-270.png
+%%DATADIR%%/images/gimp-rotate-90.png
+%%DATADIR%%/images/gimp-thumbnails.png
+%%DATADIR%%/images/gimp-transform.png
+%%DATADIR%%/images/lens.png
+%%DATADIR%%/images/library.png
+%%DATADIR%%/images/manga.png
+%%DATADIR%%/images/tango-add-bookmark.png
+%%DATADIR%%/images/tango-archive.png
+%%DATADIR%%/images/tango-enhance-image.png
+%%DATADIR%%/images/tango-image.png
+%%DATADIR%%/images/zoom.png
+%%DATADIR%%/src/about.py
+%%DATADIR%%/src/about.pyc
+%%DATADIR%%/src/archive.py
+%%DATADIR%%/src/archive.pyc
+%%DATADIR%%/src/bookmark.py
+%%DATADIR%%/src/bookmark.pyc
+%%DATADIR%%/src/comix.py
+%%DATADIR%%/src/comix.pyc
+%%DATADIR%%/src/comment.py
+%%DATADIR%%/src/comment.pyc
+%%DATADIR%%/src/constants.py
+%%DATADIR%%/src/constants.pyc
+%%DATADIR%%/src/cursor.py
+%%DATADIR%%/src/cursor.pyc
+%%DATADIR%%/src/deprecated.py
+%%DATADIR%%/src/deprecated.pyc
+%%DATADIR%%/src/edit.py
+%%DATADIR%%/src/edit.pyc
+%%DATADIR%%/src/encoding.py
+%%DATADIR%%/src/encoding.pyc
+%%DATADIR%%/src/enhance.py
+%%DATADIR%%/src/enhance.pyc
+%%DATADIR%%/src/event.py
+%%DATADIR%%/src/event.pyc
+%%DATADIR%%/src/filechooser.py
+%%DATADIR%%/src/filechooser.pyc
+%%DATADIR%%/src/filehandler.py
+%%DATADIR%%/src/filehandler.pyc
+%%DATADIR%%/src/histogram.py
+%%DATADIR%%/src/histogram.pyc
+%%DATADIR%%/src/icons.py
+%%DATADIR%%/src/icons.pyc
+%%DATADIR%%/src/image.py
+%%DATADIR%%/src/image.pyc
+%%DATADIR%%/src/labels.py
+%%DATADIR%%/src/labels.pyc
+%%DATADIR%%/src/lens.py
+%%DATADIR%%/src/lens.pyc
+%%DATADIR%%/src/library.py
+%%DATADIR%%/src/library.pyc
+%%DATADIR%%/src/librarybackend.py
+%%DATADIR%%/src/librarybackend.pyc
+%%DATADIR%%/src/main.py
+%%DATADIR%%/src/main.pyc
+%%DATADIR%%/src/preferences.py
+%%DATADIR%%/src/preferences.pyc
+%%DATADIR%%/src/process.py
+%%DATADIR%%/src/process.pyc
+%%DATADIR%%/src/properties.py
+%%DATADIR%%/src/properties.pyc
+%%DATADIR%%/src/recent.py
+%%DATADIR%%/src/recent.pyc
+%%DATADIR%%/src/slideshow.py
+%%DATADIR%%/src/slideshow.pyc
+%%DATADIR%%/src/status.py
+%%DATADIR%%/src/status.pyc
+%%DATADIR%%/src/thumbbar.py
+%%DATADIR%%/src/thumbbar.pyc
+%%DATADIR%%/src/thumbnail.py
+%%DATADIR%%/src/thumbnail.pyc
+%%DATADIR%%/src/thumbremover.py
+%%DATADIR%%/src/thumbremover.pyc
+%%DATADIR%%/src/ui.py
+%%DATADIR%%/src/ui.pyc
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/README
+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/cs/LC_MESSAGES/comix.mo
-share/locale/de/LC_MESSAGES/comix.mo
-share/locale/el/LC_MESSAGES/comix.mo
 share/locale/es/LC_MESSAGES/comix.mo
-share/locale/fa/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/id/LC_MESSAGES/comix.mo
-share/locale/it/LC_MESSAGES/comix.mo
 share/locale/ja/LC_MESSAGES/comix.mo
 share/locale/ko/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/sv/LC_MESSAGES/comix.mo
-share/locale/zh_CN/LC_MESSAGES/comix.mo
-share/locale/zh_TW/LC_MESSAGES/comix.mo
-%%THUMBNAILS:%%share/mime/application/x-cbr.xml
-%%THUMBNAILS:%%share/mime/application/x-cbt.xml
-%%THUMBNAILS:%%share/mime/application/x-cbz.xml
 %%THUMBNAILS:%%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
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm %%DATADIR%%/src
+@dirrm %%DATADIR%%/images/16x16
+@dirrm %%DATADIR%%/images
+@dirrm %%DATADIR%%
 @dirrmtry share/applications
 %%THUMBNAILS:%%@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
 %%THUMBNAILS:%%@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime