update to 1.4.2, and finally activate the pgsql kexi support.

This commit is contained in:
espie 2005-10-17 15:15:40 +00:00
parent 1f64e141a4
commit 3e6d852324
15 changed files with 45 additions and 133 deletions

View File

@ -1,13 +1,13 @@
# $OpenBSD: Makefile,v 1.25 2005/09/20 18:04:29 espie Exp $
# $OpenBSD: Makefile,v 1.26 2005/10/17 15:15:40 espie Exp $
COMMENT= "office suite for KDE"
CATEGORIES= x11 x11/kde productivity
VMEM_WARNING= Yes
MASTER_SITES?= ${MASTER_SITE_KDE:S@$@stable/koffice-1.4.1/src/@}
MASTER_SITES?= ${MASTER_SITE_KDE:S@$@stable/koffice-1.4.2/src/@}
DISTNAME= koffice-1.4.1
PKGNAME= ${DISTNAME}p0
DISTNAME= koffice-1.4.2
PKGNAME= ${DISTNAME}
FLAVORS=debug
FAKE_FLAGS= ${MAKE_FLAGS} TAR=tar DESTDIR=${WRKINST}
@ -35,6 +35,7 @@ WANTLIB= ICE SM X11 Xext Xrender artsflow artsflow_idl audiofile bz2 c \
soundserver_idl stdc++ tiff util vorbis vorbisenc vorbisfile \
xml2 xslt z Xt termcap Xi fontconfig crypto readline ssl
CONFIGURE_ARGS+= --disable-pgsql
# --with-pgsqlincdir=${LOCALBASE}/include/postgresql
CONFIGURE_ARGS+= --with-pgsqlincdir=${LOCALBASE}/include/postgresql
LIB_DEPENDS+= pqxx::databases/libpqxx \
pq::databases/postgresql
.include <bsd.port.mk>

View File

@ -1,4 +1,4 @@
MD5 (kde/koffice-1.4.1.tar.bz2) = 91a7b68757addc5934c5a8209a4926d5
RMD160 (kde/koffice-1.4.1.tar.bz2) = ebbe0b7cd65142807d20337c050b144790f25c31
SHA1 (kde/koffice-1.4.1.tar.bz2) = 55b456beeb0be61d4ba0c16e8469f6ed6224d076
SIZE (kde/koffice-1.4.1.tar.bz2) = 19364338
MD5 (kde/koffice-1.4.2.tar.bz2) = 6b456fb7d54c84b11396b27a96ae0cf8
RMD160 (kde/koffice-1.4.2.tar.bz2) = 117d5c50aa81d669002005f39fc03bc3f999b62c
SHA1 (kde/koffice-1.4.2.tar.bz2) = 474ab6d289ff1330c200768b30a3dbe271cd26c5
SIZE (kde/koffice-1.4.2.tar.bz2) = 19486852

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-configure_in,v 1.2 2005/08/05 10:49:18 espie Exp $
--- configure.in.orig Wed Jun 1 11:20:03 2005
+++ configure.in Tue Jun 14 12:44:39 2005
$OpenBSD: patch-configure_in,v 1.3 2005/10/17 15:15:40 espie Exp $
--- configure.in.orig Tue Jul 19 21:55:34 2005
+++ configure.in Tue Sep 20 23:07:48 2005
@@ -845,8 +845,8 @@ dnl ====================================
if test "$compile_pgsql_plugin" = "yes"; then
AC_MSG_CHECKING([for PostgreSQL... Step 2 of 4])
@ -12,6 +12,17 @@ $OpenBSD: patch-configure_in,v 1.2 2005/08/05 10:49:18 espie Exp $
compile_pgsql_plugin="no"
AC_MSG_RESULT([not found])
else
@@ -880,8 +880,8 @@ dnl ====================================
if test "$compile_pgsql_plugin" = "yes"; then
AC_MSG_CHECKING([for PostgreSQL... Step 4 of 4])
pqxx_libdirs="$ac_pqxx_libdir /usr/lib /usr/local/lib /usr/local/pqxx/lib"
- AC_FIND_FILE(libpqxx.so, $pqxx_libdirs, pqxx_libdir)
- if test ! -r $pqxx_libdir/libpqxx.so; then
+ AC_FIND_FILE(libpqxx.so.0.0, $pqxx_libdirs, pqxx_libdir)
+ if test ! -r $pqxx_libdir/libpqxx.so.0.0; then
compile_pgsql_plugin="no"
AC_MSG_RESULT([not found])
else
@@ -918,7 +918,7 @@ AC_CACHE_VAL(ac_cv_have_knewstuff,
AC_FIND_FILE(knewstuff/downloaddialog.h, $kde_incdirs, knewstuff_incdir)
ac_knewstuff_includes="$knewstuff_incdir"

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-karbon_dockers_vdocumentdocker_cc,v 1.1 2005/09/20 18:04:30 espie Exp $
--- karbon/dockers/vdocumentdocker.cc.orig Tue Sep 20 19:29:31 2005
+++ karbon/dockers/vdocumentdocker.cc Tue Sep 20 19:29:43 2005
@@ -846,8 +846,8 @@ void
$OpenBSD: patch-karbon_dockers_vdocumentdocker_cc,v 1.2 2005/10/17 15:15:40 espie Exp $
--- karbon/dockers/vdocumentdocker.cc.orig Wed Sep 21 14:27:52 2005
+++ karbon/dockers/vdocumentdocker.cc Fri Sep 23 01:29:44 2005
@@ -1147,8 +1147,8 @@ void
VHistoryItem::init()
{
kdDebug(38000) << "In VHistoryItem::init() : " << m_command->name() << endl;

View File

@ -1,23 +0,0 @@
--- kpresenter/imageEffectBase.ui.orig Fri Sep 16 18:02:09 2005
+++ kpresenter/imageEffectBase.ui Fri Sep 16 18:02:24 2005
@@ -1461,20 +1461,5 @@
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kcolorbutton.h</includehint>
- <includehint>kdoublenuminput.h</includehint>
- <includehint>kcolorbutton.h</includehint>
- <includehint>kcolorbutton.h</includehint>
- <includehint>kdoublenuminput.h</includehint>
- <includehint>kdoublenuminput.h</includehint>
- <includehint>kdoublenuminput.h</includehint>
- <includehint>kdoublenuminput.h</includehint>
- <includehint>kdoublenuminput.h</includehint>
- <includehint>kdoublenuminput.h</includehint>
- <includehint>kdoublenuminput.h</includehint>
- <includehint>kdoublenuminput.h</includehint>
- <includehint>kdoublenuminput.h</includehint>
- <includehint>kdoublenuminput.h</includehint>
- <includehint>kdoublenuminput.h</includehint>
- <includehint>kdoublenuminput.h</includehint>
</includehints>
</UI>

View File

@ -1,10 +0,0 @@
--- krita/plugins/colorspaceconversion/wdgconvertcolorspace.ui.orig Tue Jul 19 16:09:43 2005
+++ krita/plugins/colorspaceconversion/wdgconvertcolorspace.ui Tue Sep 20 12:04:01 2005
@@ -265,7 +265,4 @@ colors (Pantone, TruMatch, logo colors,
<tabstop>radioPerceptual</tabstop>
</tabstops>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>kiscmbidlist.h</includehint>
-</includehints>
</UI>

View File

@ -1,10 +0,0 @@
--- krita/plugins/convolutionfilters/kis_custom_convolution_filter_configuration_base_widget.ui.orig Thu Sep 15 12:36:52 2005
+++ krita/plugins/convolutionfilters/kis_custom_convolution_filter_configuration_base_widget.ui Thu Sep 15 12:37:07 2005
@@ -186,7 +186,4 @@
</image>
</images>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>kismatrixwidget.h</includehint>
-</includehints>
</UI>

View File

@ -1,10 +0,0 @@
--- krita/plugins/screenshot/ksnapshotwidget.ui.orig Tue Jul 19 16:09:46 2005
+++ krita/plugins/screenshot/ksnapshotwidget.ui Tue Sep 20 12:04:01 2005
@@ -332,7 +332,4 @@ If &lt;i&gt;no delay&lt;/i&gt; is set, t
<pixmapfunction>SmallIconSet</pixmapfunction>
<layoutdefaults spacing="6" margin="11"/>
<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
-<includehints>
- <includehint>ksnapshotthumb.h</includehint>
-</includehints>
</UI>

View File

@ -1,11 +0,0 @@
--- krita/ui/kis_previewwidgetbase.ui.orig Thu Sep 15 18:26:35 2005
+++ krita/ui/kis_previewwidgetbase.ui Thu Sep 15 18:26:43 2005
@@ -201,8 +201,4 @@
</connection>
</connections>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>kispreviewview.h</includehint>
- <includehint>kispreviewview.h</includehint>
-</includehints>
</UI>

View File

@ -1,11 +0,0 @@
--- krita/ui/wdgcolorsettings.ui.orig Tue Jul 19 16:10:21 2005
+++ krita/ui/wdgcolorsettings.ui Tue Sep 20 12:04:01 2005
@@ -361,8 +361,4 @@ result in neutral grays. Intended for im
<tabstop>radioPerceptual</tabstop>
</tabstops>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>kiscmbidlist.h</includehint>
- <includehint>kiscmbidlist.h</includehint>
-</includehints>
</UI>

View File

@ -1,11 +0,0 @@
--- krita/ui/wdglayerbox.ui.orig Thu Sep 15 21:07:24 2005
+++ krita/ui/wdglayerbox.ui Thu Sep 15 21:09:24 2005
@@ -250,8 +250,6 @@
</images>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
- <includehint>kiscmbcomposite.h</includehint>
- <includehint>knuminput.h</includehint>
<includehint>knuminput.h</includehint>
<includehint>klistbox.h</includehint>
</includehints>

View File

@ -1,11 +0,0 @@
--- krita/ui/wdgnewimage.ui.orig Thu Sep 15 18:22:50 2005
+++ krita/ui/wdgnewimage.ui Thu Sep 15 18:23:08 2005
@@ -319,8 +319,6 @@
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>knuminput.h</includehint>
- <includehint>knuminput.h</includehint>
- <includehint>kiscmbidlist.h</includehint>
<includehint>kcolorcombo.h</includehint>
</includehints>
</UI>

View File

@ -1,11 +0,0 @@
--- krita/ui/widgets/kis_wdg_autogradient.ui.orig Thu Sep 15 12:28:25 2005
+++ krita/ui/widgets/kis_wdg_autogradient.ui Thu Sep 15 12:28:43 2005
@@ -406,8 +406,6 @@
</tabstops>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
- <includehint>kisgradientsliderwidget.h</includehint>
- <includehint>kcolorbutton.h</includehint>
<includehint>kcolorbutton.h</includehint>
</includehints>
</UI>

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-kspread_plugins_calculator_Makefile_in,v 1.3 2005/09/20 18:04:30 espie Exp $
--- kspread/plugins/calculator/Makefile.in.orig Tue Jul 19 21:58:08 2005
+++ kspread/plugins/calculator/Makefile.in Tue Sep 20 12:04:52 2005
@@ -577,7 +577,7 @@ clean-kde_moduleLTLIBRARIES:
$OpenBSD: patch-kspread_plugins_calculator_Makefile_in,v 1.4 2005/10/17 15:15:40 espie Exp $
--- kspread/plugins/calculator/Makefile.in.orig Wed Sep 21 17:28:31 2005
+++ kspread/plugins/calculator/Makefile.in Fri Sep 23 01:30:21 2005
@@ -468,7 +468,7 @@ clean-kde_moduleLTLIBRARIES:
#>+ 2
@KDE_USE_CLOSURE_TRUE@libkspreadcalc.la: libkspreadcalc.la.closure $(libkspreadcalc_la_OBJECTS) $(libkspreadcalc_la_DEPENDENCIES)
@KDE_USE_CLOSURE_FALSE@libkspreadcalc.la: $(libkspreadcalc_la_OBJECTS) $(libkspreadcalc_la_DEPENDENCIES)

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.15 2005/08/05 13:54:03 espie Exp $
@comment $OpenBSD: PLIST,v 1.16 2005/10/17 15:15:40 espie Exp $
bin/karbon
bin/kchart
bin/kexi
@ -176,6 +176,8 @@ ${KDE}/kexi.la
${KDE}/kexi.so
${KDE}/kexidb_mysqldriver.la
${KDE}/kexidb_mysqldriver.so
${KDE}/kexidb_pqxxsqldriver.la
${KDE}/kexidb_pqxxsqldriver.so
${KDE}/kexidb_sqlite2driver.la
${KDE}/kexidb_sqlite2driver.so
${KDE}/kexidb_sqlite3driver.la
@ -196,6 +198,8 @@ ${KDE}/kexihandler_table.la
${KDE}/kexihandler_table.so
${KDE}/keximigrate_mysql.la
${KDE}/keximigrate_mysql.so
${KDE}/keximigrate_pqxx.la
${KDE}/keximigrate_pqxx.so
${KDE}/kfile_koffice.la
${KDE}/kfile_koffice.so
${KDE}/kfile_ooo.la
@ -553,7 +557,9 @@ lib/libkwmf.la
lib/libkwordexportfilters.la
@lib lib/libkwordexportfilters.so.1.1
share/applications/kde/kexi.desktop
share/applications/kde/kformdesigner.desktop
share/applications/kde/kivio.desktop
share/applications/kde/krita.desktop
share/applnk/
share/applnk/Office/
share/applnk/Office/KThesaurus.desktop
@ -562,13 +568,11 @@ share/applnk/Office/kchart.desktop
share/applnk/Office/kformula.desktop
share/applnk/Office/koshell.desktop
share/applnk/Office/kpresenter.desktop
share/applnk/Office/krita.desktop
share/applnk/Office/krita_magick.desktop
share/applnk/Office/kspread.desktop
share/applnk/Office/kudesigner.desktop
share/applnk/Office/kugar.desktop
share/applnk/Office/kword.desktop
share/applnk/Utilities/
share/applnk/Utilities/kformdesigner.desktop
share/apps/karbon/
share/apps/karbon/gradients/
share/apps/karbon/gradients/allcolors.kgr
@ -979,6 +983,7 @@ share/apps/kivio/icons/crystalsvg/22x22/actions/arrowheads.png
share/apps/kivio/icons/crystalsvg/22x22/actions/font_bold.png
share/apps/kivio/icons/crystalsvg/22x22/actions/font_italic.png
share/apps/kivio/icons/crystalsvg/22x22/actions/font_under.png
share/apps/kivio/icons/crystalsvg/22x22/actions/kivio_connector.png
share/apps/kivio/icons/crystalsvg/22x22/actions/open_stencilset.png
share/apps/kivio/icons/crystalsvg/32x32/
share/apps/kivio/icons/crystalsvg/32x32/actions/
@ -1052,6 +1057,7 @@ share/apps/kivio/icons/hicolor/22x22/actions/font_bold.png
share/apps/kivio/icons/hicolor/22x22/actions/font_italic.png
share/apps/kivio/icons/hicolor/22x22/actions/font_under.png
share/apps/kivio/icons/hicolor/22x22/actions/group_stencils.png
share/apps/kivio/icons/hicolor/22x22/actions/kivio_connector.png
share/apps/kivio/icons/hicolor/22x22/actions/linestyle.png
share/apps/kivio/icons/hicolor/22x22/actions/linewidth.png
share/apps/kivio/icons/hicolor/22x22/actions/open_stencilset.png
@ -4172,9 +4178,11 @@ share/services/kexi/kexireporthandler.desktop
share/services/kexi/kexiscripthandler.desktop
share/services/kexi/kexitablehandler.desktop
share/services/kexidb_mysqldriver.desktop
share/services/kexidb_pqxxsqldriver.desktop
share/services/kexidb_sqlite2driver.desktop
share/services/kexidb_sqlite3driver.desktop
share/services/keximigrate_mysql.desktop
share/services/keximigrate_pqxx.desktop
share/services/kfile_koffice.desktop
share/services/kfile_ooo.desktop
share/services/kformdesigner/