Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 10 Dec 2018 14:19:22 +0000 (UTC)
From:      Alex Dupre <ale@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r487169 - in head: lang/php56 mail/php56-imap mail/php56-imap/files net-mgmt/php56-snmp/files security/php56-openssl
Message-ID:  <201812101419.wBAEJMvb048060@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: ale
Date: Mon Dec 10 14:19:22 2018
New Revision: 487169
URL: https://svnweb.freebsd.org/changeset/ports/487169

Log:
  Update to 5.6.39 release [1].
  
  - clean up CONFLICTS [2]
  - don't link with libpkg [3]
  - fix recode ordering issue [4]
  
  PR:		233847 [1], 226534 [2], 230980 [3], 211794 [4]
  Submitted by:	Pascal Christen <pascal.christen@hostpoint.ch> [1],
  		brnrd [2], amdmi3 [3], jaretbartsch@yahoo.ca [4]

Added:
  head/net-mgmt/php56-snmp/files/
  head/net-mgmt/php56-snmp/files/patch-config.m4   (contents, props changed)
Deleted:
  head/mail/php56-imap/files/patch-php__imap.c
  head/mail/php56-imap/files/patch-php__imap.h
Modified:
  head/lang/php56/Makefile
  head/lang/php56/Makefile.ext
  head/lang/php56/distinfo
  head/mail/php56-imap/Makefile
  head/security/php56-openssl/Makefile

Modified: head/lang/php56/Makefile
==============================================================================
--- head/lang/php56/Makefile	Mon Dec 10 14:13:53 2018	(r487168)
+++ head/lang/php56/Makefile	Mon Dec 10 14:19:22 2018	(r487169)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	php56
-PORTVERSION=	5.6.38
+PORTVERSION=	5.6.39
 PORTREVISION?=	0
 CATEGORIES?=	lang devel www
 MASTER_SITES=	PHP/distributions
@@ -32,7 +32,7 @@ CONFIGURE_ARGS+=--with-layout=GNU \
 		--with-pcre-regex=${LOCALBASE} \
 		--with-zlib-dir=/usr \
 		--program-prefix=""
-USES+=		autoreconf:build
+USES+=		autoreconf:build gnome
 USE_GNOME=	libxml2
 
 # PR230207 Allow relocations against read-only segments (override lld default)
@@ -55,7 +55,7 @@ MAILHEAD_DESC=	Enable mail header patch
 LINKTHR_DESC=	Link thread lib (for threaded extensions)
 ZTS_DESC=	Force Zend Thread Safety (ZTS) build
 
-CONFLICTS=	php55-5* php70-* php71-* php72-* php73-*
+CONFLICTS=	php70-* php71-* php72-* php73-*
 
 DESTDIRNAME=	INSTALL_ROOT
 

Modified: head/lang/php56/Makefile.ext
==============================================================================
--- head/lang/php56/Makefile.ext	Mon Dec 10 14:13:53 2018	(r487168)
+++ head/lang/php56/Makefile.ext	Mon Dec 10 14:19:22 2018	(r487169)
@@ -316,6 +316,7 @@ USES+=		readline
 LIB_DEPENDS+=	librecode.so:converters/recode
 
 CONFIGURE_ARGS+=--with-recode=${LOCALBASE}
+MPHP_MOD_PRIO=	18
 .endif
 
 .if ${PHP_MODNAME} == "session"

Modified: head/lang/php56/distinfo
==============================================================================
--- head/lang/php56/distinfo	Mon Dec 10 14:13:53 2018	(r487168)
+++ head/lang/php56/distinfo	Mon Dec 10 14:19:22 2018	(r487169)
@@ -1,5 +1,5 @@
-TIMESTAMP = 1537790285
-SHA256 (php-5.6.38.tar.xz) = c2fac47dc6316bd230f0ea91d8a5498af122fb6a3eb43f796c9ea5f59b04aa1e
-SIZE (php-5.6.38.tar.xz) = 12467408
+TIMESTAMP = 1544448187
+SHA256 (php-5.6.39.tar.xz) = 8147576001a832ff3d03cb2980caa2d6b584a10624f87ac459fcd3948c6e4a10
+SIZE (php-5.6.39.tar.xz) = 12467096
 SHA256 (php-5.5.x-mail-header.patch) = f510672c4bf2c228e4d8c7837e16a82169de82139dcf33fafce51e9e55a1b9ed
 SIZE (php-5.5.x-mail-header.patch) = 4426

Modified: head/mail/php56-imap/Makefile
==============================================================================
--- head/mail/php56-imap/Makefile	Mon Dec 10 14:13:53 2018	(r487168)
+++ head/mail/php56-imap/Makefile	Mon Dec 10 14:19:22 2018	(r487169)
@@ -2,7 +2,6 @@
 # $FreeBSD$
 
 CATEGORIES=	mail
-PORTREVISION=	1
 
 MASTERDIR=	${.CURDIR}/../../lang/php56
 

Added: head/net-mgmt/php56-snmp/files/patch-config.m4
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net-mgmt/php56-snmp/files/patch-config.m4	Mon Dec 10 14:19:22 2018	(r487169)
@@ -0,0 +1,10 @@
+--- config.m4.orig	2018-08-31 12:19:23 UTC
++++ config.m4
+@@ -18,7 +18,6 @@ if test "$PHP_SNMP" != "no"; then
+ 
+   if test -x "$SNMP_CONFIG"; then
+     SNMP_LIBS=`$SNMP_CONFIG --netsnmp-libs`
+-    SNMP_LIBS="$SNMP_LIBS `$SNMP_CONFIG --external-libs`"
+     SNMP_PREFIX=`$SNMP_CONFIG --prefix`
+     snmp_full_version=`$SNMP_CONFIG --version`
+     ac_IFS=$IFS

Modified: head/security/php56-openssl/Makefile
==============================================================================
--- head/security/php56-openssl/Makefile	Mon Dec 10 14:13:53 2018	(r487168)
+++ head/security/php56-openssl/Makefile	Mon Dec 10 14:19:22 2018	(r487169)
@@ -5,7 +5,6 @@ CATEGORIES=	security
 
 MASTERDIR=	${.CURDIR}/../../lang/php56
 
-PORTREVISION=	1
 PKGNAMESUFFIX=	-openssl
 
 .include "${MASTERDIR}/Makefile"



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201812101419.wBAEJMvb048060>