head 1.6; access; symbols pkgsrc-2013Q2:1.6.0.46 pkgsrc-2013Q2-base:1.6 pkgsrc-2012Q4:1.6.0.44 pkgsrc-2012Q4-base:1.6 pkgsrc-2011Q4:1.6.0.42 pkgsrc-2011Q4-base:1.6 pkgsrc-2011Q2:1.6.0.40 pkgsrc-2011Q2-base:1.6 pkgsrc-2009Q4:1.6.0.38 pkgsrc-2009Q4-base:1.6 pkgsrc-2008Q4:1.6.0.36 pkgsrc-2008Q4-base:1.6 pkgsrc-2008Q3:1.6.0.34 pkgsrc-2008Q3-base:1.6 cube-native-xorg:1.6.0.32 cube-native-xorg-base:1.6 pkgsrc-2008Q2:1.6.0.30 pkgsrc-2008Q2-base:1.6 pkgsrc-2008Q1:1.6.0.28 pkgsrc-2008Q1-base:1.6 pkgsrc-2007Q4:1.6.0.26 pkgsrc-2007Q4-base:1.6 pkgsrc-2007Q3:1.6.0.24 pkgsrc-2007Q3-base:1.6 pkgsrc-2007Q2:1.6.0.22 pkgsrc-2007Q2-base:1.6 pkgsrc-2007Q1:1.6.0.20 pkgsrc-2007Q1-base:1.6 pkgsrc-2006Q4:1.6.0.18 pkgsrc-2006Q4-base:1.6 pkgsrc-2006Q3:1.6.0.16 pkgsrc-2006Q3-base:1.6 pkgsrc-2006Q2:1.6.0.14 pkgsrc-2006Q2-base:1.6 pkgsrc-2006Q1:1.6.0.12 pkgsrc-2006Q1-base:1.6 pkgsrc-2005Q4:1.6.0.10 pkgsrc-2005Q4-base:1.6 pkgsrc-2005Q3:1.6.0.8 pkgsrc-2005Q3-base:1.6 pkgsrc-2005Q2:1.6.0.6 pkgsrc-2005Q2-base:1.6 pkgsrc-2005Q1:1.6.0.4 pkgsrc-2005Q1-base:1.6 pkgsrc-2004Q4:1.6.0.2 pkgsrc-2004Q4-base:1.6 pkgsrc-2004Q3:1.5.0.6 pkgsrc-2004Q3-base:1.5 pkgsrc-2004Q2:1.5.0.4 pkgsrc-2004Q2-base:1.5 pkgsrc-2004Q1:1.5.0.2 pkgsrc-2004Q1-base:1.5 pkgsrc-2003Q4:1.4.0.2 pkgsrc-2003Q4-base:1.4 netbsd-1-6-1:1.3.0.2 netbsd-1-6-1-base:1.3 netbsd-1-6:1.2.0.8 netbsd-1-6-RELEASE-base:1.2 pkgviews:1.2.0.4 pkgviews-base:1.2 buildlink2:1.2.0.2 buildlink2-base:1.2 netbsd-1-5-PATCH003:1.2 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.6 date 2004.10.31.18.23.24; author jdolecek; state dead; branches; next 1.5; 1.5 date 2004.01.16.15.04.54; author jdolecek; state Exp; branches; next 1.4; 1.4 date 2003.08.31.19.55.48; author jdolecek; state Exp; branches; next 1.3; 1.3 date 2002.11.02.00.05.05; author elric; state Exp; branches; next 1.2; 1.2 date 2001.12.31.23.57.39; author jlam; state Exp; branches; next 1.1; 1.1 date 2001.10.16.05.39.57; author jlam; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2001.10.16.05.39.57; author jlam; state Exp; branches; next ; desc @@ 1.6 log @move php4-imap patches into php4/patches and use USE_PHP_EXT_PATCHES @ text @$NetBSD: patch-aa,v 1.5 2004/01/16 15:04:54 jdolecek Exp $ --- config.m4.orig 2003-10-03 07:25:35.000000000 +0200 +++ config.m4 @@@@ -54,6 +54,14 @@@@ AC_DEFUN(PHP_IMAP_TEST_BUILD, [ ]) ]) +dsl Must be before --with-kerberos, affects the check +PHP_ARG_WITH(imap-linkage,use IMAP c-client linkage, +[ --with-imap-linkage Use IMAP c-client linkage to determine supported items.]) + +if test "$PHP_IMAP_LINKAGE" != "no"; then + AC_DEFINE(HAVE_IMAP_LINKAGE, 1, [ ]) +fi + AC_DEFUN(PHP_IMAP_KRB_CHK, [ AC_ARG_WITH(kerberos, [ --with-kerberos[=DIR] IMAP: Include Kerberos support. DIR is the Kerberos install dir.],[ @@@@ -90,7 +98,7 @@@@ AC_DEFUN(PHP_IMAP_KRB_CHK, [ PHP_ADD_LIBRARY(k5crypto, 1, IMAP_SHARED_LIBADD) PHP_ADD_LIBRARY(com_err, 1, IMAP_SHARED_LIBADD) PHP_ADD_INCLUDE($PHP_KERBEROS_DIR/include) - else + elif test "$PHP_IMAP_LINKAGE" != "yes"; then AC_EGREP_HEADER(auth_gss, $IMAP_INC_DIR/linkage.h, [ AC_MSG_ERROR([This c-client library is built with Kerberos support. @ 1.5 log @Adapt the imap-uw c-client linkage file use patches, so that they are more acceptabtable for inclusion in master PHP sources. No externally visible change, so pkg revision not bumped. @ text @d1 1 a1 1 $NetBSD$ @ 1.4 log @Update PHP to final 4.3.3 Some highlights of changes since 4.2.3: * PCRE updated to 4.3, GD to 2.0.15 * improved Apache2 support * much improved stream & URL wrapper support, output compression support * added CLI (Command Line Interface) SAPI * debug_backtrace() backported from ZendEngine2 * faster build system * huge number of other bug fixes and improvements Packaging changes: * 'pcre', 'xml', and 'session' modules folded back into main package - 'pcre' and 'xml' is required by PEAR, and 'session' is just too essential to be separate * 'gd' module now uses bundled PHP GD library, which is better integrated * PHP modules use shared distinfo when possible to ease future PHP updates * ${PREFIX}/bin/php is now CLI version, ${PREFIX}/libexec/cgi-big/php remains CGI version @ text @d3 18 a20 3 --- config.m4.orig 2003-08-31 15:11:49.000000000 +0200 +++ config.m4 2003-08-31 15:12:05.000000000 +0200 @@@@ -91,13 +91,6 @@@@ d25 3 a27 7 - AC_EGREP_HEADER(auth_gss, $IMAP_INC_DIR/linkage.h, [ - AC_MSG_ERROR([This c-client library is built with Kerberos support. - - Add --with-kerberos to your configure line. Check config.log for details. - ]) - ]) fi a28 1 ]) @ 1.3 log @Remove the check for auth_gss in this. The check only causes the build to prematurely fail if it thinks that it might fail. Addresses PR pkg/18851 @ text @d3 3 a5 4 --- config.m4.orig Tue Aug 20 19:09:01 2002 +++ config.m4 Thu Oct 31 17:59:46 2002 @@@@ -40,12 +40,6 @@@@ PHP_ADD_LIBRARY(krb5, 1, IMAP_SHARED_LIBADD) d8 1 d11 1 a11 1 - AC_MSG_ERROR(This c-client library is built with Kerberos support. d13 2 a14 1 - Add --with-kerberos<=DIR> to your configure line. Check config.log for details.) a18 21 @@@@ -65,8 +59,8 @@@@ if test "$PHP_IMAP_SSL" != "no"; then AC_DEFINE(HAVE_IMAP_SSL,1,[ ]) PHP_ADD_LIBPATH($PHP_IMAP_SSL/lib, IMAP_SHARED_LIBADD) - PHP_ADD_LIBRARY_DEFER(ssl,, IMAP_SHARED_LIBADD) - PHP_ADD_LIBRARY_DEFER(crypto,, IMAP_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(crypto, $PHP_IMAP_SSL/lib, IMAP_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(ssl, $PHP_IMAP_SSL/lib, IMAP_SHARED_LIBADD) else old_LIBS=$LIBS LIBS="$LIBS -L$IMAP_LIBDIR -l$IMAP_LIB" @@@@ -162,8 +156,7 @@@@ fi PHP_ADD_INCLUDE($IMAP_INC_DIR) - PHP_ADD_LIBPATH($IMAP_LIBDIR, IMAP_SHARED_LIBADD) - PHP_ADD_LIBRARY_DEFER($IMAP_LIB,, IMAP_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH($IMAP_LIB, $IMAP_LIBDIR, IMAP_SHARED_LIBADD) PHP_IMAP_KRB_CHK PHP_IMAP_SSL_CHK fi @ 1.2 log @Update math/php4-imap to 4.1.0. No list of changes from version 4.0.6; simply update to version from php-4.1.0 distribution, but add back "--with-imap-ssl" to configure options as the IMAP client library does both TLS _and_ IMAP over SSL, and the functionality isn't enabled in the PHP4 client unless this option is specified. @ text @d3 16 a18 3 --- config.m4.orig Tue Aug 7 12:18:04 2001 +++ config.m4 @@@@ -65,8 +65,8 @@@@ d29 1 a29 1 @@@@ -162,8 +162,7 @@@@ @ 1.1 log @Initial revision @ text @d3 1 a3 1 --- config.m4.orig Mon May 21 20:38:46 2001 d5 1 a5 2 @@@@ -49,10 +49,11 @@@@ d7 1 d9 2 a10 2 - PHP_ADD_LIBRARY_DEFER(crypto) - PHP_ADD_LIBRARY_DEFER(ssl) d13 1 a13 1 d15 2 a16 5 + LIBS="$LIBS -lssl -lcrypto" LIBS="$LIBS -lc-client" if test $PHP_KERBEROS != "no"; then LIBS="$LIBS -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err" @@@@ -133,8 +134,7 @@@@ d21 1 a21 1 - PHP_ADD_LIBRARY_DEFER($IMAP_LIB) @ 1.1.1.1 log @Update php4-imap to the version from the php-4.0.6 distribution. There is no list of changes from version 4.0.5. Also move from the www category. @ text @@