Here are diffs to switch to php 5.5 as the primary version, all tested
in a bulk build, and a subset tested at runtime.
pecl-APC is removed, it doesn't work with 5.5. Either use xcache (tested)
or the built-in opcode cache in PHP 5.5 instead.
I have not included the REVISION bump diffs (74 files changed).
No @pkgpath markers because the versions can co-exist, we could add them
if we removed the php/5.4 directory.
OK?
Index: lang/php/php.port.mk
===================================================================
RCS file: /cvs/ports/lang/php/php.port.mk,v
retrieving revision 1.10
diff -u -p -r1.10 php.port.mk
--- lang/php/php.port.mk 16 Jan 2014 23:21:08 -0000 1.10
+++ lang/php/php.port.mk 2 Nov 2014 12:52:02 -0000
@@ -4,7 +4,7 @@ SHARED_ONLY= Yes
CATEGORIES+= lang/php
-MODPHP_VERSION?= 5.4
+MODPHP_VERSION?= 5.5
.if ${MODPHP_VERSION} == 5.3
MODPHP_VSPEC = >=${MODPHP_VERSION},<5.4
.elif ${MODPHP_VERSION} == 5.4
Index: mail/zarafa/zarafa/patches/patch-configure
===================================================================
RCS file: /cvs/ports/mail/zarafa/zarafa/patches/patch-configure,v
retrieving revision 1.32
diff -u -p -r1.32 patch-configure
--- mail/zarafa/zarafa/patches/patch-configure 2 Sep 2014 11:09:38 -0000
1.32
+++ mail/zarafa/zarafa/patches/patch-configure 2 Nov 2014 12:52:02 -0000
@@ -1,7 +1,19 @@
$OpenBSD: patch-configure,v 1.32 2014/09/02 11:09:38 robert Exp $
---- configure.orig Mon Sep 1 18:01:58 2014
-+++ configure Mon Sep 1 18:02:31 2014
-@@ -19764,68 +19764,6 @@ rm -f core conftest.err conftest.$ac_objext \
+--- configure.orig Sun Aug 24 03:53:42 2014
++++ configure Wed Oct 29 08:29:56 2014
+@@ -16750,11 +16750,6 @@ esac
+ # disable write-strings: too much complains about "" being 'cast' to char*
(since const char* is not in the declarations) on g++-4.2 and higher
+ ZCPPFLAGS="$ZCPPFLAGS $BUILDOS -DHAVE_CONFIG_H"
+ ZCXXFLAGS="$ZCXXFLAGS -g -rdynamic -Wall -Wno-write-strings"
+-if ! test "$want_release" = "yes"; then
+-# when using -pedantic, -Wno-long-long is required
+-# only add -pedantic in non-release mode, since a header in php5 contains a ,
too much in an enum, which triggers a compile error.
+- ZCXXFLAGS="$ZCXXFLAGS -pedantic -Wno-long-long"
+-fi
+
+ # programs that use files >2gb need 64bit file support
+ LFS_CFLAGS=`getconf LFS_CFLAGS`
+@@ -19764,68 +19759,6 @@ rm -f core conftest.err conftest.$ac_objext \
LIBS=$LIBS_system
@@ -70,7 +82,7 @@ $OpenBSD: patch-configure,v 1.32 2014/09
# Only specific links with uuid and dl, clients only with crypto and ssl for
ssl connections
SSL_LIBS=
# TODO: version of ssl check??
-@@ -19836,7 +19774,7 @@ if ${ac_cv_lib_ssl_SSL_accept+:} false; then :
+@@ -19836,7 +19769,7 @@ if ${ac_cv_lib_ssl_SSL_accept+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
Index: www/Makefile
===================================================================
RCS file: /cvs/ports/www/Makefile,v
retrieving revision 1.685
diff -u -p -r1.685 Makefile
--- www/Makefile 23 Oct 2014 21:13:46 -0000 1.685
+++ www/Makefile 2 Nov 2014 12:52:04 -0000
@@ -362,7 +362,6 @@
SUBDIR += pear-HTML-Template-IT
SUBDIR += pear-HTTP-WebDAV-Server
SUBDIR += pear-SOAP
- SUBDIR += pecl-APC
SUBDIR += pecl-chroot
SUBDIR += pecl-geoip
SUBDIR += pecl-http
Index: www/pecl-APC/Makefile
===================================================================
RCS file: www/pecl-APC/Makefile
diff -N www/pecl-APC/Makefile
--- www/pecl-APC/Makefile 15 Aug 2013 02:48:02 -0000 1.31
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,37 +0,0 @@
-# $OpenBSD: Makefile,v 1.31 2013/08/15 02:48:02 william Exp $
-
-COMMENT= Alternative PHP Cache
-
-DISTNAME= APC-3.1.13
-PKGNAME= pecl-${DISTNAME}
-
-MAINTAINER= William Yodlowsky <[email protected]>
-
-# PHP
-PERMIT_PACKAGE_CDROM= Yes
-
-MODULES= lang/php/pecl
-CONFIGURE_STYLE= gnu
-
-CONFIGURE_ARGS= --enable-apc
-
-FLAVORS= shm
-FLAVOR?=
-
-.if ${FLAVOR:Mshm}
-CONFIGURE_ARGS+= --disable-apc-mmap
-.endif
-
-WEBROOT= ${VARBASE}/www
-SUBST_VARS= WEBROOT
-
-post-configure:
- @perl -pi -e "s,-rpath \\$$\\(phplibdir\\),-rpath ${LOCALBASE}/lib,g" \
- ${WRKSRC}/Makefile
-
-pre-install:
- @${INSTALL_DATA_DIR} ${WRKINST}/${WEBROOT}/pecl-APC
- @${INSTALL_DATA} ${WRKSRC}/apc.php ${WRKSRC}/INSTALL \
- ${WRKINST}/${WEBROOT}/pecl-APC
-
-.include <bsd.port.mk>
Index: www/pecl-APC/distinfo
===================================================================
RCS file: www/pecl-APC/distinfo
diff -N www/pecl-APC/distinfo
--- www/pecl-APC/distinfo 15 Aug 2013 02:48:02 -0000 1.9
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,2 +0,0 @@
-SHA256 (APC-3.1.13.tgz) = Xvi6B3KecpRulZUWcqU3i+2Yy1opTnm/DwqXrGKCmr0=
-SIZE (APC-3.1.13.tgz) = 171591
Index: www/pecl-APC/pkg/DESCR
===================================================================
RCS file: www/pecl-APC/pkg/DESCR
diff -N www/pecl-APC/pkg/DESCR
--- www/pecl-APC/pkg/DESCR 5 Sep 2012 09:24:13 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,7 +0,0 @@
-APC is the Alternative PHP Cache. It was conceived of to provide a
-free, open, and robust framework for caching and optimizing PHP
-intermediate code.
-
-Flavors:
- mmap (the default; one memory segment, no maximum limit)
- shm (multiple segments, "sysctl kern.shminfo.shmmax" is the max)
Index: www/pecl-APC/pkg/PLIST
===================================================================
RCS file: www/pecl-APC/pkg/PLIST
diff -N www/pecl-APC/pkg/PLIST
--- www/pecl-APC/pkg/PLIST 27 Jan 2012 04:02:26 -0000 1.6
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,10 +0,0 @@
-@comment $OpenBSD: PLIST,v 1.6 2012/01/27 04:02:26 william Exp $
-lib/php-${MODPHP_VERSION}/modules/${MODULE_NAME}.so
-share/examples/php-${MODPHP_VERSION}/${MODULE_NAME}.ini
-@sample ${SYSCONFDIR}/php-${MODPHP_VERSION}.sample/${MODULE_NAME}.ini
-share/php-${MODPHP_VERSION}/include/ext/${MODULE_NAME}/
-share/php-${MODPHP_VERSION}/include/ext/${MODULE_NAME}/${MODULE_NAME}_serializer.h
-@cwd ${WEBROOT}
-pecl-APC/
-pecl-APC/INSTALL
-pecl-APC/apc.php
