[pkgsrc/trunk]: pkgsrc/misc/koffice Fix configure to find and use the python ...

[markd <markd%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/45934ff2c220
branches:  trunk
changeset: 468144:45934ff2c220
user:      markd <markd%pkgsrc.org@localhost>
date:      Tue Feb 10 21:06:33 2004 +0000

description:
Fix configure to find and use the python headers and libraries that belong
to the version of python that has been selected for use via pkgsrc.

Should fix PR pkg/24288

diffstat:

 misc/koffice/Makefile         |   3 ++-
 misc/koffice/distinfo         |   3 ++-
 misc/koffice/patches/patch-ab |  15 +++++++++++++++
 3 files changed, 19 insertions(+), 2 deletions(-)

diffs (47 lines):

diff -r 1c6385409aec -r 45934ff2c220 misc/koffice/Makefile
--- a/misc/koffice/Makefile     Tue Feb 10 20:58:04 2004 +0000
+++ b/misc/koffice/Makefile     Tue Feb 10 21:06:33 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2004/02/09 18:47:37 jmmv Exp $
+# $NetBSD: Makefile,v 1.37 2004/02/10 21:06:33 markd Exp $
 
 DISTNAME=      koffice-1.3
 PKGREVISION=   1
@@ -26,6 +26,7 @@
 
 PYTHON_VERSIONS_ACCEPTED=      23 23pth # needs shared library
 CONFIGURE_ENV+=                        PYTHONDIR="${LOCALBASE}"
+CONFIGURE_ENV+=                        PYVERSSUFFIX="${PYVERSSUFFIX}"
 
 REPLACE_PERL+=         lib/store/fix_storage.pl
 REPLACE_PERL+=         admin/config.pl
diff -r 1c6385409aec -r 45934ff2c220 misc/koffice/distinfo
--- a/misc/koffice/distinfo     Tue Feb 10 20:58:04 2004 +0000
+++ b/misc/koffice/distinfo     Tue Feb 10 21:06:33 2004 +0000
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.11 2004/01/28 08:43:11 markd Exp $
+$NetBSD: distinfo,v 1.12 2004/02/10 21:06:33 markd Exp $
 
 SHA1 (koffice-1.3.tar.bz2) = f9c6736e6409ff4be4bbfd5407a1dfee9adf6d1d
 Size (koffice-1.3.tar.bz2) = 10622005 bytes
 SHA1 (patch-aa) = 865725ae91baa89ea3a9e87613cc9837e1034ac7
+SHA1 (patch-ab) = 6f253484f6c09877cca6b1d1d7610725c895e13a
diff -r 1c6385409aec -r 45934ff2c220 misc/koffice/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/misc/koffice/patches/patch-ab     Tue Feb 10 21:06:33 2004 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-ab,v 1.6 2004/02/10 21:06:33 markd Exp $
+
+--- configure.orig     2004-01-21 08:11:50.000000000 +1300
++++ configure
+@@ -32275,6 +32275,10 @@ else
+   version=""2.3""
+ fi
+ 
++if test -n "${PYVERSSUFFIX}"; then
++  version="${PYVERSSUFFIX}"
++fi
++
+ echo "$as_me:$LINENO: checking for Python$version" >&5
+ echo $ECHO_N "checking for Python$version... $ECHO_C" >&6
+