koffice 1.2

This commit is contained in:
espie 2002-09-11 12:02:50 +00:00
parent 7d7e9d2f1b
commit b65991dc63
18 changed files with 563 additions and 619 deletions

View File

@ -1,21 +1,23 @@
# $OpenBSD: Makefile,v 1.7 2002/09/01 08:25:26 espie Exp $
# $OpenBSD: Makefile,v 1.8 2002/09/11 12:02:50 espie Exp $
COMMENT= "office applications for kde"
CATEGORIES= x11 x11/kde productivity
VERSION= 1.1.1
DISTNAME= koffice-${VERSION}
VERSION= 3.0
VMEM_WARNING= Yes
MASTER_SITES?= ${MASTER_SITE_KDE:S@$@stable/${DISTNAME}/src/@}
FULLPKGNAME= koffice-${VERSION}-kde3
MASTER_SITES= ${MASTER_SITE_KDE:=koffice-1.1.1-kde3/src/}
DISTFILES= koffice-${VERSION}-kde3.tar.bz2
DISTNAME= koffice-1.2
PKGNAME= koffice-1.2
#BUILD_DEPENDS= ::x11/qt2-designer
LIB_DEPENDS= kdecore.3,DCOP,kdefx,kdeprint,kdesu,kdeui,kio,kparts,kspell::x11/kde/libs3 python2.2.0.0:python-2.2*:lang/python/2.2
# kill docs for now, they don't compile yet.
#MAKE_FLAGS=TOPSUBDIRS="autocorrect karbon kchart kformula kivio kontour koshell kounavail kpresenter kspread kugar kword pics plugins servicetypes templates tools"
FAKE_FLAGS=${MAKE_FLAGS} TAR=tar DESTDIR=${WRKINST}
PATCHORIG= .bsdorig
LIB_DEPENDS=kdecore.4,DCOP,artskde,kdefx,kdeprint,kdesu,kdeui,khtml,kio,kjava,kparts,kspell::x11/kde/libs3 python2.2.0.0:python-2.2*:lang/python/2.2
#PATCHORIG= .bsdorig
MODULES= qt3
PATCH_LIST= p-* patch-*
#PATCH_LIST= p-* patch-*
KDE=lib/kde3
#KDE=lib/kde3
.include <bsd.port.mk>

View File

@ -1,3 +1,3 @@
MD5 (kde/koffice-1.1.1-kde3.tar.bz2) = 91ba4cbf5a16678e59d3c08f4b6fc071
RMD160 (kde/koffice-1.1.1-kde3.tar.bz2) = d5f9b3800742b4ba6200bc010eb24cc7b7a676b9
SHA1 (kde/koffice-1.1.1-kde3.tar.bz2) = c2eeec46daac8a672cf11565fdf3dfdd899300f3
MD5 (kde/koffice-1.2.tar.bz2) = 34cb13104bc1d4f0916b0dda6dec7ee0
RMD160 (kde/koffice-1.2.tar.bz2) = d102b0d9c3cd6ba5c667295c2dce8ac9bb446b4c
SHA1 (kde/koffice-1.2.tar.bz2) = 5a959033358a27e8c6e9f02a1d0405fb1bd06b52

View File

@ -1,36 +0,0 @@
$OpenBSD: p-aclocal_m4,v 1.1.1.1 2002/04/05 16:04:24 espie Exp $
--- aclocal.m4.orig Fri Mar 29 16:16:47 2002
+++ aclocal.m4 Fri Apr 5 02:03:31 2002
@@ -3454,6 +3454,11 @@ LIBDL="-ldl"
ac_cv_have_dlfcn=yes
])
+AC_CHECK_LIB(c, dlopen, [
+LIBDL=
+ac_cv_have_dlfcn=yes
+])
+
AC_CHECK_LIB(dld, shl_unload, [
LIBDL="-ldld"
ac_cv_have_shload=yes
@@ -5349,19 +5354,7 @@ netbsd*)
;;
openbsd* )
- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
- case "$host_cpu" in
- i*86 )
- changequote(,)dnl
- lt_cv_deplibs_check_method='file_magic OpenBSD/i[3-9]86 demand paged shared library'
- changequote([, ])dnl
- lt_cv_file_magic_cmd=/usr/bin/file
- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
- ;;
- esac
- else
- lt_cv_deplibs_check_method=pass_all
- fi
+ lt_cv_deplibs_check_method=pass_all
;;
newsos6)

View File

@ -1,24 +0,0 @@
$OpenBSD: p-admin_libtool_m4_in,v 1.1.1.1 2002/04/05 16:04:24 espie Exp $
--- admin/libtool.m4.in.orig Tue Jul 31 21:00:04 2001
+++ admin/libtool.m4.in Fri Aug 17 00:02:40 2001
@@ -617,19 +617,7 @@ netbsd*)
;;
openbsd* )
- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
- case "$host_cpu" in
- i*86 )
- changequote(,)dnl
- lt_cv_deplibs_check_method='file_magic OpenBSD/i[3-9]86 demand paged shared library'
- changequote([, ])dnl
- lt_cv_file_magic_cmd=/usr/bin/file
- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
- ;;
- esac
- else
- lt_cv_deplibs_check_method=pass_all
- fi
+ lt_cv_deplibs_check_method=pass_all
;;
newsos6)

View File

@ -1,20 +0,0 @@
$OpenBSD: p-admin_ltcf-c_sh,v 1.1.1.1 2002/04/05 16:04:24 espie Exp $
--- admin/ltcf-c.sh.orig Sat May 19 09:19:10 2001
+++ admin/ltcf-c.sh Fri Aug 17 00:02:40 2001
@@ -457,10 +457,14 @@ else
;;
openbsd*)
- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
- hardcode_libdir_flag_spec='-R$libdir'
+ archive_cmds='$CC $pic_flag -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+ archive_expsym_cmds='$CC $pic_flag -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+ old_archive_cmds="$old_archive_cmds~"'$RANLIB $oldlib'
+ hardcode_libdir_flag_spec='${wl}-R$libdir'
hardcode_direct=yes
hardcode_shlibpath_var=no
+ remove_lgcc=yes
+ output_verbose_link_cmds='$CC $ac_cv_prog_cc_pic -shared $CFLAGS -v conftest.$objext 2>&1 | egrep "\-L"'
;;
os2*)

View File

@ -1,21 +0,0 @@
$OpenBSD: p-admin_ltcf-cxx_sh,v 1.1.1.1 2002/04/05 16:04:24 espie Exp $
--- admin/ltcf-cxx.sh.orig Mon Mar 18 14:23:03 2002
+++ admin/ltcf-cxx.sh Fri Apr 5 02:03:32 2002
@@ -413,14 +413,14 @@ case $host_os in
openbsd*)
if test "$with_gcc" = yes && test "$with_gnu_ld" = no; then
# MM: OpenBSD 2.7 uses G++, but not GNU ld
- archive_cmds='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
- archive_expsym_cmds='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+ archive_cmds='$CC $pic_flag -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+ archive_expsym_cmds='$CC $pic_flag -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
old_archive_cmds="$old_archive_cmds~"'$RANLIB $oldlib'
hardcode_libdir_flag_spec='${wl}-R$libdir'
hardcode_direct=yes
hardcode_shlibpath_var=no
- whole_archive_flag_spec='${wl}-Bforcearchive'
remove_lgcc=yes
+ output_verbose_link_cmds='$CC $ac_cv_prog_cc_pic -shared $CFLAGS -v conftest.$objext 2>&1 | egrep "\-L"'
fi
;;
osf3*)

View File

@ -1,37 +0,0 @@
$OpenBSD: p-admin_ltconfig,v 1.1.1.1 2002/04/05 16:04:24 espie Exp $
--- admin/ltconfig.orig Mon Mar 18 14:23:04 2002
+++ admin/ltconfig Fri Apr 5 02:03:32 2002
@@ -625,7 +625,12 @@ old_postuninstall_cmds=
if test -n "$RANLIB"; then
old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
- old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
+ case $host_os in
+ openbsd*)
+ old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds";;
+ *)
+ old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds";;
+ esac
fi
# Source the script associated with the $tagname tag configuration.
@@ -1246,15 +1251,15 @@ newsos6)
openbsd*)
version_type=sunos
- if test "$with_gnu_ld" = yes; then
- need_lib_prefix=no
- need_version=no
- fi
+ need_lib_prefix=yes
+ need_version=yes
library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
# OpenBSD 2.7 the overriding is needed for fast-install
shlibpath_overrides_runpath=yes
+ deplibs_check_method=pass_all
+ sys_lib_dlsearch_path_spec='/usr/lib /usr/local/lib /usr/X11R6/lib /usr/local/lib/qt2'
;;
os2*)

View File

@ -1,21 +0,0 @@
$OpenBSD: patch-kchart_kdchart_KDChartTable_h,v 1.1.1.1 2002/04/05 16:04:24 espie Exp $
--- kchart/kdchart/KDChartTable.h.orig Mon Dec 10 12:53:35 2001
+++ kchart/kdchart/KDChartTable.h Fri Apr 5 02:03:32 2002
@@ -28,9 +28,17 @@ Copyright (C) 1998, 1999, 2000 Torben We
#define MAXDOUBLE DBL_MAX
#define MINDOUBLE DBL_MIN
#else
+#ifdef __OpenBSD__
+#include <float.h>
+#include <limits.h>
+#include <math.h>
+#define MAXDOUBLE DBL_MAX
+#define MINDOUBLE DBL_MIN
+#else
#include <values.h>
#include <limits.h>
#include <math.h>
+#endif
#endif
#if defined SUN7 || ( defined HP11_aCC && defined HP1100 )

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-kivio_kiviopart_Makefile_in,v 1.1.1.1 2002/04/05 16:04:24 espie Exp $
--- kivio/kiviopart/Makefile.in.orig Fri Mar 29 16:17:43 2002
+++ kivio/kiviopart/Makefile.in Fri Apr 5 02:05:58 2002
@@ -244,7 +244,7 @@ x_libraries = @x_libraries@
SUBDIRS = ui kiviosdk tklib tools pics tiles stencils .
kde_module_LTLIBRARIES = libkiviopart.la
-libkiviopart_la_LIBADD = $(top_builddir)/kivio/kiviopart/tools/libtools.la $(top_builddir)/kivio/kiviopart/tklib/libtklib.la $(top_builddir)/kivio/kiviopart/kiviosdk/libkiviosdk.la $(top_builddir)/kivio/kiviopart/ui/libui.la $(LIBPYTHON) $(PYTHONLIB)
+libkiviopart_la_LIBADD = $(top_builddir)/kivio/kiviopart/tools/libtools.la $(top_builddir)/kivio/kiviopart/tklib/libtklib.la $(top_builddir)/kivio/kiviopart/kiviosdk/libkiviosdk.la $(top_builddir)/kivio/kiviopart/ui/libui.la $(LIBPYTHON) $(PYTHONLIB) -lc_r
INCLUDES = -I$(srcdir)/ui -Iui -I$(srcdir)/kiviosdk -I$(srcdir)/tklib -I$(srcdir)/tools $(KOFFICE_INCLUDES) -I$(top_srcdir)/lib/kformula $(all_includes)

View File

@ -1,38 +0,0 @@
$OpenBSD: patch-kivio_kiviopart_kiviosdk_kivio_plugin_stencil_spawner_cpp,v 1.1.1.1 2002/04/05 16:04:24 espie Exp $
--- kivio/kiviopart/kiviosdk/kivio_plugin_stencil_spawner.cpp.orig Wed Sep 5 17:39:17 2001
+++ kivio/kiviopart/kiviosdk/kivio_plugin_stencil_spawner.cpp Wed Sep 5 17:40:43 2001
@@ -60,14 +60,14 @@ bool KivioPluginStencilSpawner::load( co
return false;
}
- m_handle = dlopen( f.ascii(), RTLD_NOW | RTLD_GLOBAL );
+ m_handle = dlopen( f.ascii(), 0);
if( !m_handle )
{
kdDebug() << "KivioPluginStencilSpawner::load() - " << f << " is not a dll" << endl;
return false;
}
- pNewStencil = pNewStencil = (NewStencilFunc)dlsym( m_handle, "NewStencil" );
+ pNewStencil = pNewStencil = (NewStencilFunc)dlsym( m_handle, "_NewStencil" );
if( (error=dlerror())!=NULL )
{
kdDebug() << "KivioPluginStencilSpawner::load() - " << f << " - dlsym failed for NewStencil(): " << error << endl;
@@ -76,7 +76,7 @@ bool KivioPluginStencilSpawner::load( co
return false;
}
- pGetIcon = pGetIcon = (GetIconFunc)dlsym( m_handle, "GetIcon" );
+ pGetIcon = pGetIcon = (GetIconFunc)dlsym( m_handle, "_GetIcon" );
if( (error=dlerror())!=NULL )
{
kdDebug() << "KivioPluginStencilSpawner::load() - " << f << " - dlsym failed for GetIcon(): " << error << endl;
@@ -85,7 +85,7 @@ bool KivioPluginStencilSpawner::load( co
return false;
}
- pGetSpawnerInfo = (GetSpawnerInfoFunc)dlsym( m_handle, "GetSpawnerInfo" );
+ pGetSpawnerInfo = (GetSpawnerInfoFunc)dlsym( m_handle, "_GetSpawnerInfo" );
if( (error=dlerror())!=NULL )
{
kdDebug() << "KivioPluginStencilSpawner::load() - " << f << " - dlsym failed for GetIcon(): " << error << endl;

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-kivio_plugins_kivioconnectortool_straight_connector_Makefile_am,v 1.1.1.1 2002/04/05 16:04:24 espie Exp $
--- kivio/plugins/kivioconnectortool/straight_connector/Makefile.am.orig Thu Sep 6 14:54:44 2001
+++ kivio/plugins/kivioconnectortool/straight_connector/Makefile.am Thu Sep 6 14:54:50 2001
@@ -34,7 +34,7 @@ EXTRA_DIST = \
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(libdir)
- $(LIBTOOL) --mode=install $(INSTALL) ./.libs/libstraight_connector.so $(DESTDIR)$(libdir)/straight_connector.ksp;
+ $(LIBTOOL) --mode=install $(INSTALL) ./.libs/libstraight_connector.so.1.0 $(DESTDIR)$(libdir)/straight_connector.ksp;
uninstall-libLTLIBRARIES:
@$(NORMAL_UNINSTALL)

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-kivio_plugins_kivioconnectortool_straight_connector_Makefile_in,v 1.1.1.1 2002/04/05 16:04:24 espie Exp $
--- kivio/plugins/kivioconnectortool/straight_connector/Makefile.in.orig Fri Mar 29 16:17:44 2002
+++ kivio/plugins/kivioconnectortool/straight_connector/Makefile.in Fri Apr 5 02:03:33 2002
@@ -537,7 +537,7 @@ maintainer-clean: maintainer-clean-am
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(libdir)
- $(LIBTOOL) --mode=install $(INSTALL) ./.libs/libstraight_connector.so $(DESTDIR)$(libdir)/straight_connector.ksp;
+ $(LIBTOOL) --mode=install $(INSTALL) ./.libs/libstraight_connector.so.1.0 $(DESTDIR)$(libdir)/straight_connector.ksp;
uninstall-libLTLIBRARIES:
@$(NORMAL_UNINSTALL)

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-kontour_BezierTool_cc,v 1.1.1.1 2002/04/05 16:04:24 espie Exp $
--- kontour/BezierTool.cc.orig Wed Sep 5 22:43:42 2001
+++ kontour/BezierTool.cc Wed Sep 5 22:43:51 2001
@@ -22,7 +22,7 @@
*/
-#if defined(__FreeBSD__) || defined(__NetBSD__)
+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
#include <math.h>
#else
#include <values.h>

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-kontour_GBezier_cc,v 1.1.1.1 2002/04/05 16:04:24 espie Exp $
--- kontour/GBezier.cc.orig Wed Sep 5 22:41:51 2001
+++ kontour/GBezier.cc Wed Sep 5 22:42:02 2001
@@ -22,7 +22,7 @@
*/
#include <float.h>
-#if defined(__FreeBSD__) || defined(__NetBSD__)
+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
#include <math.h>
#else
#include <values.h>

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-kontour_GDocument_cc,v 1.1.1.1 2002/04/05 16:04:24 espie Exp $
--- kontour/GDocument.cc.orig Wed Sep 5 22:44:27 2001
+++ kontour/GDocument.cc Wed Sep 5 22:44:36 2001
@@ -41,7 +41,7 @@
#include <assert.h>
#include <kdebug.h>
-#if defined(__FreeBSD__) || defined(__NetBSD__)
+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
#include <math.h>
#else
#include <values.h>

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-kontour_GPage_cc,v 1.1.1.1 2002/04/05 16:04:24 espie Exp $
--- kontour/GPage.cc.orig Wed Sep 5 22:40:04 2001
+++ kontour/GPage.cc Wed Sep 5 22:40:20 2001
@@ -41,7 +41,7 @@
#include <assert.h>
#include <kdebug.h>
-#if defined(__FreeBSD__) || defined(__NetBSD__)
+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
#include <math.h>
#else
#include <values.h>

View File

@ -1,40 +1,58 @@
@comment $OpenBSD: PFRAG.shared,v 1.2 2002/04/15 06:53:54 espie Exp $
@comment $OpenBSD: PFRAG.shared,v 1.3 2002/09/11 12:02:50 espie Exp $
${KDE}/libabiwordexport.so.0.0
${KDE}/libabiwordimport.so.0.0
${KDE}/libapplixgraphicimport.so.0.0
${KDE}/libamiproexport.so.0.0
${KDE}/libamiproimport.so.0.0
${KDE}/libapplixspreadimport.so.0.0
${KDE}/libapplixwordimport.so.0.0
${KDE}/libasciiexport.so.0.0
${KDE}/libasciiimport.so.0.0
${KDE}/libclipartthumbnail.so.0.0
${KDE}/libcsvexport.so.0.0
${KDE}/libcsvimport.so.0.0
${KDE}/libdbaseimport.so.0.0
${KDE}/libdocbookexport.so.0.0
${KDE}/libgnumericexport.so.0.0
${KDE}/libgnumericimport.so.0.0
${KDE}/libhtmlexport.so.0.0
${KDE}/libhtmlimport.so.0.0
${KDE}/libkchartpart.so.0.0
${KDE}/libkfile_koffice.so.0.0
${KDE}/libkfolatexexport.so.0.0
${KDE}/libkfopngexport.so.0.0
${KDE}/libkformulapart.so.0.0
${KDE}/libkiviopart.so.0.0
${KDE}/libkodocinfopropspage.so.0.0
${KDE}/libkofficescan.so.0.0
${KDE}/libkontourpart.so.0.0
${KDE}/libkofficethumbnail.so.0.0
${KDE}/libkounavailpart.so.0.0
${KDE}/libkpresenterpart.so.0.0
${KDE}/libkprkword.so.0.0
${KDE}/libkspelltool.so.0.0
${KDE}/libkspreadcalc.so.0.0
${KDE}/libkspreadhtmlexport.so.0.0
${KDE}/libkspreadpart.so.0.0
${KDE}/libkwmailmerge_classic.so.0.0
${KDE}/libkwmailmerge_qtsqldb.so.0.0
${KDE}/libkwmailmerge_qtsqldb_power.so.0.0
${KDE}/libkwordpart.so.0.0
${KDE}/liblatexexport.so.0.0
${KDE}/libmsodimport.so.0.0
${KDE}/liblateximport.so.0.0
${KDE}/liblatexparser.so.0.0
${KDE}/libmswriteimport.so.0.0
${KDE}/libolefilter.so.0.0
${KDE}/libpalmdocexport.so.0.0
${KDE}/libpalmdocimport.so.0.0
${KDE}/libqproimport.so.0.0
${KDE}/librtfexport.so.0.0
${KDE}/libsvgexport.so.0.0
${KDE}/libsvgimport.so.0.0
${KDE}/libwmfimport.so.0.0
${KDE}/librtfimport.so.0.0
${KDE}/libthesaurustool.so.0.0
${KDE}/libwmlexport.so.0.0
${KDE}/libwmlimport.so.0.0
${KDE}/libwpexport.so.0.0
${KDE}/libwpimport.so.0.0
${KDE}/libxfigimport.so.0.0
${KDE}/libxsltexport.so.0.0
${KDE}/libxsltimport.so.0.0
lib/libkchart.so.0.0
lib/libkdchart.so.0.0
lib/libkformula.so.3.0
@ -45,16 +63,18 @@ lib/libkivioselecttool.so.0.0
lib/libkiviotexttool.so.0.0
lib/libkiviozoomtool.so.0.0
lib/libkochart.so.1.0
lib/libkodocinfopropspage.so.0.0
lib/libkofficecore.so.1.0
lib/libkofficeui.so.1.0
lib/libkontour.so.0.0
lib/libkoscript.so.1.0
lib/libkofficecore.so.2.0
lib/libkofficeui.so.2.0
lib/libkoscript.so.2.0
lib/libkoshell.so.0.0
lib/libkotext.so.2.0
lib/libkpresenter.so.0.0
lib/libkspread.so.0.0
lib/libkstore.so.1.0
lib/libkstore.so.2.0
lib/libkugar.so.1.2
lib/libkugarpart.so.0.0
lib/libkwmf.so.1.0
lib/libkwmailmerge_interface.so.4.0
lib/libkwmf.so.2.0
lib/libkword.so.0.0
lib/libkwordexportfilters.so.1.0
DYNLIBDIR(%D/lib)

File diff suppressed because it is too large Load Diff