diff options
| author | Michael Nottebrock <lofi@FreeBSD.org> | 2004-11-08 00:34:12 +0000 |
|---|---|---|
| committer | Michael Nottebrock <lofi@FreeBSD.org> | 2004-11-08 00:34:12 +0000 |
| commit | 14a1da27f45c47f56c03f100467c4145b22cc27f (patch) | |
| tree | 1672be7254edbd4e14c07966ad43adbe5529db3b /editors | |
| parent | 1bee8f44c60705f102471d2277b0c99dd759ea47 (diff) | |
Update to KDE 3.3.1
Notes
Notes:
svn path=/head/; revision=121092
Diffstat (limited to 'editors')
148 files changed, 563 insertions, 458 deletions
diff --git a/editors/calligra-l10n-ca/Makefile b/editors/calligra-l10n-ca/Makefile index b7f9274a2850..3f6797446a0c 100644 --- a/editors/calligra-l10n-ca/Makefile +++ b/editors/calligra-l10n-ca/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.3.2 +PORTVERSION= 1.3.4 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION:S/.0//}/src diff --git a/editors/calligra-l10n-ca/distinfo b/editors/calligra-l10n-ca/distinfo index 5ad9e463d212..55c50932feed 100644 --- a/editors/calligra-l10n-ca/distinfo +++ b/editors/calligra-l10n-ca/distinfo @@ -1,2 +1,2 @@ -MD5 (KDE/kde-i18n/koffice-i18n-ca-1.3.2.tar.bz2) = 64b81f2e77cecb2d1351a4b020bac9d9 -SIZE (KDE/kde-i18n/koffice-i18n-ca-1.3.2.tar.bz2) = 600798 +MD5 (KDE/kde-i18n/koffice-i18n-ca-1.3.4.tar.bz2) = 92f3c35950e45d3ba415e37d83d6b75f +SIZE (KDE/kde-i18n/koffice-i18n-ca-1.3.4.tar.bz2) = 579109 diff --git a/editors/calligra-l10n-ca/pkg-plist b/editors/calligra-l10n-ca/pkg-plist index 74bdc0cde688..b105c51256e3 100644 --- a/editors/calligra-l10n-ca/pkg-plist +++ b/editors/calligra-l10n-ca/pkg-plist @@ -5,11 +5,8 @@ share/locale/ca/LC_MESSAGES/example.mo share/locale/ca/LC_MESSAGES/karbon.mo share/locale/ca/LC_MESSAGES/karbonepsfilter.mo share/locale/ca/LC_MESSAGES/kchart.mo -share/locale/ca/LC_MESSAGES/kdgantt.mo -share/locale/ca/LC_MESSAGES/kexi.mo share/locale/ca/LC_MESSAGES/kfile_koffice.mo share/locale/ca/LC_MESSAGES/kfile_ooo.mo -share/locale/ca/LC_MESSAGES/kformdesigner.mo share/locale/ca/LC_MESSAGES/kformula.mo share/locale/ca/LC_MESSAGES/kformulalatexfilter.mo share/locale/ca/LC_MESSAGES/kformulamathmlfilter.mo @@ -19,10 +16,8 @@ share/locale/ca/LC_MESSAGES/koconverter.mo share/locale/ca/LC_MESSAGES/koffice.mo share/locale/ca/LC_MESSAGES/koshell.mo share/locale/ca/LC_MESSAGES/kounavail.mo -share/locale/ca/LC_MESSAGES/kplato.mo share/locale/ca/LC_MESSAGES/kpresenter.mo share/locale/ca/LC_MESSAGES/kpresenterkwordfilter.mo -share/locale/ca/LC_MESSAGES/krita.mo share/locale/ca/LC_MESSAGES/kscan_plugin.mo share/locale/ca/LC_MESSAGES/kspread.mo share/locale/ca/LC_MESSAGES/kspreadcalc_calc.mo diff --git a/editors/calligra-l10n-da/Makefile b/editors/calligra-l10n-da/Makefile index 389047ae8a70..223ec0908929 100644 --- a/editors/calligra-l10n-da/Makefile +++ b/editors/calligra-l10n-da/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.3.2 +PORTVERSION= 1.3.4 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION:S/.0//}/src diff --git a/editors/calligra-l10n-da/distinfo b/editors/calligra-l10n-da/distinfo index 685403c81d31..048958cf1418 100644 --- a/editors/calligra-l10n-da/distinfo +++ b/editors/calligra-l10n-da/distinfo @@ -1,2 +1,2 @@ -MD5 (KDE/kde-i18n/koffice-i18n-da-1.3.2.tar.bz2) = dec78da3da7685d5d2ffea73c68323ae -SIZE (KDE/kde-i18n/koffice-i18n-da-1.3.2.tar.bz2) = 1061611 +MD5 (KDE/kde-i18n/koffice-i18n-da-1.3.4.tar.bz2) = 380f08397afe19a9958539bb692ecb12 +SIZE (KDE/kde-i18n/koffice-i18n-da-1.3.4.tar.bz2) = 1084794 diff --git a/editors/calligra-l10n-el/Makefile b/editors/calligra-l10n-el/Makefile index 6c9f6f5775c5..88976eeab3db 100644 --- a/editors/calligra-l10n-el/Makefile +++ b/editors/calligra-l10n-el/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.3.2 +PORTVERSION= 1.3.4 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION:S/.0//}/src diff --git a/editors/calligra-l10n-el/distinfo b/editors/calligra-l10n-el/distinfo index 5a083782ffa5..a68be89bd51b 100644 --- a/editors/calligra-l10n-el/distinfo +++ b/editors/calligra-l10n-el/distinfo @@ -1,2 +1,2 @@ -MD5 (KDE/kde-i18n/koffice-i18n-el-1.3.2.tar.bz2) = 35d810ee4b2a432fee24c19c9e9fa997 -SIZE (KDE/kde-i18n/koffice-i18n-el-1.3.2.tar.bz2) = 524219 +MD5 (KDE/kde-i18n/koffice-i18n-el-1.3.4.tar.bz2) = 2553159c99293c505422db1b8543381a +SIZE (KDE/kde-i18n/koffice-i18n-el-1.3.4.tar.bz2) = 517034 diff --git a/editors/calligra-l10n-en_GB/Makefile b/editors/calligra-l10n-en_GB/Makefile index b40f86fb0cde..22e882e1a03a 100644 --- a/editors/calligra-l10n-en_GB/Makefile +++ b/editors/calligra-l10n-en_GB/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.3.2 +PORTVERSION= 1.3.4 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION:S/.0//}/src diff --git a/editors/calligra-l10n-en_GB/distinfo b/editors/calligra-l10n-en_GB/distinfo index d1b12acbde77..b5769de1b403 100644 --- a/editors/calligra-l10n-en_GB/distinfo +++ b/editors/calligra-l10n-en_GB/distinfo @@ -1,2 +1,2 @@ -MD5 (KDE/kde-i18n/koffice-i18n-en_GB-1.3.2.tar.bz2) = d482c100ebe5ff4fdd666d8968b36e54 -SIZE (KDE/kde-i18n/koffice-i18n-en_GB-1.3.2.tar.bz2) = 549415 +MD5 (KDE/kde-i18n/koffice-i18n-en_GB-1.3.4.tar.bz2) = b570ad31d8f714b94051594b6524809e +SIZE (KDE/kde-i18n/koffice-i18n-en_GB-1.3.4.tar.bz2) = 541033 diff --git a/editors/calligra-l10n-es/Makefile b/editors/calligra-l10n-es/Makefile index 2a8cc6487ad5..ab07b03c2b18 100644 --- a/editors/calligra-l10n-es/Makefile +++ b/editors/calligra-l10n-es/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.3.2 +PORTVERSION= 1.3.4 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION:S/.0//}/src diff --git a/editors/calligra-l10n-es/distinfo b/editors/calligra-l10n-es/distinfo index 217e0aa8da44..35b3766ea758 100644 --- a/editors/calligra-l10n-es/distinfo +++ b/editors/calligra-l10n-es/distinfo @@ -1,2 +1,2 @@ -MD5 (KDE/kde-i18n/koffice-i18n-es-1.3.2.tar.bz2) = a3b1067594093968644ddd22c9501120 -SIZE (KDE/kde-i18n/koffice-i18n-es-1.3.2.tar.bz2) = 1733975 +MD5 (KDE/kde-i18n/koffice-i18n-es-1.3.4.tar.bz2) = 1ea77f3630e893cb5a90e62ef1f46d3c +SIZE (KDE/kde-i18n/koffice-i18n-es-1.3.4.tar.bz2) = 1085846 diff --git a/editors/calligra-l10n-et/Makefile b/editors/calligra-l10n-et/Makefile index 9f71a3bc0a72..f24cc01a6116 100644 --- a/editors/calligra-l10n-et/Makefile +++ b/editors/calligra-l10n-et/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.3.2 +PORTVERSION= 1.3.4 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION:S/.0//}/src diff --git a/editors/calligra-l10n-et/distinfo b/editors/calligra-l10n-et/distinfo index 99bc8cdd58fb..ae8dad7135f6 100644 --- a/editors/calligra-l10n-et/distinfo +++ b/editors/calligra-l10n-et/distinfo @@ -1,2 +1,2 @@ -MD5 (KDE/kde-i18n/koffice-i18n-et-1.3.2.tar.bz2) = fefea899f957e8cfe2e9b2a46a7c8895 -SIZE (KDE/kde-i18n/koffice-i18n-et-1.3.2.tar.bz2) = 1184170 +MD5 (KDE/kde-i18n/koffice-i18n-et-1.3.4.tar.bz2) = bd92ef9522f9bdf7a3009a4c6cf4ddb2 +SIZE (KDE/kde-i18n/koffice-i18n-et-1.3.4.tar.bz2) = 1204587 diff --git a/editors/calligra-l10n-it/Makefile b/editors/calligra-l10n-it/Makefile index 65878060be43..6dfd703b6744 100644 --- a/editors/calligra-l10n-it/Makefile +++ b/editors/calligra-l10n-it/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.3.2 +PORTVERSION= 1.3.4 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION:S/.0//}/src diff --git a/editors/calligra-l10n-it/distinfo b/editors/calligra-l10n-it/distinfo index da18d3b8da25..eaa0c6f032e1 100644 --- a/editors/calligra-l10n-it/distinfo +++ b/editors/calligra-l10n-it/distinfo @@ -1,2 +1,2 @@ -MD5 (KDE/kde-i18n/koffice-i18n-it-1.3.2.tar.bz2) = 76b0983454ff1af4f116f25e1fdb26c1 -SIZE (KDE/kde-i18n/koffice-i18n-it-1.3.2.tar.bz2) = 1628461 +MD5 (KDE/kde-i18n/koffice-i18n-it-1.3.4.tar.bz2) = 87a62e8215f5d28964fa65b0d8ae3cec +SIZE (KDE/kde-i18n/koffice-i18n-it-1.3.4.tar.bz2) = 1381710 diff --git a/editors/calligra-l10n-it/pkg-plist b/editors/calligra-l10n-it/pkg-plist index 250b9416e3e4..1ed657477821 100644 --- a/editors/calligra-l10n-it/pkg-plist +++ b/editors/calligra-l10n-it/pkg-plist @@ -5,7 +5,10 @@ share/doc/HTML/it/kchart/index.docbook share/doc/HTML/it/kformula/common share/doc/HTML/it/kformula/index.cache.bz2 share/doc/HTML/it/kformula/index.docbook +share/doc/HTML/it/kivio/common share/doc/HTML/it/kivio/credits.docbook +share/doc/HTML/it/kivio/index.cache.bz2 +share/doc/HTML/it/kivio/index.docbook share/doc/HTML/it/kivio/introduction.docbook share/doc/HTML/it/kivio/usage.docbook share/doc/HTML/it/kivio/working.docbook @@ -100,7 +103,6 @@ share/locale/it/LC_MESSAGES/kwordasciifilter.mo share/locale/it/LC_MESSAGES/kwordhtmlexportfilter.mo share/locale/it/LC_MESSAGES/kwordhtmlimportfilter.mo share/locale/it/LC_MESSAGES/kwordlatexexportfilter.mo -share/locale/it/LC_MESSAGES/kwordlatexfilter.mo share/locale/it/LC_MESSAGES/kwordlateximportfilter.mo share/locale/it/LC_MESSAGES/kwordmswordfilter.mo share/locale/it/LC_MESSAGES/kwordmswritefilter.mo diff --git a/editors/calligra-l10n-nb/Makefile b/editors/calligra-l10n-nb/Makefile index dd497a5c2498..eeb628c86f24 100644 --- a/editors/calligra-l10n-nb/Makefile +++ b/editors/calligra-l10n-nb/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.3.2 +PORTVERSION= 1.3.4 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION:S/.0//}/src diff --git a/editors/calligra-l10n-nb/distinfo b/editors/calligra-l10n-nb/distinfo index 2c94ad8673ad..43728c25e137 100644 --- a/editors/calligra-l10n-nb/distinfo +++ b/editors/calligra-l10n-nb/distinfo @@ -1,2 +1,2 @@ -MD5 (KDE/kde-i18n/koffice-i18n-nb-1.3.2.tar.bz2) = 152cd5f93bfbc48fa1a5ba773e6b346a -SIZE (KDE/kde-i18n/koffice-i18n-nb-1.3.2.tar.bz2) = 619257 +MD5 (KDE/kde-i18n/koffice-i18n-nb-1.3.4.tar.bz2) = e62a2c0ee5fbce326dce566b37c03380 +SIZE (KDE/kde-i18n/koffice-i18n-nb-1.3.4.tar.bz2) = 652286 diff --git a/editors/calligra-l10n-nb/pkg-plist b/editors/calligra-l10n-nb/pkg-plist index 506fa2835366..b447971fba29 100644 --- a/editors/calligra-l10n-nb/pkg-plist +++ b/editors/calligra-l10n-nb/pkg-plist @@ -49,5 +49,3 @@ share/locale/nb/LC_MESSAGES/olefilterswinword97filter.mo share/locale/nb/LC_MESSAGES/thesaurus_tool.mo share/locale/nb/LC_MESSAGES/xsltexportfilter.mo share/locale/nb/LC_MESSAGES/xsltimportfilter.mo -@dirrm share/locale/nb/LC_MESSAGES -@dirrm share/locale/nb diff --git a/editors/calligra-l10n-nl/Makefile b/editors/calligra-l10n-nl/Makefile index 73cb198b0ba6..cade5a846370 100644 --- a/editors/calligra-l10n-nl/Makefile +++ b/editors/calligra-l10n-nl/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.3.2 +PORTVERSION= 1.3.4 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION:S/.0//}/src diff --git a/editors/calligra-l10n-nl/distinfo b/editors/calligra-l10n-nl/distinfo index 25ecb8825ada..bb70b8af9559 100644 --- a/editors/calligra-l10n-nl/distinfo +++ b/editors/calligra-l10n-nl/distinfo @@ -1,2 +1,2 @@ -MD5 (KDE/kde-i18n/koffice-i18n-nl-1.3.2.tar.bz2) = d40a5d78ddead57fe8a5806499db83eb -SIZE (KDE/kde-i18n/koffice-i18n-nl-1.3.2.tar.bz2) = 618585 +MD5 (KDE/kde-i18n/koffice-i18n-nl-1.3.4.tar.bz2) = 783fd4e43104aac9244befc6aebe9712 +SIZE (KDE/kde-i18n/koffice-i18n-nl-1.3.4.tar.bz2) = 613058 diff --git a/editors/calligra-l10n-sv/Makefile b/editors/calligra-l10n-sv/Makefile index 9e0286b8c377..2121f5edbf55 100644 --- a/editors/calligra-l10n-sv/Makefile +++ b/editors/calligra-l10n-sv/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.3.2 +PORTVERSION= 1.3.4 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION:S/.0//}/src diff --git a/editors/calligra-l10n-sv/distinfo b/editors/calligra-l10n-sv/distinfo index 0ef1592d4f85..8f80664c5ce5 100644 --- a/editors/calligra-l10n-sv/distinfo +++ b/editors/calligra-l10n-sv/distinfo @@ -1,2 +1,2 @@ -MD5 (KDE/kde-i18n/koffice-i18n-sv-1.3.2.tar.bz2) = f5431d336eca9b5baff397eb18736a22 -SIZE (KDE/kde-i18n/koffice-i18n-sv-1.3.2.tar.bz2) = 4185172 +MD5 (KDE/kde-i18n/koffice-i18n-sv-1.3.4.tar.bz2) = 759a81ab33b5bc99c8816446df8720c7 +SIZE (KDE/kde-i18n/koffice-i18n-sv-1.3.4.tar.bz2) = 4160432 diff --git a/editors/calligra-l10n-sv/pkg-plist b/editors/calligra-l10n-sv/pkg-plist index d9cacf5c0378..12dee2273a0a 100644 --- a/editors/calligra-l10n-sv/pkg-plist +++ b/editors/calligra-l10n-sv/pkg-plist @@ -322,11 +322,8 @@ share/locale/sv/LC_MESSAGES/example.mo share/locale/sv/LC_MESSAGES/karbon.mo share/locale/sv/LC_MESSAGES/karbonepsfilter.mo share/locale/sv/LC_MESSAGES/kchart.mo -share/locale/sv/LC_MESSAGES/kdgantt.mo -share/locale/sv/LC_MESSAGES/kexi.mo share/locale/sv/LC_MESSAGES/kfile_koffice.mo share/locale/sv/LC_MESSAGES/kfile_ooo.mo -share/locale/sv/LC_MESSAGES/kformdesigner.mo share/locale/sv/LC_MESSAGES/kformula.mo share/locale/sv/LC_MESSAGES/kformulalatexfilter.mo share/locale/sv/LC_MESSAGES/kformulamathmlfilter.mo @@ -336,10 +333,8 @@ share/locale/sv/LC_MESSAGES/koconverter.mo share/locale/sv/LC_MESSAGES/koffice.mo share/locale/sv/LC_MESSAGES/koshell.mo share/locale/sv/LC_MESSAGES/kounavail.mo -share/locale/sv/LC_MESSAGES/kplato.mo share/locale/sv/LC_MESSAGES/kpresenter.mo share/locale/sv/LC_MESSAGES/kpresenterkwordfilter.mo -share/locale/sv/LC_MESSAGES/krita.mo share/locale/sv/LC_MESSAGES/kscan_plugin.mo share/locale/sv/LC_MESSAGES/kspread.mo share/locale/sv/LC_MESSAGES/kspreadcalc_calc.mo @@ -356,7 +351,6 @@ share/locale/sv/LC_MESSAGES/kwordasciifilter.mo share/locale/sv/LC_MESSAGES/kwordhtmlexportfilter.mo share/locale/sv/LC_MESSAGES/kwordhtmlimportfilter.mo share/locale/sv/LC_MESSAGES/kwordlatexexportfilter.mo -share/locale/sv/LC_MESSAGES/kwordlatexfilter.mo share/locale/sv/LC_MESSAGES/kwordlateximportfilter.mo share/locale/sv/LC_MESSAGES/kwordmswordfilter.mo share/locale/sv/LC_MESSAGES/kwordmswritefilter.mo diff --git a/editors/calligra-l10n/Makefile b/editors/calligra-l10n/Makefile index 94ddc075555a..6edeb8f7852e 100644 --- a/editors/calligra-l10n/Makefile +++ b/editors/calligra-l10n/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.3.2 +PORTVERSION= 1.3.4 CATEGORIES= misc kde MASTER_SITES= # none DISTFILES= # none @@ -29,7 +29,7 @@ RUN_DEPENDS+=\ ${LOCALBASE}/share/locale/uk/LC_MESSAGES/kword.mo:${PORTSDIR}/ukrainian/koffice-i18n\ ${LOCALBASE}/share/locale/zh_TW/LC_MESSAGES/kword.mo:${PORTSDIR}/chinese/koffice-i18n-zh_TW -.for LANG in af bg bs ca cs da el en_GB eo es et fa fi it \ +.for LANG in af bg bs ca cs da el en_GB eo es et fa fi hsb it \ lo lt lv mt nb nl nn se sk sl sr sv tg th tr ven xh zu RUN_DEPENDS+=\ ${LOCALBASE}/share/locale/${LANG}/LC_MESSAGES/kword.mo:${PORTSDIR}/misc/koffice-i18n-${LANG} diff --git a/editors/calligra/Makefile b/editors/calligra/Makefile index 32351cfe58f7..eb58f1bcf16c 100644 --- a/editors/calligra/Makefile +++ b/editors/calligra/Makefile @@ -7,8 +7,7 @@ # PORTNAME= koffice -PORTVERSION= 1.3.2 -PORTREVISION= 1 +PORTVERSION= 1.3.4 PORTEPOCH= 1 CATEGORIES= editors kde MASTER_SITES= ${MASTER_SITE_KDE} @@ -38,7 +37,7 @@ USE_GMAKE= yes USE_ICONV= yes USE_PYTHON= yes GNU_CONFIGURE= yes -_NO_KDE_CLOSURE= yes +_NO_KDE_FIXPTHREAD= yes INSTALLS_SHLIB= yes LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3 diff --git a/editors/calligra/distinfo b/editors/calligra/distinfo index 820fe1879077..9ac09634c272 100644 --- a/editors/calligra/distinfo +++ b/editors/calligra/distinfo @@ -1,2 +1,2 @@ -MD5 (KDE/koffice/koffice-1.3.2.tar.bz2) = 078a371f6768bea53b84ea342ac0b34b -SIZE (KDE/koffice/koffice-1.3.2.tar.bz2) = 10736662 +MD5 (KDE/koffice/koffice-1.3.4.tar.bz2) = 79896426542b0cf07e2e15f84946905a +SIZE (KDE/koffice/koffice-1.3.4.tar.bz2) = 10765924 diff --git a/editors/calligra/files/patch-configure b/editors/calligra/files/patch-configure new file mode 100644 index 000000000000..5147ed156f26 --- /dev/null +++ b/editors/calligra/files/patch-configure @@ -0,0 +1,11 @@ +--- configure.orig Sat Oct 30 03:46:09 2004 ++++ configure Sat Oct 30 03:46:54 2004 +@@ -26335,7 +26335,7 @@ + PTHREAD_LIBS="$PTHREAD_LIBS_save" + fi + +- if test -z "$LIBPTHREAD"; then ++ if test -z "$LIBPTHREAD" && test "$PTHREAD_LIBS" != "-pthread" ; then + echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5 + echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6 + if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then diff --git a/editors/calligra/files/patch-filters_kword_pdf_xpdf_xpdf_Catalog.cc b/editors/calligra/files/patch-filters_kword_pdf_xpdf_xpdf_Catalog.cc deleted file mode 100644 index 1e54fc9cb30e..000000000000 --- a/editors/calligra/files/patch-filters_kword_pdf_xpdf_xpdf_Catalog.cc +++ /dev/null @@ -1,27 +0,0 @@ ---- filters/kword/pdf/xpdf/xpdf/Catalog.cc.orig 2004-10-18 16:26:39.388666476 +0200 -+++ filters/kword/pdf/xpdf/xpdf/Catalog.cc 2004-10-18 16:27:28.004749073 +0200 -@@ -62,6 +62,12 @@ - } - pagesSize = numPages0 = obj.getInt(); - obj.free(); -+ if (pagesSize*sizeof(Page *)/sizeof(Page *) != pagesSize || -+ pagesSize*sizeof(Ref)/sizeof(Ref) != pagesSize) { -+ error(-1, "Invalid 'pagesSize'"); -+ ok = gFalse; -+ return; -+ } - pages = (Page **)gmalloc(pagesSize * sizeof(Page *)); - pageRefs = (Ref *)gmalloc(pagesSize * sizeof(Ref)); - for (i = 0; i < pagesSize; ++i) { -@@ -186,6 +192,11 @@ - } - if (start >= pagesSize) { - pagesSize += 32; -+ if (pagesSize*sizeof(Page *)/sizeof(Page *) != pagesSize || -+ pagesSize*sizeof(Ref)/sizeof(Ref) != pagesSize) { -+ error(-1, "Invalid 'pagesSize' parameter."); -+ goto err3; -+ } - pages = (Page **)grealloc(pages, pagesSize * sizeof(Page *)); - pageRefs = (Ref *)grealloc(pageRefs, pagesSize * sizeof(Ref)); - for (j = pagesSize - 32; j < pagesSize; ++j) { diff --git a/editors/calligra/files/patch-filters_kword_pdf_xpdf_xpdf_XRef.cc b/editors/calligra/files/patch-filters_kword_pdf_xpdf_xpdf_XRef.cc deleted file mode 100644 index 935e7b56c6e6..000000000000 --- a/editors/calligra/files/patch-filters_kword_pdf_xpdf_xpdf_XRef.cc +++ /dev/null @@ -1,49 +0,0 @@ ---- filters/kword/pdf/xpdf/xpdf/XRef.cc.orig 2004-09-17 23:54:38.000000000 -0700 -+++ filters/kword/pdf/xpdf/xpdf/XRef.cc 2004-09-25 17:59:36.000000000 -0700 -@@ -76,6 +76,12 @@ - - // trailer is ok - read the xref table - } else { -+ if (size*sizeof(XRefEntry)/sizeof(XRefEntry) != size) { -+ error(-1, "Invalid 'size' inside xref table."); -+ ok = gFalse; -+ errCode = errDamaged; -+ return; -+ } - entries = (XRefEntry *)gmalloc(size * sizeof(XRefEntry)); - for (i = 0; i < size; ++i) { - entries[i].offset = 0xffffffff; -@@ -267,6 +273,10 @@ - // table size - if (first + n > size) { - newSize = size + 256; -+ if (newSize*sizeof(XRefEntry)/sizeof(XRefEntry) != newSize) { -+ error(-1, "Invalid 'newSize'"); -+ goto err2; -+ } - entries = (XRefEntry *)grealloc(entries, newSize * sizeof(XRefEntry)); - for (i = size; i < newSize; ++i) { - entries[i].offset = 0xffffffff; -@@ -410,6 +420,10 @@ - if (!strncmp(p, "obj", 3)) { - if (num >= size) { - newSize = (num + 1 + 255) & ~255; -+ if (newSize*sizeof(XRefEntry)/sizeof(XRefEntry) != newSize) { -+ error(-1, "Invalid 'obj' parameters."); -+ return gFalse; -+ } - entries = (XRefEntry *) - grealloc(entries, newSize * sizeof(XRefEntry)); - for (i = size; i < newSize; ++i) { -@@ -431,6 +445,11 @@ - } else if (!strncmp(p, "endstream", 9)) { - if (streamEndsLen == streamEndsSize) { - streamEndsSize += 64; -+ if (streamEndsSize*sizeof(int)/sizeof(int) != streamEndsSize) { -+ error(-1, "Invalid 'endstream' parameter."); -+ return gFalse; -+ } -+ - streamEnds = (Guint *)grealloc(streamEnds, - streamEndsSize * sizeof(int)); - } diff --git a/editors/calligra/files/patch-koffice_1_3_4_xpdf_security_integer_overflow b/editors/calligra/files/patch-koffice_1_3_4_xpdf_security_integer_overflow new file mode 100644 index 000000000000..449806bd4fdb --- /dev/null +++ b/editors/calligra/files/patch-koffice_1_3_4_xpdf_security_integer_overflow @@ -0,0 +1,90 @@ +Index: Catalog.cc +=================================================================== +RCS file: /home/kde/koffice/filters/kword/pdf/xpdf/xpdf/Catalog.cc,v +retrieving revision 1.1.2.1 +retrieving revision 1.1.2.4 +diff -u -p -r1.1.2.1 -r1.1.2.4 +--- filters/kword/pdf/xpdf/xpdf/Catalog.cc 22 Oct 2004 12:13:56 -0000 1.1.2.1 ++++ filters/kword/pdf/xpdf/xpdf/Catalog.cc 30 Oct 2004 16:43:47 -0000 1.1.2.4 +@@ -12,6 +12,7 @@ + #pragma implementation + #endif + ++#include <limits.h> + #include <stddef.h> + #include "gmem.h" + #include "Object.h" +@@ -63,8 +64,8 @@ Catalog::Catalog(XRef *xrefA) { + } + pagesSize = numPages0 = obj.getInt(); + obj.free(); +- if (pagesSize*sizeof(Page *)/sizeof(Page *) != pagesSize || +- pagesSize*sizeof(Ref)/sizeof(Ref) != pagesSize) { ++ if ((unsigned) pagesSize >= INT_MAX / sizeof(Page *) || ++ (unsigned) pagesSize >= INT_MAX / sizeof(Ref)) { + error(-1, "Invalid 'pagesSize'"); + ok = gFalse; + return; +@@ -196,8 +197,8 @@ int Catalog::readPageTree(Dict *pagesDic + } + if (start >= pagesSize) { + pagesSize += 32; +- if (pagesSize*sizeof(Page *)/sizeof(Page *) != pagesSize || +- pagesSize*sizeof(Ref)/sizeof(Ref) != pagesSize) { ++ if ((unsigned) pagesSize >= INT_MAX / sizeof(Page *) || ++ (unsigned) pagesSize >= INT_MAX / sizeof(Ref)) { + error(-1, "Invalid 'pagesSize' parameter."); + goto err3; + } +Index: XRef.cc +=================================================================== +RCS file: /home/kde/koffice/filters/kword/pdf/xpdf/xpdf/XRef.cc,v +retrieving revision 1.1.2.1 +retrieving revision 1.1.2.4 +diff -u -p -r1.1.2.1 -r1.1.2.4 +--- filters/kword/pdf/xpdf/xpdf/XRef.cc 22 Oct 2004 12:13:56 -0000 1.1.2.1 ++++ filters/kword/pdf/xpdf/xpdf/XRef.cc 30 Oct 2004 16:43:47 -0000 1.1.2.4 +@@ -12,6 +12,7 @@ + #pragma implementation + #endif + ++#include <limits.h> + #include <stdlib.h> + #include <stddef.h> + #include <string.h> +@@ -76,7 +77,7 @@ XRef::XRef(BaseStream *strA, GString *ow + + // trailer is ok - read the xref table + } else { +- if (size*sizeof(XRefEntry)/sizeof(XRefEntry) != size) { ++ if ((unsigned) size >= INT_MAX / sizeof(XRefEntry)) { + error(-1, "Invalid 'size' inside xref table."); + ok = gFalse; + errCode = errDamaged; +@@ -273,7 +274,7 @@ GBool XRef::readXRef(Guint *pos) { + // table size + if (first + n > size) { + newSize = size + 256; +- if (newSize*sizeof(XRefEntry)/sizeof(XRefEntry) != newSize) { ++ if ((unsigned) newSize >= INT_MAX / sizeof(XRefEntry)) { + error(-1, "Invalid 'newSize'"); + goto err2; + } +@@ -420,7 +421,7 @@ GBool XRef::constructXRef() { + if (!strncmp(p, "obj", 3)) { + if (num >= size) { + newSize = (num + 1 + 255) & ~255; +- if (newSize*sizeof(XRefEntry)/sizeof(XRefEntry) != newSize) { ++ if ((unsigned) newSize >= INT_MAX / sizeof(XRefEntry)) { + error(-1, "Invalid 'obj' parameters."); + return gFalse; + } +@@ -445,7 +446,7 @@ GBool XRef::constructXRef() { + } else if (!strncmp(p, "endstream", 9)) { + if (streamEndsLen == streamEndsSize) { + streamEndsSize += 64; +- if (streamEndsSize*sizeof(int)/sizeof(int) != streamEndsSize) { ++ if ((unsigned) streamEndsSize >= INT_MAX / sizeof(int)) { + error(-1, "Invalid 'endstream' parameter."); + return gFalse; + } diff --git a/editors/calligra/pkg-plist b/editors/calligra/pkg-plist index fef180be29a4..695143c3b098 100644 --- a/editors/calligra/pkg-plist +++ b/editors/calligra/pkg-plist @@ -1902,6 +1902,14 @@ share/apps/koffice/pics/koPortrait.png share/apps/koffice/pics/koRulerFirst.png share/apps/koffice/pics/koRulerLeft.png share/apps/koffice/pics/koffice-logo.png +share/apps/konqueror/servicemenus/karbon_konqi.desktop +share/apps/konqueror/servicemenus/kexi_konqi.desktop +share/apps/konqueror/servicemenus/kformula_konqi.desktop +share/apps/konqueror/servicemenus/kivio_konqi.desktop +share/apps/konqueror/servicemenus/kpresenter_konqi.desktop +share/apps/konqueror/servicemenus/krita_konqi.desktop +share/apps/konqueror/servicemenus/kspread_konqi.desktop +share/apps/konqueror/servicemenus/kword_konqi.desktop share/apps/koshell/koshellui.rc share/apps/kpresenter/autoforms/.autoforms share/apps/kpresenter/autoforms/Arrows/.directory @@ -3094,10 +3102,7 @@ share/templates/TextDocument.desktop @dirrm share/icons/locolor/16x16/apps @dirrm share/icons/locolor/16x16 @dirrm share/icons/locolor -@dirrm share/icons/crystalsvg/48x48/apps -@dirrm share/icons/crystalsvg/32x32/apps @dirrm share/icons/crystalsvg/22x22/apps -@dirrm share/icons/crystalsvg/16x16/apps @dirrm share/doc/HTML/en/thesaurus @dirrm share/doc/HTML/en/kword @dirrm share/doc/HTML/en/kugar @@ -3203,6 +3208,8 @@ share/templates/TextDocument.desktop @dirrm share/apps/kpresenter/autoforms @dirrm share/apps/kpresenter @dirrm share/apps/koshell +@dirrm share/apps/konqueror/servicemenus +@dirrm share/apps/konqueror @dirrm share/apps/koffice/pics @dirrm share/apps/koffice/icons/crystalsvg/48x48/apps @dirrm share/apps/koffice/icons/crystalsvg/48x48 diff --git a/editors/kate-plugins/distinfo b/editors/kate-plugins/distinfo index 070945a1593c..ddf6c6fbdb7b 100644 --- a/editors/kate-plugins/distinfo +++ b/editors/kate-plugins/distinfo @@ -1,2 +1,2 @@ -MD5 (KDE/kdeaddons-3.3.0.tar.bz2) = 6ba019d8b3ce0811ae2c861d6819aaab -SIZE (KDE/kdeaddons-3.3.0.tar.bz2) = 1554404 +MD5 (KDE/kdeaddons-3.3.1.tar.bz2) = 69ec1deff7ae2d0c3602bb141ed4c546 +SIZE (KDE/kdeaddons-3.3.1.tar.bz2) = 1556965 diff --git a/editors/kate-plugins/pkg-plist b/editors/kate-plugins/pkg-plist index 521effb4df0f..a41eba84773d 100644 --- a/editors/kate-plugins/pkg-plist +++ b/editors/kate-plugins/pkg-plist @@ -20,7 +20,7 @@ lib/kde3/katexmltoolsplugin.la lib/kde3/katexmltoolsplugin.so lib/kde3/libkatetabbarextensionplugin.la lib/kde3/libkatetabbarextensionplugin.so -share/applications/kdeaddons-kate-plugins-3.3.0 +share/applications/kdeaddons-kate-plugins-3.3.1 share/applnk/.hidden/katefll.desktop share/apps/kate/plugins/katecppsymbolviewer/ui.rc share/apps/kate/plugins/katefll/ui.rc diff --git a/editors/koffice-i18n-af/Makefile b/editors/koffice-i18n-af/Makefile index a23f868edee4..dd67531e9587 100644 --- a/editors/koffice-i18n-af/Makefile +++ b/editors/koffice-i18n-af/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.3.2 +PORTVERSION= 1.3.4 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION:S/.0//}/src diff --git a/editors/koffice-i18n-af/distinfo b/editors/koffice-i18n-af/distinfo index 537d2664b35b..dfdfd4b770cd 100644 --- a/editors/koffice-i18n-af/distinfo +++ b/editors/koffice-i18n-af/distinfo @@ -1,2 +1,2 @@ -MD5 (KDE/kde-i18n/koffice-i18n-af-1.3.2.tar.bz2) = 1c6c45574d4967f61622eee62c670505 -SIZE (KDE/kde-i18n/koffice-i18n-af-1.3.2.tar.bz2) = 529977 +MD5 (KDE/kde-i18n/koffice-i18n-af-1.3.4.tar.bz2) = e1a518fe565c146abe0fc745dc2881a3 +SIZE (KDE/kde-i18n/koffice-i18n-af-1.3.4.tar.bz2) = 534319 diff --git a/editors/koffice-i18n-bg/Makefile b/editors/koffice-i18n-bg/Makefile index 1b8edcd69157..ae3c35b9a60b 100644 --- a/editors/koffice-i18n-bg/Makefile +++ b/editors/koffice-i18n-bg/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.3.2 +PORTVERSION= 1.3.4 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION:S/.0//}/src diff --git a/editors/koffice-i18n-bg/distinfo b/editors/koffice-i18n-bg/distinfo index c72067555c30..7eb0112f54bd 100644 --- a/editors/koffice-i18n-bg/distinfo +++ b/editors/koffice-i18n-bg/distinfo @@ -1,2 +1,2 @@ -MD5 (KDE/kde-i18n/koffice-i18n-bg-1.3.2.tar.bz2) = 274f1bad8e264499395ba1e141b7d08e -SIZE (KDE/kde-i18n/koffice-i18n-bg-1.3.2.tar.bz2) = 536504 +MD5 (KDE/kde-i18n/koffice-i18n-bg-1.3.4.tar.bz2) = 61987311c452f419e1c0bd952381154a +SIZE (KDE/kde-i18n/koffice-i18n-bg-1.3.4.tar.bz2) = 526966 diff --git a/editors/koffice-i18n-bs/distinfo b/editors/koffice-i18n-bs/distinfo index e69de29bb2d1..67b365d2fb37 100644 --- a/editors/koffice-i18n-bs/distinfo +++ b/editors/koffice-i18n-bs/distinfo @@ -0,0 +1,2 @@ +MD5 (KDE/kde-i18n/koffice-i18n-bs-1.2.1.tar.bz2) = fe642085ab01f4b5d22dfa08c9085d72 +SIZE (KDE/kde-i18n/koffice-i18n-bs-1.2.1.tar.bz2) = 415750 diff --git a/editors/koffice-i18n-ca/Makefile b/editors/koffice-i18n-ca/Makefile index b7f9274a2850..3f6797446a0c 100644 --- a/editors/koffice-i18n-ca/Makefile +++ b/editors/koffice-i18n-ca/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.3.2 +PORTVERSION= 1.3.4 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION:S/.0//}/src diff --git a/editors/koffice-i18n-ca/distinfo b/editors/koffice-i18n-ca/distinfo index 5ad9e463d212..55c50932feed 100644 --- a/editors/koffice-i18n-ca/distinfo +++ b/editors/koffice-i18n-ca/distinfo @@ -1,2 +1,2 @@ -MD5 (KDE/kde-i18n/koffice-i18n-ca-1.3.2.tar.bz2) = 64b81f2e77cecb2d1351a4b020bac9d9 -SIZE (KDE/kde-i18n/koffice-i18n-ca-1.3.2.tar.bz2) = 600798 +MD5 (KDE/kde-i18n/koffice-i18n-ca-1.3.4.tar.bz2) = 92f3c35950e45d3ba415e37d83d6b75f +SIZE (KDE/kde-i18n/koffice-i18n-ca-1.3.4.tar.bz2) = 579109 diff --git a/editors/koffice-i18n-ca/pkg-plist b/editors/koffice-i18n-ca/pkg-plist index 74bdc0cde688..b105c51256e3 100644 --- a/editors/koffice-i18n-ca/pkg-plist +++ b/editors/koffice-i18n-ca/pkg-plist @@ -5,11 +5,8 @@ share/locale/ca/LC_MESSAGES/example.mo share/locale/ca/LC_MESSAGES/karbon.mo share/locale/ca/LC_MESSAGES/karbonepsfilter.mo share/locale/ca/LC_MESSAGES/kchart.mo -share/locale/ca/LC_MESSAGES/kdgantt.mo -share/locale/ca/LC_MESSAGES/kexi.mo share/locale/ca/LC_MESSAGES/kfile_koffice.mo share/locale/ca/LC_MESSAGES/kfile_ooo.mo -share/locale/ca/LC_MESSAGES/kformdesigner.mo share/locale/ca/LC_MESSAGES/kformula.mo share/locale/ca/LC_MESSAGES/kformulalatexfilter.mo share/locale/ca/LC_MESSAGES/kformulamathmlfilter.mo @@ -19,10 +16,8 @@ share/locale/ca/LC_MESSAGES/koconverter.mo share/locale/ca/LC_MESSAGES/koffice.mo share/locale/ca/LC_MESSAGES/koshell.mo share/locale/ca/LC_MESSAGES/kounavail.mo -share/locale/ca/LC_MESSAGES/kplato.mo share/locale/ca/LC_MESSAGES/kpresenter.mo share/locale/ca/LC_MESSAGES/kpresenterkwordfilter.mo -share/locale/ca/LC_MESSAGES/krita.mo share/locale/ca/LC_MESSAGES/kscan_plugin.mo share/locale/ca/LC_MESSAGES/kspread.mo share/locale/ca/LC_MESSAGES/kspreadcalc_calc.mo diff --git a/editors/koffice-i18n-cs/Makefile b/editors/koffice-i18n-cs/Makefile index 9e2b83e20576..5d43007a90df 100644 --- a/editors/koffice-i18n-cs/Makefile +++ b/editors/koffice-i18n-cs/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.3.2 +PORTVERSION= 1.3.4 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION:S/.0//}/src diff --git a/editors/koffice-i18n-cs/distinfo b/editors/koffice-i18n-cs/distinfo index 08cc48b097e7..5fe96ed912cf 100644 --- a/editors/koffice-i18n-cs/distinfo +++ b/editors/koffice-i18n-cs/distinfo @@ -1,2 +1,2 @@ -MD5 (KDE/kde-i18n/koffice-i18n-cs-1.3.2.tar.bz2) = f4757ee4fc27284de38df5fddc1955d5 -SIZE (KDE/kde-i18n/koffice-i18n-cs-1.3.2.tar.bz2) = 584596 +MD5 (KDE/kde-i18n/koffice-i18n-cs-1.3.4.tar.bz2) = 3dcba3c06d3c5a9708065f6083921670 +SIZE (KDE/kde-i18n/koffice-i18n-cs-1.3.4.tar.bz2) = 578438 diff --git a/editors/koffice-i18n-da/Makefile b/editors/koffice-i18n-da/Makefile index 389047ae8a70..223ec0908929 100644 --- a/editors/koffice-i18n-da/Makefile +++ b/editors/koffice-i18n-da/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.3.2 +PORTVERSION= 1.3.4 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION:S/.0//}/src diff --git a/editors/koffice-i18n-da/distinfo b/editors/koffice-i18n-da/distinfo index 685403c81d31..048958cf1418 100644 --- a/editors/koffice-i18n-da/distinfo +++ b/editors/koffice-i18n-da/distinfo @@ -1,2 +1,2 @@ -MD5 (KDE/kde-i18n/koffice-i18n-da-1.3.2.tar.bz2) = dec78da3da7685d5d2ffea73c68323ae -SIZE (KDE/kde-i18n/koffice-i18n-da-1.3.2.tar.bz2) = 1061611 +MD5 (KDE/kde-i18n/koffice-i18n-da-1.3.4.tar.bz2) = 380f08397afe19a9958539bb692ecb12 +SIZE (KDE/kde-i18n/koffice-i18n-da-1.3.4.tar.bz2) = 1084794 diff --git a/editors/koffice-i18n-el/Makefile b/editors/koffice-i18n-el/Makefile index 6c9f6f5775c5..88976eeab3db 100644 --- a/editors/koffice-i18n-el/Makefile +++ b/editors/koffice-i18n-el/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.3.2 +PORTVERSION= 1.3.4 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION:S/.0//}/src diff --git a/editors/koffice-i18n-el/distinfo b/editors/koffice-i18n-el/distinfo index 5a083782ffa5..a68be89bd51b 100644 --- a/editors/koffice-i18n-el/distinfo +++ b/editors/koffice-i18n-el/distinfo @@ -1,2 +1,2 @@ -MD5 (KDE/kde-i18n/koffice-i18n-el-1.3.2.tar.bz2) = 35d810ee4b2a432fee24c19c9e9fa997 -SIZE (KDE/kde-i18n/koffice-i18n-el-1.3.2.tar.bz2) = 524219 +MD5 (KDE/kde-i18n/koffice-i18n-el-1.3.4.tar.bz2) = 2553159c99293c505422db1b8543381a +SIZE (KDE/kde-i18n/koffice-i18n-el-1.3.4.tar.bz2) = 517034 diff --git a/editors/koffice-i18n-en_GB/Makefile b/editors/koffice-i18n-en_GB/Makefile index b40f86fb0cde..22e882e1a03a 100644 --- a/editors/koffice-i18n-en_GB/Makefile +++ b/editors/koffice-i18n-en_GB/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.3.2 +PORTVERSION= 1.3.4 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION:S/.0//}/src diff --git a/editors/koffice-i18n-en_GB/distinfo b/editors/koffice-i18n-en_GB/distinfo index d1b12acbde77..b5769de1b403 100644 --- a/editors/koffice-i18n-en_GB/distinfo +++ b/editors/koffice-i18n-en_GB/distinfo @@ -1,2 +1,2 @@ -MD5 (KDE/kde-i18n/koffice-i18n-en_GB-1.3.2.tar.bz2) = d482c100ebe5ff4fdd666d8968b36e54 -SIZE (KDE/kde-i18n/koffice-i18n-en_GB-1.3.2.tar.bz2) = 549415 +MD5 (KDE/kde-i18n/koffice-i18n-en_GB-1.3.4.tar.bz2) = b570ad31d8f714b94051594b6524809e +SIZE (KDE/kde-i18n/koffice-i18n-en_GB-1.3.4.tar.bz2) = 541033 diff --git a/editors/koffice-i18n-eo/Makefile b/editors/koffice-i18n-eo/Makefile index 19e00ab992ec..7ec7f473ec60 100644 --- a/editors/koffice-i18n-eo/Makefile +++ b/editors/koffice-i18n-eo/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.3.2 +PORTVERSION= 1.3.4 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION:S/.0//}/src diff --git a/editors/koffice-i18n-eo/distinfo b/editors/koffice-i18n-eo/distinfo index 8f4e99586c9f..5baef99101e0 100644 --- a/editors/koffice-i18n-eo/distinfo +++ b/editors/koffice-i18n-eo/distinfo @@ -1,2 +1,2 @@ -MD5 (KDE/kde-i18n/koffice-i18n-eo-1.3.2.tar.bz2) = 2a20daab35034fddcb7643a8aad41dca -SIZE (KDE/kde-i18n/koffice-i18n-eo-1.3.2.tar.bz2) = 570489 +MD5 (KDE/kde-i18n/koffice-i18n-eo-1.3.4.tar.bz2) = f19eef3ff421ebc14fe241e3a0fde047 +SIZE (KDE/kde-i18n/koffice-i18n-eo-1.3.4.tar.bz2) = 565022 diff --git a/editors/koffice-i18n-es/Makefile b/editors/koffice-i18n-es/Makefile index 2a8cc6487ad5..ab07b03c2b18 100644 --- a/editors/koffice-i18n-es/Makefile +++ b/editors/koffice-i18n-es/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.3.2 +PORTVERSION= 1.3.4 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION:S/.0//}/src diff --git a/editors/koffice-i18n-es/distinfo b/editors/koffice-i18n-es/distinfo index 217e0aa8da44..35b3766ea758 100644 --- a/editors/koffice-i18n-es/distinfo +++ b/editors/koffice-i18n-es/distinfo @@ -1,2 +1,2 @@ -MD5 (KDE/kde-i18n/koffice-i18n-es-1.3.2.tar.bz2) = a3b1067594093968644ddd22c9501120 -SIZE (KDE/kde-i18n/koffice-i18n-es-1.3.2.tar.bz2) = 1733975 +MD5 (KDE/kde-i18n/koffice-i18n-es-1.3.4.tar.bz2) = 1ea77f3630e893cb5a90e62ef1f46d3c +SIZE (KDE/kde-i18n/koffice-i18n-es-1.3.4.tar.bz2) = 1085846 diff --git a/editors/koffice-i18n-et/Makefile b/editors/koffice-i18n-et/Makefile index 9f71a3bc0a72..f24cc01a6116 100644 --- a/editors/koffice-i18n-et/Makefile +++ b/editors/koffice-i18n-et/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.3.2 +PORTVERSION= 1.3.4 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION:S/.0//}/src diff --git a/editors/koffice-i18n-et/distinfo b/editors/koffice-i18n-et/distinfo index 99bc8cdd58fb..ae8dad7135f6 100644 --- a/editors/koffice-i18n-et/distinfo +++ b/editors/koffice-i18n-et/distinfo @@ -1,2 +1,2 @@ -MD5 (KDE/kde-i18n/koffice-i18n-et-1.3.2.tar.bz2) = fefea899f957e8cfe2e9b2a46a7c8895 -SIZE (KDE/kde-i18n/koffice-i18n-et-1.3.2.tar.bz2) = 1184170 +MD5 (KDE/kde-i18n/koffice-i18n-et-1.3.4.tar.bz2) = bd92ef9522f9bdf7a3009a4c6cf4ddb2 +SIZE (KDE/kde-i18n/koffice-i18n-et-1.3.4.tar.bz2) = 1204587 diff --git a/editors/koffice-i18n-fa/Makefile b/editors/koffice-i18n-fa/Makefile index ff543fbe801b..b2cbcdd04987 100644 --- a/editors/koffice-i18n-fa/Makefile +++ b/editors/koffice-i18n-fa/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.3.2 +PORTVERSION= 1.3.4 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION:S/.0//}/src diff --git a/editors/koffice-i18n-fa/distinfo b/editors/koffice-i18n-fa/distinfo index 62416e9ab1e5..5a3edc95394e 100644 --- a/editors/koffice-i18n-fa/distinfo +++ b/editors/koffice-i18n-fa/distinfo @@ -1,2 +1,2 @@ -MD5 (KDE/kde-i18n/koffice-i18n-fa-1.3.2.tar.bz2) = 405977750c2e48dc5413d40b52484f2d -SIZE (KDE/kde-i18n/koffice-i18n-fa-1.3.2.tar.bz2) = 566885 +MD5 (KDE/kde-i18n/koffice-i18n-fa-1.3.4.tar.bz2) = fbabcdde8220e4e63b05284a5d302b71 +SIZE (KDE/kde-i18n/koffice-i18n-fa-1.3.4.tar.bz2) = 565772 diff --git a/editors/koffice-i18n-fi/Makefile b/editors/koffice-i18n-fi/Makefile index d9ded3d0ae4e..32e5f2a0bcfd 100644 --- a/editors/koffice-i18n-fi/Makefile +++ b/editors/koffice-i18n-fi/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.3.2 +PORTVERSION= 1.3.4 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION:S/.0//}/src diff --git a/editors/koffice-i18n-fi/distinfo b/editors/koffice-i18n-fi/distinfo index 88e3066fe5e0..ff990d6c4f26 100644 --- a/editors/koffice-i18n-fi/distinfo +++ b/editors/koffice-i18n-fi/distinfo @@ -1,2 +1,2 @@ -MD5 (KDE/kde-i18n/koffice-i18n-fi-1.3.2.tar.bz2) = 33239d6de9e82b5591891f6be94929a1 -SIZE (KDE/kde-i18n/koffice-i18n-fi-1.3.2.tar.bz2) = 554745 +MD5 (KDE/kde-i18n/koffice-i18n-fi-1.3.4.tar.bz2) = be4a80ce938b0c791b9bb91d74bbd7ac +SIZE (KDE/kde-i18n/koffice-i18n-fi-1.3.4.tar.bz2) = 547704 diff --git a/editors/koffice-i18n-hsb/Makefile b/editors/koffice-i18n-hsb/Makefile new file mode 100644 index 000000000000..60f3a3ae902b --- /dev/null +++ b/editors/koffice-i18n-hsb/Makefile @@ -0,0 +1,29 @@ +# New ports collection makefile for: koffice-i18n-es +# Date created: 27 April 2003 +# Whom: Michael Nottebrock <michaelnottebrock@gmx.net> +# +# $FreeBSD$ +# + +PORTNAME= koffice-i18n +PORTVERSION= 1.3.4 +CATEGORIES?= misc kde +MASTER_SITES= ${MASTER_SITE_KDE} +MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION:S/.0//}/src +PKGNAMEPREFIX= hsb- +DIST_SUBDIR= KDE + +MAINTAINER= kde@FreeBSD.org +COMMENT= Localized messages and documentation for koffice + +BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext + +USE_KDELIBS_VER=3 +USE_BZIP2= yes +USE_GMAKE= yes +GNU_CONFIGURE= yes +KDE_I18N= yes + +.include "${.CURDIR}/../../x11/kde3/Makefile.kde" + +.include <bsd.port.mk> diff --git a/editors/koffice-i18n-hsb/distinfo b/editors/koffice-i18n-hsb/distinfo new file mode 100644 index 000000000000..708b50bc22e9 --- /dev/null +++ b/editors/koffice-i18n-hsb/distinfo @@ -0,0 +1,2 @@ +MD5 (KDE/kde-i18n/koffice-i18n-hsb-1.3.4.tar.bz2) = acb5166029429b01d3692d0d1fef0d81 +SIZE (KDE/kde-i18n/koffice-i18n-hsb-1.3.4.tar.bz2) = 246236 diff --git a/editors/koffice-i18n-hsb/pkg-descr b/editors/koffice-i18n-hsb/pkg-descr new file mode 100644 index 000000000000..9cb0386755e8 --- /dev/null +++ b/editors/koffice-i18n-hsb/pkg-descr @@ -0,0 +1,3 @@ +Localized messages and documentation for koffice. + +WWW: http://koffice.kde.org/ diff --git a/editors/koffice-i18n-hsb/pkg-plist b/editors/koffice-i18n-hsb/pkg-plist new file mode 100644 index 000000000000..5690e4badfce --- /dev/null +++ b/editors/koffice-i18n-hsb/pkg-plist @@ -0,0 +1,7 @@ +share/locale/hsb/LC_MESSAGES/koshell.mo +share/locale/hsb/LC_MESSAGES/kthesaurus.mo +share/locale/hsb/LC_MESSAGES/kword.mo +share/locale/hsb/LC_MESSAGES/kwordmswordfilter.mo +share/locale/hsb/LC_MESSAGES/thesaurus_tool.mo +@dirrm share/locale/hsb/LC_MESSAGES +@dirrm share/locale/hsb diff --git a/editors/koffice-i18n-it/Makefile b/editors/koffice-i18n-it/Makefile index 65878060be43..6dfd703b6744 100644 --- a/editors/koffice-i18n-it/Makefile +++ b/editors/koffice-i18n-it/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.3.2 +PORTVERSION= 1.3.4 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION:S/.0//}/src diff --git a/editors/koffice-i18n-it/distinfo b/editors/koffice-i18n-it/distinfo index da18d3b8da25..eaa0c6f032e1 100644 --- a/editors/koffice-i18n-it/distinfo +++ b/editors/koffice-i18n-it/distinfo @@ -1,2 +1,2 @@ -MD5 (KDE/kde-i18n/koffice-i18n-it-1.3.2.tar.bz2) = 76b0983454ff1af4f116f25e1fdb26c1 -SIZE (KDE/kde-i18n/koffice-i18n-it-1.3.2.tar.bz2) = 1628461 +MD5 (KDE/kde-i18n/koffice-i18n-it-1.3.4.tar.bz2) = 87a62e8215f5d28964fa65b0d8ae3cec +SIZE (KDE/kde-i18n/koffice-i18n-it-1.3.4.tar.bz2) = 1381710 diff --git a/editors/koffice-i18n-it/pkg-plist b/editors/koffice-i18n-it/pkg-plist index 250b9416e3e4..1ed657477821 100644 --- a/editors/koffice-i18n-it/pkg-plist +++ b/editors/koffice-i18n-it/pkg-plist @@ -5,7 +5,10 @@ share/doc/HTML/it/kchart/index.docbook share/doc/HTML/it/kformula/common share/doc/HTML/it/kformula/index.cache.bz2 share/doc/HTML/it/kformula/index.docbook +share/doc/HTML/it/kivio/common share/doc/HTML/it/kivio/credits.docbook +share/doc/HTML/it/kivio/index.cache.bz2 +share/doc/HTML/it/kivio/index.docbook share/doc/HTML/it/kivio/introduction.docbook share/doc/HTML/it/kivio/usage.docbook share/doc/HTML/it/kivio/working.docbook @@ -100,7 +103,6 @@ share/locale/it/LC_MESSAGES/kwordasciifilter.mo share/locale/it/LC_MESSAGES/kwordhtmlexportfilter.mo share/locale/it/LC_MESSAGES/kwordhtmlimportfilter.mo share/locale/it/LC_MESSAGES/kwordlatexexportfilter.mo -share/locale/it/LC_MESSAGES/kwordlatexfilter.mo share/locale/it/LC_MESSAGES/kwordlateximportfilter.mo share/locale/it/LC_MESSAGES/kwordmswordfilter.mo share/locale/it/LC_MESSAGES/kwordmswritefilter.mo diff --git a/editors/koffice-i18n-lo/Makefile b/editors/koffice-i18n-lo/Makefile index 74b183ed6083..dac8237784e7 100644 --- a/editors/koffice-i18n-lo/Makefile +++ b/editors/koffice-i18n-lo/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.3.2 +PORTVERSION= 1.3.4 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION:S/.0//}/src diff --git a/editors/koffice-i18n-lo/distinfo b/editors/koffice-i18n-lo/distinfo index e19e4da10111..1d2356f01d45 100644 --- a/editors/koffice-i18n-lo/distinfo +++ b/editors/koffice-i18n-lo/distinfo @@ -1,2 +1,2 @@ -MD5 (KDE/kde-i18n/koffice-i18n-lo-1.3.2.tar.bz2) = 3272c4d54c32af0b7c24cb146d3918de -SIZE (KDE/kde-i18n/koffice-i18n-lo-1.3.2.tar.bz2) = 618512 +MD5 (KDE/kde-i18n/koffice-i18n-lo-1.3.4.tar.bz2) = 18e716c2efd3f9b63b74150a11262ea2 +SIZE (KDE/kde-i18n/koffice-i18n-lo-1.3.4.tar.bz2) = 623368 diff --git a/editors/koffice-i18n-lt/distinfo b/editors/koffice-i18n-lt/distinfo index e69de29bb2d1..24870a79f0ae 100644 --- a/editors/koffice-i18n-lt/distinfo +++ b/editors/koffice-i18n-lt/distinfo @@ -0,0 +1,2 @@ +MD5 (KDE/kde-i18n/koffice-i18n-lt-1.2.1.tar.bz2) = 06315fcd279197763dc748de29484233 +SIZE (KDE/kde-i18n/koffice-i18n-lt-1.2.1.tar.bz2) = 475748 diff --git a/editors/koffice-i18n-lv/distinfo b/editors/koffice-i18n-lv/distinfo index e69de29bb2d1..de20b5547dcd 100644 --- a/editors/koffice-i18n-lv/distinfo +++ b/editors/koffice-i18n-lv/distinfo @@ -0,0 +1,2 @@ +MD5 (KDE/kde-i18n/koffice-i18n-lv-1.2.1.tar.bz2) = 15cf6b3a8ca3caa0f6e4b9b51810b555 +SIZE (KDE/kde-i18n/koffice-i18n-lv-1.2.1.tar.bz2) = 438315 diff --git a/editors/koffice-i18n-mt/Makefile b/editors/koffice-i18n-mt/Makefile index a99bb2c93901..ef19cda04455 100644 --- a/editors/koffice-i18n-mt/Makefile +++ b/editors/koffice-i18n-mt/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.3.2 +PORTVERSION= 1.3.4 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION:S/.0//}/src diff --git a/editors/koffice-i18n-mt/distinfo b/editors/koffice-i18n-mt/distinfo index 3e1496ee18d9..3df82d8f641d 100644 --- a/editors/koffice-i18n-mt/distinfo +++ b/editors/koffice-i18n-mt/distinfo @@ -1,2 +1,2 @@ -MD5 (KDE/kde-i18n/koffice-i18n-mt-1.3.2.tar.bz2) = 05632fdda445dd376fe312c0dbcaf519 -SIZE (KDE/kde-i18n/koffice-i18n-mt-1.3.2.tar.bz2) = 556274 +MD5 (KDE/kde-i18n/koffice-i18n-mt-1.3.4.tar.bz2) = 1b484cae3fc2c0fafe9ab7d24f31dd87 +SIZE (KDE/kde-i18n/koffice-i18n-mt-1.3.4.tar.bz2) = 551995 diff --git a/editors/koffice-i18n-nb/Makefile b/editors/koffice-i18n-nb/Makefile index dd497a5c2498..eeb628c86f24 100644 --- a/editors/koffice-i18n-nb/Makefile +++ b/editors/koffice-i18n-nb/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.3.2 +PORTVERSION= 1.3.4 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION:S/.0//}/src diff --git a/editors/koffice-i18n-nb/distinfo b/editors/koffice-i18n-nb/distinfo index 2c94ad8673ad..43728c25e137 100644 --- a/editors/koffice-i18n-nb/distinfo +++ b/editors/koffice-i18n-nb/distinfo @@ -1,2 +1,2 @@ -MD5 (KDE/kde-i18n/koffice-i18n-nb-1.3.2.tar.bz2) = 152cd5f93bfbc48fa1a5ba773e6b346a -SIZE (KDE/kde-i18n/koffice-i18n-nb-1.3.2.tar.bz2) = 619257 +MD5 (KDE/kde-i18n/koffice-i18n-nb-1.3.4.tar.bz2) = e62a2c0ee5fbce326dce566b37c03380 +SIZE (KDE/kde-i18n/koffice-i18n-nb-1.3.4.tar.bz2) = 652286 diff --git a/editors/koffice-i18n-nb/pkg-plist b/editors/koffice-i18n-nb/pkg-plist index 506fa2835366..b447971fba29 100644 --- a/editors/koffice-i18n-nb/pkg-plist +++ b/editors/koffice-i18n-nb/pkg-plist @@ -49,5 +49,3 @@ share/locale/nb/LC_MESSAGES/olefilterswinword97filter.mo share/locale/nb/LC_MESSAGES/thesaurus_tool.mo share/locale/nb/LC_MESSAGES/xsltexportfilter.mo share/locale/nb/LC_MESSAGES/xsltimportfilter.mo -@dirrm share/locale/nb/LC_MESSAGES -@dirrm share/locale/nb diff --git a/editors/koffice-i18n-nl/Makefile b/editors/koffice-i18n-nl/Makefile index 73cb198b0ba6..cade5a846370 100644 --- a/editors/koffice-i18n-nl/Makefile +++ b/editors/koffice-i18n-nl/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.3.2 +PORTVERSION= 1.3.4 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION:S/.0//}/src diff --git a/editors/koffice-i18n-nl/distinfo b/editors/koffice-i18n-nl/distinfo index 25ecb8825ada..bb70b8af9559 100644 --- a/editors/koffice-i18n-nl/distinfo +++ b/editors/koffice-i18n-nl/distinfo @@ -1,2 +1,2 @@ -MD5 (KDE/kde-i18n/koffice-i18n-nl-1.3.2.tar.bz2) = d40a5d78ddead57fe8a5806499db83eb -SIZE (KDE/kde-i18n/koffice-i18n-nl-1.3.2.tar.bz2) = 618585 +MD5 (KDE/kde-i18n/koffice-i18n-nl-1.3.4.tar.bz2) = 783fd4e43104aac9244befc6aebe9712 +SIZE (KDE/kde-i18n/koffice-i18n-nl-1.3.4.tar.bz2) = 613058 diff --git a/editors/koffice-i18n-nn/Makefile b/editors/koffice-i18n-nn/Makefile index a5041292bd6e..99357dd19ba2 100644 --- a/editors/koffice-i18n-nn/Makefile +++ b/editors/koffice-i18n-nn/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.3.2 +PORTVERSION= 1.3.4 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION:S/.0//}/src diff --git a/editors/koffice-i18n-nn/distinfo b/editors/koffice-i18n-nn/distinfo index 6652fded6bff..30ccb4e37a9d 100644 --- a/editors/koffice-i18n-nn/distinfo +++ b/editors/koffice-i18n-nn/distinfo @@ -1,2 +1,2 @@ -MD5 (KDE/kde-i18n/koffice-i18n-nn-1.3.2.tar.bz2) = 6366cc39f1ccd6e3a9e3520940adc43d -SIZE (KDE/kde-i18n/koffice-i18n-nn-1.3.2.tar.bz2) = 603338 +MD5 (KDE/kde-i18n/koffice-i18n-nn-1.3.4.tar.bz2) = c37e618786f5a0132566f6c9d3021b74 +SIZE (KDE/kde-i18n/koffice-i18n-nn-1.3.4.tar.bz2) = 626437 diff --git a/editors/koffice-i18n-se/Makefile b/editors/koffice-i18n-se/Makefile index 441b7ef7a817..356eedda2a5a 100644 --- a/editors/koffice-i18n-se/Makefile +++ b/editors/koffice-i18n-se/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.3.2 +PORTVERSION= 1.3.4 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION:S/.0//}/src diff --git a/editors/koffice-i18n-se/distinfo b/editors/koffice-i18n-se/distinfo index 8134cdd92186..af34cdce6023 100644 --- a/editors/koffice-i18n-se/distinfo +++ b/editors/koffice-i18n-se/distinfo @@ -1,2 +1,2 @@ -MD5 (KDE/kde-i18n/koffice-i18n-se-1.3.2.tar.bz2) = 59b96c0cf07ce480ac3b0c7158374ea4 -SIZE (KDE/kde-i18n/koffice-i18n-se-1.3.2.tar.bz2) = 591077 +MD5 (KDE/kde-i18n/koffice-i18n-se-1.3.4.tar.bz2) = 279bd7df48d4f3ef07eaca20031ab37f +SIZE (KDE/kde-i18n/koffice-i18n-se-1.3.4.tar.bz2) = 590015 diff --git a/editors/koffice-i18n-sk/Makefile b/editors/koffice-i18n-sk/Makefile index 4e4d972fc4c9..dea2f34251e1 100644 --- a/editors/koffice-i18n-sk/Makefile +++ b/editors/koffice-i18n-sk/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.3.2 +PORTVERSION= 1.3.4 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION:S/.0//}/src diff --git a/editors/koffice-i18n-sk/distinfo b/editors/koffice-i18n-sk/distinfo index c9d8cbb02a69..b44ffcf1985d 100644 --- a/editors/koffice-i18n-sk/distinfo +++ b/editors/koffice-i18n-sk/distinfo @@ -1,2 +1,2 @@ -MD5 (KDE/kde-i18n/koffice-i18n-sk-1.3.2.tar.bz2) = 0932c38864fea2a5bde5b979231cd59e -SIZE (KDE/kde-i18n/koffice-i18n-sk-1.3.2.tar.bz2) = 1229838 +MD5 (KDE/kde-i18n/koffice-i18n-sk-1.3.4.tar.bz2) = 8232f07452ac048f7ad8464f3c4cead5 +SIZE (KDE/kde-i18n/koffice-i18n-sk-1.3.4.tar.bz2) = 1226201 diff --git a/editors/koffice-i18n-sl/Makefile b/editors/koffice-i18n-sl/Makefile index 99f8ec90721d..f55c0138bea1 100644 --- a/editors/koffice-i18n-sl/Makefile +++ b/editors/koffice-i18n-sl/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.3.2 +PORTVERSION= 1.3.4 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION:S/.0//}/src diff --git a/editors/koffice-i18n-sl/distinfo b/editors/koffice-i18n-sl/distinfo index aca60c6b50e0..f84c1da71aaa 100644 --- a/editors/koffice-i18n-sl/distinfo +++ b/editors/koffice-i18n-sl/distinfo @@ -1,2 +1,2 @@ -MD5 (KDE/kde-i18n/koffice-i18n-sl-1.3.2.tar.bz2) = 71719ccc7de04323f20defe02dc4577c -SIZE (KDE/kde-i18n/koffice-i18n-sl-1.3.2.tar.bz2) = 607413 +MD5 (KDE/kde-i18n/koffice-i18n-sl-1.3.4.tar.bz2) = 54f87c7f2c9b6735d7ae590f7a07f17d +SIZE (KDE/kde-i18n/koffice-i18n-sl-1.3.4.tar.bz2) = 599861 diff --git a/editors/koffice-i18n-sr/Makefile b/editors/koffice-i18n-sr/Makefile index ca5dbbfd80f3..37846b0fa6dc 100644 --- a/editors/koffice-i18n-sr/Makefile +++ b/editors/koffice-i18n-sr/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.3.2 +PORTVERSION= 1.3.4 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION:S/.0//}/src diff --git a/editors/koffice-i18n-sr/distinfo b/editors/koffice-i18n-sr/distinfo index 0ad5fe6e597f..3f5c1a699a98 100644 --- a/editors/koffice-i18n-sr/distinfo +++ b/editors/koffice-i18n-sr/distinfo @@ -1,2 +1,2 @@ -MD5 (KDE/kde-i18n/koffice-i18n-sr-1.3.2.tar.bz2) = 73c0dbc96161499a43ae48a4e335d242 -SIZE (KDE/kde-i18n/koffice-i18n-sr-1.3.2.tar.bz2) = 606970 +MD5 (KDE/kde-i18n/koffice-i18n-sr-1.3.4.tar.bz2) = 873d280b5da5814273521cb57fec06d8 +SIZE (KDE/kde-i18n/koffice-i18n-sr-1.3.4.tar.bz2) = 634982 diff --git a/editors/koffice-i18n-sv/Makefile b/editors/koffice-i18n-sv/Makefile index 9e0286b8c377..2121f5edbf55 100644 --- a/editors/koffice-i18n-sv/Makefile +++ b/editors/koffice-i18n-sv/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.3.2 +PORTVERSION= 1.3.4 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION:S/.0//}/src diff --git a/editors/koffice-i18n-sv/distinfo b/editors/koffice-i18n-sv/distinfo index 0ef1592d4f85..8f80664c5ce5 100644 --- a/editors/koffice-i18n-sv/distinfo +++ b/editors/koffice-i18n-sv/distinfo @@ -1,2 +1,2 @@ -MD5 (KDE/kde-i18n/koffice-i18n-sv-1.3.2.tar.bz2) = f5431d336eca9b5baff397eb18736a22 -SIZE (KDE/kde-i18n/koffice-i18n-sv-1.3.2.tar.bz2) = 4185172 +MD5 (KDE/kde-i18n/koffice-i18n-sv-1.3.4.tar.bz2) = 759a81ab33b5bc99c8816446df8720c7 +SIZE (KDE/kde-i18n/koffice-i18n-sv-1.3.4.tar.bz2) = 4160432 diff --git a/editors/koffice-i18n-sv/pkg-plist b/editors/koffice-i18n-sv/pkg-plist index d9cacf5c0378..12dee2273a0a 100644 --- a/editors/koffice-i18n-sv/pkg-plist +++ b/editors/koffice-i18n-sv/pkg-plist @@ -322,11 +322,8 @@ share/locale/sv/LC_MESSAGES/example.mo share/locale/sv/LC_MESSAGES/karbon.mo share/locale/sv/LC_MESSAGES/karbonepsfilter.mo share/locale/sv/LC_MESSAGES/kchart.mo -share/locale/sv/LC_MESSAGES/kdgantt.mo -share/locale/sv/LC_MESSAGES/kexi.mo share/locale/sv/LC_MESSAGES/kfile_koffice.mo share/locale/sv/LC_MESSAGES/kfile_ooo.mo -share/locale/sv/LC_MESSAGES/kformdesigner.mo share/locale/sv/LC_MESSAGES/kformula.mo share/locale/sv/LC_MESSAGES/kformulalatexfilter.mo share/locale/sv/LC_MESSAGES/kformulamathmlfilter.mo @@ -336,10 +333,8 @@ share/locale/sv/LC_MESSAGES/koconverter.mo share/locale/sv/LC_MESSAGES/koffice.mo share/locale/sv/LC_MESSAGES/koshell.mo share/locale/sv/LC_MESSAGES/kounavail.mo -share/locale/sv/LC_MESSAGES/kplato.mo share/locale/sv/LC_MESSAGES/kpresenter.mo share/locale/sv/LC_MESSAGES/kpresenterkwordfilter.mo -share/locale/sv/LC_MESSAGES/krita.mo share/locale/sv/LC_MESSAGES/kscan_plugin.mo share/locale/sv/LC_MESSAGES/kspread.mo share/locale/sv/LC_MESSAGES/kspreadcalc_calc.mo @@ -356,7 +351,6 @@ share/locale/sv/LC_MESSAGES/kwordasciifilter.mo share/locale/sv/LC_MESSAGES/kwordhtmlexportfilter.mo share/locale/sv/LC_MESSAGES/kwordhtmlimportfilter.mo share/locale/sv/LC_MESSAGES/kwordlatexexportfilter.mo -share/locale/sv/LC_MESSAGES/kwordlatexfilter.mo share/locale/sv/LC_MESSAGES/kwordlateximportfilter.mo share/locale/sv/LC_MESSAGES/kwordmswordfilter.mo share/locale/sv/LC_MESSAGES/kwordmswritefilter.mo diff --git a/editors/koffice-i18n-tg/Makefile b/editors/koffice-i18n-tg/Makefile index d7b15ccf5105..d030fa026791 100644 --- a/editors/koffice-i18n-tg/Makefile +++ b/editors/koffice-i18n-tg/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.3.2 +PORTVERSION= 1.3.4 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION:S/.0//}/src diff --git a/editors/koffice-i18n-tg/distinfo b/editors/koffice-i18n-tg/distinfo index 49864468fd0e..18cca20d42fd 100644 --- a/editors/koffice-i18n-tg/distinfo +++ b/editors/koffice-i18n-tg/distinfo @@ -1,2 +1,2 @@ -MD5 (KDE/kde-i18n/koffice-i18n-tg-1.3.2.tar.bz2) = 13989d70392f561ee5336c4dc88426de -SIZE (KDE/kde-i18n/koffice-i18n-tg-1.3.2.tar.bz2) = 563743 +MD5 (KDE/kde-i18n/koffice-i18n-tg-1.3.4.tar.bz2) = 6cc89e3f85b21c965b06734e429f0268 +SIZE (KDE/kde-i18n/koffice-i18n-tg-1.3.4.tar.bz2) = 690746 diff --git a/editors/koffice-i18n-tg/pkg-plist b/editors/koffice-i18n-tg/pkg-plist index 30b7f17ec736..cabb85872017 100644 --- a/editors/koffice-i18n-tg/pkg-plist +++ b/editors/koffice-i18n-tg/pkg-plist @@ -49,5 +49,3 @@ share/locale/tg/LC_MESSAGES/olefilterswinword97filter.mo share/locale/tg/LC_MESSAGES/thesaurus_tool.mo share/locale/tg/LC_MESSAGES/xsltexportfilter.mo share/locale/tg/LC_MESSAGES/xsltimportfilter.mo -@dirrm share/locale/tg/LC_MESSAGES -@dirrm share/locale/tg diff --git a/editors/koffice-i18n-th/Makefile b/editors/koffice-i18n-th/Makefile index 95e22dfeddf6..4613065028d0 100644 --- a/editors/koffice-i18n-th/Makefile +++ b/editors/koffice-i18n-th/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.3.2 +PORTVERSION= 1.3.4 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION:S/.0//}/src diff --git a/editors/koffice-i18n-th/distinfo b/editors/koffice-i18n-th/distinfo index d378a26ee97b..e477038515e8 100644 --- a/editors/koffice-i18n-th/distinfo +++ b/editors/koffice-i18n-th/distinfo @@ -1,2 +1,2 @@ -MD5 (KDE/kde-i18n/koffice-i18n-th-1.3.2.tar.bz2) = 0eb58c7ff314d87f555cd4309b498bfe -SIZE (KDE/kde-i18n/koffice-i18n-th-1.3.2.tar.bz2) = 519278 +MD5 (KDE/kde-i18n/koffice-i18n-th-1.3.4.tar.bz2) = d79550250d01646770dfddf1b434abf2 +SIZE (KDE/kde-i18n/koffice-i18n-th-1.3.4.tar.bz2) = 525693 diff --git a/editors/koffice-i18n-tr/Makefile b/editors/koffice-i18n-tr/Makefile index 816fd6dffba8..6c7ec2ecb50e 100644 --- a/editors/koffice-i18n-tr/Makefile +++ b/editors/koffice-i18n-tr/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.3.2 +PORTVERSION= 1.3.4 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION:S/.0//}/src diff --git a/editors/koffice-i18n-tr/distinfo b/editors/koffice-i18n-tr/distinfo index 318b8f084a26..3beae7b78701 100644 --- a/editors/koffice-i18n-tr/distinfo +++ b/editors/koffice-i18n-tr/distinfo @@ -1,2 +1,2 @@ -MD5 (KDE/kde-i18n/koffice-i18n-tr-1.3.2.tar.bz2) = 46b6958734ece8ffa3ecec6a1230a958 -SIZE (KDE/kde-i18n/koffice-i18n-tr-1.3.2.tar.bz2) = 598181 +MD5 (KDE/kde-i18n/koffice-i18n-tr-1.3.4.tar.bz2) = 7fe59f9e9c8ce968231f891bd8aadd25 +SIZE (KDE/kde-i18n/koffice-i18n-tr-1.3.4.tar.bz2) = 593459 diff --git a/editors/koffice-i18n-ven/Makefile b/editors/koffice-i18n-ven/Makefile index f872e76cd86c..34b20a4cfe11 100644 --- a/editors/koffice-i18n-ven/Makefile +++ b/editors/koffice-i18n-ven/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.3.2 +PORTVERSION= 1.3.4 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION:S/.0//}/src diff --git a/editors/koffice-i18n-ven/distinfo b/editors/koffice-i18n-ven/distinfo index b935093fec11..f8e985a46e33 100644 --- a/editors/koffice-i18n-ven/distinfo +++ b/editors/koffice-i18n-ven/distinfo @@ -1,2 +1,2 @@ -MD5 (KDE/kde-i18n/koffice-i18n-ven-1.3.2.tar.bz2) = 30b2967313efab532c93d2c340d9779f -SIZE (KDE/kde-i18n/koffice-i18n-ven-1.3.2.tar.bz2) = 552075 +MD5 (KDE/kde-i18n/koffice-i18n-ven-1.3.4.tar.bz2) = 507a2917fd219cafd4a5c954b7bb7c41 +SIZE (KDE/kde-i18n/koffice-i18n-ven-1.3.4.tar.bz2) = 546928 diff --git a/editors/koffice-i18n-xh/Makefile b/editors/koffice-i18n-xh/Makefile index 6dee87d7641b..bccedb0e3595 100644 --- a/editors/koffice-i18n-xh/Makefile +++ b/editors/koffice-i18n-xh/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.3.2 +PORTVERSION= 1.3.4 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION:S/.0//}/src diff --git a/editors/koffice-i18n-xh/distinfo b/editors/koffice-i18n-xh/distinfo index cbf670227665..dcdd5de9fc62 100644 --- a/editors/koffice-i18n-xh/distinfo +++ b/editors/koffice-i18n-xh/distinfo @@ -1,2 +1,2 @@ -MD5 (KDE/kde-i18n/koffice-i18n-xh-1.3.2.tar.bz2) = aa05a8d90700bd5da18de815b0253cbc -SIZE (KDE/kde-i18n/koffice-i18n-xh-1.3.2.tar.bz2) = 561018 +MD5 (KDE/kde-i18n/koffice-i18n-xh-1.3.4.tar.bz2) = 1fe2f07ef22069d3435a478b5b26602e +SIZE (KDE/kde-i18n/koffice-i18n-xh-1.3.4.tar.bz2) = 568581 diff --git a/editors/koffice-i18n-zu/Makefile b/editors/koffice-i18n-zu/Makefile index 407f4b6f20b7..1fff12d2e49c 100644 --- a/editors/koffice-i18n-zu/Makefile +++ b/editors/koffice-i18n-zu/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.3.2 +PORTVERSION= 1.3.4 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION:S/.0//}/src diff --git a/editors/koffice-i18n-zu/distinfo b/editors/koffice-i18n-zu/distinfo index c7be1ece02d0..e5ffa940972c 100644 --- a/editors/koffice-i18n-zu/distinfo +++ b/editors/koffice-i18n-zu/distinfo @@ -1,2 +1,2 @@ -MD5 (KDE/kde-i18n/koffice-i18n-zu-1.3.2.tar.bz2) = 8085b4f502539d037f5c5dc8dcd2ed86 -SIZE (KDE/kde-i18n/koffice-i18n-zu-1.3.2.tar.bz2) = 563783 +MD5 (KDE/kde-i18n/koffice-i18n-zu-1.3.4.tar.bz2) = 29a28b859e3ed6f14d3961dc24c442a3 +SIZE (KDE/kde-i18n/koffice-i18n-zu-1.3.4.tar.bz2) = 556706 diff --git a/editors/koffice-i18n/Makefile b/editors/koffice-i18n/Makefile index 94ddc075555a..6edeb8f7852e 100644 --- a/editors/koffice-i18n/Makefile +++ b/editors/koffice-i18n/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.3.2 +PORTVERSION= 1.3.4 CATEGORIES= misc kde MASTER_SITES= # none DISTFILES= # none @@ -29,7 +29,7 @@ RUN_DEPENDS+=\ ${LOCALBASE}/share/locale/uk/LC_MESSAGES/kword.mo:${PORTSDIR}/ukrainian/koffice-i18n\ ${LOCALBASE}/share/locale/zh_TW/LC_MESSAGES/kword.mo:${PORTSDIR}/chinese/koffice-i18n-zh_TW -.for LANG in af bg bs ca cs da el en_GB eo es et fa fi it \ +.for LANG in af bg bs ca cs da el en_GB eo es et fa fi hsb it \ lo lt lv mt nb nl nn se sk sl sr sv tg th tr ven xh zu RUN_DEPENDS+=\ ${LOCALBASE}/share/locale/${LANG}/LC_MESSAGES/kword.mo:${PORTSDIR}/misc/koffice-i18n-${LANG} diff --git a/editors/koffice-kde3/Makefile b/editors/koffice-kde3/Makefile index 32351cfe58f7..eb58f1bcf16c 100644 --- a/editors/koffice-kde3/Makefile +++ b/editors/koffice-kde3/Makefile @@ -7,8 +7,7 @@ # PORTNAME= koffice -PORTVERSION= 1.3.2 -PORTREVISION= 1 +PORTVERSION= 1.3.4 PORTEPOCH= 1 CATEGORIES= editors kde MASTER_SITES= ${MASTER_SITE_KDE} @@ -38,7 +37,7 @@ USE_GMAKE= yes USE_ICONV= yes USE_PYTHON= yes GNU_CONFIGURE= yes -_NO_KDE_CLOSURE= yes +_NO_KDE_FIXPTHREAD= yes INSTALLS_SHLIB= yes LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3 diff --git a/editors/koffice-kde3/distinfo b/editors/koffice-kde3/distinfo index 820fe1879077..9ac09634c272 100644 --- a/editors/koffice-kde3/distinfo +++ b/editors/koffice-kde3/distinfo @@ -1,2 +1,2 @@ -MD5 (KDE/koffice/koffice-1.3.2.tar.bz2) = 078a371f6768bea53b84ea342ac0b34b -SIZE (KDE/koffice/koffice-1.3.2.tar.bz2) = 10736662 +MD5 (KDE/koffice/koffice-1.3.4.tar.bz2) = 79896426542b0cf07e2e15f84946905a +SIZE (KDE/koffice/koffice-1.3.4.tar.bz2) = 10765924 diff --git a/editors/koffice-kde3/files/patch-configure b/editors/koffice-kde3/files/patch-configure new file mode 100644 index 000000000000..5147ed156f26 --- /dev/null +++ b/editors/koffice-kde3/files/patch-configure @@ -0,0 +1,11 @@ +--- configure.orig Sat Oct 30 03:46:09 2004 ++++ configure Sat Oct 30 03:46:54 2004 +@@ -26335,7 +26335,7 @@ + PTHREAD_LIBS="$PTHREAD_LIBS_save" + fi + +- if test -z "$LIBPTHREAD"; then ++ if test -z "$LIBPTHREAD" && test "$PTHREAD_LIBS" != "-pthread" ; then + echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5 + echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6 + if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then diff --git a/editors/koffice-kde3/files/patch-filters_kword_pdf_xpdf_xpdf_Catalog.cc b/editors/koffice-kde3/files/patch-filters_kword_pdf_xpdf_xpdf_Catalog.cc deleted file mode 100644 index 1e54fc9cb30e..000000000000 --- a/editors/koffice-kde3/files/patch-filters_kword_pdf_xpdf_xpdf_Catalog.cc +++ /dev/null @@ -1,27 +0,0 @@ ---- filters/kword/pdf/xpdf/xpdf/Catalog.cc.orig 2004-10-18 16:26:39.388666476 +0200 -+++ filters/kword/pdf/xpdf/xpdf/Catalog.cc 2004-10-18 16:27:28.004749073 +0200 -@@ -62,6 +62,12 @@ - } - pagesSize = numPages0 = obj.getInt(); - obj.free(); -+ if (pagesSize*sizeof(Page *)/sizeof(Page *) != pagesSize || -+ pagesSize*sizeof(Ref)/sizeof(Ref) != pagesSize) { -+ error(-1, "Invalid 'pagesSize'"); -+ ok = gFalse; -+ return; -+ } - pages = (Page **)gmalloc(pagesSize * sizeof(Page *)); - pageRefs = (Ref *)gmalloc(pagesSize * sizeof(Ref)); - for (i = 0; i < pagesSize; ++i) { -@@ -186,6 +192,11 @@ - } - if (start >= pagesSize) { - pagesSize += 32; -+ if (pagesSize*sizeof(Page *)/sizeof(Page *) != pagesSize || -+ pagesSize*sizeof(Ref)/sizeof(Ref) != pagesSize) { -+ error(-1, "Invalid 'pagesSize' parameter."); -+ goto err3; -+ } - pages = (Page **)grealloc(pages, pagesSize * sizeof(Page *)); - pageRefs = (Ref *)grealloc(pageRefs, pagesSize * sizeof(Ref)); - for (j = pagesSize - 32; j < pagesSize; ++j) { diff --git a/editors/koffice-kde3/files/patch-filters_kword_pdf_xpdf_xpdf_XRef.cc b/editors/koffice-kde3/files/patch-filters_kword_pdf_xpdf_xpdf_XRef.cc deleted file mode 100644 index 935e7b56c6e6..000000000000 --- a/editors/koffice-kde3/files/patch-filters_kword_pdf_xpdf_xpdf_XRef.cc +++ /dev/null @@ -1,49 +0,0 @@ ---- filters/kword/pdf/xpdf/xpdf/XRef.cc.orig 2004-09-17 23:54:38.000000000 -0700 -+++ filters/kword/pdf/xpdf/xpdf/XRef.cc 2004-09-25 17:59:36.000000000 -0700 -@@ -76,6 +76,12 @@ - - // trailer is ok - read the xref table - } else { -+ if (size*sizeof(XRefEntry)/sizeof(XRefEntry) != size) { -+ error(-1, "Invalid 'size' inside xref table."); -+ ok = gFalse; -+ errCode = errDamaged; -+ return; -+ } - entries = (XRefEntry *)gmalloc(size * sizeof(XRefEntry)); - for (i = 0; i < size; ++i) { - entries[i].offset = 0xffffffff; -@@ -267,6 +273,10 @@ - // table size - if (first + n > size) { - newSize = size + 256; -+ if (newSize*sizeof(XRefEntry)/sizeof(XRefEntry) != newSize) { -+ error(-1, "Invalid 'newSize'"); -+ goto err2; -+ } - entries = (XRefEntry *)grealloc(entries, newSize * sizeof(XRefEntry)); - for (i = size; i < newSize; ++i) { - entries[i].offset = 0xffffffff; -@@ -410,6 +420,10 @@ - if (!strncmp(p, "obj", 3)) { - if (num >= size) { - newSize = (num + 1 + 255) & ~255; -+ if (newSize*sizeof(XRefEntry)/sizeof(XRefEntry) != newSize) { -+ error(-1, "Invalid 'obj' parameters."); -+ return gFalse; -+ } - entries = (XRefEntry *) - grealloc(entries, newSize * sizeof(XRefEntry)); - for (i = size; i < newSize; ++i) { -@@ -431,6 +445,11 @@ - } else if (!strncmp(p, "endstream", 9)) { - if (streamEndsLen == streamEndsSize) { - streamEndsSize += 64; -+ if (streamEndsSize*sizeof(int)/sizeof(int) != streamEndsSize) { -+ error(-1, "Invalid 'endstream' parameter."); -+ return gFalse; -+ } -+ - streamEnds = (Guint *)grealloc(streamEnds, - streamEndsSize * sizeof(int)); - } diff --git a/editors/koffice-kde3/files/patch-koffice_1_3_4_xpdf_security_integer_overflow b/editors/koffice-kde3/files/patch-koffice_1_3_4_xpdf_security_integer_overflow new file mode 100644 index 000000000000..449806bd4fdb --- /dev/null +++ b/editors/koffice-kde3/files/patch-koffice_1_3_4_xpdf_security_integer_overflow @@ -0,0 +1,90 @@ +Index: Catalog.cc +=================================================================== +RCS file: /home/kde/koffice/filters/kword/pdf/xpdf/xpdf/Catalog.cc,v +retrieving revision 1.1.2.1 +retrieving revision 1.1.2.4 +diff -u -p -r1.1.2.1 -r1.1.2.4 +--- filters/kword/pdf/xpdf/xpdf/Catalog.cc 22 Oct 2004 12:13:56 -0000 1.1.2.1 ++++ filters/kword/pdf/xpdf/xpdf/Catalog.cc 30 Oct 2004 16:43:47 -0000 1.1.2.4 +@@ -12,6 +12,7 @@ + #pragma implementation + #endif + ++#include <limits.h> + #include <stddef.h> + #include "gmem.h" + #include "Object.h" +@@ -63,8 +64,8 @@ Catalog::Catalog(XRef *xrefA) { + } + pagesSize = numPages0 = obj.getInt(); + obj.free(); +- if (pagesSize*sizeof(Page *)/sizeof(Page *) != pagesSize || +- pagesSize*sizeof(Ref)/sizeof(Ref) != pagesSize) { ++ if ((unsigned) pagesSize >= INT_MAX / sizeof(Page *) || ++ (unsigned) pagesSize >= INT_MAX / sizeof(Ref)) { + error(-1, "Invalid 'pagesSize'"); + ok = gFalse; + return; +@@ -196,8 +197,8 @@ int Catalog::readPageTree(Dict *pagesDic + } + if (start >= pagesSize) { + pagesSize += 32; +- if (pagesSize*sizeof(Page *)/sizeof(Page *) != pagesSize || +- pagesSize*sizeof(Ref)/sizeof(Ref) != pagesSize) { ++ if ((unsigned) pagesSize >= INT_MAX / sizeof(Page *) || ++ (unsigned) pagesSize >= INT_MAX / sizeof(Ref)) { + error(-1, "Invalid 'pagesSize' parameter."); + goto err3; + } +Index: XRef.cc +=================================================================== +RCS file: /home/kde/koffice/filters/kword/pdf/xpdf/xpdf/XRef.cc,v +retrieving revision 1.1.2.1 +retrieving revision 1.1.2.4 +diff -u -p -r1.1.2.1 -r1.1.2.4 +--- filters/kword/pdf/xpdf/xpdf/XRef.cc 22 Oct 2004 12:13:56 -0000 1.1.2.1 ++++ filters/kword/pdf/xpdf/xpdf/XRef.cc 30 Oct 2004 16:43:47 -0000 1.1.2.4 +@@ -12,6 +12,7 @@ + #pragma implementation + #endif + ++#include <limits.h> + #include <stdlib.h> + #include <stddef.h> + #include <string.h> +@@ -76,7 +77,7 @@ XRef::XRef(BaseStream *strA, GString *ow + + // trailer is ok - read the xref table + } else { +- if (size*sizeof(XRefEntry)/sizeof(XRefEntry) != size) { ++ if ((unsigned) size >= INT_MAX / sizeof(XRefEntry)) { + error(-1, "Invalid 'size' inside xref table."); + ok = gFalse; + errCode = errDamaged; +@@ -273,7 +274,7 @@ GBool XRef::readXRef(Guint *pos) { + // table size + if (first + n > size) { + newSize = size + 256; +- if (newSize*sizeof(XRefEntry)/sizeof(XRefEntry) != newSize) { ++ if ((unsigned) newSize >= INT_MAX / sizeof(XRefEntry)) { + error(-1, "Invalid 'newSize'"); + goto err2; + } +@@ -420,7 +421,7 @@ GBool XRef::constructXRef() { + if (!strncmp(p, "obj", 3)) { + if (num >= size) { + newSize = (num + 1 + 255) & ~255; +- if (newSize*sizeof(XRefEntry)/sizeof(XRefEntry) != newSize) { ++ if ((unsigned) newSize >= INT_MAX / sizeof(XRefEntry)) { + error(-1, "Invalid 'obj' parameters."); + return gFalse; + } +@@ -445,7 +446,7 @@ GBool XRef::constructXRef() { + } else if (!strncmp(p, "endstream", 9)) { + if (streamEndsLen == streamEndsSize) { + streamEndsSize += 64; +- if (streamEndsSize*sizeof(int)/sizeof(int) != streamEndsSize) { ++ if ((unsigned) streamEndsSize >= INT_MAX / sizeof(int)) { + error(-1, "Invalid 'endstream' parameter."); + return gFalse; + } diff --git a/editors/koffice-kde3/pkg-plist b/editors/koffice-kde3/pkg-plist index fef180be29a4..695143c3b098 100644 --- a/editors/koffice-kde3/pkg-plist +++ b/editors/koffice-kde3/pkg-plist @@ -1902,6 +1902,14 @@ share/apps/koffice/pics/koPortrait.png share/apps/koffice/pics/koRulerFirst.png share/apps/koffice/pics/koRulerLeft.png share/apps/koffice/pics/koffice-logo.png +share/apps/konqueror/servicemenus/karbon_konqi.desktop +share/apps/konqueror/servicemenus/kexi_konqi.desktop +share/apps/konqueror/servicemenus/kformula_konqi.desktop +share/apps/konqueror/servicemenus/kivio_konqi.desktop +share/apps/konqueror/servicemenus/kpresenter_konqi.desktop +share/apps/konqueror/servicemenus/krita_konqi.desktop +share/apps/konqueror/servicemenus/kspread_konqi.desktop +share/apps/konqueror/servicemenus/kword_konqi.desktop share/apps/koshell/koshellui.rc share/apps/kpresenter/autoforms/.autoforms share/apps/kpresenter/autoforms/Arrows/.directory @@ -3094,10 +3102,7 @@ share/templates/TextDocument.desktop @dirrm share/icons/locolor/16x16/apps @dirrm share/icons/locolor/16x16 @dirrm share/icons/locolor -@dirrm share/icons/crystalsvg/48x48/apps -@dirrm share/icons/crystalsvg/32x32/apps @dirrm share/icons/crystalsvg/22x22/apps -@dirrm share/icons/crystalsvg/16x16/apps @dirrm share/doc/HTML/en/thesaurus @dirrm share/doc/HTML/en/kword @dirrm share/doc/HTML/en/kugar @@ -3203,6 +3208,8 @@ share/templates/TextDocument.desktop @dirrm share/apps/kpresenter/autoforms @dirrm share/apps/kpresenter @dirrm share/apps/koshell +@dirrm share/apps/konqueror/servicemenus +@dirrm share/apps/konqueror @dirrm share/apps/koffice/pics @dirrm share/apps/koffice/icons/crystalsvg/48x48/apps @dirrm share/apps/koffice/icons/crystalsvg/48x48 diff --git a/editors/koffice-kde4-l10n-ca/Makefile b/editors/koffice-kde4-l10n-ca/Makefile index b7f9274a2850..3f6797446a0c 100644 --- a/editors/koffice-kde4-l10n-ca/Makefile +++ b/editors/koffice-kde4-l10n-ca/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.3.2 +PORTVERSION= 1.3.4 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION:S/.0//}/src diff --git a/editors/koffice-kde4-l10n-ca/distinfo b/editors/koffice-kde4-l10n-ca/distinfo index 5ad9e463d212..55c50932feed 100644 --- a/editors/koffice-kde4-l10n-ca/distinfo +++ b/editors/koffice-kde4-l10n-ca/distinfo @@ -1,2 +1,2 @@ -MD5 (KDE/kde-i18n/koffice-i18n-ca-1.3.2.tar.bz2) = 64b81f2e77cecb2d1351a4b020bac9d9 -SIZE (KDE/kde-i18n/koffice-i18n-ca-1.3.2.tar.bz2) = 600798 +MD5 (KDE/kde-i18n/koffice-i18n-ca-1.3.4.tar.bz2) = 92f3c35950e45d3ba415e37d83d6b75f +SIZE (KDE/kde-i18n/koffice-i18n-ca-1.3.4.tar.bz2) = 579109 diff --git a/editors/koffice-kde4-l10n-ca/pkg-plist b/editors/koffice-kde4-l10n-ca/pkg-plist index 74bdc0cde688..b105c51256e3 100644 --- a/editors/koffice-kde4-l10n-ca/pkg-plist +++ b/editors/koffice-kde4-l10n-ca/pkg-plist @@ -5,11 +5,8 @@ share/locale/ca/LC_MESSAGES/example.mo share/locale/ca/LC_MESSAGES/karbon.mo share/locale/ca/LC_MESSAGES/karbonepsfilter.mo share/locale/ca/LC_MESSAGES/kchart.mo -share/locale/ca/LC_MESSAGES/kdgantt.mo -share/locale/ca/LC_MESSAGES/kexi.mo share/locale/ca/LC_MESSAGES/kfile_koffice.mo share/locale/ca/LC_MESSAGES/kfile_ooo.mo -share/locale/ca/LC_MESSAGES/kformdesigner.mo share/locale/ca/LC_MESSAGES/kformula.mo share/locale/ca/LC_MESSAGES/kformulalatexfilter.mo share/locale/ca/LC_MESSAGES/kformulamathmlfilter.mo @@ -19,10 +16,8 @@ share/locale/ca/LC_MESSAGES/koconverter.mo share/locale/ca/LC_MESSAGES/koffice.mo share/locale/ca/LC_MESSAGES/koshell.mo share/locale/ca/LC_MESSAGES/kounavail.mo -share/locale/ca/LC_MESSAGES/kplato.mo share/locale/ca/LC_MESSAGES/kpresenter.mo share/locale/ca/LC_MESSAGES/kpresenterkwordfilter.mo -share/locale/ca/LC_MESSAGES/krita.mo share/locale/ca/LC_MESSAGES/kscan_plugin.mo share/locale/ca/LC_MESSAGES/kspread.mo share/locale/ca/LC_MESSAGES/kspreadcalc_calc.mo diff --git a/editors/koffice-kde4-l10n-da/Makefile b/editors/koffice-kde4-l10n-da/Makefile index 389047ae8a70..223ec0908929 100644 --- a/editors/koffice-kde4-l10n-da/Makefile +++ b/editors/koffice-kde4-l10n-da/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.3.2 +PORTVERSION= 1.3.4 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION:S/.0//}/src diff --git a/editors/koffice-kde4-l10n-da/distinfo b/editors/koffice-kde4-l10n-da/distinfo index 685403c81d31..048958cf1418 100644 --- a/editors/koffice-kde4-l10n-da/distinfo +++ b/editors/koffice-kde4-l10n-da/distinfo @@ -1,2 +1,2 @@ -MD5 (KDE/kde-i18n/koffice-i18n-da-1.3.2.tar.bz2) = dec78da3da7685d5d2ffea73c68323ae -SIZE (KDE/kde-i18n/koffice-i18n-da-1.3.2.tar.bz2) = 1061611 +MD5 (KDE/kde-i18n/koffice-i18n-da-1.3.4.tar.bz2) = 380f08397afe19a9958539bb692ecb12 +SIZE (KDE/kde-i18n/koffice-i18n-da-1.3.4.tar.bz2) = 1084794 diff --git a/editors/koffice-kde4-l10n-el/Makefile b/editors/koffice-kde4-l10n-el/Makefile index 6c9f6f5775c5..88976eeab3db 100644 --- a/editors/koffice-kde4-l10n-el/Makefile +++ b/editors/koffice-kde4-l10n-el/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.3.2 +PORTVERSION= 1.3.4 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION:S/.0//}/src diff --git a/editors/koffice-kde4-l10n-el/distinfo b/editors/koffice-kde4-l10n-el/distinfo index 5a083782ffa5..a68be89bd51b 100644 --- a/editors/koffice-kde4-l10n-el/distinfo +++ b/editors/koffice-kde4-l10n-el/distinfo @@ -1,2 +1,2 @@ -MD5 (KDE/kde-i18n/koffice-i18n-el-1.3.2.tar.bz2) = 35d810ee4b2a432fee24c19c9e9fa997 -SIZE (KDE/kde-i18n/koffice-i18n-el-1.3.2.tar.bz2) = 524219 +MD5 (KDE/kde-i18n/koffice-i18n-el-1.3.4.tar.bz2) = 2553159c99293c505422db1b8543381a +SIZE (KDE/kde-i18n/koffice-i18n-el-1.3.4.tar.bz2) = 517034 diff --git a/editors/koffice-kde4-l10n-en_GB/Makefile b/editors/koffice-kde4-l10n-en_GB/Makefile index b40f86fb0cde..22e882e1a03a 100644 --- a/editors/koffice-kde4-l10n-en_GB/Makefile +++ b/editors/koffice-kde4-l10n-en_GB/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.3.2 +PORTVERSION= 1.3.4 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION:S/.0//}/src diff --git a/editors/koffice-kde4-l10n-en_GB/distinfo b/editors/koffice-kde4-l10n-en_GB/distinfo index d1b12acbde77..b5769de1b403 100644 --- a/editors/koffice-kde4-l10n-en_GB/distinfo +++ b/editors/koffice-kde4-l10n-en_GB/distinfo @@ -1,2 +1,2 @@ -MD5 (KDE/kde-i18n/koffice-i18n-en_GB-1.3.2.tar.bz2) = d482c100ebe5ff4fdd666d8968b36e54 -SIZE (KDE/kde-i18n/koffice-i18n-en_GB-1.3.2.tar.bz2) = 549415 +MD5 (KDE/kde-i18n/koffice-i18n-en_GB-1.3.4.tar.bz2) = b570ad31d8f714b94051594b6524809e +SIZE (KDE/kde-i18n/koffice-i18n-en_GB-1.3.4.tar.bz2) = 541033 diff --git a/editors/koffice-kde4-l10n-es/Makefile b/editors/koffice-kde4-l10n-es/Makefile index 2a8cc6487ad5..ab07b03c2b18 100644 --- a/editors/koffice-kde4-l10n-es/Makefile +++ b/editors/koffice-kde4-l10n-es/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.3.2 +PORTVERSION= 1.3.4 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION:S/.0//}/src diff --git a/editors/koffice-kde4-l10n-es/distinfo b/editors/koffice-kde4-l10n-es/distinfo index 217e0aa8da44..35b3766ea758 100644 --- a/editors/koffice-kde4-l10n-es/distinfo +++ b/editors/koffice-kde4-l10n-es/distinfo @@ -1,2 +1,2 @@ -MD5 (KDE/kde-i18n/koffice-i18n-es-1.3.2.tar.bz2) = a3b1067594093968644ddd22c9501120 -SIZE (KDE/kde-i18n/koffice-i18n-es-1.3.2.tar.bz2) = 1733975 +MD5 (KDE/kde-i18n/koffice-i18n-es-1.3.4.tar.bz2) = 1ea77f3630e893cb5a90e62ef1f46d3c +SIZE (KDE/kde-i18n/koffice-i18n-es-1.3.4.tar.bz2) = 1085846 diff --git a/editors/koffice-kde4-l10n-et/Makefile b/editors/koffice-kde4-l10n-et/Makefile index 9f71a3bc0a72..f24cc01a6116 100644 --- a/editors/koffice-kde4-l10n-et/Makefile +++ b/editors/koffice-kde4-l10n-et/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.3.2 +PORTVERSION= 1.3.4 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION:S/.0//}/src diff --git a/editors/koffice-kde4-l10n-et/distinfo b/editors/koffice-kde4-l10n-et/distinfo index 99bc8cdd58fb..ae8dad7135f6 100644 --- a/editors/koffice-kde4-l10n-et/distinfo +++ b/editors/koffice-kde4-l10n-et/distinfo @@ -1,2 +1,2 @@ -MD5 (KDE/kde-i18n/koffice-i18n-et-1.3.2.tar.bz2) = fefea899f957e8cfe2e9b2a46a7c8895 -SIZE (KDE/kde-i18n/koffice-i18n-et-1.3.2.tar.bz2) = 1184170 +MD5 (KDE/kde-i18n/koffice-i18n-et-1.3.4.tar.bz2) = bd92ef9522f9bdf7a3009a4c6cf4ddb2 +SIZE (KDE/kde-i18n/koffice-i18n-et-1.3.4.tar.bz2) = 1204587 diff --git a/editors/koffice-kde4-l10n-it/Makefile b/editors/koffice-kde4-l10n-it/Makefile index 65878060be43..6dfd703b6744 100644 --- a/editors/koffice-kde4-l10n-it/Makefile +++ b/editors/koffice-kde4-l10n-it/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.3.2 +PORTVERSION= 1.3.4 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION:S/.0//}/src diff --git a/editors/koffice-kde4-l10n-it/distinfo b/editors/koffice-kde4-l10n-it/distinfo index da18d3b8da25..eaa0c6f032e1 100644 --- a/editors/koffice-kde4-l10n-it/distinfo +++ b/editors/koffice-kde4-l10n-it/distinfo @@ -1,2 +1,2 @@ -MD5 (KDE/kde-i18n/koffice-i18n-it-1.3.2.tar.bz2) = 76b0983454ff1af4f116f25e1fdb26c1 -SIZE (KDE/kde-i18n/koffice-i18n-it-1.3.2.tar.bz2) = 1628461 +MD5 (KDE/kde-i18n/koffice-i18n-it-1.3.4.tar.bz2) = 87a62e8215f5d28964fa65b0d8ae3cec +SIZE (KDE/kde-i18n/koffice-i18n-it-1.3.4.tar.bz2) = 1381710 diff --git a/editors/koffice-kde4-l10n-it/pkg-plist b/editors/koffice-kde4-l10n-it/pkg-plist index 250b9416e3e4..1ed657477821 100644 --- a/editors/koffice-kde4-l10n-it/pkg-plist +++ b/editors/koffice-kde4-l10n-it/pkg-plist @@ -5,7 +5,10 @@ share/doc/HTML/it/kchart/index.docbook share/doc/HTML/it/kformula/common share/doc/HTML/it/kformula/index.cache.bz2 share/doc/HTML/it/kformula/index.docbook +share/doc/HTML/it/kivio/common share/doc/HTML/it/kivio/credits.docbook +share/doc/HTML/it/kivio/index.cache.bz2 +share/doc/HTML/it/kivio/index.docbook share/doc/HTML/it/kivio/introduction.docbook share/doc/HTML/it/kivio/usage.docbook share/doc/HTML/it/kivio/working.docbook @@ -100,7 +103,6 @@ share/locale/it/LC_MESSAGES/kwordasciifilter.mo share/locale/it/LC_MESSAGES/kwordhtmlexportfilter.mo share/locale/it/LC_MESSAGES/kwordhtmlimportfilter.mo share/locale/it/LC_MESSAGES/kwordlatexexportfilter.mo -share/locale/it/LC_MESSAGES/kwordlatexfilter.mo share/locale/it/LC_MESSAGES/kwordlateximportfilter.mo share/locale/it/LC_MESSAGES/kwordmswordfilter.mo share/locale/it/LC_MESSAGES/kwordmswritefilter.mo diff --git a/editors/koffice-kde4-l10n-nb/Makefile b/editors/koffice-kde4-l10n-nb/Makefile index dd497a5c2498..eeb628c86f24 100644 --- a/editors/koffice-kde4-l10n-nb/Makefile +++ b/editors/koffice-kde4-l10n-nb/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.3.2 +PORTVERSION= 1.3.4 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION:S/.0//}/src diff --git a/editors/koffice-kde4-l10n-nb/distinfo b/editors/koffice-kde4-l10n-nb/distinfo index 2c94ad8673ad..43728c25e137 100644 --- a/editors/koffice-kde4-l10n-nb/distinfo +++ b/editors/koffice-kde4-l10n-nb/distinfo @@ -1,2 +1,2 @@ -MD5 (KDE/kde-i18n/koffice-i18n-nb-1.3.2.tar.bz2) = 152cd5f93bfbc48fa1a5ba773e6b346a -SIZE (KDE/kde-i18n/koffice-i18n-nb-1.3.2.tar.bz2) = 619257 +MD5 (KDE/kde-i18n/koffice-i18n-nb-1.3.4.tar.bz2) = e62a2c0ee5fbce326dce566b37c03380 +SIZE (KDE/kde-i18n/koffice-i18n-nb-1.3.4.tar.bz2) = 652286 diff --git a/editors/koffice-kde4-l10n-nb/pkg-plist b/editors/koffice-kde4-l10n-nb/pkg-plist index 506fa2835366..b447971fba29 100644 --- a/editors/koffice-kde4-l10n-nb/pkg-plist +++ b/editors/koffice-kde4-l10n-nb/pkg-plist @@ -49,5 +49,3 @@ share/locale/nb/LC_MESSAGES/olefilterswinword97filter.mo share/locale/nb/LC_MESSAGES/thesaurus_tool.mo share/locale/nb/LC_MESSAGES/xsltexportfilter.mo share/locale/nb/LC_MESSAGES/xsltimportfilter.mo -@dirrm share/locale/nb/LC_MESSAGES -@dirrm share/locale/nb diff --git a/editors/koffice-kde4-l10n-nl/Makefile b/editors/koffice-kde4-l10n-nl/Makefile index 73cb198b0ba6..cade5a846370 100644 --- a/editors/koffice-kde4-l10n-nl/Makefile +++ b/editors/koffice-kde4-l10n-nl/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.3.2 +PORTVERSION= 1.3.4 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION:S/.0//}/src diff --git a/editors/koffice-kde4-l10n-nl/distinfo b/editors/koffice-kde4-l10n-nl/distinfo index 25ecb8825ada..bb70b8af9559 100644 --- a/editors/koffice-kde4-l10n-nl/distinfo +++ b/editors/koffice-kde4-l10n-nl/distinfo @@ -1,2 +1,2 @@ -MD5 (KDE/kde-i18n/koffice-i18n-nl-1.3.2.tar.bz2) = d40a5d78ddead57fe8a5806499db83eb -SIZE (KDE/kde-i18n/koffice-i18n-nl-1.3.2.tar.bz2) = 618585 +MD5 (KDE/kde-i18n/koffice-i18n-nl-1.3.4.tar.bz2) = 783fd4e43104aac9244befc6aebe9712 +SIZE (KDE/kde-i18n/koffice-i18n-nl-1.3.4.tar.bz2) = 613058 diff --git a/editors/koffice-kde4-l10n-sv/Makefile b/editors/koffice-kde4-l10n-sv/Makefile index 9e0286b8c377..2121f5edbf55 100644 --- a/editors/koffice-kde4-l10n-sv/Makefile +++ b/editors/koffice-kde4-l10n-sv/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.3.2 +PORTVERSION= 1.3.4 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION:S/.0//}/src diff --git a/editors/koffice-kde4-l10n-sv/distinfo b/editors/koffice-kde4-l10n-sv/distinfo index 0ef1592d4f85..8f80664c5ce5 100644 --- a/editors/koffice-kde4-l10n-sv/distinfo +++ b/editors/koffice-kde4-l10n-sv/distinfo @@ -1,2 +1,2 @@ -MD5 (KDE/kde-i18n/koffice-i18n-sv-1.3.2.tar.bz2) = f5431d336eca9b5baff397eb18736a22 -SIZE (KDE/kde-i18n/koffice-i18n-sv-1.3.2.tar.bz2) = 4185172 +MD5 (KDE/kde-i18n/koffice-i18n-sv-1.3.4.tar.bz2) = 759a81ab33b5bc99c8816446df8720c7 +SIZE (KDE/kde-i18n/koffice-i18n-sv-1.3.4.tar.bz2) = 4160432 diff --git a/editors/koffice-kde4-l10n-sv/pkg-plist b/editors/koffice-kde4-l10n-sv/pkg-plist index d9cacf5c0378..12dee2273a0a 100644 --- a/editors/koffice-kde4-l10n-sv/pkg-plist +++ b/editors/koffice-kde4-l10n-sv/pkg-plist @@ -322,11 +322,8 @@ share/locale/sv/LC_MESSAGES/example.mo share/locale/sv/LC_MESSAGES/karbon.mo share/locale/sv/LC_MESSAGES/karbonepsfilter.mo share/locale/sv/LC_MESSAGES/kchart.mo -share/locale/sv/LC_MESSAGES/kdgantt.mo -share/locale/sv/LC_MESSAGES/kexi.mo share/locale/sv/LC_MESSAGES/kfile_koffice.mo share/locale/sv/LC_MESSAGES/kfile_ooo.mo -share/locale/sv/LC_MESSAGES/kformdesigner.mo share/locale/sv/LC_MESSAGES/kformula.mo share/locale/sv/LC_MESSAGES/kformulalatexfilter.mo share/locale/sv/LC_MESSAGES/kformulamathmlfilter.mo @@ -336,10 +333,8 @@ share/locale/sv/LC_MESSAGES/koconverter.mo share/locale/sv/LC_MESSAGES/koffice.mo share/locale/sv/LC_MESSAGES/koshell.mo share/locale/sv/LC_MESSAGES/kounavail.mo -share/locale/sv/LC_MESSAGES/kplato.mo share/locale/sv/LC_MESSAGES/kpresenter.mo share/locale/sv/LC_MESSAGES/kpresenterkwordfilter.mo -share/locale/sv/LC_MESSAGES/krita.mo share/locale/sv/LC_MESSAGES/kscan_plugin.mo share/locale/sv/LC_MESSAGES/kspread.mo share/locale/sv/LC_MESSAGES/kspreadcalc_calc.mo @@ -356,7 +351,6 @@ share/locale/sv/LC_MESSAGES/kwordasciifilter.mo share/locale/sv/LC_MESSAGES/kwordhtmlexportfilter.mo share/locale/sv/LC_MESSAGES/kwordhtmlimportfilter.mo share/locale/sv/LC_MESSAGES/kwordlatexexportfilter.mo -share/locale/sv/LC_MESSAGES/kwordlatexfilter.mo share/locale/sv/LC_MESSAGES/kwordlateximportfilter.mo share/locale/sv/LC_MESSAGES/kwordmswordfilter.mo share/locale/sv/LC_MESSAGES/kwordmswritefilter.mo diff --git a/editors/koffice-kde4-l10n-tr/Makefile b/editors/koffice-kde4-l10n-tr/Makefile index 816fd6dffba8..6c7ec2ecb50e 100644 --- a/editors/koffice-kde4-l10n-tr/Makefile +++ b/editors/koffice-kde4-l10n-tr/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.3.2 +PORTVERSION= 1.3.4 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION:S/.0//}/src diff --git a/editors/koffice-kde4-l10n-tr/distinfo b/editors/koffice-kde4-l10n-tr/distinfo index 318b8f084a26..3beae7b78701 100644 --- a/editors/koffice-kde4-l10n-tr/distinfo +++ b/editors/koffice-kde4-l10n-tr/distinfo @@ -1,2 +1,2 @@ -MD5 (KDE/kde-i18n/koffice-i18n-tr-1.3.2.tar.bz2) = 46b6958734ece8ffa3ecec6a1230a958 -SIZE (KDE/kde-i18n/koffice-i18n-tr-1.3.2.tar.bz2) = 598181 +MD5 (KDE/kde-i18n/koffice-i18n-tr-1.3.4.tar.bz2) = 7fe59f9e9c8ce968231f891bd8aadd25 +SIZE (KDE/kde-i18n/koffice-i18n-tr-1.3.4.tar.bz2) = 593459 diff --git a/editors/koffice-kde4-l10n/Makefile b/editors/koffice-kde4-l10n/Makefile index 94ddc075555a..6edeb8f7852e 100644 --- a/editors/koffice-kde4-l10n/Makefile +++ b/editors/koffice-kde4-l10n/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.3.2 +PORTVERSION= 1.3.4 CATEGORIES= misc kde MASTER_SITES= # none DISTFILES= # none @@ -29,7 +29,7 @@ RUN_DEPENDS+=\ ${LOCALBASE}/share/locale/uk/LC_MESSAGES/kword.mo:${PORTSDIR}/ukrainian/koffice-i18n\ ${LOCALBASE}/share/locale/zh_TW/LC_MESSAGES/kword.mo:${PORTSDIR}/chinese/koffice-i18n-zh_TW -.for LANG in af bg bs ca cs da el en_GB eo es et fa fi it \ +.for LANG in af bg bs ca cs da el en_GB eo es et fa fi hsb it \ lo lt lv mt nb nl nn se sk sl sr sv tg th tr ven xh zu RUN_DEPENDS+=\ ${LOCALBASE}/share/locale/${LANG}/LC_MESSAGES/kword.mo:${PORTSDIR}/misc/koffice-i18n-${LANG} diff --git a/editors/koffice-kde4/Makefile b/editors/koffice-kde4/Makefile index 32351cfe58f7..eb58f1bcf16c 100644 --- a/editors/koffice-kde4/Makefile +++ b/editors/koffice-kde4/Makefile @@ -7,8 +7,7 @@ # PORTNAME= koffice -PORTVERSION= 1.3.2 -PORTREVISION= 1 +PORTVERSION= 1.3.4 PORTEPOCH= 1 CATEGORIES= editors kde MASTER_SITES= ${MASTER_SITE_KDE} @@ -38,7 +37,7 @@ USE_GMAKE= yes USE_ICONV= yes USE_PYTHON= yes GNU_CONFIGURE= yes -_NO_KDE_CLOSURE= yes +_NO_KDE_FIXPTHREAD= yes INSTALLS_SHLIB= yes LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3 diff --git a/editors/koffice-kde4/distinfo b/editors/koffice-kde4/distinfo index 820fe1879077..9ac09634c272 100644 --- a/editors/koffice-kde4/distinfo +++ b/editors/koffice-kde4/distinfo @@ -1,2 +1,2 @@ -MD5 (KDE/koffice/koffice-1.3.2.tar.bz2) = 078a371f6768bea53b84ea342ac0b34b -SIZE (KDE/koffice/koffice-1.3.2.tar.bz2) = 10736662 +MD5 (KDE/koffice/koffice-1.3.4.tar.bz2) = 79896426542b0cf07e2e15f84946905a +SIZE (KDE/koffice/koffice-1.3.4.tar.bz2) = 10765924 diff --git a/editors/koffice-kde4/files/patch-configure b/editors/koffice-kde4/files/patch-configure new file mode 100644 index 000000000000..5147ed156f26 --- /dev/null +++ b/editors/koffice-kde4/files/patch-configure @@ -0,0 +1,11 @@ +--- configure.orig Sat Oct 30 03:46:09 2004 ++++ configure Sat Oct 30 03:46:54 2004 +@@ -26335,7 +26335,7 @@ + PTHREAD_LIBS="$PTHREAD_LIBS_save" + fi + +- if test -z "$LIBPTHREAD"; then ++ if test -z "$LIBPTHREAD" && test "$PTHREAD_LIBS" != "-pthread" ; then + echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5 + echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6 + if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then diff --git a/editors/koffice-kde4/files/patch-filters_kword_pdf_xpdf_xpdf_Catalog.cc b/editors/koffice-kde4/files/patch-filters_kword_pdf_xpdf_xpdf_Catalog.cc deleted file mode 100644 index 1e54fc9cb30e..000000000000 --- a/editors/koffice-kde4/files/patch-filters_kword_pdf_xpdf_xpdf_Catalog.cc +++ /dev/null @@ -1,27 +0,0 @@ ---- filters/kword/pdf/xpdf/xpdf/Catalog.cc.orig 2004-10-18 16:26:39.388666476 +0200 -+++ filters/kword/pdf/xpdf/xpdf/Catalog.cc 2004-10-18 16:27:28.004749073 +0200 -@@ -62,6 +62,12 @@ - } - pagesSize = numPages0 = obj.getInt(); - obj.free(); -+ if (pagesSize*sizeof(Page *)/sizeof(Page *) != pagesSize || -+ pagesSize*sizeof(Ref)/sizeof(Ref) != pagesSize) { -+ error(-1, "Invalid 'pagesSize'"); -+ ok = gFalse; -+ return; -+ } - pages = (Page **)gmalloc(pagesSize * sizeof(Page *)); - pageRefs = (Ref *)gmalloc(pagesSize * sizeof(Ref)); - for (i = 0; i < pagesSize; ++i) { -@@ -186,6 +192,11 @@ - } - if (start >= pagesSize) { - pagesSize += 32; -+ if (pagesSize*sizeof(Page *)/sizeof(Page *) != pagesSize || -+ pagesSize*sizeof(Ref)/sizeof(Ref) != pagesSize) { -+ error(-1, "Invalid 'pagesSize' parameter."); -+ goto err3; -+ } - pages = (Page **)grealloc(pages, pagesSize * sizeof(Page *)); - pageRefs = (Ref *)grealloc(pageRefs, pagesSize * sizeof(Ref)); - for (j = pagesSize - 32; j < pagesSize; ++j) { diff --git a/editors/koffice-kde4/files/patch-filters_kword_pdf_xpdf_xpdf_XRef.cc b/editors/koffice-kde4/files/patch-filters_kword_pdf_xpdf_xpdf_XRef.cc deleted file mode 100644 index 935e7b56c6e6..000000000000 --- a/editors/koffice-kde4/files/patch-filters_kword_pdf_xpdf_xpdf_XRef.cc +++ /dev/null @@ -1,49 +0,0 @@ ---- filters/kword/pdf/xpdf/xpdf/XRef.cc.orig 2004-09-17 23:54:38.000000000 -0700 -+++ filters/kword/pdf/xpdf/xpdf/XRef.cc 2004-09-25 17:59:36.000000000 -0700 -@@ -76,6 +76,12 @@ - - // trailer is ok - read the xref table - } else { -+ if (size*sizeof(XRefEntry)/sizeof(XRefEntry) != size) { -+ error(-1, "Invalid 'size' inside xref table."); -+ ok = gFalse; -+ errCode = errDamaged; -+ return; -+ } - entries = (XRefEntry *)gmalloc(size * sizeof(XRefEntry)); - for (i = 0; i < size; ++i) { - entries[i].offset = 0xffffffff; -@@ -267,6 +273,10 @@ - // table size - if (first + n > size) { - newSize = size + 256; -+ if (newSize*sizeof(XRefEntry)/sizeof(XRefEntry) != newSize) { -+ error(-1, "Invalid 'newSize'"); -+ goto err2; -+ } - entries = (XRefEntry *)grealloc(entries, newSize * sizeof(XRefEntry)); - for (i = size; i < newSize; ++i) { - entries[i].offset = 0xffffffff; -@@ -410,6 +420,10 @@ - if (!strncmp(p, "obj", 3)) { - if (num >= size) { - newSize = (num + 1 + 255) & ~255; -+ if (newSize*sizeof(XRefEntry)/sizeof(XRefEntry) != newSize) { -+ error(-1, "Invalid 'obj' parameters."); -+ return gFalse; -+ } - entries = (XRefEntry *) - grealloc(entries, newSize * sizeof(XRefEntry)); - for (i = size; i < newSize; ++i) { -@@ -431,6 +445,11 @@ - } else if (!strncmp(p, "endstream", 9)) { - if (streamEndsLen == streamEndsSize) { - streamEndsSize += 64; -+ if (streamEndsSize*sizeof(int)/sizeof(int) != streamEndsSize) { -+ error(-1, "Invalid 'endstream' parameter."); -+ return gFalse; -+ } -+ - streamEnds = (Guint *)grealloc(streamEnds, - streamEndsSize * sizeof(int)); - } diff --git a/editors/koffice-kde4/files/patch-koffice_1_3_4_xpdf_security_integer_overflow b/editors/koffice-kde4/files/patch-koffice_1_3_4_xpdf_security_integer_overflow new file mode 100644 index 000000000000..449806bd4fdb --- /dev/null +++ b/editors/koffice-kde4/files/patch-koffice_1_3_4_xpdf_security_integer_overflow @@ -0,0 +1,90 @@ +Index: Catalog.cc +=================================================================== +RCS file: /home/kde/koffice/filters/kword/pdf/xpdf/xpdf/Catalog.cc,v +retrieving revision 1.1.2.1 +retrieving revision 1.1.2.4 +diff -u -p -r1.1.2.1 -r1.1.2.4 +--- filters/kword/pdf/xpdf/xpdf/Catalog.cc 22 Oct 2004 12:13:56 -0000 1.1.2.1 ++++ filters/kword/pdf/xpdf/xpdf/Catalog.cc 30 Oct 2004 16:43:47 -0000 1.1.2.4 +@@ -12,6 +12,7 @@ + #pragma implementation + #endif + ++#include <limits.h> + #include <stddef.h> + #include "gmem.h" + #include "Object.h" +@@ -63,8 +64,8 @@ Catalog::Catalog(XRef *xrefA) { + } + pagesSize = numPages0 = obj.getInt(); + obj.free(); +- if (pagesSize*sizeof(Page *)/sizeof(Page *) != pagesSize || +- pagesSize*sizeof(Ref)/sizeof(Ref) != pagesSize) { ++ if ((unsigned) pagesSize >= INT_MAX / sizeof(Page *) || ++ (unsigned) pagesSize >= INT_MAX / sizeof(Ref)) { + error(-1, "Invalid 'pagesSize'"); + ok = gFalse; + return; +@@ -196,8 +197,8 @@ int Catalog::readPageTree(Dict *pagesDic + } + if (start >= pagesSize) { + pagesSize += 32; +- if (pagesSize*sizeof(Page *)/sizeof(Page *) != pagesSize || +- pagesSize*sizeof(Ref)/sizeof(Ref) != pagesSize) { ++ if ((unsigned) pagesSize >= INT_MAX / sizeof(Page *) || ++ (unsigned) pagesSize >= INT_MAX / sizeof(Ref)) { + error(-1, "Invalid 'pagesSize' parameter."); + goto err3; + } +Index: XRef.cc +=================================================================== +RCS file: /home/kde/koffice/filters/kword/pdf/xpdf/xpdf/XRef.cc,v +retrieving revision 1.1.2.1 +retrieving revision 1.1.2.4 +diff -u -p -r1.1.2.1 -r1.1.2.4 +--- filters/kword/pdf/xpdf/xpdf/XRef.cc 22 Oct 2004 12:13:56 -0000 1.1.2.1 ++++ filters/kword/pdf/xpdf/xpdf/XRef.cc 30 Oct 2004 16:43:47 -0000 1.1.2.4 +@@ -12,6 +12,7 @@ + #pragma implementation + #endif + ++#include <limits.h> + #include <stdlib.h> + #include <stddef.h> + #include <string.h> +@@ -76,7 +77,7 @@ XRef::XRef(BaseStream *strA, GString *ow + + // trailer is ok - read the xref table + } else { +- if (size*sizeof(XRefEntry)/sizeof(XRefEntry) != size) { ++ if ((unsigned) size >= INT_MAX / sizeof(XRefEntry)) { + error(-1, "Invalid 'size' inside xref table."); + ok = gFalse; + errCode = errDamaged; +@@ -273,7 +274,7 @@ GBool XRef::readXRef(Guint *pos) { + // table size + if (first + n > size) { + newSize = size + 256; +- if (newSize*sizeof(XRefEntry)/sizeof(XRefEntry) != newSize) { ++ if ((unsigned) newSize >= INT_MAX / sizeof(XRefEntry)) { + error(-1, "Invalid 'newSize'"); + goto err2; + } +@@ -420,7 +421,7 @@ GBool XRef::constructXRef() { + if (!strncmp(p, "obj", 3)) { + if (num >= size) { + newSize = (num + 1 + 255) & ~255; +- if (newSize*sizeof(XRefEntry)/sizeof(XRefEntry) != newSize) { ++ if ((unsigned) newSize >= INT_MAX / sizeof(XRefEntry)) { + error(-1, "Invalid 'obj' parameters."); + return gFalse; + } +@@ -445,7 +446,7 @@ GBool XRef::constructXRef() { + } else if (!strncmp(p, "endstream", 9)) { + if (streamEndsLen == streamEndsSize) { + streamEndsSize += 64; +- if (streamEndsSize*sizeof(int)/sizeof(int) != streamEndsSize) { ++ if ((unsigned) streamEndsSize >= INT_MAX / sizeof(int)) { + error(-1, "Invalid 'endstream' parameter."); + return gFalse; + } diff --git a/editors/koffice-kde4/pkg-plist b/editors/koffice-kde4/pkg-plist index fef180be29a4..695143c3b098 100644 --- a/editors/koffice-kde4/pkg-plist +++ b/editors/koffice-kde4/pkg-plist @@ -1902,6 +1902,14 @@ share/apps/koffice/pics/koPortrait.png share/apps/koffice/pics/koRulerFirst.png share/apps/koffice/pics/koRulerLeft.png share/apps/koffice/pics/koffice-logo.png +share/apps/konqueror/servicemenus/karbon_konqi.desktop +share/apps/konqueror/servicemenus/kexi_konqi.desktop +share/apps/konqueror/servicemenus/kformula_konqi.desktop +share/apps/konqueror/servicemenus/kivio_konqi.desktop +share/apps/konqueror/servicemenus/kpresenter_konqi.desktop +share/apps/konqueror/servicemenus/krita_konqi.desktop +share/apps/konqueror/servicemenus/kspread_konqi.desktop +share/apps/konqueror/servicemenus/kword_konqi.desktop share/apps/koshell/koshellui.rc share/apps/kpresenter/autoforms/.autoforms share/apps/kpresenter/autoforms/Arrows/.directory @@ -3094,10 +3102,7 @@ share/templates/TextDocument.desktop @dirrm share/icons/locolor/16x16/apps @dirrm share/icons/locolor/16x16 @dirrm share/icons/locolor -@dirrm share/icons/crystalsvg/48x48/apps -@dirrm share/icons/crystalsvg/32x32/apps @dirrm share/icons/crystalsvg/22x22/apps -@dirrm share/icons/crystalsvg/16x16/apps @dirrm share/doc/HTML/en/thesaurus @dirrm share/doc/HTML/en/kword @dirrm share/doc/HTML/en/kugar @@ -3203,6 +3208,8 @@ share/templates/TextDocument.desktop @dirrm share/apps/kpresenter/autoforms @dirrm share/apps/kpresenter @dirrm share/apps/koshell +@dirrm share/apps/konqueror/servicemenus +@dirrm share/apps/konqueror @dirrm share/apps/koffice/pics @dirrm share/apps/koffice/icons/crystalsvg/48x48/apps @dirrm share/apps/koffice/icons/crystalsvg/48x48 diff --git a/editors/vimpart/distinfo b/editors/vimpart/distinfo index 070945a1593c..ddf6c6fbdb7b 100644 --- a/editors/vimpart/distinfo +++ b/editors/vimpart/distinfo @@ -1,2 +1,2 @@ -MD5 (KDE/kdeaddons-3.3.0.tar.bz2) = 6ba019d8b3ce0811ae2c861d6819aaab -SIZE (KDE/kdeaddons-3.3.0.tar.bz2) = 1554404 +MD5 (KDE/kdeaddons-3.3.1.tar.bz2) = 69ec1deff7ae2d0c3602bb141ed4c546 +SIZE (KDE/kdeaddons-3.3.1.tar.bz2) = 1556965 diff --git a/editors/vimpart/pkg-plist b/editors/vimpart/pkg-plist index 451c254aa0ba..4c83af8e76c9 100644 --- a/editors/vimpart/pkg-plist +++ b/editors/vimpart/pkg-plist @@ -7,7 +7,7 @@ lib/libxvim.la lib/libxvim.so lib/libxvim.so.0 share/applications/kde/kcmvim.desktop -share/applications/kdeaddons-vimpart-3.3.0 +share/applications/kdeaddons-vimpart-3.3.1 share/apps/kcontrol/pics/kvim.png share/apps/vimpart/kvim.vim share/apps/vimpart/vimpartui.rc |