From owner-svn-ports-head@FreeBSD.ORG Mon Jan 19 10:32:24 2015 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8884E1A9; Mon, 19 Jan 2015 10:32:24 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7475B768; Mon, 19 Jan 2015 10:32:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0JAWOvA039170; Mon, 19 Jan 2015 10:32:24 GMT (envelope-from ale@FreeBSD.org) Received: (from ale@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0JAWNlp039167; Mon, 19 Jan 2015 10:32:23 GMT (envelope-from ale@FreeBSD.org) Message-Id: <201501191032.t0JAWNlp039167@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ale set sender to ale@FreeBSD.org using -f From: Alex Dupre Date: Mon, 19 Jan 2015 10:32:23 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r377396 - in head/lang: php5 php55 php56 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Jan 2015 10:32:24 -0000 Author: ale Date: Mon Jan 19 10:32:23 2015 New Revision: 377396 URL: https://svnweb.freebsd.org/changeset/ports/377396 QAT: https://qat.redports.org/buildarchive/r377396/ Log: Allow to link imap extension with newer panda-cclient library. PR: 195973 Submitted by: thierry Modified: head/lang/php5/Makefile.ext head/lang/php55/Makefile.ext head/lang/php56/Makefile.ext Modified: head/lang/php5/Makefile.ext ============================================================================== --- head/lang/php5/Makefile.ext Mon Jan 19 10:18:22 2015 (r377395) +++ head/lang/php5/Makefile.ext Mon Jan 19 10:32:23 2015 (r377396) @@ -132,17 +132,16 @@ USES+= iconv:translit .endif .if ${PHP_MODNAME} == "imap" -LIB_DEPENDS+= libc-client4.so:${PORTSDIR}/mail/cclient +OPTIONS_DEFINE= PANDA +PANDA_DESC= Uses the forked panda-cclient instead of the original cclient CONFIGURE_ARGS+=--with-imap=${LOCALBASE} \ - --with-pcre-dir=${LOCALBASE} -.if !defined(WITHOUT_SSL) -CONFIGURE_ARGS+=--with-imap-ssl=${OPENSSLBASE} + --with-pcre-dir=${LOCALBASE} \ + --with-imap-ssl=${OPENSSLBASE} LDFLAGS+= -L${OPENSSLLIB} -lcrypto -lssl USE_OPENSSL= yes .endif -.endif .if ${PHP_MODNAME} == "interbase" CONFIGURE_ARGS+=--with-interbase=${LOCALBASE} @@ -524,6 +523,14 @@ CONFIGURE_ARGS+=--with-vpx-dir=${LOCALBA . endif .endif +.if ${PHP_MODNAME} == "imap" +. if ${PORT_OPTIONS:MPANDA} +LIB_DEPENDS+= libc-client4.so.10:${PORTSDIR}/mail/panda-cclient +. else +LIB_DEPENDS+= libc-client4.so.9:${PORTSDIR}/mail/cclient +. endif +.endif + .if ${PHP_MODNAME} == "mbstring" . if ${PORT_OPTIONS:MREGEX} LIB_DEPENDS+= libonig.so:${PORTSDIR}/devel/oniguruma4 Modified: head/lang/php55/Makefile.ext ============================================================================== --- head/lang/php55/Makefile.ext Mon Jan 19 10:18:22 2015 (r377395) +++ head/lang/php55/Makefile.ext Mon Jan 19 10:32:23 2015 (r377396) @@ -132,17 +132,16 @@ USES+= iconv:translit .endif .if ${PHP_MODNAME} == "imap" -LIB_DEPENDS+= libc-client4.so:${PORTSDIR}/mail/cclient +OPTIONS_DEFINE= PANDA +PANDA_DESC= Uses the forked panda-cclient instead of the original cclient CONFIGURE_ARGS+=--with-imap=${LOCALBASE} \ - --with-pcre-dir=${LOCALBASE} -.if !defined(WITHOUT_SSL) -CONFIGURE_ARGS+=--with-imap-ssl=${OPENSSLBASE} + --with-pcre-dir=${LOCALBASE} \ + --with-imap-ssl=${OPENSSLBASE} LDFLAGS+= -L${OPENSSLLIB} -lcrypto -lssl USE_OPENSSL= yes .endif -.endif .if ${PHP_MODNAME} == "interbase" CONFIGURE_ARGS+=--with-interbase=${LOCALBASE} @@ -524,6 +523,14 @@ CONFIGURE_ARGS+=--with-vpx-dir=${LOCALBA . endif .endif +.if ${PHP_MODNAME} == "imap" +. if ${PORT_OPTIONS:MPANDA} +LIB_DEPENDS+= libc-client4.so.10:${PORTSDIR}/mail/panda-cclient +. else +LIB_DEPENDS+= libc-client4.so.9:${PORTSDIR}/mail/cclient +. endif +.endif + .if ${PHP_MODNAME} == "mbstring" . if ${PORT_OPTIONS:MREGEX} LIB_DEPENDS+= libonig.so:${PORTSDIR}/devel/oniguruma4 Modified: head/lang/php56/Makefile.ext ============================================================================== --- head/lang/php56/Makefile.ext Mon Jan 19 10:18:22 2015 (r377395) +++ head/lang/php56/Makefile.ext Mon Jan 19 10:32:23 2015 (r377396) @@ -132,17 +132,16 @@ USES+= iconv:translit .endif .if ${PHP_MODNAME} == "imap" -LIB_DEPENDS+= libc-client4.so:${PORTSDIR}/mail/cclient +OPTIONS_DEFINE= PANDA +PANDA_DESC= Uses the forked panda-cclient instead of the original cclient CONFIGURE_ARGS+=--with-imap=${LOCALBASE} \ - --with-pcre-dir=${LOCALBASE} -.if !defined(WITHOUT_SSL) -CONFIGURE_ARGS+=--with-imap-ssl=${OPENSSLBASE} + --with-pcre-dir=${LOCALBASE} \ + --with-imap-ssl=${OPENSSLBASE} LDFLAGS+= -L${OPENSSLLIB} -lcrypto -lssl USE_OPENSSL= yes .endif -.endif .if ${PHP_MODNAME} == "interbase" CONFIGURE_ARGS+=--with-interbase=${LOCALBASE} @@ -527,6 +526,14 @@ CONFIGURE_ARGS+=--with-vpx-dir=${LOCALBA . endif .endif +.if ${PHP_MODNAME} == "imap" +. if ${PORT_OPTIONS:MPANDA} +LIB_DEPENDS+= libc-client4.so.10:${PORTSDIR}/mail/panda-cclient +. else +LIB_DEPENDS+= libc-client4.so.9:${PORTSDIR}/mail/cclient +. endif +.endif + .if ${PHP_MODNAME} == "mbstring" . if ${PORT_OPTIONS:MREGEX} LIB_DEPENDS+= libonig.so:${PORTSDIR}/devel/oniguruma4