cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert previous until problems with it are fixed - the installed header

Browse Source 
share/php-${PV}/include/ext/pcre/php_pcre.h pulls in pcre.h which is
no longer installed by PHP and the include path isn't setup to find it
from devel/pcre. Reported by aja@ with pecl-imagick,php70.
This commit is contained in:
sthen 2018-06-05 12:50:28 +00:00
parent a657c52b9a
commit def08e7119
5 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lang/php/5.6/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.75 2018/06/04 15:22:36 martijn Exp $
# $OpenBSD: Makefile,v 1.76 2018/06/05 12:50:29 sthen Exp $
PV= 5.6
V= ${PV}.36
REVISION= 7
REVISION= 8
MASTER_SITES0= https://download.suhosin.org/

8
lang/php/5.6/pkg/PLIST-main
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.18 2018/06/04 15:22:36 martijn Exp $
@comment $OpenBSD: PLIST-main,v 1.19 2018/06/05 12:50:29 sthen Exp $
@option no-default-conflict
@option is-branch
@conflict php->=5.6,<5.7
@ -241,6 +241,12 @@ share/php-${PV}/include/ext/mysqlnd/mysqlnd_structs.h
share/php-${PV}/include/ext/mysqlnd/mysqlnd_wireprotocol.h
share/php-${PV}/include/ext/mysqlnd/php_mysqlnd.h
share/php-${PV}/include/ext/pcre/
share/php-${PV}/include/ext/pcre/pcrelib/
share/php-${PV}/include/ext/pcre/pcrelib/config.h
share/php-${PV}/include/ext/pcre/pcrelib/pcre.h
share/php-${PV}/include/ext/pcre/pcrelib/pcre_internal.h
share/php-${PV}/include/ext/pcre/pcrelib/pcreposix.h
share/php-${PV}/include/ext/pcre/pcrelib/ucp.h
share/php-${PV}/include/ext/pcre/php_pcre.h
share/php-${PV}/include/ext/pdo/
share/php-${PV}/include/ext/pdo/php_pdo.h

4
lang/php/7.0/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.58 2018/06/04 15:22:36 martijn Exp $
# $OpenBSD: Makefile,v 1.59 2018/06/05 12:50:29 sthen Exp $
PV= 7.0
V= ${PV}.30
REVISION= 7
REVISION= 8
BUILD_DEPENDS+= devel/bison

8
lang/php/7.0/pkg/PLIST-main
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.14 2018/06/04 15:22:37 martijn Exp $
@comment $OpenBSD: PLIST-main,v 1.15 2018/06/05 12:50:29 sthen Exp $
@option no-default-conflict
@option is-branch
@conflict php->=7.0,<7.1
@ -238,6 +238,12 @@ share/php-${PV}/include/ext/mysqlnd/mysqlnd_structs.h
share/php-${PV}/include/ext/mysqlnd/mysqlnd_wireprotocol.h
share/php-${PV}/include/ext/mysqlnd/php_mysqlnd.h
share/php-${PV}/include/ext/pcre/
share/php-${PV}/include/ext/pcre/pcrelib/
share/php-${PV}/include/ext/pcre/pcrelib/config.h
share/php-${PV}/include/ext/pcre/pcrelib/pcre.h
share/php-${PV}/include/ext/pcre/pcrelib/pcre_internal.h
share/php-${PV}/include/ext/pcre/pcrelib/pcreposix.h
share/php-${PV}/include/ext/pcre/pcrelib/ucp.h
share/php-${PV}/include/ext/pcre/php_pcre.h
share/php-${PV}/include/ext/pdo/
share/php-${PV}/include/ext/pdo/php_pdo.h

7
lang/php/Makefile.inc
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile.inc,v 1.116 2018/06/04 15:22:36 martijn Exp $
# $OpenBSD: Makefile.inc,v 1.117 2018/06/05 12:50:28 sthen Exp $
BROKEN-hppa= no __sync_bool_compare_and_swap support nor asm fallback
@ -82,7 +82,7 @@ CONFIGURE_ARGS+= --with-gettext=${LOCALBASE} \
--with-iconv=${LOCALBASE} \
--with-onig=${LOCALBASE} \
--with-openssl \
--with-pcre-regex=${LOCALBASE} \
--with-pcre-regex \
--with-zlib \
--enable-bcmath \
--enable-calendar \
@ -146,10 +146,9 @@ COMMENT-dbg= interactive php debugger
CONFIGURE_ARGS+= --enable-phpdbg
.for i in ${SAPI}
WANTLIB$i += c crypto curses iconv intl lzma m onig pcre
WANTLIB$i += c crypto curses iconv intl lzma m onig
WANTLIB$i += pthread readline ssl xml2 z
LIB_DEPENDS$i += devel/gettext \
devel/pcre \
textproc/libxml \
textproc/oniguruma
.endfor