Initial test on nextcloud looks good.
Thanks!
Ok so far.
On [27/08/17] [07:37P], Martijn van Duren wrote:
; On 08/27/17 19:31, Robert Nagy wrote:
; > Yeah let's keep php as is for 6.2, you can remove 5.5 and add 7.1 but
that's it.
; > After unlock we can unleash hell on the tree.
;
; Then I'd like to propose to just remove 5.5.
;
; Adding 7.1 would either backporting extra fixes from my patch, or keep it
close
; to the way 7.0 is right now (including some ugly hacks in Makefile.inc), which
; would further complicate things for me later on.
;
; OK?
;
; martijn@
; >
; > On (2017-08-27 13:50), Stuart Henderson wrote:
; >> I would be ok with killing 5.5 and adding 7.1 but think it's the wrong time
; >> in the release cycle for anything more complex.
; >> --
; >> Sent from a phone, apologies for poor formatting.
; >>
; >>
; >>
; Index: Makefile
; ===================================================================
; RCS file: /cvs/ports/lang/php/Makefile,v
; retrieving revision 1.11
; diff -u -p -r1.11 Makefile
; --- Makefile 28 Apr 2016 18:19:23 -0000 1.11
; +++ Makefile 27 Aug 2017 17:36:28 -0000
; @@ -1,7 +1,6 @@
; # $OpenBSD: Makefile,v 1.11 2016/04/28 18:19:23 sthen Exp $
;
; SUBDIR =
; -SUBDIR += 5.5
; SUBDIR += 5.6
; SUBDIR += 7.0
;
; Index: Makefile.inc
; ===================================================================
; RCS file: /cvs/ports/lang/php/Makefile.inc,v
; retrieving revision 1.96
; diff -u -p -r1.96 Makefile.inc
; --- Makefile.inc 24 Aug 2017 10:03:25 -0000 1.96
; +++ Makefile.inc 27 Aug 2017 17:36:28 -0000
; @@ -78,11 +78,7 @@ CONFIGURE_ARGS+= --enable-shared \
; --enable-sqlite-utf8 \
; --with-sqlite3 \
; --program-suffix=-${PV}
; -
; -# readline is broken in PHP-5.3
; -.if ${PV} != 5.3
; CONFIGURE_ARGS += --with-readline
; -.endif
;
; # apache module
; CONFIGURE_ARGS+= --with-apxs2=${LOCALBASE}/sbin/apxs2
; @@ -221,10 +217,8 @@ MULTI_PACKAGES+= -odbc
; COMMENT-odbc= odbc database access extensions for php5
; CONFIGURE_ARGS+= --with-iodbc=shared,${LOCALBASE}
; LIB_DEPENDS-odbc= databases/iodbc
; -WANTLIB-odbc= iodbc>=2 pthread
; -.if ${PV} != "5.3"
; -WANTLIB-odbc+= iodbcinst
; -.endif
; +WANTLIB-odbc= iodbc>=2 pthread \
; + iodbcinst
;
; # pcntl
; MULTI_PACKAGES+= -pcntl
; @@ -347,7 +341,6 @@ PHPXS_SUBST+= -e 's,${i},${${i}},'
; WANTLIB-main+= c crypto iconv intl lzma m pthread ssl xml2>=8 z
; WANTLIB-main+= ncurses readline ${COMPILER_LIBCXX}
;
; -# php 5.4/5.5 : WANTLIB-main += ${COMPILER_LIBCXX}
; WANTLIB-fastcgi= ${WANTLIB-main}
; LIB_DEPENDS-main= devel/gettext \
; textproc/libxml
; @@ -384,11 +377,7 @@ pre-configure:
; MODULE_NAME-${i}= ${i}
; DESCR-${i}= ${.CURDIR}/../files/DESCR-${i}
; PKGNAME-${i}= php-${i}-${V}
; -.if ${V:M5.4*}
; -PKGSPEC-${i}= php-${i}->=5.4,<5.5
; -.elif ${V:M5.5*}
; -PKGSPEC-${i}= php-${i}->=5.5,<5.6
; -.elif ${V:M5.6*}
; +.if ${V:M5.6*}
; PKGSPEC-${i}= php-${i}->=5.6,<5.7
; .elif ${V:M7.0*}
; PKGSPEC-${i}= php-${i}->=7.0,<7.1
;
--
Sending from my toaster.
