diff options
| author | rillig <rillig@pkgsrc.org> | 2006-11-19 23:13:42 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2006-11-19 23:13:42 +0000 |
| commit | b06cc3f456a528286a5eb2a4d4f9d1580edf1136 (patch) | |
| tree | 92fd3f5c8fe2c7792e4d4fb694994cecd2600cb0 /graphics/opencv | |
| parent | 4dd36239bf5632effee04fbef1db23c6268be326 (diff) | |
| download | pkgsrc-b06cc3f456a528286a5eb2a4d4f9d1580edf1136.tar.gz | |
Fixed "test ==" and the path to the Python interpreter, but did not add
a dependency.
PKGREVISION++
Diffstat (limited to 'graphics/opencv')
| -rw-r--r-- | graphics/opencv/Makefile | 8 | ||||
| -rw-r--r-- | graphics/opencv/distinfo | 4 | ||||
| -rw-r--r-- | graphics/opencv/patches/patch-ab | 15 | ||||
| -rw-r--r-- | graphics/opencv/patches/patch-ac | 15 |
4 files changed, 40 insertions, 2 deletions
diff --git a/graphics/opencv/Makefile b/graphics/opencv/Makefile index 4768db72f58..b0b45eb8885 100644 --- a/graphics/opencv/Makefile +++ b/graphics/opencv/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.2 2006/11/10 10:50:21 taca Exp $ +# $NetBSD: Makefile,v 1.3 2006/11/19 23:13:42 rillig Exp $ # DISTNAME= opencv-1.0.0 +PKGREVISION= 1 CATEGORIES= graphics devel MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=opencvlibrary/} @@ -19,6 +20,11 @@ INSTALLATION_DIRS+= share/doc/opencv/papers share/doc/opencv/ref/pics \ GNU_CONFIGURE= yes PKGCONFIG_OVERRIDE+= opencv.pc.in +SUBST_CLASSES+= py +SUBST_STAGE.py= pre-configure +SUBST_FILES.py= samples/python/*.py +SUBST_SED.py= -e 's,/usr/bin/python,/usr/bin/env python,' + CONFIGURE_ARGS+=--with-swig=no CONFIGURE_ARGS+=--with-python=no diff --git a/graphics/opencv/distinfo b/graphics/opencv/distinfo index 873048a6f63..5cd752e797f 100644 --- a/graphics/opencv/distinfo +++ b/graphics/opencv/distinfo @@ -1,6 +1,8 @@ -$NetBSD: distinfo,v 1.1.1.1 2006/11/09 05:13:41 uebayasi Exp $ +$NetBSD: distinfo,v 1.2 2006/11/19 23:13:42 rillig Exp $ SHA1 (opencv-1.0.0.tar.gz) = c7dd500703b0060cedfa049fcb33de0846e631fb RMD160 (opencv-1.0.0.tar.gz) = f041798ea63101b90e945957e0d0ad3f7497dcd4 Size (opencv-1.0.0.tar.gz) = 11146334 bytes SHA1 (patch-aa) = 2411f8ccfc2c9b1d5713840bbea939caee1b5bca +SHA1 (patch-ab) = 7ece3d9908fa5cda8fc6d0cf81154a2aa899862a +SHA1 (patch-ac) = b2e20615b2d295991ee7146b937ed43e3192f255 diff --git a/graphics/opencv/patches/patch-ab b/graphics/opencv/patches/patch-ab new file mode 100644 index 00000000000..bfd63dd40f2 --- /dev/null +++ b/graphics/opencv/patches/patch-ab @@ -0,0 +1,15 @@ +$NetBSD: patch-ab,v 1.1 2006/11/19 23:13:42 rillig Exp $ + +Tags: pkgsrc-only + +--- configure.orig 2006-11-03 16:54:49.000000000 +0100 ++++ configure 2006-11-19 23:03:44.000000000 +0100 +@@ -20433,7 +20433,7 @@ else + echo "${ECHO_T}no" >&6 + fi + +- if test x"$PKG_CONFIG" == "xno"; then ++ if test x"$PKG_CONFIG" = "xno"; then + { { echo "$as_me:$LINENO: error: You have to install pkg-config to compile OpenCV with GTK+" >&5 + echo "$as_me: error: You have to install pkg-config to compile OpenCV with GTK+" >&2;} + { (exit 1); exit 1; }; } diff --git a/graphics/opencv/patches/patch-ac b/graphics/opencv/patches/patch-ac new file mode 100644 index 00000000000..f41441c98a3 --- /dev/null +++ b/graphics/opencv/patches/patch-ac @@ -0,0 +1,15 @@ +$NetBSD: patch-ac,v 1.1 2006/11/19 23:13:42 rillig Exp $ + +Tags: upstream + +--- configure.in.orig 2006-11-19 23:04:12.000000000 +0100 ++++ configure.in 2006-11-19 23:04:17.000000000 +0100 +@@ -304,7 +304,7 @@ else + + # pkg-config is needed for GTK+ + AC_PATH_PROG(PKG_CONFIG, pkg-config, no) +- if test x"$PKG_CONFIG" == "xno"; then ++ if test x"$PKG_CONFIG" = "xno"; then + AC_MSG_ERROR([You have to install pkg-config to compile OpenCV with GTK+]) + fi + |