cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

koffice 1.4.1

Browse Source 
does not enable all kexi plugins yet.
karbon does not work (bug in ld.so)
This commit is contained in:
espie 2005-08-05 10:49:18 +00:00
parent dd77ea6520
commit 3d0b96bfc9
6 changed files with 48 additions and 172 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
x11/kde/office3/Makefile
View File

@ -1,36 +1,39 @@
# $OpenBSD: Makefile,v 1.23 2004/12/30 21:14:27 espie Exp $
# $OpenBSD: Makefile,v 1.24 2005/08/05 10:49:18 espie Exp $
COMMENT= "office suite for KDE"
CATEGORIES= x11 x11/kde productivity
VERSION= 3.1.4
VMEM_WARNING= Yes
MASTER_SITES?= ${MASTER_SITE_KDE:S@$@stable/${DISTNAME}/src/@}
MASTER_SITES?= ${MASTER_SITE_KDE:S@$@stable/koffice-1.4.1/src/@}
DISTNAME= koffice-1.3.5
PKGNAME= ${DISTNAME}
DISTNAME= koffice-1.4.1
PKGNAME= koffice-1.4.1
FAKE_FLAGS= ${MAKE_FLAGS} TAR=tar DESTDIR=${WRKINST}
SEPARATE_BUILD= flavored
MODKDE_VERSION=
MODKDE_VERSION= 3.4
AUTOCONF?= /bin/sh ${WRKDIST}/admin/cvs.sh configure
AUTOCONF_VERSION=2.58
AUTOCONF_VERSION=2.59
LIB_DEPENDS= kdecore.4,DCOP,artskde,kdefx,kdeprint,kdesu,kdeui,khtml,kio,kjava,kparts,kspell,kabc,kjs,kresources,kutils,kwalletclient,vcard::x11/kde/libs3 \
MODKDE_LIBTOOL=Yes
LIB_DEPENDS= kdecore.4,DCOP,artskde,kdefx,kdeprint,kdesu,kdeui,khtml,kio,kparts,kspell,kabc,kjs,kresources,ktexteditor,kutils,kwalletclient,vcard,kspell2,knewstuff,kmdi::x11/kde/libs3 \
python2.3.0.0:python-2.3.*:lang/python/2.3 \
art_lgpl_2.5::graphics/libart \
wv2::converters/wv2 \
aspell::textproc/aspell/core \
Magick::graphics/ImageMagick \
jbig::graphics/jbigkit
jbig::graphics/jbigkit \
mysqlclient::databases/mysql
WANTLIB= ICE SM X11 Xext Xrender artsflow artsflow_idl audiofile bz2 c \
esd freetype glib-2.0.0.0 gmodule-2.0.0.0 gobject-2.0.0.0 \
gsf-1 gthread-2.0.0.0 iconv intl jasper jpeg kmedia2_idl lcms \
m mad mcop ogg ossaudio pcre pcreposix png pthread qtmcop \
soundserver_idl stdc++ tiff util vorbis vorbisenc vorbisfile \
xml2 xslt z
xml2 xslt z Xt termcap Xi fontconfig crypto readline ssl
CONFIGURE_ARGS+= --disable-pgsql
# --with-pgsqlincdir=${LOCALBASE}/include/postgresql
.include <bsd.port.mk>

8
x11/kde/office3/distinfo
View File

@ -1,4 +1,4 @@
MD5 (kde/koffice-1.3.5.tar.bz2) = dbc7e76c86647709a3e74f57c0fcf7f5
RMD160 (kde/koffice-1.3.5.tar.bz2) = 8db829422ded44b2388af79cb230ce4fd3e588da
SHA1 (kde/koffice-1.3.5.tar.bz2) = feccb391be8039514f23f0f9cde9b01e22625769
SIZE (kde/koffice-1.3.5.tar.bz2) = 10778584
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

105
x11/kde/office3/patches/patch-aclocal_m4
View File

@ -1,105 +0,0 @@
$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
- need_lib_prefix=no
- need_version=no
+ need_lib_prefix=yes
+ need_version=yes
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
@@ -7661,13 +7661,7 @@ nto-qnx*)
;;
openbsd*)
- lt_cv_file_magic_cmd=/usr/bin/file
- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB shared object'
- else
- lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
- fi
+ lt_cv_deplibs_check_method=pass_all
;;
osf3* | osf4* | osf5*)
@@ -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::"'
;;
+ openbsd*)
+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+ _LT_AC_TAGVAR(remove_libsearchpath, $1)='yes'
+ _LT_AC_TAGVAR(remove_lgcc, $1)='yes'
+ ;;
osf3*)
case $cc_basename in
KCC)
@@ -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
+ if test "x$_LT_AC_TAGVAR(remove_libsearchpath, $1)" = "xyes"; then
+ _LT_AC_TAGVAR(compiler_lib_search_path, $1)=""
+ fi
;;
# The "-l" case would never come before the object being
# linked, so don't bother handling this case.
esac
else
+ add="${prev}$p"
+ if test "x$_LT_AC_TAGVAR(remove_lgcc, $1)" = "xyes"; then
+ case "$add" in
+ -lgcc ) add="" ;;
+ esac
+ fi
if test -z "$_LT_AC_TAGVAR(postdeps, $1)"; then
- _LT_AC_TAGVAR(postdeps, $1)="${prev}${p}"
+ _LT_AC_TAGVAR(postdeps, $1)="$add"
else
- _LT_AC_TAGVAR(postdeps, $1)="${_LT_AC_TAGVAR(postdeps, $1)} ${prev}${p}"
+ _LT_AC_TAGVAR(postdeps, $1)="${_LT_AC_TAGVAR(postdeps, $1)} ${add}"
fi
fi
;;
@@ -10922,22 +10934,8 @@ EOF
openbsd*)
_LT_AC_TAGVAR(hardcode_direct, $1)=yes
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
- else
- case $host_os in
- openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
- ;;
- *)
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- ;;
- esac
- fi
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
;;
os2*)
@@ -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'
+ _LT_AC_TAGVAR(remove_lgcc, $1)='yes'
;;
osf3*)

42
x11/kde/office3/patches/patch-admin_ltmain_sh
View File

@ -1,42 +0,0 @@
$OpenBSD: patch-admin_ltmain_sh,v 1.1 2003/12/31 07:13:20 brad Exp $
--- admin/ltmain.sh.orig 2003-09-24 07:51:34.000000000 -0400
+++ admin/ltmain.sh 2003-12-14 15:29:22.000000000 -0500
@@ -1294,6 +1294,17 @@ EOF
continue
;;
+ -pthread)
+ case $host in
+ *-*-openbsd*)
+ deplibs="$deplibs $arg"
+ ;;
+ *)
+ continue
+ ;;
+ esac
+ ;;
+
-module)
module=yes
continue
@@ -1973,6 +1984,20 @@ EOF
fi
continue
;;
+ -pthread)
+ case $linkmode in
+ lib)
+ deplibs="$deplib $deplibs"
+ newdependency_libs="$deplib $newdependency_libs"
+ ;;
+ prog)
+ compile_deplibs="$deplib $compile_deplibs"
+ finalize_deplibs="$deplib $finalize_deplibs"
+ ;;
+ esac
+ continue
+ ;;
+
%DEPLIBS%)
alldeplibs=yes
continue

32
x11/kde/office3/patches/patch-configure_in
View File

@ -1,12 +1,32 @@
$OpenBSD: patch-configure_in,v 1.1 2004/10/26 09:13:38 espie Exp $
--- configure.in.orig Sat Oct 23 07:59:13 2004
+++ configure.in Sat Oct 23 08:02:32 2004
@@ -624,7 +624,7 @@ dnl FILE: ./lib/kospell/configure.in.in
$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
@@ -845,8 +845,8 @@ dnl ====================================
if test "$compile_pgsql_plugin" = "yes"; then
AC_MSG_CHECKING([for PostgreSQL... Step 2 of 4])
pgsql_libdirs="$ac_pgsql_libdir /usr/lib /usr/local/lib /usr/local/pgsql/lib /opt/postgres/lib"
- AC_FIND_FILE(libpq.so, $pgsql_libdirs, pgsql_libdir)
- if test ! -r $pgsql_libdir/libpq.so; then
+ AC_FIND_FILE(libpq.a, $pgsql_libdirs, pgsql_libdir)
+ if test ! -r $pgsql_libdir/libpq.a; 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"
-AC_FIND_FILE(libknewstuff.so, $kde_libdirs, knewstuff_libdir)
+AC_FIND_FILE(libknewstuff.so.1.0, $kde_libdirs, knewstuff_libdir)
ac_knewstuff_libraries="$knewstuff_libdir"
if test "$ac_knewstuff_includes" = NO || test "$ac_knewstuff_libraries" = NO; then
@@ -1245,7 +1245,7 @@ dnl FILE: ./lib/kotext/configure.in.in
dnl =======================================================
AC_LANG_SAVE
- AC_LANG_C
+ AC_LANG_CPLUSPLUS
dnl Check for aspell library
KDE_CHECK_LIB(aspell, new_aspell_config, [LIBASPELL="-laspell"])
KDE_CHECK_HEADER(aspell.h)
AC_MSG_CHECKING([for kspell2/broker.h (kdelibs>3.2)])
AC_FIND_FILE(kspell2/broker.h, $kde_includes, ac_kspell2_includes)

8
x11/kde/office3/patches/patch-kspread_plugins_calculator_Makefile_in
View File

@ -1,7 +1,7 @@
$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:
$OpenBSD: patch-kspread_plugins_calculator_Makefile_in,v 1.2 2005/08/05 10:49:18 espie Exp $
--- kspread/plugins/calculator/Makefile.in.orig Wed Jun 1 11:21:59 2005
+++ kspread/plugins/calculator/Makefile.in Mon Jun 13 12:32:50 2005
@@ -578,7 +578,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)