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

update to real 1.5.

Browse Source
This commit is contained in:
espie 2006-04-17 10:56:49 +00:00
parent 55c71fb5c1
commit 9c2c8ad3f4
8 changed files with 222 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
x11/kde/office3/Makefile
View File

@ -1,13 +1,13 @@
# $OpenBSD: Makefile,v 1.30 2006/04/02 09:44:31 espie Exp $
# $OpenBSD: Makefile,v 1.31 2006/04/17 10:56:49 espie Exp $
COMMENT= "office suite for KDE"
CATEGORIES= x11 x11/kde productivity
VMEM_WARNING= Yes
MASTER_SITES?= ${MASTER_SITE_KDE:S@$@unstable/koffice-1.5-rc1/src/@}
MASTER_SITES?= ${MASTER_SITE_KDE:S@$@stable/koffice-1.5.0/src/@}
DISTNAME= koffice-1.5.0-rc1
PKGNAME= koffice-1.5.0rc1
DISTNAME= koffice-1.5.0
PKGNAME= koffice-1.5.0
#SHARED_LIBS= karbonbase 3.0 \
# kexipropertyeditor 1.0 \
# koscript 3.0 \
@ -74,7 +74,7 @@ FAKE_FLAGS= ${MAKE_FLAGS} TAR=tar DESTDIR=${WRKINST}
SEPARATE_BUILD= flavored
BUILD_DEPENDS+= ::devel/pkgconfig
MODKDE_VERSION= 3.5.2
MODKDE_VERSION=
AUTOCONF?= /bin/sh ${WRKDIST}/admin/cvs.sh configure
AUTOCONF_VERSION=2.59

8
x11/kde/office3/distinfo
View File

@ -1,4 +1,4 @@
MD5 (kde/koffice-1.5.0-rc1.tar.bz2) = e9346977d18c67185d5b50f49ee8225b
RMD160 (kde/koffice-1.5.0-rc1.tar.bz2) = 6553df43f5a8b8261943a06d9bd9801b1d02f66c
SHA1 (kde/koffice-1.5.0-rc1.tar.bz2) = 1891e50207bd8cdb4e2e63873450f11ffbe4bcf6
SIZE (kde/koffice-1.5.0-rc1.tar.bz2) = 35965316
MD5 (kde/koffice-1.5.0.tar.bz2) = 220b6bde28b5ebd5c6621bc87ca2c05f
RMD160 (kde/koffice-1.5.0.tar.bz2) = d3539bf2d6ed9be51e34f5533f0c4c17dfbc7cf0
SHA1 (kde/koffice-1.5.0.tar.bz2) = e8886c8dd438d5522a7b2fe514024543e33436d5
SIZE (kde/koffice-1.5.0.tar.bz2) = 35981152

69
x11/kde/office3/patches/patch-acinclude_m4 Normal file
View File

@ -0,0 +1,69 @@
$OpenBSD: patch-acinclude_m4,v 1.1 2006/04/17 10:56:49 espie Exp $
--- acinclude.m4.orig Mon Apr 3 19:27:40 2006
+++ acinclude.m4 Sun Apr 16 17:53:21 2006
@@ -6646,6 +6646,19 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [d
lt_cv_sys_max_cmd_len=8192;
;;
+ netbsd* | freebsd* | openbsd* | darwin* )
+ # This has been around since 386BSD, at least. Likely further.
+ if test -x /sbin/sysctl; then
+ lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
+ elif test -x /usr/sbin/sysctl; then
+ lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
+ else
+ lt_cv_sys_max_cmd_len=65536 # usable default for *BSD
+ fi
+ # And add a safety zone
+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+ ;;
+
*)
# If test is not a shell built-in, we'll probably end up computing a
# maximum length that is only half of the actual maximum length, but
@@ -8186,13 +8199,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*)
@@ -9166,6 +9173,22 @@ 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::"'
;;
+ openbsd2*)
+ # C++ shared libraries are fairly broken
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+ 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 $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+ fi
+ output_verbose_link_cmd='echo'
+ ;;
osf3*)
case $cc_basename in
KCC)
@@ -11494,6 +11517,7 @@ EOF
_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 $compiler_flags $libobjs $deplibs'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
else

14
x11/kde/office3/patches/patch-admin_cvs_sh Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-admin_cvs_sh,v 1.1 2006/04/17 10:56:49 espie Exp $
--- admin/cvs.sh.orig Mon Apr 3 19:17:01 2006
+++ admin/cvs.sh Sun Apr 16 17:53:13 2006
@@ -634,6 +634,10 @@ fi
# Call script to find autoconf and friends. Uses eval since the script outputs
# sh-compatible code.
eval `$admindir/detect-autoconf.pl`
+AUTOCONF=autoconf
+AUTOHEADER=autoheader
+AUTOM4TE=autom4te-2.59
+ACLOCAL=aclocal
###
### Main

69
x11/kde/office3/patches/patch-admin_libtool_m4_in Normal file
View File

@ -0,0 +1,69 @@
$OpenBSD: patch-admin_libtool_m4_in,v 1.1 2006/04/17 10:56:49 espie Exp $
--- admin/libtool.m4.in.orig Mon Apr 3 19:17:01 2006
+++ admin/libtool.m4.in Sun Apr 16 17:53:20 2006
@@ -672,6 +672,19 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [d
lt_cv_sys_max_cmd_len=8192;
;;
+ netbsd* | freebsd* | openbsd* | darwin* )
+ # This has been around since 386BSD, at least. Likely further.
+ if test -x /sbin/sysctl; then
+ lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
+ elif test -x /usr/sbin/sysctl; then
+ lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
+ else
+ lt_cv_sys_max_cmd_len=65536 # usable default for *BSD
+ fi
+ # And add a safety zone
+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+ ;;
+
*)
# If test is not a shell built-in, we'll probably end up computing a
# maximum length that is only half of the actual maximum length, but
@@ -2212,13 +2225,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*)
@@ -3192,6 +3199,22 @@ 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::"'
;;
+ openbsd2*)
+ # C++ shared libraries are fairly broken
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+ 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 $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+ fi
+ output_verbose_link_cmd='echo'
+ ;;
osf3*)
case $cc_basename in
KCC)
@@ -5520,6 +5543,7 @@ EOF
_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 $compiler_flags $libobjs $deplibs'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
else

52
x11/kde/office3/patches/patch-admin_ltmain_sh Normal file
View File

@ -0,0 +1,52 @@
$OpenBSD: patch-admin_ltmain_sh,v 1.3 2006/04/17 10:56:49 espie Exp $
--- admin/ltmain.sh.orig Mon Apr 3 19:17:01 2006
+++ admin/ltmain.sh Sun Apr 16 17:52:44 2006
@@ -1301,6 +1301,17 @@ EOF
continue
;;
+ -pthread)
+ case $host in
+ *-*-openbsd*)
+ deplibs="$deplibs $arg"
+ ;;
+ *)
+ continue
+ ;;
+ esac
+ ;;
+
-module)
module=yes
continue
@@ -1997,6 +2008,30 @@ EOF
fi
continue
;;
+ -pthread)
+ case $linkmode in
+ lib)
+ deplibs="$deplib $deplibs"
+ test "$pass" = conv && continue
+ newdependency_libs="$deplib $newdependency_libs"
+ ;;
+ prog)
+ if test "$pass" = conv; then
+ deplibs="$deplib $deplibs"
+ continue
+ fi
+ if test "$pass" = scan; then
+ deplibs="$deplib $deplibs"
+ else
+ compile_deplibs="$deplib $compile_deplibs"
+ finalize_deplibs="$deplib $finalize_deplibs"
+ fi
+ ;;
+ *)
+ ;;
+ esac # linkmode
+ continue
+ ;; # -pthread
%DEPLIBS%)
alldeplibs=yes
continue

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

@ -1,6 +1,6 @@
$OpenBSD: patch-configure_in,v 1.5 2006/04/02 09:44:31 espie Exp $
--- configure.in.orig Thu Mar 23 21:13:59 2006
+++ configure.in Sat Apr 1 15:12:43 2006
$OpenBSD: patch-configure_in,v 1.6 2006/04/17 10:56:49 espie Exp $
--- configure.in.orig Mon Apr 3 19:27:42 2006
+++ configure.in Sun Apr 16 17:53:20 2006
@@ -935,8 +935,8 @@ dnl *** Check that the paths given to co
AC_MSG_CHECKING([for PostgreSQL C API libraries])
@ -56,5 +56,5 @@ $OpenBSD: patch-configure_in,v 1.5 2006/04/02 09:44:31 espie Exp $
- AC_LANG_C
+ AC_LANG_CPLUSPLUS
dnl Check for aspell library
AC_MSG_CHECKING([for kspell2/broker.h (kdelibs>3.2)])
AC_FIND_FILE(kspell2/broker.h, $kde_includes, ac_kspell2_includes)
KDE_CHECK_HEADERS([kspell2/broker.h])
if test "x$ac_cv_header_kspell2_broker_h" = "xyes"; then

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.5 2006/04/02 09:44:31 espie Exp $
--- kspread/plugins/calculator/Makefile.in.orig Fri Mar 3 22:13:23 2006
+++ kspread/plugins/calculator/Makefile.in Sun Mar 5 23:57:33 2006
@@ -670,7 +670,7 @@ clean-kde_moduleLTLIBRARIES:
$OpenBSD: patch-kspread_plugins_calculator_Makefile_in,v 1.6 2006/04/17 10:56:49 espie Exp $
--- kspread/plugins/calculator/Makefile.in.orig Mon Apr 3 19:30:42 2006
+++ kspread/plugins/calculator/Makefile.in Sun Apr 16 17:53:23 2006
@@ -671,7 +671,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)