Tue Nov 3 19:02:26 2009 UTC ()
Allow python26


(markd)
diff -r1.111 -r1.112 pkgsrc/misc/koffice/Makefile
diff -r1.44 -r1.45 pkgsrc/misc/koffice/distinfo
diff -r1.8 -r1.9 pkgsrc/misc/koffice/patches/patch-ab
cvs diff -r1.111 -r1.112 pkgsrc/misc/koffice/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/misc/koffice/Attic/Makefile 2009/09/07 19:02:14 1.111
+++ pkgsrc/misc/koffice/Attic/Makefile 2009/11/03 19:02:26 1.112
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.111 2009/09/07 19:02:14 joerg Exp $ 1# $NetBSD: Makefile,v 1.112 2009/11/03 19:02:26 markd Exp $
2 2
3DISTNAME= koffice-1.6.3 3DISTNAME= koffice-1.6.3
4PKGREVISION= 12 4PKGREVISION= 12
5CATEGORIES= misc kde 5CATEGORIES= misc kde
6MASTER_SITES= ${MASTER_SITE_KDE:=koffice-1.6.3/src/} 6MASTER_SITES= ${MASTER_SITE_KDE:=koffice-1.6.3/src/}
7EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
8 8
9MAINTAINER= markd@NetBSD.org 9MAINTAINER= markd@NetBSD.org
10HOMEPAGE= http://www.koffice.org/ 10HOMEPAGE= http://www.koffice.org/
11COMMENT= KDE Office Suite 11COMMENT= KDE Office Suite
12 12
13PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
14 14
@@ -16,27 +16,27 @@ PATCH_SITES= ftp://ftp.kde.org/pub/kde/s @@ -16,27 +16,27 @@ PATCH_SITES= ftp://ftp.kde.org/pub/kde/s
16PATCHFILES= koffice-xpdf-CVE-2007-3387.diff koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff 16PATCHFILES= koffice-xpdf-CVE-2007-3387.diff koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff
17 17
18CONFLICTS+= koffice3-[0-9]* 18CONFLICTS+= koffice3-[0-9]*
19 19
20# to unpack krita/plugins/convolutionfilters properly on NetBSD 1.6 20# to unpack krita/plugins/convolutionfilters properly on NetBSD 1.6
21## EXTRACT_USING= gtar 21## EXTRACT_USING= gtar
22 22
23USE_LANGUAGES= c c++ 23USE_LANGUAGES= c c++
24USE_LIBTOOL= yes 24USE_LIBTOOL= yes
25USE_TOOLS+= gmake perl pkg-config 25USE_TOOLS+= gmake perl pkg-config
26GNU_CONFIGURE= yes 26GNU_CONFIGURE= yes
27 27
28GCC_REQD+= 2.95.3 28GCC_REQD+= 2.95.3
29PYTHON_VERSIONS_ACCEPTED= 25 24 29PYTHON_VERSIONS_ACCEPTED= 26 25 24
30 30
31PTHREAD_OPTS+= require 31PTHREAD_OPTS+= require
32 32
33CONFIGURE_ENV+= PYTHONDIR=${LOCALBASE:Q} 33CONFIGURE_ENV+= PYTHONDIR=${LOCALBASE:Q}
34CONFIGURE_ENV+= PYVERSSUFFIX=${PYVERSSUFFIX:Q} 34CONFIGURE_ENV+= PYVERSSUFFIX=${PYVERSSUFFIX:Q}
35 35
36REPLACE_PERL+= lib/store/fix_storage.pl 36REPLACE_PERL+= lib/store/fix_storage.pl
37REPLACE_PERL+= admin/config.pl 37REPLACE_PERL+= admin/config.pl
38REPLACE_PERL+= admin/bcheck.pl 38REPLACE_PERL+= admin/bcheck.pl
39REPLACE_PERL+= admin/conf.change.pl 39REPLACE_PERL+= admin/conf.change.pl
40REPLACE_PERL+= kword/templates/make_template.pl 40REPLACE_PERL+= kword/templates/make_template.pl
41REPLACE_PERL+= tools/scripts/gdb_output_to_text.pl 41REPLACE_PERL+= tools/scripts/gdb_output_to_text.pl
42REPLACE_PERL+= tools/thesaurus/extract.pl 42REPLACE_PERL+= tools/thesaurus/extract.pl
cvs diff -r1.44 -r1.45 pkgsrc/misc/koffice/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/misc/koffice/Attic/distinfo 2008/05/06 23:50:42 1.44
+++ pkgsrc/misc/koffice/Attic/distinfo 2009/11/03 19:02:26 1.45
@@ -1,21 +1,21 @@ @@ -1,21 +1,21 @@
1$NetBSD: distinfo,v 1.44 2008/05/06 23:50:42 markd Exp $ 1$NetBSD: distinfo,v 1.45 2009/11/03 19:02:26 markd Exp $
2 2
3SHA1 (koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff) = a3d1d85567ccf729a2237f4aa837f7e025ce00ae 3SHA1 (koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff) = a3d1d85567ccf729a2237f4aa837f7e025ce00ae
4RMD160 (koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff) = ab6ec62b1ee7c369e8a6f44ba285a56b8c5439b4 4RMD160 (koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff) = ab6ec62b1ee7c369e8a6f44ba285a56b8c5439b4
5Size (koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff) = 15961 bytes 5Size (koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff) = 15961 bytes
6SHA1 (koffice-1.6.3.tar.bz2) = de84214dec913eac1d47dab04dd93f3d81729fd3 6SHA1 (koffice-1.6.3.tar.bz2) = de84214dec913eac1d47dab04dd93f3d81729fd3
7RMD160 (koffice-1.6.3.tar.bz2) = e474ba48fa983fafb61ad58fb79cddda69ec6908 7RMD160 (koffice-1.6.3.tar.bz2) = e474ba48fa983fafb61ad58fb79cddda69ec6908
8Size (koffice-1.6.3.tar.bz2) = 56829391 bytes 8Size (koffice-1.6.3.tar.bz2) = 56829391 bytes
9SHA1 (koffice-xpdf-CVE-2007-3387.diff) = bff4f540389a77320bc87e2dedece50b82932e59 9SHA1 (koffice-xpdf-CVE-2007-3387.diff) = bff4f540389a77320bc87e2dedece50b82932e59
10RMD160 (koffice-xpdf-CVE-2007-3387.diff) = 7f620ec00ca05da91596f2d750d32ed8aa8bec95 10RMD160 (koffice-xpdf-CVE-2007-3387.diff) = 7f620ec00ca05da91596f2d750d32ed8aa8bec95
11Size (koffice-xpdf-CVE-2007-3387.diff) = 601 bytes 11Size (koffice-xpdf-CVE-2007-3387.diff) = 601 bytes
12SHA1 (patch-ab) = f5a96b7271b854e28a144c861288eb5437f1cf73 12SHA1 (patch-ab) = b7cb13d120764011b3b1d32cdc1ec805ddac59d8
13SHA1 (patch-af) = a79564e57f2ef8eb43e8c1e23bb6a8e3d2a1d110 13SHA1 (patch-af) = a79564e57f2ef8eb43e8c1e23bb6a8e3d2a1d110
14SHA1 (patch-ag) = f0ad29395bbf52f70dd96f65c291fdb2ff0c6083 14SHA1 (patch-ag) = f0ad29395bbf52f70dd96f65c291fdb2ff0c6083
15SHA1 (patch-ah) = 094eaa1ff9a5f38adc2bf2f74965b0e47ccd2843 15SHA1 (patch-ah) = 094eaa1ff9a5f38adc2bf2f74965b0e47ccd2843
16SHA1 (patch-ai) = d12fa21d16a1bb11af9b35d65e5dfa9538a635b7 16SHA1 (patch-ai) = d12fa21d16a1bb11af9b35d65e5dfa9538a635b7
17SHA1 (patch-aj) = 2cbe0c00dbb0b3b52f15caaf5b925bc68e1f55b8 17SHA1 (patch-aj) = 2cbe0c00dbb0b3b52f15caaf5b925bc68e1f55b8
18SHA1 (patch-ak) = 5738bb6b043f8657c473c4d14e2c74d97d4974f8 18SHA1 (patch-ak) = 5738bb6b043f8657c473c4d14e2c74d97d4974f8
19SHA1 (patch-al) = 806334757d3ebca4515738e87454a30d9dd26e53 19SHA1 (patch-al) = 806334757d3ebca4515738e87454a30d9dd26e53
20SHA1 (patch-am) = 022be8c44e0eaa3cab3404da48a4259f1dc3499c 20SHA1 (patch-am) = 022be8c44e0eaa3cab3404da48a4259f1dc3499c
21SHA1 (patch-ao) = 7d976c4f3094635f984fc70964589a863e914be7 21SHA1 (patch-ao) = 7d976c4f3094635f984fc70964589a863e914be7
cvs diff -r1.8 -r1.9 pkgsrc/misc/koffice/patches/Attic/patch-ab (expand / switch to unified diff)

--- pkgsrc/misc/koffice/patches/Attic/patch-ab 2008/05/06 23:50:42 1.8
+++ pkgsrc/misc/koffice/patches/Attic/patch-ab 2009/11/03 19:02:26 1.9
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-ab,v 1.8 2008/05/06 23:50:42 markd Exp $ 1$NetBSD: patch-ab,v 1.9 2009/11/03 19:02:26 markd Exp $
2 2
3--- configure.orig 2007-05-31 09:56:35.000000000 +1200 3--- configure.orig 2007-05-31 09:56:35.000000000 +1200
4+++ configure 4+++ configure
5@@ -33848,6 +33848,7 @@ echo "${ECHO_T}$kde_cv_path" >&6; } 5@@ -33848,6 +33848,7 @@ echo "${ECHO_T}$kde_cv_path" >&6; }
6  6
7 fi 7 fi
8  8
9+GRAPHICS_MAGICK_CONFIG= 9+GRAPHICS_MAGICK_CONFIG=
10  10
11 if test -n "$GRAPHICS_MAGICK_CONFIG"; then 11 if test -n "$GRAPHICS_MAGICK_CONFIG"; then
12 vers=`$GRAPHICS_MAGICK_CONFIG --version 2>/dev/null | $AWK 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'` 12 vers=`$GRAPHICS_MAGICK_CONFIG --version 2>/dev/null | $AWK 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
13@@ -38534,7 +38535,7 @@ fi 13@@ -38534,7 +38535,7 @@ fi
14  14
@@ -29,13 +29,24 @@ $NetBSD: patch-ab,v 1.8 2008/05/06 23:50 @@ -29,13 +29,24 @@ $NetBSD: patch-ab,v 1.8 2008/05/06 23:50
29 cat >>confdefs.h <<\_ACEOF 29 cat >>confdefs.h <<\_ACEOF
30 #define KEXI_MACROS_SUPPORT 1 30 #define KEXI_MACROS_SUPPORT 1
31@@ -38928,6 +38929,10 @@ else 31@@ -38928,6 +38929,10 @@ else
32 version=""2.5"" 32 version=""2.5""
33 fi 33 fi
34  34
35+if test -n "${PYVERSSUFFIX}"; then 35+if test -n "${PYVERSSUFFIX}"; then
36+ version="${PYVERSSUFFIX}" 36+ version="${PYVERSSUFFIX}"
37+fi 37+fi
38+ 38+
39 { echo "$as_me:$LINENO: checking for Python$version" >&5 39 { echo "$as_me:$LINENO: checking for Python$version" >&5
40 echo $ECHO_N "checking for Python$version... $ECHO_C" >&6; } 40 echo $ECHO_N "checking for Python$version... $ECHO_C" >&6; }
41  41
 42@@ -51132,6 +51137,10 @@ else
 43 version=""2.5""
 44 fi
 45
 46+if test -n "${PYVERSSUFFIX}"; then
 47+ version="${PYVERSSUFFIX}"
 48+fi
 49+
 50 { echo "$as_me:$LINENO: checking for Python$version" >&5
 51 echo $ECHO_N "checking for Python$version... $ECHO_C" >&6; }
 52