Thu Mar 8 11:44:43 2012 UTC ()
Update for new python default version. Bump PKGREVISION.


(wiz)
diff -r1.16 -r1.17 pkgsrc/graphics/vigra/Makefile
diff -r1.72 -r1.73 pkgsrc/wm/openbox/Makefile
cvs diff -r1.16 -r1.17 pkgsrc/graphics/vigra/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/vigra/Makefile 2012/02/26 08:33:06 1.16
+++ pkgsrc/graphics/vigra/Makefile 2012/03/08 11:44:43 1.17
@@ -1,43 +1,43 @@ @@ -1,43 +1,43 @@
1# $NetBSD: Makefile,v 1.16 2012/02/26 08:33:06 obache Exp $ 1# $NetBSD: Makefile,v 1.17 2012/03/08 11:44:43 wiz Exp $
2 2
3DISTNAME= vigra-1.8.0-src 3DISTNAME= vigra-1.8.0-src
4PKGNAME= ${DISTNAME:S/-src//} 4PKGNAME= ${DISTNAME:S/-src//}
5PKGREVISION= 1 5PKGREVISION= 2
6CATEGORIES= graphics 6CATEGORIES= graphics
7MASTER_SITES= http://hci.iwr.uni-heidelberg.de/vigra/ 7MASTER_SITES= http://hci.iwr.uni-heidelberg.de/vigra/
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://hci.iwr.uni-heidelberg.de/vigra/ 10HOMEPAGE= http://hci.iwr.uni-heidelberg.de/vigra/
11COMMENT= Computer vision library 11COMMENT= Computer vision library
12LICENSE= mit 12LICENSE= mit
13 13
14PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
15 15
16WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} 16WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
17 17
18USE_CMAKE= yes 18USE_CMAKE= yes
19USE_LANGUAGES= c c++ 19USE_LANGUAGES= c c++
20USE_LIBTOOL= yes 20USE_LIBTOOL= yes
21USE_TOOLS+= pkg-config 21USE_TOOLS+= pkg-config
22 22
23CMAKE_ARGS+= -D DOCINSTALL:PATH=${PREFIX}/share/doc 23CMAKE_ARGS+= -D DOCINSTALL:PATH=${PREFIX}/share/doc
24 24
25SUBST_CLASSES+= python 25SUBST_CLASSES+= python
26SUBST_STAGE.python= pre-configure 26SUBST_STAGE.python= pre-configure
27SUBST_FILES.python+= config/vigra-config.in 27SUBST_FILES.python+= config/vigra-config.in
28# Best we can do without pulling in a python dependency. 28# Best we can do without pulling in a python dependency.
29# Update when PYTHON_VERSION_DEFAULT changes! 29# Update when PYTHON_VERSION_DEFAULT changes!
30SUBST_SED.python+= -e 's,/usr/bin/env.*python,${PREFIX}/bin/python2.6,' 30SUBST_SED.python+= -e 's,/usr/bin/env.*python,${PREFIX}/bin/python2.7,'
31SUBST_MESSAGE.python= Fixing path to python. 31SUBST_MESSAGE.python= Fixing path to python.
32 32
33# Package doesn't need dependency, only packages using the script, 33# Package doesn't need dependency, only packages using the script,
34# usually during configure, so don't depend on python. 34# usually during configure, so don't depend on python.
35CHECK_INTERPRETER_SKIP= bin/vigra-config 35CHECK_INTERPRETER_SKIP= bin/vigra-config
36 36
37.include "options.mk" 37.include "options.mk"
38 38
39pre-install: 39pre-install:
40 ${RM} -f ${WRKSRC}/include/vigra/*.orig 40 ${RM} -f ${WRKSRC}/include/vigra/*.orig
41 41
42.include "../../devel/zlib/buildlink3.mk" 42.include "../../devel/zlib/buildlink3.mk"
43.include "../../graphics/openexr/buildlink3.mk" 43.include "../../graphics/openexr/buildlink3.mk"
cvs diff -r1.72 -r1.73 pkgsrc/wm/openbox/Makefile (expand / switch to unified diff)

--- pkgsrc/wm/openbox/Makefile 2012/03/05 15:02:49 1.72
+++ pkgsrc/wm/openbox/Makefile 2012/03/08 11:44:43 1.73
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.72 2012/03/05 15:02:49 wiz Exp $ 1# $NetBSD: Makefile,v 1.73 2012/03/08 11:44:43 wiz Exp $
2 2
3DISTNAME= openbox-3.5.0 3DISTNAME= openbox-3.5.0
4PKGREVISION= 3 4PKGREVISION= 4
5CATEGORIES= wm x11 5CATEGORIES= wm x11
6MASTER_SITES= http://openbox.org/dist/openbox/ 6MASTER_SITES= http://openbox.org/dist/openbox/
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@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
@@ -30,27 +30,27 @@ OWN_DIRS= ${PKG_SYSCONFDIR} @@ -30,27 +30,27 @@ OWN_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}/autostart ${PKG_SYSCONFDIR}/openbox/autostart 33CONF_FILES= ${EGDIR}/autostart ${PKG_SYSCONFDIR}/openbox/autostart
34CONF_FILES+= ${EGDIR}/environment ${PKG_SYSCONFDIR}/openbox/environment 34CONF_FILES+= ${EGDIR}/environment ${PKG_SYSCONFDIR}/openbox/environment
35CONF_FILES+= ${EGDIR}/menu.xml ${PKG_SYSCONFDIR}/openbox/menu.xml 35CONF_FILES+= ${EGDIR}/menu.xml ${PKG_SYSCONFDIR}/openbox/menu.xml
36CONF_FILES+= ${EGDIR}/rc.xml ${PKG_SYSCONFDIR}/openbox/rc.xml 36CONF_FILES+= ${EGDIR}/rc.xml ${PKG_SYSCONFDIR}/openbox/rc.xml
37 37
38SUBST_CLASSES+= python 38SUBST_CLASSES+= python
39SUBST_STAGE.python= pre-build 39SUBST_STAGE.python= pre-build
40SUBST_FILES.python+= data/autostart/openbox-xdg-autostart 40SUBST_FILES.python+= data/autostart/openbox-xdg-autostart
41# Best we can do without pulling in a python dependency. 41# Best we can do without pulling in a python dependency.
42# Update when PYTHON_VERSION_DEFAULT changes! 42# Update when PYTHON_VERSION_DEFAULT changes!
43SUBST_SED.python+= -e 's,/usr/bin/env.*python,${PREFIX}/bin/python2.6,' 43SUBST_SED.python+= -e 's,/usr/bin/env.*python,${PREFIX}/bin/python2.7,'
44SUBST_MESSAGE.python= Fixing path to python. 44SUBST_MESSAGE.python= Fixing path to python.
45CHECK_INTERPRETER_SKIP= libexec/openbox-xdg-autostart 45CHECK_INTERPRETER_SKIP= libexec/openbox-xdg-autostart
46 46
47BUILDLINK_DEPMETHOD.libXt?= build 47BUILDLINK_DEPMETHOD.libXt?= build
48 48
49.include "../../converters/libiconv/buildlink3.mk" 49.include "../../converters/libiconv/buildlink3.mk"
50.include "../../devel/glib2/buildlink3.mk" 50.include "../../devel/glib2/buildlink3.mk"
51.include "../../devel/pango/buildlink3.mk" 51.include "../../devel/pango/buildlink3.mk"
52.include "../../textproc/libxml2/buildlink3.mk" 52.include "../../textproc/libxml2/buildlink3.mk"
53.include "../../sysutils/desktop-file-utils/desktopdb.mk" 53.include "../../sysutils/desktop-file-utils/desktopdb.mk"
54.include "../../x11/libSM/buildlink3.mk" 54.include "../../x11/libSM/buildlink3.mk"
55.include "../../x11/libX11/buildlink3.mk" 55.include "../../x11/libX11/buildlink3.mk"
56.include "../../x11/libXcursor/buildlink3.mk" 56.include "../../x11/libXcursor/buildlink3.mk"