svn commit: r377396 - in head/lang: php5 php55 php56

[Alex Dupre]

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