Mon May 2 12:57:22 2011 UTC ()
Avoid using /usr/bin/env. On the other hand, the script using python
is only needed by packages using vigra-config to find vigra, so don't
depend on python here -- let the packages using it pull it in themselves.

Bump PKGREVISION.


(wiz)
diff -r1.11 -r1.12 pkgsrc/graphics/vigra/Makefile
cvs diff -r1.11 -r1.12 pkgsrc/graphics/vigra/Makefile (expand / switch to unified diff)

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