From b8ad7f8c4012540ed4f009082df170eefb8cd641 Mon Sep 17 00:00:00 2001
From: espie <espie@openbsd.org>
Date: Sat, 30 Mar 2002 02:22:25 +0000
Subject: [PATCH] sigh... the python stuff is specific to koffice, so don't
 reuse the kdelibs patches.

---
 x11/kde/office2/Makefile                      |  4 +-
 x11/kde/office2/patches/p-aclocal_m4          | 48 +++++++++++++++++++
 x11/kde/office2/patches/p-admin_libtool_m4_in | 24 ++++++++++
 x11/kde/office2/patches/p-admin_ltcf-c_sh     | 20 ++++++++
 x11/kde/office2/patches/p-admin_ltcf-cxx_sh   | 21 ++++++++
 x11/kde/office2/patches/p-admin_ltconfig      | 37 ++++++++++++++
 x11/kde/office2/pkg/PFRAG.shared              |  2 +-
 x11/kde/office2/pkg/PLIST                     | 39 ++++++++++++++-
 8 files changed, 191 insertions(+), 4 deletions(-)
 create mode 100644 x11/kde/office2/patches/p-aclocal_m4
 create mode 100644 x11/kde/office2/patches/p-admin_libtool_m4_in
 create mode 100644 x11/kde/office2/patches/p-admin_ltcf-c_sh
 create mode 100644 x11/kde/office2/patches/p-admin_ltcf-cxx_sh
 create mode 100644 x11/kde/office2/patches/p-admin_ltconfig

diff --git a/x11/kde/office2/Makefile b/x11/kde/office2/Makefile
index 832a2017432..dfeef4c1fca 100644
--- a/x11/kde/office2/Makefile
+++ b/x11/kde/office2/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.16 2002/03/30 00:12:20 espie Exp $
+# $OpenBSD: Makefile,v 1.17 2002/03/30 02:22:25 espie Exp $
 
 COMMENT=		"office applications for kde"
 CATEGORIES=		x11 x11/kde productivity
@@ -24,7 +24,7 @@ CONFIGURE_ARGS+=	--with-extra-libs=${LOCALBASE}/lib
 CONFIGURE_ARGS+=	--with-extra-includes=${LOCALBASE}/include
 CONFIGURE_ARGS+=	--disable-debug
 #CONFIGURE_ARGS+=--enable-static --enable-debug --disable-shared
-PATCH_LIST=${PORTSDIR}/x11/kde/libs2/patches/p-* patch-*
+PATCH_LIST=	p-* patch-*
 
 # Not yet, too much time to compile
 #CONFIGURE_ARGS+=	--enable-static
diff --git a/x11/kde/office2/patches/p-aclocal_m4 b/x11/kde/office2/patches/p-aclocal_m4
new file mode 100644
index 00000000000..5ad3e6d9105
--- /dev/null
+++ b/x11/kde/office2/patches/p-aclocal_m4
@@ -0,0 +1,48 @@
+$OpenBSD: p-aclocal_m4,v 1.1 2002/03/30 02:22:25 espie Exp $
+--- aclocal.m4.orig	Thu Aug 23 06:48:31 2001
++++ aclocal.m4	Fri Mar 29 18:23:25 2002
+@@ -2960,6 +2960,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
+@@ -3459,9 +3464,11 @@ fi
+ 
+ AC_DEFUN(KDE_CHECK_PYTHON,
+ [
++  KDE_CHECK_PYTHON_INTERN("2.2", [
+   KDE_CHECK_PYTHON_INTERN("2.1", [KDE_CHECK_PYTHON_INTERN("2.0",
+         [ KDE_CHECK_PYTHON_INTERN($1, $2) ])
+   ])
++  ])
+ ])
+ 
+ AC_DEFUN(KDE_CHECK_STL_SGI,
+@@ -4722,19 +4729,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)
diff --git a/x11/kde/office2/patches/p-admin_libtool_m4_in b/x11/kde/office2/patches/p-admin_libtool_m4_in
new file mode 100644
index 00000000000..0318040ac12
--- /dev/null
+++ b/x11/kde/office2/patches/p-admin_libtool_m4_in
@@ -0,0 +1,24 @@
+$OpenBSD: p-admin_libtool_m4_in,v 1.1 2002/03/30 02:22:25 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)
diff --git a/x11/kde/office2/patches/p-admin_ltcf-c_sh b/x11/kde/office2/patches/p-admin_ltcf-c_sh
new file mode 100644
index 00000000000..5f4ec34bcab
--- /dev/null
+++ b/x11/kde/office2/patches/p-admin_ltcf-c_sh
@@ -0,0 +1,20 @@
+$OpenBSD: p-admin_ltcf-c_sh,v 1.1 2002/03/30 02:22:25 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*)
diff --git a/x11/kde/office2/patches/p-admin_ltcf-cxx_sh b/x11/kde/office2/patches/p-admin_ltcf-cxx_sh
new file mode 100644
index 00000000000..ce39958904d
--- /dev/null
+++ b/x11/kde/office2/patches/p-admin_ltcf-cxx_sh
@@ -0,0 +1,21 @@
+$OpenBSD: p-admin_ltcf-cxx_sh,v 1.1 2002/03/30 02:22:25 espie Exp $
+--- admin/ltcf-cxx.sh.orig	Sat May 19 09:19:10 2001
++++ admin/ltcf-cxx.sh	Fri Mar 29 18:01:52 2002
+@@ -409,14 +409,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*)
diff --git a/x11/kde/office2/patches/p-admin_ltconfig b/x11/kde/office2/patches/p-admin_ltconfig
new file mode 100644
index 00000000000..61ecb5bc3e4
--- /dev/null
+++ b/x11/kde/office2/patches/p-admin_ltconfig
@@ -0,0 +1,37 @@
+$OpenBSD: p-admin_ltconfig,v 1.1 2002/03/30 02:22:25 espie Exp $
+--- admin/ltconfig.orig	Sat May 19 09:19:10 2001
++++ admin/ltconfig	Fri Mar 29 18:01:52 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.
+@@ -1245,15 +1250,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*)
diff --git a/x11/kde/office2/pkg/PFRAG.shared b/x11/kde/office2/pkg/PFRAG.shared
index 371998230d3..2f2a775630c 100644
--- a/x11/kde/office2/pkg/PFRAG.shared
+++ b/x11/kde/office2/pkg/PFRAG.shared
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PFRAG.shared,v 1.2 2001/09/06 13:01:53 espie Exp $
+@comment $OpenBSD: PFRAG.shared,v 1.3 2002/03/30 02:22:25 espie Exp $
 lib/kde2/libabiwordexport.so.0.0
 lib/kde2/libabiwordimport.so.0.0
 lib/kde2/libapplixgraphicimport.so.0.0
diff --git a/x11/kde/office2/pkg/PLIST b/x11/kde/office2/pkg/PLIST
index 2d6fd2e7507..db8fc123914 100644
--- a/x11/kde/office2/pkg/PLIST
+++ b/x11/kde/office2/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.2 2001/09/06 13:01:53 espie Exp $
+@comment $OpenBSD: PLIST,v 1.3 2002/03/30 02:22:25 espie Exp $
 bin/filter_wrapper
 bin/kchart
 bin/kformula
@@ -1490,10 +1490,18 @@ share/templates/TextDocument.desktop
 @dirrm share/icons/hicolor/48x48
 @dirrm share/icons/hicolor/32x32/mimetypes
 @dirrm share/icons/hicolor/32x32/apps
+@dirrm share/icons/hicolor/32x32/actions
+@dirrm share/icons/hicolor/32x32
 @dirrm share/icons/hicolor/22x22/mimetypes
 @dirrm share/icons/hicolor/22x22/apps
+@dirrm share/icons/hicolor/22x22/actions
+@dirrm share/icons/hicolor/22x22
 @dirrm share/icons/hicolor/16x16/mimetypes
 @dirrm share/icons/hicolor/16x16/apps
+@dirrm share/icons/hicolor/16x16/actions
+@dirrm share/icons/hicolor/16x16
+@dirrm share/icons/hicolor
+@dirrm share/icons
 @dirrm share/doc/HTML/en/kword
 @dirrm share/doc/HTML/en/kugar
 @dirrm share/doc/HTML/en/kspread
@@ -1502,6 +1510,8 @@ share/templates/TextDocument.desktop
 @dirrm share/doc/HTML/en/koshell
 @dirrm share/doc/HTML/en/kontour
 @dirrm share/doc/HTML/en/koffice
+@dirrm share/doc/HTML/en
+@dirrm share/doc/HTML
 @dirrm share/apps/kword/templates/Publishing/.source
 @dirrm share/apps/kword/templates/Publishing/.icon
 @dirrm share/apps/kword/templates/Publishing
@@ -1580,6 +1590,7 @@ share/templates/TextDocument.desktop
 @dirrm share/apps/kontour/icons/hicolor
 @dirrm share/apps/kontour/icons
 @dirrm share/apps/kontour
+@dirrm share/apps/koffice/pics
 @dirrm share/apps/koffice/icons/hicolor/48x48/apps
 @dirrm share/apps/koffice/icons/hicolor/48x48
 @dirrm share/apps/koffice/icons/hicolor/32x32/apps
@@ -1593,8 +1604,34 @@ share/templates/TextDocument.desktop
 @dirrm share/apps/koffice/icons/hicolor/16x16
 @dirrm share/apps/koffice/icons/hicolor
 @dirrm share/apps/koffice/icons
+@dirrm share/apps/koffice
+@dirrm share/apps/kivio/stencils/Flowcharting/BasicFlowcharting
+@dirrm share/apps/kivio/stencils/Flowcharting
+@dirrm share/apps/kivio/stencils
 @dirrm share/apps/kivio/pics
 @dirrm share/apps/kivio/kpartplugins
+@dirrm share/apps/kivio/icons/hicolor/32x32/actions
+@dirrm share/apps/kivio/icons/hicolor/32x32
+@dirrm share/apps/kivio/icons/hicolor/22x22/actions
+@dirrm share/apps/kivio/icons/hicolor/22x22
+@dirrm share/apps/kivio/icons/hicolor/16x16/actions
+@dirrm share/apps/kivio/icons/hicolor/16x16
+@dirrm share/apps/kivio/icons/hicolor
+@dirrm share/apps/kivio/icons
 @dirrm share/apps/kivio/autoloadStencils
+@dirrm share/apps/kivio
+@dirrm share/apps/kformula/pics
+@dirrm share/apps/kformula
+@dirrm share/apps/kchart/pics
+@dirrm share/apps/kchart/icons/locolor/16x16/actions
+@dirrm share/apps/kchart/icons/locolor/16x16
+@dirrm share/apps/kchart/icons/locolor
+@dirrm share/apps/kchart/icons/hicolor/22x22/actions
+@dirrm share/apps/kchart/icons/hicolor/22x22
+@dirrm share/apps/kchart/icons/hicolor
+@dirrm share/apps/kchart/icons
+@dirrm share/apps/kchart
+@dirrm share/apps
 @dirrm share/applnk/Office
+@dirrm share/applnk
 @dirrm lib/kde2