update to koffice 1.3.2

This commit is contained in:
espie 2004-09-18 09:37:27 +00:00
parent 45f1a50f11
commit a5c6126943
6 changed files with 391 additions and 367 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.16 2004/02/26 09:52:58 brad Exp $
# $OpenBSD: Makefile,v 1.17 2004/09/18 09:37:27 espie Exp $
COMMENT= "office suite for KDE"
@ -7,18 +7,22 @@ VERSION= 3.1.4
VMEM_WARNING= Yes
MASTER_SITES?= ${MASTER_SITE_KDE:S@$@stable/${DISTNAME}/src/@}
DISTNAME= koffice-1.3
DISTNAME= koffice-1.3.2
FAKE_FLAGS= ${MAKE_FLAGS} TAR=tar DESTDIR=${WRKINST}
SEPARATE_BUILD= flavored
MODKDE_VERSION=
AUTOCONF?= /bin/sh ${WRKDIST}/admin/cvs.sh configure
AUTOCONF_VERSION=2.59
LIB_DEPENDS= kdecore.4,DCOP,artskde,kdefx,kdeprint,kdesu,kdeui,khtml,kio,kjava,kparts,kspell::x11/kde/libs3 \
python2.3.0.0::lang/python/2.3 \
art_lgpl_2.5::graphics/libart \
wv2::converters/wv2 \
aspell::textproc/aspell/core
aspell::textproc/aspell/core \
Magick::graphics/ImageMagick \
jbig::graphics/jbigkit
.include <bsd.port.mk>

View File

@ -1,3 +1,3 @@
MD5 (kde/koffice-1.3.tar.bz2) = 8e4c9db57f701d42f21d61651f0b03bd
RMD160 (kde/koffice-1.3.tar.bz2) = 53d861a827d697a062aa139a5811aa5bf7f680ff
SHA1 (kde/koffice-1.3.tar.bz2) = f9c6736e6409ff4be4bbfd5407a1dfee9adf6d1d
MD5 (kde/koffice-1.3.2.tar.bz2) = 078a371f6768bea53b84ea342ac0b34b
RMD160 (kde/koffice-1.3.2.tar.bz2) = 8c4714f543e45528226b31ed718735a36c44ea7d
SHA1 (kde/koffice-1.3.2.tar.bz2) = f7a4fec6986c557ece913c2749fd8586a698453c

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-aclocal_m4,v 1.1 2003/12/31 07:13:20 brad Exp $
--- aclocal.m4.orig 2003-12-17 06:49:08.000000000 -0500
+++ aclocal.m4 2003-12-17 21:37:37.000000000 -0500
@@ -6847,8 +6847,8 @@ nto-qnx*)
$OpenBSD: patch-aclocal_m4,v 1.2 2004/09/18 09:37:27 espie Exp $
--- aclocal.m4.orig Wed Jun 30 09:56:42 2004
+++ aclocal.m4 Tue Sep 7 13:53:41 2004
@@ -6932,8 +6932,8 @@ nto-qnx*)
openbsd*)
version_type=sunos
@ -12,7 +12,7 @@ $OpenBSD: patch-aclocal_m4,v 1.1 2003/12/31 07:13:20 brad Exp $
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
@@ -7572,13 +7572,7 @@ nto-qnx*)
@@ -7661,13 +7661,7 @@ nto-qnx*)
;;
openbsd*)
@ -27,7 +27,7 @@ $OpenBSD: patch-aclocal_m4,v 1.1 2003/12/31 07:13:20 brad Exp $
;;
osf3* | osf4* | osf5*)
@@ -8526,6 +8520,15 @@ case $host_os in
@@ -8615,6 +8609,15 @@ case $host_os in
# Workaround some broken pre-1.5 toolchains
output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
;;
@ -43,7 +43,7 @@ $OpenBSD: patch-aclocal_m4,v 1.1 2003/12/31 07:13:20 brad Exp $
osf3*)
case $cc_basename in
KCC)
@@ -8899,15 +8902,24 @@ if AC_TRY_EVAL(ac_compile); then
@@ -8988,15 +8991,24 @@ if AC_TRY_EVAL(ac_compile); then
else
_LT_AC_TAGVAR(compiler_lib_search_path, $1)="${_LT_AC_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
fi
@ -70,7 +70,7 @@ $OpenBSD: patch-aclocal_m4,v 1.1 2003/12/31 07:13:20 brad Exp $
fi
fi
;;
@@ -10833,22 +10845,8 @@ EOF
@@ -10922,22 +10934,8 @@ EOF
openbsd*)
_LT_AC_TAGVAR(hardcode_direct, $1)=yes
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
@ -95,7 +95,7 @@ $OpenBSD: patch-aclocal_m4,v 1.1 2003/12/31 07:13:20 brad Exp $
;;
os2*)
@@ -10857,6 +10855,7 @@ EOF
@@ -10946,6 +10944,7 @@ EOF
_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
_LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
_LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-kspread_plugins_calculator_Makefile_in,v 1.1 2004/09/18 09:37:28 espie Exp $
--- kspread/plugins/calculator/Makefile.in.orig Tue Sep 7 15:48:54 2004
+++ kspread/plugins/calculator/Makefile.in Tue Sep 7 15:49:08 2004
@@ -525,7 +525,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)
- $(CXXLINK) -rpath $(kde_moduledir) $(libkspreadcalc_la_LDFLAGS) $(libkspreadcalc_la_OBJECTS) $(libkspreadcalc_la_LIBADD) $(LIBS)
+ $(CXXLINK) -Wl,-rpath,$(kde_moduledir) -rpath $(kde_moduledir) $(libkspreadcalc_la_LDFLAGS) $(libkspreadcalc_la_OBJECTS) $(libkspreadcalc_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT) core *.core

View File

@ -1,122 +0,0 @@
@comment $OpenBSD: PFRAG.shared,v 1.6 2003/12/31 07:13:20 brad Exp $
${KDE}/libabiwordexport.so.0.0
${KDE}/libabiwordimport.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}/libgenerickofilter.so.0.0
${KDE}/libgnumericexport.so.0.0
${KDE}/libgnumericimport.so.0.0
${KDE}/libhtmlexport.so.0.0
${KDE}/libhtmlimport.so.0.0
${KDE}/libkarbon_flattenpathplugin.so.0.0
${KDE}/libkarbon_imagetoolplugin.so.0.0
${KDE}/libkarbon_insertknotsplugin.so.0.0
${KDE}/libkarbon_roundcornersplugin.so.0.0
${KDE}/libkarbon_shadoweffectplugin.so.0.0
${KDE}/libkarbon_whirlpinchplugin.so.0.0
${KDE}/libkarbon_zoomtoolplugin.so.0.0
${KDE}/libkarbonaiimport.so.1.0
${KDE}/libkarbonbase.so.0.0
${KDE}/libkarbonepsexport.so.0.0
${KDE}/libkarbonepsimport.so.0.0
${KDE}/libkarbonkontourimport.so.0.0
${KDE}/libkarbonmsodimport.so.0.0
${KDE}/libkarbonpart.so.0.0
${KDE}/libkarbonpngexport.so.0.0
${KDE}/libkarbonsvgexport.so.0.0
${KDE}/libkarbonsvgimport.so.0.0
${KDE}/libkarbonxcfexport.so.0.0
${KDE}/libkchartpart.so.0.0
${KDE}/libkfile_koffice.so.0.0
${KDE}/libkfile_ooo.so.0.0
${KDE}/libkfolatexexport.so.0.0
${KDE}/libkfomathmlexport.so.0.0
${KDE}/libkfomathmlimport.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}/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}/libkspreadlatexexport.so.0.0
${KDE}/libkspreadpart.so.0.0
${KDE}/libkudesignerpart.so.0.0
${KDE}/libkugarnopimport.so.0.0
${KDE}/libkugarpart.so.0.0
${KDE}/libkwmailmerge_classic.so.0.0
${KDE}/libkwmailmerge_qtsqldb.so.0.0
${KDE}/libkwmailmerge_qtsqldb_power.so.0.0
${KDE}/libkwordlatexexport.so.0.0
${KDE}/libkwordpart.so.0.0
${KDE}/libmswordimport.so.0.0
${KDE}/libmswriteexport.so.0.0
${KDE}/libmswriteimport.so.0.0
${KDE}/libolefilter.so.0.0
${KDE}/libooimpressexport.so.0.0
${KDE}/libooimpressimport.so.0.0
${KDE}/liboowriterexport.so.0.0
${KDE}/liboowriterimport.so.0.0
${KDE}/libopencalcexport.so.0.0
${KDE}/libopencalcimport.so.0.0
${KDE}/libpalmdocexport.so.0.0
${KDE}/libpalmdocimport.so.0.0
${KDE}/libpdfimport.so.0.0
${KDE}/libqproimport.so.0.0
${KDE}/librtfexport.so.0.0
${KDE}/librtfimport.so.0.0
${KDE}/libstraight_connector.so.0.0
${KDE}/libthesaurustool.so.0.0
${KDE}/libwmfexport.so.0.0
${KDE}/libwmfimport.so.0.0
${KDE}/libwmlexport.so.0.0
${KDE}/libwmlimport.so.0.0
${KDE}/libwpexport.so.0.0
${KDE}/libwpimport.so.0.0
${KDE}/libxsltexport.so.0.0
${KDE}/libxsltimport.so.0.0
lib/libkarbon.so.0.0
lib/libkchart.so.0.0
lib/libkdchart.so.0.0
lib/libkformula.so.3.0
lib/libkformulamain.so.0.0
lib/libkivio.so.0.0
lib/libkivioconnectortool.so.0.0
lib/libkivioselecttool.so.0.0
lib/libkiviotexttool.so.0.0
lib/libkiviozoomtool.so.0.0
lib/libkochart.so.1.0
lib/libkofficecore.so.2.0
lib/libkofficeui.so.2.0
lib/libkopainter.so.1.0
lib/libkoscript.so.2.0
lib/libkoshell.so.0.0
lib/libkospell.so.5.0
lib/libkotext.so.2.0
lib/libkowmf.so.1.0
lib/libkpresenter.so.0.0
lib/libkspread.so.0.0
lib/libkstore.so.2.0
lib/libkudesigner.so.0.0
lib/libkudesignercore.so.0.0
lib/libkugar.so.0.0
lib/libkugar.so.1.2
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