Fri Feb 15 23:55:08 2013 UTC ()
Don't depend on py-gobject and py-gtk2 directly, use the py-gtk2 buildlink3.mk.
Use python/distutils.mk as it should.
Use shared-mime-info/mimedb.mk as it should and remove file managed by
shared-mime-info from PLIST.

This makes zim not abort when started.

Bump PKGREVISION.


(bad)
diff -r1.11 -r1.12 pkgsrc/editors/zim/Makefile
diff -r1.6 -r1.7 pkgsrc/editors/zim/PLIST

cvs diff -r1.11 -r1.12 pkgsrc/editors/zim/Makefile (expand / switch to context diff)
--- pkgsrc/editors/zim/Makefile 2013/01/26 13:39:37 1.11
+++ pkgsrc/editors/zim/Makefile 2013/02/15 23:55:07 1.12
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.11 2013/01/26 13:39:37 ryoon Exp $
+# $NetBSD: Makefile,v 1.12 2013/02/15 23:55:07 bad Exp $
 #
 
 DISTNAME=	zim-0.59
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	editors
 MASTER_SITES=	http://zim-wiki.org/downloads/
+PKGREVISION=	1
 
 MAINTAINER=	ryoon@NetBSD.org
 HOMEPAGE=	http://zim-wiki.org/
@@ -16,8 +17,6 @@
 REPLACE_PYTHON=	${WRKSRC}/zim.py
 PYDISTUTILSPKG=	YES
 
-DEPENDS+=	${PYPKGPREFIX}-gobject-[0-9]*:../../devel/py-gobject
-DEPENDS+=	${PYPKGPREFIX}-gtk2-[0-9]*:../../x11/py-gtk2
 DEPENDS+=	${PYPKGPREFIX}-xdg-[0-9]*:../../devel/py-xdg
 DEPENDS+=	${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3
 DEPENDS+=	${PYPKGPREFIX}-cElementTree-[0-9]*:../../textproc/py-cElementTree
@@ -42,6 +41,9 @@
 SUBST_SED.man-path=		-e s,share/man/man1,${PKGMANDIR}/man1,
 
 .include "../../lang/python/application.mk"
-.include "../../lang/python/extension.mk"
+.include "../../lang/python/distutils.mk"
+.include "../../x11/py-gtk2/buildlink3.mk"
+.include "../../databases/shared-mime-info/mimedb.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/bsd.pkg.mk"

cvs diff -r1.6 -r1.7 pkgsrc/editors/zim/PLIST (expand / switch to context diff)
--- pkgsrc/editors/zim/PLIST 2013/01/26 13:39:37 1.6
+++ pkgsrc/editors/zim/PLIST 2013/02/15 23:55:07 1.7
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2013/01/26 13:39:37 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.7 2013/02/15 23:55:07 bad Exp $
 bin/zim
 ${PYSITELIB}/zim/__init__.py
 ${PYSITELIB}/zim/__init__.pyc
@@ -295,22 +295,7 @@
 share/locale/uk/LC_MESSAGES/zim.mo
 share/locale/zh_CN/LC_MESSAGES/zim.mo
 share/locale/zh_TW/LC_MESSAGES/zim.mo
-share/mime/XMLnamespaces
-share/mime/aliases
-share/mime/application/x-gjots.xml
-share/mime/application/x-zim-notebook.xml
-share/mime/generic-icons
-share/mime/globs
-share/mime/globs2
-share/mime/icons
-share/mime/magic
-share/mime/mime.cache
 share/mime/packages/zim.xml
-share/mime/subclasses
-share/mime/text/x-zim-wiki.xml
-share/mime/treemagic
-share/mime/types
-share/mime/version
 share/pixmaps/zim.png
 share/zim/dates.list
 share/zim/globe.svg