Mon May 2 12:50:13 2011 UTC ()
Replace /usr/bin/env python with ${PREFIX}/bin/python2.6;
on the other hand, don't depend on Python (too heavy dependency for a
window manager), so skip the interpreter check for that file.

Bump PKGREVISION.


(wiz)
diff -r1.65 -r1.66 pkgsrc/wm/openbox/Makefile
cvs diff -r1.65 -r1.66 pkgsrc/wm/openbox/Makefile (expand / switch to unified diff)

--- pkgsrc/wm/openbox/Makefile 2011/04/22 13:42:18 1.65
+++ pkgsrc/wm/openbox/Makefile 2011/05/02 12:50:13 1.66
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.65 2011/04/22 13:42:18 obache Exp $ 1# $NetBSD: Makefile,v 1.66 2011/05/02 12:50:13 wiz Exp $
2 2
3DISTNAME= openbox-3.4.11.2 3DISTNAME= openbox-3.4.11.2
4PKGREVISION= 4 4PKGREVISION= 5
5CATEGORIES= wm x11 5CATEGORIES= wm x11
6MASTER_SITES= http://openbox.org/dist/openbox/ 6MASTER_SITES= http://openbox.org/dist/openbox/
7 7
8MAINTAINER= wiz@NetBSD.org 8MAINTAINER= wiz@NetBSD.org
9HOMEPAGE= http://openbox.org/ 9HOMEPAGE= http://openbox.org/
10COMMENT= Standards compliant, light-weight, and extensible window manager 10COMMENT= Standards compliant, light-weight, and extensible window manager
11LICENSE= gnu-gpl-v2 11LICENSE= gnu-gpl-v2
12 12
13DEPENDS+= vera-ttf>=1.10:../../fonts/vera-ttf 13DEPENDS+= vera-ttf>=1.10:../../fonts/vera-ttf
14 14
15PKG_DESTDIR_SUPPORT= user-destdir 15PKG_DESTDIR_SUPPORT= user-destdir
16 16
17GNU_CONFIGURE= YES 17GNU_CONFIGURE= YES
@@ -25,26 +25,35 @@ PKGCONFIG_OVERRIDE+= render/obrender-3.0 @@ -25,26 +25,35 @@ PKGCONFIG_OVERRIDE+= render/obrender-3.0
25 25
26CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} 26CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
27LDFLAGS+= ${BUILDLINK_LDADD.libsetenv} 27LDFLAGS+= ${BUILDLINK_LDADD.libsetenv}
28PKG_SYSCONFSUBDIR= xdg 28PKG_SYSCONFSUBDIR= xdg
29OWN_DIRS= ${PKG_SYSCONFDIR} 29OWN_DIRS= ${PKG_SYSCONFDIR}
30OWN_DIRS+= ${PKG_SYSCONFDIR}/openbox 30OWN_DIRS+= ${PKG_SYSCONFDIR}/openbox
31 31
32EGDIR= ${PREFIX}/share/examples/openbox 32EGDIR= ${PREFIX}/share/examples/openbox
33CONF_FILES= ${EGDIR}/menu.xml ${PKG_SYSCONFDIR}/openbox/menu.xml 33CONF_FILES= ${EGDIR}/menu.xml ${PKG_SYSCONFDIR}/openbox/menu.xml
34CONF_FILES+= ${EGDIR}/rc.xml ${PKG_SYSCONFDIR}/openbox/rc.xml 34CONF_FILES+= ${EGDIR}/rc.xml ${PKG_SYSCONFDIR}/openbox/rc.xml
35CONF_FILES+= ${EGDIR}/autostart.sh \ 35CONF_FILES+= ${EGDIR}/autostart.sh \
36 ${PKG_SYSCONFDIR}/openbox/autostart.sh 36 ${PKG_SYSCONFDIR}/openbox/autostart.sh
37 37
 38SUBST_CLASSES+= python
 39SUBST_STAGE.python= pre-build
 40SUBST_FILES.python+= tools/xdg-autostart/xdg-autostart
 41# Best we can do without pulling in a python dependency.
 42# Update when PYTHON_VERSION_DEFAULT changes!
 43SUBST_SED.python+= -e 's,/usr/bin/env.*python,${PREFIX}/bin/python2.6,'
 44SUBST_MESSAGE.xdg= Fixing path to python.
 45CHECK_INTERPRETER_SKIP= lib/openbox/xdg-autostart
 46
38BUILDLINK_DEPMETHOD.libXt?= build 47BUILDLINK_DEPMETHOD.libXt?= build
39 48
40.include "../../converters/libiconv/buildlink3.mk" 49.include "../../converters/libiconv/buildlink3.mk"
41.include "../../devel/glib2/buildlink3.mk" 50.include "../../devel/glib2/buildlink3.mk"
42.include "../../devel/pango/buildlink3.mk" 51.include "../../devel/pango/buildlink3.mk"
43.include "../../textproc/libxml2/buildlink3.mk" 52.include "../../textproc/libxml2/buildlink3.mk"
44.include "../../sysutils/desktop-file-utils/desktopdb.mk" 53.include "../../sysutils/desktop-file-utils/desktopdb.mk"
45.include "../../x11/libSM/buildlink3.mk" 54.include "../../x11/libSM/buildlink3.mk"
46.include "../../x11/libX11/buildlink3.mk" 55.include "../../x11/libX11/buildlink3.mk"
47.include "../../x11/libXcursor/buildlink3.mk" 56.include "../../x11/libXcursor/buildlink3.mk"
48.include "../../x11/libXft/buildlink3.mk" 57.include "../../x11/libXft/buildlink3.mk"
49.include "../../x11/libXinerama/buildlink3.mk" 58.include "../../x11/libXinerama/buildlink3.mk"
50.include "../../x11/libXrandr/buildlink3.mk" 59.include "../../x11/libXrandr/buildlink3.mk"