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 unified 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,47 +1,49 @@ @@ -1,47 +1,49 @@
1# $NetBSD: Makefile,v 1.11 2013/01/26 13:39:37 ryoon Exp $ 1# $NetBSD: Makefile,v 1.12 2013/02/15 23:55:07 bad Exp $
2# 2#
3 3
4DISTNAME= zim-0.59 4DISTNAME= zim-0.59
5PKGNAME= ${PYPKGPREFIX}-${DISTNAME} 5PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
6CATEGORIES= editors 6CATEGORIES= editors
7MASTER_SITES= http://zim-wiki.org/downloads/ 7MASTER_SITES= http://zim-wiki.org/downloads/
 8PKGREVISION= 1
8 9
9MAINTAINER= ryoon@NetBSD.org 10MAINTAINER= ryoon@NetBSD.org
10HOMEPAGE= http://zim-wiki.org/ 11HOMEPAGE= http://zim-wiki.org/
11COMMENT= Zim brings the concept of a wiki to your desktop 12COMMENT= Zim brings the concept of a wiki to your desktop
12LICENSE= gnu-gpl-v2 13LICENSE= gnu-gpl-v2
13 14
14USE_LANGUAGES= # none 15USE_LANGUAGES= # none
15 16
16REPLACE_PYTHON= ${WRKSRC}/zim.py 17REPLACE_PYTHON= ${WRKSRC}/zim.py
17PYDISTUTILSPKG= YES 18PYDISTUTILSPKG= YES
18 19
19DEPENDS+= ${PYPKGPREFIX}-gobject-[0-9]*:../../devel/py-gobject 
20DEPENDS+= ${PYPKGPREFIX}-gtk2-[0-9]*:../../x11/py-gtk2 
21DEPENDS+= ${PYPKGPREFIX}-xdg-[0-9]*:../../devel/py-xdg 20DEPENDS+= ${PYPKGPREFIX}-xdg-[0-9]*:../../devel/py-xdg
22DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3 21DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3
23DEPENDS+= ${PYPKGPREFIX}-cElementTree-[0-9]*:../../textproc/py-cElementTree 22DEPENDS+= ${PYPKGPREFIX}-cElementTree-[0-9]*:../../textproc/py-cElementTree
24DEPENDS+= xdg-utils-[0-9]*:../../misc/xdg-utils 23DEPENDS+= xdg-utils-[0-9]*:../../misc/xdg-utils
25 24
26SUBST_CLASSES+= data-path 25SUBST_CLASSES+= data-path
27SUBST_STAGE.data-path= pre-configure 26SUBST_STAGE.data-path= pre-configure
28SUBST_FILES.data-path= zim/config.py 27SUBST_FILES.data-path= zim/config.py
29SUBST_SED.data-path= -e 's,/usr/local/share/,${PREFIX}/share/,' 28SUBST_SED.data-path= -e 's,/usr/local/share/,${PREFIX}/share/,'
30 29
31SUBST_CLASSES+= fix-python 30SUBST_CLASSES+= fix-python
32SUBST_STAGE.fix-python= pre-configure 31SUBST_STAGE.fix-python= pre-configure
33SUBST_MESSAGE.fix-python= Fixing dynamic python 32SUBST_MESSAGE.fix-python= Fixing dynamic python
34SUBST_FILES.fix-python+= zim/_lib/xdot.py 33SUBST_FILES.fix-python+= zim/_lib/xdot.py
35SUBST_FILES.fix-python+= zim/_version.py 34SUBST_FILES.fix-python+= zim/_version.py
36SUBST_FILES.fix-python+= zim/inc/xdot.py 35SUBST_FILES.fix-python+= zim/inc/xdot.py
37SUBST_SED.fix-python+= -e 's,/usr/bin/env python,${PYTHONBIN},' 36SUBST_SED.fix-python+= -e 's,/usr/bin/env python,${PYTHONBIN},'
38 37
39SUBST_CLASSES+= man-path 38SUBST_CLASSES+= man-path
40SUBST_STAGE.man-path= pre-configure 39SUBST_STAGE.man-path= pre-configure
41SUBST_FILES.man-path+= setup.py 40SUBST_FILES.man-path+= setup.py
42SUBST_SED.man-path= -e s,share/man/man1,${PKGMANDIR}/man1, 41SUBST_SED.man-path= -e s,share/man/man1,${PKGMANDIR}/man1,
43 42
44.include "../../lang/python/application.mk" 43.include "../../lang/python/application.mk"
45.include "../../lang/python/extension.mk" 44.include "../../lang/python/distutils.mk"
 45.include "../../x11/py-gtk2/buildlink3.mk"
 46.include "../../databases/shared-mime-info/mimedb.mk"
 47.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
46.include "../../sysutils/desktop-file-utils/desktopdb.mk" 48.include "../../sysutils/desktop-file-utils/desktopdb.mk"
47.include "../../mk/bsd.pkg.mk" 49.include "../../mk/bsd.pkg.mk"
cvs diff -r1.6 -r1.7 pkgsrc/editors/zim/PLIST (expand / switch to unified 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,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.6 2013/01/26 13:39:37 ryoon Exp $ 1@comment $NetBSD: PLIST,v 1.7 2013/02/15 23:55:07 bad Exp $
2bin/zim 2bin/zim
3${PYSITELIB}/zim/__init__.py 3${PYSITELIB}/zim/__init__.py
4${PYSITELIB}/zim/__init__.pyc 4${PYSITELIB}/zim/__init__.pyc
5${PYSITELIB}/zim/__init__.pyo 5${PYSITELIB}/zim/__init__.pyo
6${PYSITELIB}/zim/_version.py 6${PYSITELIB}/zim/_version.py
7${PYSITELIB}/zim/_version.pyc 7${PYSITELIB}/zim/_version.pyc
8${PYSITELIB}/zim/_version.pyo 8${PYSITELIB}/zim/_version.pyo
9${PYSITELIB}/zim/applications.py 9${PYSITELIB}/zim/applications.py
10${PYSITELIB}/zim/applications.pyc 10${PYSITELIB}/zim/applications.pyc
11${PYSITELIB}/zim/applications.pyo 11${PYSITELIB}/zim/applications.pyo
12${PYSITELIB}/zim/async.py 12${PYSITELIB}/zim/async.py
13${PYSITELIB}/zim/async.pyc 13${PYSITELIB}/zim/async.pyc
14${PYSITELIB}/zim/async.pyo 14${PYSITELIB}/zim/async.pyo
@@ -285,42 +285,27 @@ share/locale/ja/LC_MESSAGES/zim.mo @@ -285,42 +285,27 @@ share/locale/ja/LC_MESSAGES/zim.mo
285share/locale/nl/LC_MESSAGES/zim.mo 285share/locale/nl/LC_MESSAGES/zim.mo
286share/locale/pl/LC_MESSAGES/zim.mo 286share/locale/pl/LC_MESSAGES/zim.mo
287share/locale/pt_BR/LC_MESSAGES/zim.mo 287share/locale/pt_BR/LC_MESSAGES/zim.mo
288share/locale/ro/LC_MESSAGES/zim.mo 288share/locale/ro/LC_MESSAGES/zim.mo
289share/locale/ru/LC_MESSAGES/zim.mo 289share/locale/ru/LC_MESSAGES/zim.mo
290share/locale/sk/LC_MESSAGES/zim.mo 290share/locale/sk/LC_MESSAGES/zim.mo
291share/locale/sl/LC_MESSAGES/zim.mo 291share/locale/sl/LC_MESSAGES/zim.mo
292share/locale/sr/LC_MESSAGES/zim.mo 292share/locale/sr/LC_MESSAGES/zim.mo
293share/locale/sv/LC_MESSAGES/zim.mo 293share/locale/sv/LC_MESSAGES/zim.mo
294share/locale/tr/LC_MESSAGES/zim.mo 294share/locale/tr/LC_MESSAGES/zim.mo
295share/locale/uk/LC_MESSAGES/zim.mo 295share/locale/uk/LC_MESSAGES/zim.mo
296share/locale/zh_CN/LC_MESSAGES/zim.mo 296share/locale/zh_CN/LC_MESSAGES/zim.mo
297share/locale/zh_TW/LC_MESSAGES/zim.mo 297share/locale/zh_TW/LC_MESSAGES/zim.mo
298share/mime/XMLnamespaces 
299share/mime/aliases 
300share/mime/application/x-gjots.xml 
301share/mime/application/x-zim-notebook.xml 
302share/mime/generic-icons 
303share/mime/globs 
304share/mime/globs2 
305share/mime/icons 
306share/mime/magic 
307share/mime/mime.cache 
308share/mime/packages/zim.xml 298share/mime/packages/zim.xml
309share/mime/subclasses 
310share/mime/text/x-zim-wiki.xml 
311share/mime/treemagic 
312share/mime/types 
313share/mime/version 
314share/pixmaps/zim.png 299share/pixmaps/zim.png
315share/zim/dates.list 300share/zim/dates.list
316share/zim/globe.svg 301share/zim/globe.svg
317share/zim/globe_banner.svg 302share/zim/globe_banner.svg
318share/zim/globe_banner_small.png 303share/zim/globe_banner_small.png
319share/zim/manual/About.txt 304share/zim/manual/About.txt
320share/zim/manual/Bugs.txt 305share/zim/manual/Bugs.txt
321share/zim/manual/FAQ.txt 306share/zim/manual/FAQ.txt
322share/zim/manual/Help.txt 307share/zim/manual/Help.txt
323share/zim/manual/Help/Attachments.txt 308share/zim/manual/Help/Attachments.txt
324share/zim/manual/Help/Auto_Formatting.txt 309share/zim/manual/Help/Auto_Formatting.txt
325share/zim/manual/Help/Check_Boxes.txt 310share/zim/manual/Help/Check_Boxes.txt
326share/zim/manual/Help/Config_Files.txt 311share/zim/manual/Help/Config_Files.txt