Fri Oct 14 12:30:53 2011 UTC ()
* no need to buildlink with py-gtk2, simple DEPENDS is sufficient.
* accep PYTHON variants same as py-gtk2.

Bump PKGREVISION from default python dependency changes.


(obache)
diff -r1.15 -r1.16 pkgsrc/x11/driconf/Makefile
cvs diff -r1.15 -r1.16 pkgsrc/x11/driconf/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/driconf/Makefile 2011/04/22 13:45:02 1.15
+++ pkgsrc/x11/driconf/Makefile 2011/10/14 12:30:53 1.16
@@ -1,50 +1,51 @@ @@ -1,50 +1,51 @@
1# $NetBSD: Makefile,v 1.15 2011/04/22 13:45:02 obache Exp $ 1# $NetBSD: Makefile,v 1.16 2011/10/14 12:30:53 obache Exp $
2# 2#
3 3
4DISTNAME= driconf-0.9.1 4DISTNAME= driconf-0.9.1
5PKGREVISION= 7 5PKGREVISION= 8
6CATEGORIES= x11 6CATEGORIES= x11
7MASTER_SITES= ${MASTER_SITE_LOCAL} 7MASTER_SITES= ${MASTER_SITE_LOCAL}
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://dri.freedesktop.org/wiki/DriConf 10HOMEPAGE= http://dri.freedesktop.org/wiki/DriConf
11COMMENT= Configuration applet for DRI drivers 11COMMENT= Configuration applet for DRI drivers
 12LICENSE= gnu-gpl-v2 # or later
12 13
13DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat 14DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
 15DEPENDS+= ${PYPKGPREFIX}-gtk2>=2.4:../../x11/py-gtk2
14DEPENDS+= xdriinfo>=1.0.2:../../x11/xdriinfo 16DEPENDS+= xdriinfo>=1.0.2:../../x11/xdriinfo
15 17
16PKG_DESTDIR_SUPPORT= user-destdir 18PKG_DESTDIR_SUPPORT= user-destdir
17 19
18USE_PKGLOCALEDIR= yes 20USE_PKGLOCALEDIR= yes
19USE_TOOLS+= msgfmt msgmerge xgettext 21USE_TOOLS+= msgfmt msgmerge xgettext
20 22
21CONFIGURE_ARGS+= --prefix=${PREFIX:Q} 23CONFIGURE_ARGS+= --prefix=${PREFIX:Q}
22PYDISTUTILSPKG= yes 24PYDISTUTILSPKG= yes
23REPLACE_PYTHON= *.py 25REPLACE_PYTHON= *.py
24PYTHON_VERSIONS_ACCEPTED= 25 24 26PYTHON_VERSIONS_ACCEPTED= 27 26 25
25 27
26SUBST_CLASSES+= fix-paths 28SUBST_CLASSES+= fix-paths
27SUBST_FILES.fix-paths= driconf driconf.desktop 29SUBST_FILES.fix-paths= driconf driconf.desktop
28SUBST_FILES.fix-paths+= driconf.py driconf_com*ui.py 30SUBST_FILES.fix-paths+= driconf.py driconf_com*ui.py
29SUBST_FILES.fix-paths+= setup.cfg setup.py 31SUBST_FILES.fix-paths+= setup.cfg setup.py
30SUBST_MESSAGE.fix-paths=Fixing hard-coded pathnames. 32SUBST_MESSAGE.fix-paths=Fixing hard-coded pathnames.
31SUBST_STAGE.fix-paths= pre-configure 33SUBST_STAGE.fix-paths= pre-configure
32SUBST_VARS.fix-paths= PKGBASE PKGLOCALEDIR PKG_SYSCONFDIR PREFIX PYSITELIB 34SUBST_VARS.fix-paths= PKGBASE PKGLOCALEDIR PKG_SYSCONFDIR PREFIX PYSITELIB
33### 35###
34### NOTE: this is only to build the .mo files. 36### NOTE: this is only to build the .mo files.
35### 37###
36pre-build: 38pre-build:
37 ${RUN} cd ${WRKSRC} && \ 39 ${RUN} cd ${WRKSRC} && \
38 ${BUILD_MAKE_CMD} all 40 ${BUILD_MAKE_CMD} all
39 41
40post-install: 42post-install:
41 ${RUN} cd ${WRKSRC} && \ 43 ${RUN} cd ${WRKSRC} && \
42 ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/applications && \ 44 ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/applications && \
43 ${INSTALL_DATA} ${WRKSRC}/driconf.desktop \ 45 ${INSTALL_DATA} ${WRKSRC}/driconf.desktop \
44 ${DESTDIR}${PREFIX}/share/applications/ 46 ${DESTDIR}${PREFIX}/share/applications/
45 47
46.include "../../lang/python/extension.mk" 48.include "../../lang/python/extension.mk"
47.include "../../sysutils/desktop-file-utils/desktopdb.mk" 49.include "../../sysutils/desktop-file-utils/desktopdb.mk"
48.include "../../x11/py-gtk2/buildlink3.mk" 
49 50
50.include "../../mk/bsd.pkg.mk" 51.include "../../mk/bsd.pkg.mk"