5 files changed, 67 insertions, 142 deletions

diff --git a/editors/calligra/Makefile b/editors/calligra/Makefile
index de370726d4eb..bb910686cf0e 100644
--- a/editors/calligra/Makefile
+++ b/editors/calligra/Makefile
@@ -6,12 +6,11 @@
 #
 
 PORTNAME=	koffice
-PORTVERSION=	1.2.rc1
+PORTVERSION=	1.2
 PORTEPOCH=	1
 CATEGORIES=	editors kde
 MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	unstable/${PORTNAME}-${PORTVERSION:S/.rc1/-rc1/g}/src
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/.rc1/-rc1/g}
+MASTER_SITE_SUBDIR=	stable/${PORTNAME}-${PORTVERSION}/src
 DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
@@ -22,7 +21,6 @@ LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv \
 		art_lgpl_2.5:${PORTSDIR}/graphics/libart_lgpl2
 
 _NO_KDE_PATCHUP=yes
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:S/.rc1/-rc1/g}
 USE_KDELIBS_VER=3
 GNU_CONFIGURE=	yes
 USE_PYTHON=	yes
@@ -30,7 +28,9 @@ USE_BZIP2=	yes
 INSTALLS_SHLIB=	yes
 USE_GMAKE=	yes
 
-.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
+CONFIGURE_ENV+=	DO_NOT_COMPILE=kontour	# KDE calls it "badly broken"
+
+.include "${PORTSDIR}/x11/kde3/Makefile.kde"
 
 pre-configure:
 	cd ${WRKSRC} && ${GMAKE} -f Makefile.cvs
diff --git a/editors/calligra/distinfo b/editors/calligra/distinfo
index 21628c3bb308..07883502da2d 100644
--- a/editors/calligra/distinfo
+++ b/editors/calligra/distinfo
@@ -1 +1 @@
-MD5 (KDE/koffice-1.2-rc1.tar.bz2) = ab92b156d93e659ff5d51e84fadb9dda
+MD5 (KDE/koffice-1.2.tar.bz2) = 34cb13104bc1d4f0916b0dda6dec7ee0
diff --git a/editors/calligra/pkg-comment b/editors/calligra/pkg-comment
index edffe56b8eac..b4d60bc56d7e 100644
--- a/editors/calligra/pkg-comment
+++ b/editors/calligra/pkg-comment
@@ -1 +1 @@
-Office Suite for KDE3 (Release Candidate)
+Office Suite for KDE3
diff --git a/editors/calligra/pkg-descr b/editors/calligra/pkg-descr
index 406aed1a67e3..3e111fad1e16 100644
--- a/editors/calligra/pkg-descr
+++ b/editors/calligra/pkg-descr
@@ -1,10 +1,6 @@
-This is the office suite for KDE3 that includes
-KWord, KSpread, KPresenter, KChart, and so forth.
-
-This is a Release Candidate, and therefore may have
-some unresolved issues. The final release should be
-more polished.
+This is the office suite for KDE3 that includes KWord, KSpread, KPresenter,
+KChart, and so forth.
 
 WWW: http://www.koffice.org/
 
---AlanE <ports@geeksrus.net>
+--AlanE <kde@freebsd.org>
diff --git a/editors/calligra/pkg-plist b/editors/calligra/pkg-plist
index 47c9a0b78032..719d6cb03e93 100644
--- a/editors/calligra/pkg-plist
+++ b/editors/calligra/pkg-plist
@@ -3,7 +3,6 @@ bin/kchart
 bin/kformula
 bin/kivio
 bin/koconverter
-bin/kontour
 bin/koscript
 bin/koshell
 bin/kprconverter.pl
@@ -69,6 +68,22 @@ include/koToolBox.h
 include/koUnit.h
 include/koView.h
 include/kotoolbutton.h
+include/kreportviewer.h
+include/kugar.h
+include/kugarqt.h
+include/mcalcobject.h
+include/mfieldobject.h
+include/mlabelobject.h
+include/mlineobject.h
+include/mpagecollection.h
+include/mpagedisplay.h
+include/mreportdetail.h
+include/mreportengine.h
+include/mreportobject.h
+include/mreportsection.h
+include/mreportviewer.h
+include/mspecialobject.h
+include/mutil.h
 include/tkaction.h
 include/tkcoloractions.h
 include/tkcombobox.h
@@ -150,18 +165,8 @@ lib/kde3/libkfopngexport.la
 lib/kde3/libkfopngexport.so
 lib/kde3/libkformulapart.la
 lib/kde3/libkformulapart.so
-lib/kde3/libkivioconnectortool.la
-lib/kde3/libkivioconnectortool.so
 lib/kde3/libkiviopart.la
 lib/kde3/libkiviopart.so
-lib/kde3/libkivioselecttool.la
-lib/kde3/libkivioselecttool.so
-lib/kde3/libkiviotexttool.la
-lib/kde3/libkiviotexttool.so
-lib/kde3/libkiviozoomtool.la
-lib/kde3/libkiviozoomtool.so
-lib/kde3/libkontourpart.la
-lib/kde3/libkontourpart.so
 lib/kde3/libkontourrtfexport.la
 lib/kde3/libkontourrtfexport.so
 lib/kde3/libkounavailpart.la
@@ -224,8 +229,6 @@ lib/kformulamain.la
 lib/kformulamain.so
 lib/kivio.la
 lib/kivio.so
-lib/kontour.la
-lib/kontour.so
 lib/koshell.la
 lib/koshell.so
 lib/kpresenter.la
@@ -240,6 +243,14 @@ lib/libkdchart.so.0
 lib/libkformula.la
 lib/libkformula.so
 lib/libkformula.so.3
+lib/libkivioconnectortool.la
+lib/libkivioconnectortool.so
+lib/libkivioselecttool.la
+lib/libkivioselecttool.so
+lib/libkiviotexttool.la
+lib/libkiviotexttool.so
+lib/libkiviozoomtool.la
+lib/libkiviozoomtool.so
 lib/libkochart.la
 lib/libkochart.so
 lib/libkochart.so.1
@@ -261,6 +272,9 @@ lib/libkotext.so.2
 lib/libkstore.la
 lib/libkstore.so
 lib/libkstore.so.2
+lib/libkugar.la
+lib/libkugar.so
+lib/libkugar.so.1
 lib/libkugarpart.la
 lib/libkugarpart.so
 lib/libkwmailmerge_interface.la
@@ -278,7 +292,6 @@ share/applnk/Office/karbon.desktop
 share/applnk/Office/kchart.desktop
 share/applnk/Office/kformula.desktop
 share/applnk/Office/kivio.desktop
-share/applnk/Office/kontour.desktop
 share/applnk/Office/koshell.desktop
 share/applnk/Office/kpresenter.desktop
 share/applnk/Office/kspread.desktop
@@ -671,78 +684,7 @@ share/apps/koffice/pics/koKoolBarUp.png
 share/apps/koffice/pics/koRulerFirst.png
 share/apps/koffice/pics/koRulerLeft.png
 share/apps/koffice/pics/koffice-logo.png
-share/apps/kontour/icons/hicolor/16x16/actions/abottom.png
-share/apps/kontour/icons/hicolor/16x16/actions/ahcenter.png
-share/apps/kontour/icons/hicolor/16x16/actions/aleft.png
-share/apps/kontour/icons/hicolor/16x16/actions/aright.png
-share/apps/kontour/icons/hicolor/16x16/actions/atop.png
-share/apps/kontour/icons/hicolor/16x16/actions/avcenter.png
-share/apps/kontour/icons/hicolor/16x16/actions/beziertool.png
-share/apps/kontour/icons/hicolor/16x16/actions/cap_butt.png
-share/apps/kontour/icons/hicolor/16x16/actions/cap_round.png
-share/apps/kontour/icons/hicolor/16x16/actions/cap_square.png
-share/apps/kontour/icons/hicolor/16x16/actions/dbottom.png
-share/apps/kontour/icons/hicolor/16x16/actions/deleteNode.png
-share/apps/kontour/icons/hicolor/16x16/actions/deletelayer.png
-share/apps/kontour/icons/hicolor/16x16/actions/dhcenter.png
-share/apps/kontour/icons/hicolor/16x16/actions/dhdist.png
-share/apps/kontour/icons/hicolor/16x16/actions/dleft.png
-share/apps/kontour/icons/hicolor/16x16/actions/dright.png
-share/apps/kontour/icons/hicolor/16x16/actions/dtop.png
-share/apps/kontour/icons/hicolor/16x16/actions/dvcenter.png
-share/apps/kontour/icons/hicolor/16x16/actions/dvdist.png
-share/apps/kontour/icons/hicolor/16x16/actions/ellipse1.png
-share/apps/kontour/icons/hicolor/16x16/actions/ellipse2.png
-share/apps/kontour/icons/hicolor/16x16/actions/ellipse3.png
-share/apps/kontour/icons/hicolor/16x16/actions/ellipsetool.png
-share/apps/kontour/icons/hicolor/16x16/actions/eye.png
-share/apps/kontour/icons/hicolor/16x16/actions/freehandtool.png
-share/apps/kontour/icons/hicolor/16x16/actions/group.png
-share/apps/kontour/icons/hicolor/16x16/actions/hmirror.png
-share/apps/kontour/icons/hicolor/16x16/actions/insertclipart.png
-share/apps/kontour/icons/hicolor/16x16/actions/item_add.png
-share/apps/kontour/icons/hicolor/16x16/actions/item_remove.png
-share/apps/kontour/icons/hicolor/16x16/actions/item_rename.png
-share/apps/kontour/icons/hicolor/16x16/actions/joinNodes.png
-share/apps/kontour/icons/hicolor/16x16/actions/join_bevel.png
-share/apps/kontour/icons/hicolor/16x16/actions/join_miter.png
-share/apps/kontour/icons/hicolor/16x16/actions/join_round.png
-share/apps/kontour/icons/hicolor/16x16/actions/linetool.png
-share/apps/kontour/icons/hicolor/16x16/actions/lowerlayer.png
-share/apps/kontour/icons/hicolor/16x16/actions/moveNode.png
-share/apps/kontour/icons/hicolor/16x16/actions/newNode.png
-share/apps/kontour/icons/hicolor/16x16/actions/newlayer.png
-share/apps/kontour/icons/hicolor/16x16/actions/pointtool.png
-share/apps/kontour/icons/hicolor/16x16/actions/polygontool.png
-share/apps/kontour/icons/hicolor/16x16/actions/raiselayer.png
-share/apps/kontour/icons/hicolor/16x16/actions/recttool.png
-share/apps/kontour/icons/hicolor/16x16/actions/snap_to_grid.png
-share/apps/kontour/icons/hicolor/16x16/actions/split.png
-share/apps/kontour/icons/hicolor/16x16/actions/tcenteralign.png
-share/apps/kontour/icons/hicolor/16x16/actions/texttool.png
-share/apps/kontour/icons/hicolor/16x16/actions/tleftalign.png
-share/apps/kontour/icons/hicolor/16x16/actions/trightalign.png
-share/apps/kontour/icons/hicolor/16x16/actions/ungroup.png
-share/apps/kontour/icons/hicolor/16x16/actions/vmirror.png
-share/apps/kontour/icons/hicolor/16x16/apps/kontour.png
-share/apps/kontour/icons/hicolor/22x22/actions/selecttool.png
-share/apps/kontour/icons/hicolor/32x32/actions/rect1.png
-share/apps/kontour/icons/hicolor/32x32/actions/rect2.png
-share/apps/kontour/icons/hicolor/32x32/actions/rect3.png
-share/apps/kontour/icons/hicolor/32x32/actions/rect4.png
-share/apps/kontour/icons/hicolor/32x32/actions/rect5.png
-share/apps/kontour/icons/hicolor/32x32/actions/rect6.png
-share/apps/kontour/icons/hicolor/32x32/actions/rect7.png
-share/apps/kontour/icons/hicolor/32x32/actions/rect8.png
-share/apps/kontour/icons/hicolor/32x32/apps/kontour.png
-share/apps/kontour/icons/hicolor/48x48/apps/kontour.png
-share/apps/kontour/kontour.rc
-share/apps/kontour/kontour_readonly.rc
 share/apps/kontour/kpartplugins/scan-kontour.rc
-share/apps/kontour/templates/Simple/.directory
-share/apps/kontour/templates/Simple/.icon/Plain.png
-share/apps/kontour/templates/Simple/.source/Plain.kon
-share/apps/kontour/templates/Simple/Plain.desktop
 share/apps/kpresenter/autoforms/.autoforms
 share/apps/kpresenter/autoforms/Arrows/.directory
 share/apps/kpresenter/autoforms/Arrows/.icon/ArrowDown.png
@@ -1190,8 +1132,11 @@ share/apps/kudesigner/kudesignerui.rc
 share/apps/kugar/dtd/kugartemplate.dtd
 share/apps/kugar/kugarpart.rc
 share/apps/kugar/kugarui.rc
+share/apps/kugar/templates/sample1.kud
 share/apps/kugar/templates/sample1.kut
+share/apps/kugar/templates/sample2.kud
 share/apps/kugar/templates/sample2.kut
+share/apps/kugar/templates/sample3.kud
 share/apps/kugar/templates/sample3.kut
 share/apps/kword/dtd/framestyles.dtd
 share/apps/kword/dtd/kword.dtd
@@ -1303,32 +1248,11 @@ share/doc/HTML/en/kformula/shortcut1.png
 share/doc/HTML/en/kformula/sin.png
 share/doc/HTML/en/kformula/toolbars.png
 share/doc/HTML/en/kformula/upper-index.png
+share/doc/HTML/en/koffice-apidocs/common
 share/doc/HTML/en/koffice/README.documentation
 share/doc/HTML/en/koffice/common
 share/doc/HTML/en/koffice/index.cache.bz2
 share/doc/HTML/en/koffice/index.docbook
-share/doc/HTML/en/kontour/bezier.png
-share/doc/HTML/en/kontour/colour.png
-share/doc/HTML/en/kontour/common
-share/doc/HTML/en/kontour/ellipse.png
-share/doc/HTML/en/kontour/export.png
-share/doc/HTML/en/kontour/freehand.png
-share/doc/HTML/en/kontour/index.cache.bz2
-share/doc/HTML/en/kontour/index.docbook
-share/doc/HTML/en/kontour/line.png
-share/doc/HTML/en/kontour/logo.png
-share/doc/HTML/en/kontour/movepoint.png
-share/doc/HTML/en/kontour/newpoint.png
-share/doc/HTML/en/kontour/open_dialog.png
-share/doc/HTML/en/kontour/pfeil.png
-share/doc/HTML/en/kontour/point.png
-share/doc/HTML/en/kontour/polygon-setup.png
-share/doc/HTML/en/kontour/polygon.png
-share/doc/HTML/en/kontour/rect.png
-share/doc/HTML/en/kontour/rmpoint.png
-share/doc/HTML/en/kontour/save_dialog.png
-share/doc/HTML/en/kontour/text.png
-share/doc/HTML/en/kontour/zoom.png
 share/doc/HTML/en/koshell/common
 share/doc/HTML/en/koshell/index.cache.bz2
 share/doc/HTML/en/koshell/index.docbook
@@ -1420,7 +1344,6 @@ share/doc/HTML/en/kugar/add_detail_footer.png
 share/doc/HTML/en/kugar/add_detail_header.png
 share/doc/HTML/en/kugar/common
 share/doc/HTML/en/kugar/datadtd.docbook
-share/doc/HTML/en/kugar/dataref.docbok
 share/doc/HTML/en/kugar/dataref.docbook
 share/doc/HTML/en/kugar/designer.docbook
 share/doc/HTML/en/kugar/file_new.png
@@ -1433,6 +1356,15 @@ share/doc/HTML/en/kugar/starting.docbook
 share/doc/HTML/en/kugar/template-elements.docbook
 share/doc/HTML/en/kugar/template.docbook
 share/doc/HTML/en/kugar/templatedtd.docbook
+share/doc/HTML/en/kugar/tut_edit_height.png
+share/doc/HTML/en/kugar/tut_empty_report.png
+share/doc/HTML/en/kugar/tut_file_new.png
+share/doc/HTML/en/kugar/tut_rep_complete.png
+share/doc/HTML/en/kugar/tut_rep_generated.png
+share/doc/HTML/en/kugar/tut_rep_look1.png
+share/doc/HTML/en/kugar/tut_rep_look2.png
+share/doc/HTML/en/kugar/tut_set_level.png
+share/doc/HTML/en/kugar/tutorial.docbook
 share/doc/HTML/en/kword/ChooseTempDia.png
 share/doc/HTML/en/kword/Tut1.png
 share/doc/HTML/en/kword/Tut11a.png
@@ -1700,7 +1632,6 @@ share/icons/hicolor/16x16/apps/karbon.png
 share/icons/hicolor/16x16/apps/kchart.png
 share/icons/hicolor/16x16/apps/kformula.png
 share/icons/hicolor/16x16/apps/kivio.png
-share/icons/hicolor/16x16/apps/kontour.png
 share/icons/hicolor/16x16/apps/kpresenter.png
 share/icons/hicolor/16x16/apps/kspread.png
 share/icons/hicolor/16x16/apps/kudesigner.png
@@ -1748,7 +1679,6 @@ share/icons/hicolor/32x32/apps/karbon.png
 share/icons/hicolor/32x32/apps/kchart.png
 share/icons/hicolor/32x32/apps/kformula.png
 share/icons/hicolor/32x32/apps/kivio.png
-share/icons/hicolor/32x32/apps/kontour.png
 share/icons/hicolor/32x32/apps/kpresenter.png
 share/icons/hicolor/32x32/apps/kspread.png
 share/icons/hicolor/32x32/apps/kudesigner.png
@@ -1759,7 +1689,6 @@ share/icons/hicolor/48x48/apps/karbon.png
 share/icons/hicolor/48x48/apps/kchart.png
 share/icons/hicolor/48x48/apps/kformula.png
 share/icons/hicolor/48x48/apps/kivio.png
-share/icons/hicolor/48x48/apps/kontour.png
 share/icons/hicolor/48x48/apps/kpresenter.png
 share/icons/hicolor/48x48/apps/kspread.png
 share/icons/hicolor/48x48/apps/kugar.png
@@ -1767,9 +1696,16 @@ share/icons/hicolor/48x48/apps/kword.png
 share/icons/hicolor/48x48/mimetypes/kugardata.png
 share/icons/locolor/16x16/apps/kspreadcalc.png
 share/icons/locolor/16x16/apps/kudesigner.png
+share/icons/locolor/16x16/apps/kugar.png
+share/icons/locolor/16x16/mimetypes/kugardata.png
 share/icons/locolor/22x22/apps/kspreadcalc.png
+share/icons/locolor/22x22/apps/kugar.png
+share/icons/locolor/22x22/mimetypes/kugardata.png
 share/icons/locolor/32x32/apps/kspreadcalc.png
 share/icons/locolor/32x32/apps/kudesigner.png
+share/icons/locolor/32x32/apps/kugar.png
+share/icons/locolor/32x32/mimetypes/kugardata.png
+share/mimelnk/application/x-kudesigner.desktop
 share/services/clipartthumbnail.desktop
 share/services/karbon_ai_import.desktop
 share/services/karbon_eps_export.desktop
@@ -1849,15 +1785,22 @@ share/templates/Illustration.desktop
 share/templates/Presentation.desktop
 share/templates/SpreadSheet.desktop
 share/templates/TextDocument.desktop
+@comment empty dirs
+@exec /bin/mkdir -p %D/share/doc/HTML/en/koffice-apidocs/lib/html
 @comment directories
 @dirrm share/templates/.source
 @dirrm share/templates
 @dirrm share/servicetypes
 @dirrm share/services
+@dirrm share/mimelnk/application
+@dirrm share/mimelnk
+@dirrm share/icons/locolor/32x32/mimetypes
 @dirrm share/icons/locolor/32x32/apps
 @dirrm share/icons/locolor/32x32
+@dirrm share/icons/locolor/22x22/mimetypes
 @dirrm share/icons/locolor/22x22/apps
 @dirrm share/icons/locolor/22x22
+@dirrm share/icons/locolor/16x16/mimetypes
 @dirrm share/icons/locolor/16x16/apps
 @dirrm share/icons/locolor/16x16
 @dirrm share/icons/locolor
@@ -1884,7 +1827,9 @@ share/templates/TextDocument.desktop
 @dirrm share/doc/HTML/en/kspread
 @dirrm share/doc/HTML/en/kpresenter
 @dirrm share/doc/HTML/en/koshell
-@dirrm share/doc/HTML/en/kontour
+@dirrm share/doc/HTML/en/koffice-apidocs/lib/html
+@dirrm share/doc/HTML/en/koffice-apidocs/lib
+@dirrm share/doc/HTML/en/koffice-apidocs
 @dirrm share/doc/HTML/en/koffice
 @dirrm share/doc/HTML/en/kformula
 @dirrm share/doc/HTML/en/kchart
@@ -1971,23 +1916,7 @@ share/templates/TextDocument.desktop
 @dirrm share/apps/kpresenter/autoforms/Arrows
 @dirrm share/apps/kpresenter/autoforms
 @dirrm share/apps/kpresenter
-@dirrm share/apps/kontour/templates/Simple/.source
-@dirrm share/apps/kontour/templates/Simple/.icon
-@dirrm share/apps/kontour/templates/Simple
-@dirrm share/apps/kontour/templates
 @dirrm share/apps/kontour/kpartplugins
-@dirrm share/apps/kontour/icons/hicolor/48x48/apps
-@dirrm share/apps/kontour/icons/hicolor/48x48
-@dirrm share/apps/kontour/icons/hicolor/32x32/apps
-@dirrm share/apps/kontour/icons/hicolor/32x32/actions
-@dirrm share/apps/kontour/icons/hicolor/32x32
-@dirrm share/apps/kontour/icons/hicolor/22x22/actions
-@dirrm share/apps/kontour/icons/hicolor/22x22
-@dirrm share/apps/kontour/icons/hicolor/16x16/apps
-@dirrm share/apps/kontour/icons/hicolor/16x16/actions
-@dirrm share/apps/kontour/icons/hicolor/16x16
-@dirrm share/apps/kontour/icons/hicolor
-@dirrm share/apps/kontour/icons
 @dirrm share/apps/kontour
 @dirrm share/apps/koffice/pics
 @dirrm share/apps/koffice/icons/hicolor/48x48/apps