diff options
| author | markd <markd@pkgsrc.org> | 2004-02-10 21:06:33 +0000 |
|---|---|---|
| committer | markd <markd@pkgsrc.org> | 2004-02-10 21:06:33 +0000 |
| commit | 31bd9d5abb67f91b375c40ac728b8d000f97a0eb (patch) | |
| tree | f7859768cdc913b303d7e3bd49e04ef54bdd0727 | |
| parent | 3ed46a38da09734155b9ab1fd147e376f6908672 (diff) | |
| download | pkgsrc-31bd9d5abb67f91b375c40ac728b8d000f97a0eb.tar.gz | |
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
| -rw-r--r-- | misc/koffice/Makefile | 3 | ||||
| -rw-r--r-- | misc/koffice/distinfo | 3 | ||||
| -rw-r--r-- | misc/koffice/patches/patch-ab | 15 |
3 files changed, 19 insertions, 2 deletions
diff --git a/misc/koffice/Makefile b/misc/koffice/Makefile index 80dc2a37883..f3603faf8b8 100644 --- a/misc/koffice/Makefile +++ b/misc/koffice/Makefile @@ -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 @@ PTHREAD_OPTS+= require 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 --git a/misc/koffice/distinfo b/misc/koffice/distinfo index 11523263274..330948a2df4 100644 --- a/misc/koffice/distinfo +++ b/misc/koffice/distinfo @@ -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 --git a/misc/koffice/patches/patch-ab b/misc/koffice/patches/patch-ab new file mode 100644 index 00000000000..d2e1c5d9746 --- /dev/null +++ b/misc/koffice/patches/patch-ab @@ -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 + |