Similar patches to libs2/base2

2001-04-22 15:02:29 +00:00 · 2001-04-22 15:02:29 +00:00 · 64b919c96b
commit 64b919c96b
parent 7157746931
8 changed files with 79 additions and 71 deletions
--- a/x11/kde/office2/Makefile
+++ b/x11/kde/office2/Makefile
@ -1,5 +1,6 @@
-# $OpenBSD: Makefile,v 1.3 2001/03/11 16:13:48 espie Exp $
+# $OpenBSD: Makefile,v 1.4 2001/04/22 15:02:29 espie Exp $

+COMMENT=		"office applications for kde"
 CATEGORIES=		x11 x11/kde productivity
 NEED_VERSION=		1.305
 VERSION=		2.0.1
@ -10,13 +11,17 @@ MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${VERSION}/distribution/tar/generic/src/
 EXTRACT_SUFX=		.tar.bz2

+NOT_FOR_ARCHS=${NO_SHARED_ARCHS}
+
+BUILD_DEPENDS=	zsh:zsh-*:shells/zsh
 LIB_DEPENDS=	kdecore.3.::x11/kde/libs2

-CONFIGURE_STYLE=	gnu
+CONFIGURE_STYLE=	autoconf
 CONFIGURE_ARGS=		--with-qt-includes=${LOCALBASE}/include/X11/qt2
 CONFIGURE_ARGS+=	--with-qt-libraries=${LOCALBASE}/lib/qt2
 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

 # Not yet, too much time to compile
@ -28,8 +33,13 @@ CONFIGURE_ENV=		MOC=${LOCALBASE}/bin/moc2 \
 	RUN_KAPPFINDER=no KDEDIR=/usr/local
 MAKE_ENV=		${CONFIGURE_ENV}

+pre-build:
+	# Let zsh act as an sh replacement
+	ln -sf $(LOCALBASE)/bin/zsh ${WRKBUILD}/sh
+
 # Ensure qt2 will always be at the front
 MAKE_FLAGS=CXXLD='--tag CXX ${CXX} -L${LOCALBASE}/lib/qt2'
+MAKE_FLAGS+=LIBTOOL='$(WRKBUILD)/sh $(WRKBUILD)/libtool'

 # GPL
 PERMIT_DISTFILES_CDROM=	Yes
--- a/x11/kde/office2/patches/patch-aclocal_m4
+++ b/x11/kde/office2/patches/patch-aclocal_m4
@ -0,0 +1,13 @@
+$OpenBSD: patch-aclocal_m4,v 1.1 2001/04/22 15:02:30 espie Exp $
+--- aclocal.m4.orig	Tue Nov 28 16:30:15 2000
+++ aclocal.m4	Sun Apr 22 15:39:41 2001
+@@ -4347,6 +4347,9 @@ freebsd* )
+     lt_cv_deplibs_check_method=pass_all
+   fi
+   ;;
+openbsd*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+ 
+ gnu*)
+   lt_cv_deplibs_check_method=pass_all
--- a/x11/kde/office2/patches/patch-admin_libtool_m4_in
+++ b/x11/kde/office2/patches/patch-admin_libtool_m4_in
@ -0,0 +1,14 @@
+$OpenBSD: patch-admin_libtool_m4_in,v 1.1 2001/04/22 15:02:30 espie Exp $
+--- admin/libtool.m4.in.orig	Mon Aug  7 00:20:11 2000
+++ admin/libtool.m4.in	Sun Apr 22 15:40:23 2001
+@@ -548,6 +548,10 @@ gnu*)
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+openbsd*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+ hpux10.20*)
+   # TODO:  Does this work for hpux-11 too?
+   changequote(,)dnl
--- a/x11/kde/office2/patches/patch-admin_ltcf-c_sh
+++ b/x11/kde/office2/patches/patch-admin_ltcf-c_sh
@ -0,0 +1,20 @@
+$OpenBSD: patch-admin_ltcf-c_sh,v 1.1 2001/04/22 15:02:30 espie Exp $
+--- admin/ltcf-c.sh.orig	Thu Aug 10 23:58:04 2000
+++ admin/ltcf-c.sh	Sun Apr 22 15:38:45 2001
+@@ -398,10 +398,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*)
--- a/x11/kde/office2/patches/patch-admin_ltcf-cxx_sh
+++ b/x11/kde/office2/patches/patch-admin_ltcf-cxx_sh
@ -1,40 +1,23 @@
+$OpenBSD: patch-admin_ltcf-cxx_sh,v 1.2 2001/04/22 15:02:31 espie Exp $
 --- admin/ltcf-cxx.sh.orig	Sat Sep  9 18:59:52 2000
-+++ admin/ltcf-cxx.sh	Thu Oct 26 23:26:15 2000
-@@ -107,13 +107,13 @@ if { ac_try='${CC-c++} -E conftest.$ac_e
-     # linker, instead of GNU ld.  If possible, this setting should
-     # overridden to take advantage of the native linker features on
-     # the platform it is being used on.
-    archive_cmds='$CC -shared $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'
-   fi
- 
-   # Commands to make compiler produce verbose output that lists
-   # what "hidden" libraries, object files and flags are used when
-   # linking a shared library.
-  output_verbose_link_cmds='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | egrep "\-L"'
-+  output_verbose_link_cmds='$CC $ac_cv_prog_cc_pic -shared $CFLAGS -v conftest.$objext 2>&1 | egrep "\-L"'
- 
- else
-   with_gcc=no
-@@ -339,6 +339,12 @@ case "$host_os" in
+++ admin/ltcf-cxx.sh	Sun Apr 22 15:42:09 2001
+@@ -339,6 +339,19 @@ case "$host_os" in
       ld_shlibs=no
     fi
     ;;
 +  openbsd*)
-+      ld_shlibs=yes
-+      hardcode_libdir_flag_spec='-R$libdir'
+    if test "$with_gcc" = yes && test "$with_gnu_ld" = no; then
+      # MM: OpenBSD 2.7 uses G++, but not GNU ld
+      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"'
+    fi
 +    ;;
   osf3*)
     if test "$with_gcc" = yes && test "$with_gnu_ld" = no; then
       allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-@@ -549,7 +555,7 @@ case "$host_os" in
-             # Commands to make compiler produce verbose output that lists
-             # what "hidden" libraries, object files and flags are used when
-             # linking a shared library.
-            output_verbose_link_cmds="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | egrep \"\-L\""
-+            output_verbose_link_cmds="$CC -shared $pic_flag $CFLAGS -v conftest.$objext 2>&1 | egrep \"\-L\""
-           else
-             # g++ 2.7 appears to require `-G' NOT `-shared' on this
-             # platform.
--- a/x11/kde/office2/patches/patch-admin_ltconfig
+++ b/x11/kde/office2/patches/patch-admin_ltconfig
@ -1,31 +1,12 @@
+$OpenBSD: patch-admin_ltconfig,v 1.2 2001/04/22 15:02:31 espie Exp $
 --- admin/ltconfig.orig	Fri Sep 22 13:10:22 2000
-+++ admin/ltconfig	Sun Nov 26 16:53:02 2000
-@@ -620,6 +620,12 @@ old_archive_cmds='$AR $AR_FLAGS $oldlib$
- old_postinstall_cmds='chmod 644 $oldlib'
- old_postuninstall_cmds=
- 
-+case "$host_os" in
-+openbsd*)
-+    old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
-+    ;;
-+esac
-+
- # Source the script associated with the $tagname tag configuration.
- if test -n "$tagname"; then
-   . $ltmain
-@@ -1135,6 +1141,15 @@ openbsd*)
-     need_lib_prefix=no
-     need_version=no
-   fi
-+  file_magic_cmd='/usr/bin/env -i /usr/bin/file'
-+  if $file_magic_cmd /usr/lib/libc.so.* | grep ELF >/dev/null; then
-+      deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
-+  else
-+      deplibs_check_method='file_magic OpenBSD/.* demand paged shared library.*'
-+  fi
-+  # trust our libraries, as libtool is abysmally stupid with libgcc
-+  deplibs_check_method=pass_all
-+  sys_lib_dlsearch_path_spec='/usr/lib /usr/local/lib /usr/X11R6/lib /usr/local/lib/qt2'
+++ admin/ltconfig	Sun Apr 22 15:41:05 2001
+@@ -1138,6 +1138,8 @@ openbsd*)
   library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
   shlibpath_var=LD_LIBRARY_PATH
+  deplib_check_method=pass_all
+  sys_lib_dlsearch_path_spec='/usr/lib /usr/local/lib /usr/X11R6/lib /usr/local/lib/qt2'
+   ;;
+ 
+ os2*)
--- a/x11/kde/office2/patches/patch-kchart_Makefile_in
+++ b/x11/kde/office2/patches/patch-kchart_Makefile_in
@ -1,12 +0,0 @@
-$OpenBSD: patch-kchart_Makefile_in,v 1.1 2001/04/15 18:30:03 espie Exp $
--- kchart/Makefile.in.orig	Sun Apr 15 20:07:50 2001
-+++ kchart/Makefile.in	Sun Apr 15 20:10:11 2001
-@@ -384,7 +384,7 @@ LTCXXCOMPILE = $(LIBTOOL) --mode=compile
- CXXLD = $(CXX)
- #>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@
- #>+ 1
-CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = set -e; $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(LDFLAGS) -o $@
- DATA =  $(kdelnk_DATA) $(kdemime_DATA) $(rc_DATA)
- 
- HEADERS =  $(noinst_HEADERS)
--- a/x11/kde/office2/pkg/COMMENT
+++ b/x11/kde/office2/pkg/COMMENT
@ -1 +0,0 @@
-office applications for kde