diff options
| author | markd <markd@pkgsrc.org> | 2009-11-03 19:02:26 +0000 |
|---|---|---|
| committer | markd <markd@pkgsrc.org> | 2009-11-03 19:02:26 +0000 |
| commit | 8ea70d1bbbf39354955ceeb4d04fe5a6091d68cd (patch) | |
| tree | 825ffe0454bae04c2be58120e0eb75461ced9969 | |
| parent | 5451150c50d6aaa9134c2858c715aab7e9b1f951 (diff) | |
| download | pkgsrc-8ea70d1bbbf39354955ceeb4d04fe5a6091d68cd.tar.gz | |
Allow python26
| -rw-r--r-- | misc/koffice/Makefile | 4 | ||||
| -rw-r--r-- | misc/koffice/distinfo | 4 | ||||
| -rw-r--r-- | misc/koffice/patches/patch-ab | 13 |
3 files changed, 16 insertions, 5 deletions
diff --git a/misc/koffice/Makefile b/misc/koffice/Makefile index 3d2b332f566..2bde6026d56 100644 --- a/misc/koffice/Makefile +++ b/misc/koffice/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.111 2009/09/07 19:02:14 joerg Exp $ +# $NetBSD: Makefile,v 1.112 2009/11/03 19:02:26 markd Exp $ DISTNAME= koffice-1.6.3 PKGREVISION= 12 @@ -26,7 +26,7 @@ USE_TOOLS+= gmake perl pkg-config GNU_CONFIGURE= yes GCC_REQD+= 2.95.3 -PYTHON_VERSIONS_ACCEPTED= 25 24 +PYTHON_VERSIONS_ACCEPTED= 26 25 24 PTHREAD_OPTS+= require diff --git a/misc/koffice/distinfo b/misc/koffice/distinfo index fea61aa7812..328dd95ca84 100644 --- a/misc/koffice/distinfo +++ b/misc/koffice/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.44 2008/05/06 23:50:42 markd Exp $ +$NetBSD: distinfo,v 1.45 2009/11/03 19:02:26 markd Exp $ SHA1 (koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff) = a3d1d85567ccf729a2237f4aa837f7e025ce00ae RMD160 (koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff) = ab6ec62b1ee7c369e8a6f44ba285a56b8c5439b4 @@ -9,7 +9,7 @@ Size (koffice-1.6.3.tar.bz2) = 56829391 bytes SHA1 (koffice-xpdf-CVE-2007-3387.diff) = bff4f540389a77320bc87e2dedece50b82932e59 RMD160 (koffice-xpdf-CVE-2007-3387.diff) = 7f620ec00ca05da91596f2d750d32ed8aa8bec95 Size (koffice-xpdf-CVE-2007-3387.diff) = 601 bytes -SHA1 (patch-ab) = f5a96b7271b854e28a144c861288eb5437f1cf73 +SHA1 (patch-ab) = b7cb13d120764011b3b1d32cdc1ec805ddac59d8 SHA1 (patch-af) = a79564e57f2ef8eb43e8c1e23bb6a8e3d2a1d110 SHA1 (patch-ag) = f0ad29395bbf52f70dd96f65c291fdb2ff0c6083 SHA1 (patch-ah) = 094eaa1ff9a5f38adc2bf2f74965b0e47ccd2843 diff --git a/misc/koffice/patches/patch-ab b/misc/koffice/patches/patch-ab index e247e802dca..4d52ff60cc3 100644 --- a/misc/koffice/patches/patch-ab +++ b/misc/koffice/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.8 2008/05/06 23:50:42 markd Exp $ +$NetBSD: patch-ab,v 1.9 2009/11/03 19:02:26 markd Exp $ --- configure.orig 2007-05-31 09:56:35.000000000 +1200 +++ configure @@ -39,3 +39,14 @@ $NetBSD: patch-ab,v 1.8 2008/05/06 23:50:42 markd Exp $ { echo "$as_me:$LINENO: checking for Python$version" >&5 echo $ECHO_N "checking for Python$version... $ECHO_C" >&6; } +@@ -51132,6 +51137,10 @@ else + version=""2.5"" + 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; } + |