diff options
| -rw-r--r-- | misc/koffice/Makefile | 27 | ||||
| -rw-r--r-- | misc/koffice/PLIST | 10 | ||||
| -rw-r--r-- | misc/koffice/distinfo | 10 | ||||
| -rw-r--r-- | misc/koffice/patches/patch-al | 14 |
4 files changed, 19 insertions, 42 deletions
diff --git a/misc/koffice/Makefile b/misc/koffice/Makefile index 9b78261aa6d..d6694abfdd9 100644 --- a/misc/koffice/Makefile +++ b/misc/koffice/Makefile @@ -1,13 +1,13 @@ -# $NetBSD: Makefile,v 1.65 2005/10/02 12:35:37 seb Exp $ +# $NetBSD: Makefile,v 1.66 2005/10/11 23:34:02 markd Exp $ -DISTNAME= koffice-1.4.1 +DISTNAME= koffice-1.4.2 CATEGORIES= misc kde -MASTER_SITES= ftp://ftp.kde.org/pub/kde/stable/koffice-1.4.1/src/ \ - ftp://ftp.us.kde.org/pub/kde/stable/koffice-1.4.1/src/ \ - ftp://ftp.de.kde.org/pub/kde/stable/koffice-1.4.1/src/ +MASTER_SITES= ftp://ftp.kde.org/pub/kde/stable/koffice-1.4.2/src/ \ + ftp://ftp.us.kde.org/pub/kde/stable/koffice-1.4.2/src/ \ + ftp://ftp.de.kde.org/pub/kde/stable/koffice-1.4.2/src/ EXTRACT_SUFX= .tar.bz2 -MAINTAINER= tech-pkg@NetBSD.org +MAINTAINER= markd@NetBSD.org HOMEPAGE= http://www.koffice.org/ COMMENT= KDE Office Suite @@ -41,21 +41,6 @@ REPLACE_PERL+= kpresenter/kprconverter.pl # Ensure we export symbols in the linked shared object. LDFLAGS+= ${EXPORT_SYMBOLS_LDFLAGS} -# a fix for qt-3.3.5, please remove if qt-3.3.6 (or newer) solves the problem -SUBST_CLASSES+= hints -SUBST_STAGE.hints= post-patch -SUBST_MESSAGE.hints= "Fix includehints." -SUBST_FILES.hints= krita/ui/widgets/kis_wdg_autogradient.ui \ - krita/ui/kis_previewwidgetbase.ui \ - krita/ui/wdgnewimage.ui \ - krita/ui/wdgcolorsettings.ui \ - krita/ui/wdglayerbox.ui \ - krita/plugins/screenshot/ksnapshotwidget.ui \ - krita/plugins/convolutionfilters/kis_custom_convolution_filter_configuration_base_widget.ui \ - krita/plugins/colorspaceconversion/wdgconvertcolorspace.ui \ - kpresenter/imageEffectBase.ui -SUBST_FILTER_CMD.hints= ${GREP} -v includehint - .include "options.mk" post-install: diff --git a/misc/koffice/PLIST b/misc/koffice/PLIST index 8b0b37e6735..43360a5863d 100644 --- a/misc/koffice/PLIST +++ b/misc/koffice/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.16 2005/07/25 13:05:51 markd Exp $ +@comment $NetBSD: PLIST,v 1.17 2005/10/11 23:34:02 markd Exp $ bin/karbon bin/kchart bin/kexi @@ -353,7 +353,9 @@ lib/libkwmailmerge_interface.la lib/libkwmf.la lib/libkwordexportfilters.la share/applications/kde/kexi.desktop +share/applications/kde/kformdesigner.desktop share/applications/kde/kivio.desktop +share/applications/kde/krita.desktop share/doc/kde/HTML/en/kchart/common share/doc/kde/HTML/en/kchart/cr22-action-chart_line.png share/doc/kde/HTML/en/kchart/cr22-action-data.png @@ -835,12 +837,11 @@ share/kde/applnk/Office/kchart.desktop share/kde/applnk/Office/kformula.desktop share/kde/applnk/Office/koshell.desktop share/kde/applnk/Office/kpresenter.desktop -share/kde/applnk/Office/krita.desktop +share/kde/applnk/Office/krita_magick.desktop share/kde/applnk/Office/kspread.desktop share/kde/applnk/Office/kudesigner.desktop share/kde/applnk/Office/kugar.desktop share/kde/applnk/Office/kword.desktop -share/kde/applnk/Utilities/kformdesigner.desktop share/kde/apps/karbon/gradients/allcolors.kgr share/kde/apps/karbon/gradients/simple.kgr share/kde/apps/karbon/icons/crystalsvg/16x16/actions/14_layer_deletelayer.png @@ -1183,6 +1184,7 @@ share/kde/apps/kivio/icons/crystalsvg/22x22/actions/arrowheads.png share/kde/apps/kivio/icons/crystalsvg/22x22/actions/font_bold.png share/kde/apps/kivio/icons/crystalsvg/22x22/actions/font_italic.png share/kde/apps/kivio/icons/crystalsvg/22x22/actions/font_under.png +share/kde/apps/kivio/icons/crystalsvg/22x22/actions/kivio_connector.png share/kde/apps/kivio/icons/crystalsvg/22x22/actions/open_stencilset.png share/kde/apps/kivio/icons/crystalsvg/32x32/actions/arrowheads.png share/kde/apps/kivio/icons/crystalsvg/48x48/actions/template_basicflow.png @@ -1245,6 +1247,7 @@ share/kde/apps/kivio/icons/hicolor/22x22/actions/font_bold.png share/kde/apps/kivio/icons/hicolor/22x22/actions/font_italic.png share/kde/apps/kivio/icons/hicolor/22x22/actions/font_under.png share/kde/apps/kivio/icons/hicolor/22x22/actions/group_stencils.png +share/kde/apps/kivio/icons/hicolor/22x22/actions/kivio_connector.png share/kde/apps/kivio/icons/hicolor/22x22/actions/linestyle.png share/kde/apps/kivio/icons/hicolor/22x22/actions/linewidth.png share/kde/apps/kivio/icons/hicolor/22x22/actions/open_stencilset.png @@ -4088,7 +4091,6 @@ share/kde/templates/TextDocument.desktop @dirrm share/kde/apps/karbon/gradients @dirrm share/kde/apps/karbon @comment in kde: @dirrm share/kde/apps -@comment in kde: @dirrm share/kde/applnk/Utilities @dirrm share/kde/applnk/Office @dirrm share/doc/kde/HTML/en/thesaurus @dirrm share/doc/kde/HTML/en/kword diff --git a/misc/koffice/distinfo b/misc/koffice/distinfo index 0dba0822404..aaf742fc4bf 100644 --- a/misc/koffice/distinfo +++ b/misc/koffice/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.25 2005/07/25 13:05:51 markd Exp $ +$NetBSD: distinfo,v 1.26 2005/10/11 23:34:02 markd Exp $ -SHA1 (koffice-1.4.1.tar.bz2) = 55b456beeb0be61d4ba0c16e8469f6ed6224d076 -RMD160 (koffice-1.4.1.tar.bz2) = ebbe0b7cd65142807d20337c050b144790f25c31 -Size (koffice-1.4.1.tar.bz2) = 19364338 bytes +SHA1 (koffice-1.4.2.tar.bz2) = 474ab6d289ff1330c200768b30a3dbe271cd26c5 +RMD160 (koffice-1.4.2.tar.bz2) = 117d5c50aa81d669002005f39fc03bc3f999b62c +Size (koffice-1.4.2.tar.bz2) = 19486852 bytes SHA1 (patch-ab) = 6f253484f6c09877cca6b1d1d7610725c895e13a SHA1 (patch-af) = e93b6e78c1965b9882778ae5afc1404627ce51e8 SHA1 (patch-ag) = 2b73421e1ade6592e56aeb389f17397a5a4b85f2 @@ -10,5 +10,5 @@ SHA1 (patch-ah) = a8052fccdf9dc74a24c231f62127f5f4be81f767 SHA1 (patch-ai) = 8687c4e7c765372906543bad6b0df8b0404ae57f SHA1 (patch-aj) = ac38387f0d77c74cc706ef9101e84eb9f6013b41 SHA1 (patch-ak) = f077c819a33c642f30d6b2a00d581b911f3bbec9 -SHA1 (patch-al) = a234cdc2a1aa3d5c92993d464edc336c3ccc1dbc +SHA1 (patch-al) = a12d042c1326e71d4616f86f4b1255c4e2ff2ea2 SHA1 (patch-am) = 7b23a60d7bac76421d5ec14279b3ab454af2165d diff --git a/misc/koffice/patches/patch-al b/misc/koffice/patches/patch-al index f76ea21eeb1..3fba8360222 100644 --- a/misc/koffice/patches/patch-al +++ b/misc/koffice/patches/patch-al @@ -1,13 +1,12 @@ -$NetBSD: patch-al,v 1.3 2005/06/27 02:06:45 markd Exp $ +$NetBSD: patch-al,v 1.4 2005/10/11 23:34:02 markd Exp $ --- kexi/migration/Makefile.in.orig 2005-06-16 02:17:32.000000000 +1200 +++ kexi/migration/Makefile.in -@@ -451,8 +451,11 @@ VER_INFO = -version-info 0:8:0 +@@ -451,8 +451,10 @@ VER_INFO = -version-info 0:8:0 lib_LTLIBRARIES = libkeximigrate.la +@compile_pgsql_plugin_TRUE@PG_INCS= -I$(PG_INCDIR) -I$(PQXX_INCDIR) -+@compile_pgsql_plugin_TRUE@PG_LDFLAGS= -L$(PQXX_LIBDIR) -L$(PG_LIBDIR) + INCLUDES = -I$(top_srcdir)/kexi/core -I$(top_srcdir)/kexi -I$(top_srcdir)/kexi/main/startup \ --I$(top_builddir)/kexi/main/startup $(all_includes) -I$(PG_INCDIR) -I$(PQXX_INCDIR) @@ -15,12 +14,3 @@ $NetBSD: patch-al,v 1.3 2005/06/27 02:06:45 markd Exp $ @compile_pgsql_plugin_TRUE@pgsql_dir = pqxx -@@ -472,7 +475,7 @@ libkeximigrate_la_LIBADD = \ - - - libkeximigrate_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(VER_INFO) \ ---L$(PQXX_LIBDIR) -L$(PG_LIBDIR) -+$(PG_LDFLAGS) - - - noinst_HEADERS = importwizard.h migratemanager_p.h |