From 3309e650097ca2454793c4ab146f0fa17fcbcb8f Mon Sep 17 00:00:00 2001 From: espie Date: Sun, 18 Sep 2005 12:21:07 +0000 Subject: [PATCH] now that kde 3.5 is almost out, prepare infrastructure --- x11/kde/Makefile.inc | 4 +- x11/kde/kde.port.mk | 6 +- x11/kde/patches-3.5/patch-acinclude_m4 | 69 +++++++++++++++++++ x11/kde/patches-3.5/patch-admin_cvs_sh | 14 ++++ x11/kde/patches-3.5/patch-admin_libtool_m4_in | 69 +++++++++++++++++++ x11/kde/patches-3.5/patch-admin_ltmain_sh | 52 ++++++++++++++ 6 files changed, 211 insertions(+), 3 deletions(-) create mode 100644 x11/kde/patches-3.5/patch-acinclude_m4 create mode 100644 x11/kde/patches-3.5/patch-admin_cvs_sh create mode 100644 x11/kde/patches-3.5/patch-admin_libtool_m4_in create mode 100644 x11/kde/patches-3.5/patch-admin_ltmain_sh diff --git a/x11/kde/Makefile.inc b/x11/kde/Makefile.inc index 8580ab8847c..7ffef54ae48 100644 --- a/x11/kde/Makefile.inc +++ b/x11/kde/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.32 2005/03/29 21:18:34 espie Exp $ +# $OpenBSD: Makefile.inc,v 1.33 2005/09/18 12:21:07 espie Exp $ DIST_SUBDIR?= kde HOMEPAGE?= http://www.kde.org .if defined(VERSION) && ${VERSION} == "3.1.95" @@ -25,7 +25,7 @@ MODULES?= x11/kde MODGNU_CONFIG_GUESS_DIRS?= ${MODKDE_CONFIG_GUESS_DIRS} CONFIGURE_STYLE?= autoconf -.if defined(MODKDE_VERSION) && (${MODKDE_VERSION} == "3.2.3" || ${MODKDE_VERSION} == "3.3.0" || ${MODKDE_VERSION} == "3.4") +.if defined(MODKDE_VERSION) && (${MODKDE_VERSION} == "3.2.3" || ${MODKDE_VERSION} == "3.3.0" || ${MODKDE_VERSION} == "3.4" || ${MODKDE_VERSION} == "3.5") AUTOCONF_VERSION?= 2.59 .endif AUTOCONF_VERSION?= 2.57 diff --git a/x11/kde/kde.port.mk b/x11/kde/kde.port.mk index e7d3598f2e5..62315c90e34 100644 --- a/x11/kde/kde.port.mk +++ b/x11/kde/kde.port.mk @@ -1,4 +1,4 @@ -# $OpenBSD: kde.port.mk,v 1.16 2005/04/09 10:48:31 espie Exp $ +# $OpenBSD: kde.port.mk,v 1.17 2005/09/18 12:21:07 espie Exp $ SHARED_ONLY?= Yes @@ -68,6 +68,10 @@ LIB_DEPENDS+=lib/qt3/qt-mt.3.33::x11/qt3,mt PATCH_LIST= ${PORTSDIR}/x11/kde/patches-3.4/patch-* patch-* ${SUP_PATCH_LIST} AUTOCONF?= /bin/sh ${WRKDIST}/admin/cvs.sh configure LIB_DEPENDS+=lib/qt3/qt-mt.3.33::x11/qt3,mt +.elif ${MODKDE_VERSION} == "3.5" +PATCH_LIST= ${PORTSDIR}/x11/kde/patches-3.5/patch-* patch-* ${SUP_PATCH_LIST} +AUTOCONF?= /bin/sh ${WRKDIST}/admin/cvs.sh configure +LIB_DEPENDS+=lib/qt3/qt-mt.3.33::x11/qt3,mt .elif ${MODKDE_VERSION} == "2.2.2" PATCH_LIST= ${PORTSDIR}/x11/kde/patches-2.2.2/patch-* patch-* ${SUP_PATCH_LIST} .endif diff --git a/x11/kde/patches-3.5/patch-acinclude_m4 b/x11/kde/patches-3.5/patch-acinclude_m4 new file mode 100644 index 00000000000..52b55e3979f --- /dev/null +++ b/x11/kde/patches-3.5/patch-acinclude_m4 @@ -0,0 +1,69 @@ +$OpenBSD: patch-acinclude_m4,v 1.1 2005/09/18 12:21:07 espie Exp $ +--- acinclude.m4.orig Sat Sep 10 21:33:23 2005 ++++ acinclude.m4 Sun Sep 18 14:09:00 2005 +@@ -6561,6 +6561,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 +@@ -8101,13 +8114,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*) +@@ -9081,6 +9088,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) +@@ -11409,6 +11432,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 diff --git a/x11/kde/patches-3.5/patch-admin_cvs_sh b/x11/kde/patches-3.5/patch-admin_cvs_sh new file mode 100644 index 00000000000..85e8f49dd89 --- /dev/null +++ b/x11/kde/patches-3.5/patch-admin_cvs_sh @@ -0,0 +1,14 @@ +$OpenBSD: patch-admin_cvs_sh,v 1.1 2005/09/18 12:21:07 espie Exp $ +--- admin/cvs.sh.orig Sat Sep 10 16:28:22 2005 ++++ admin/cvs.sh Sun Sep 18 14:09:34 2005 +@@ -631,6 +631,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 diff --git a/x11/kde/patches-3.5/patch-admin_libtool_m4_in b/x11/kde/patches-3.5/patch-admin_libtool_m4_in new file mode 100644 index 00000000000..12adc5e6e4c --- /dev/null +++ b/x11/kde/patches-3.5/patch-admin_libtool_m4_in @@ -0,0 +1,69 @@ +$OpenBSD: patch-admin_libtool_m4_in,v 1.1 2005/09/18 12:21:07 espie Exp $ +--- admin/libtool.m4.in.orig Sat Sep 10 16:28:22 2005 ++++ admin/libtool.m4.in Sun Sep 18 14:09:00 2005 +@@ -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 diff --git a/x11/kde/patches-3.5/patch-admin_ltmain_sh b/x11/kde/patches-3.5/patch-admin_ltmain_sh new file mode 100644 index 00000000000..cabc4301a22 --- /dev/null +++ b/x11/kde/patches-3.5/patch-admin_ltmain_sh @@ -0,0 +1,52 @@ +$OpenBSD: patch-admin_ltmain_sh,v 1.1 2005/09/18 12:21:07 espie Exp $ +--- admin/ltmain.sh.orig Sat Sep 10 16:28:22 2005 ++++ admin/ltmain.sh Sun Sep 18 14:09:00 2005 +@@ -1307,6 +1307,17 @@ EOF + continue + ;; + ++ -pthread) ++ case $host in ++ *-*-openbsd*) ++ deplibs="$deplibs $arg" ++ ;; ++ *) ++ continue ++ ;; ++ esac ++ ;; ++ + -module) + module=yes + continue +@@ -2003,6 +2014,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