openbsd-ports/www/php5/patches/patch-aclocal_m4

$OpenBSD: patch-aclocal_m4,v 1.6 2006/05/09 14:15:40 robert Exp $
--- aclocal.m4.orig	Wed Nov 23 22:37:40 2005
+++ aclocal.m4	Sat Nov 26 12:59:21 2005
@@ -2100,10 +2100,9 @@
     if test "$PHP_KERBEROS_DIR"; then
       found_kerberos=yes
       PHP_ADD_LIBPATH($PHP_KERBEROS_DIR/$PHP_LIBDIR, $1)
-      PHP_ADD_LIBRARY(gssapi_krb5, 1, $1)
       PHP_ADD_LIBRARY(krb5, 1, $1)
-      PHP_ADD_LIBRARY(k5crypto, 1, $1)
-      PHP_ADD_LIBRARY(com_err,  1, $1)
+      PHP_ADD_LIBRARY(crypto, 1, $1)
+      PHP_ADD_LIBRARY(gssapi, 1, $1)
       PHP_ADD_INCLUDE($PHP_KERBEROS_DIR/include)
     fi
   fi
@@ -4165,7 +4164,7 @@
     *)                         need_version=no  ;;
   esac
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  finish_cmds=
   shlibpath_var=LD_LIBRARY_PATH
   if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
     case $host_os in
Update to version 5.1.4; Add a hardened flavor for both core and extensions (inspired by niallo@); Use our own way to install pear because the bundled installer is totally broken and upstream refuses to fix it. Add a mysqli subpackage which can be used to access the functionality provided by MySQL 4.1 and above. Other minor changes and fixes are also included. ok sturm@; tested by many 2006-05-09 10:15:40 -04:00			$OpenBSD: patch-aclocal_m4,v 1.6 2006/05/09 14:15:40 robert Exp $
			`--- aclocal.m4.orig Wed Nov 23 22:37:40 2005`
			`+++ aclocal.m4 Sat Nov 26 12:59:21 2005`
			`@@ -2100,10 +2100,9 @@`
update to 5.0.4; 2005-04-04 17:13:21 -04:00			`if test "$PHP_KERBEROS_DIR"; then`
			`found_kerberos=yes`
Update to version 5.1.4; Add a hardened flavor for both core and extensions (inspired by niallo@); Use our own way to install pear because the bundled installer is totally broken and upstream refuses to fix it. Add a mysqli subpackage which can be used to access the functionality provided by MySQL 4.1 and above. Other minor changes and fixes are also included. ok sturm@; tested by many 2006-05-09 10:15:40 -04:00			`PHP_ADD_LIBPATH($PHP_KERBEROS_DIR/$PHP_LIBDIR, $1)`
update to 5.0.4; 2005-04-04 17:13:21 -04:00			`- PHP_ADD_LIBRARY(gssapi_krb5, 1, $1)`
			`PHP_ADD_LIBRARY(krb5, 1, $1)`
			`- PHP_ADD_LIBRARY(k5crypto, 1, $1)`
			`- PHP_ADD_LIBRARY(com_err, 1, $1)`
			`+ PHP_ADD_LIBRARY(crypto, 1, $1)`
			`+ PHP_ADD_LIBRARY(gssapi, 1, $1)`
			`PHP_ADD_INCLUDE($PHP_KERBEROS_DIR/include)`
			`fi`
			`fi`
Update to version 5.1.4; Add a hardened flavor for both core and extensions (inspired by niallo@); Use our own way to install pear because the bundled installer is totally broken and upstream refuses to fix it. Add a mysqli subpackage which can be used to access the functionality provided by MySQL 4.1 and above. Other minor changes and fixes are also included. ok sturm@; tested by many 2006-05-09 10:15:40 -04:00			`@@ -4165,7 +4164,7 @@`
			`*) need_version=no ;;`
			`esac`
			`library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'`
- fix WANTLIB markers and dependencies (from alek@ and wilfried@) - delete some whitespaces (from wilfried@) - don't leave mess in ldconfig search path (reported by Moritz Grimm <mlist@scapa.dnsalias.net>) - bump PKGNAMEs tested by many; ok pval@ 2005-03-16 15:09:41 -05:00			`- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'`
			`+ finish_cmds=`
			`shlibpath_var=LD_LIBRARY_PATH`
Update to version 5.1.4; Add a hardened flavor for both core and extensions (inspired by niallo@); Use our own way to install pear because the bundled installer is totally broken and upstream refuses to fix it. Add a mysqli subpackage which can be used to access the functionality provided by MySQL 4.1 and above. Other minor changes and fixes are also included. ok sturm@; tested by many 2006-05-09 10:15:40 -04:00			if test -z "`echo __ELF__ \| $CC -E - \| grep __ELF__`" \|\| test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
			`case $host_os in`