put the pecl/php73 bits in; even though php/7.3 itself is disabled doing\
this doesn't get in the way and makes it easier to test possible fixes
This commit is contained in:
sthen
parent
a029091094
commit
78dfb0b064
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.92 2018/12/11 12:07:47 sthen Exp $
|
||||
# $OpenBSD: Makefile,v 1.93 2019/03/08 17:02:43 sthen Exp $
|
||||
|
||||
SUBDIR =
|
||||
SUBDIR += arc
|
||||
@ -47,8 +47,10 @@
|
||||
SUBDIR += par2cmdline
|
||||
SUBDIR += pecl-lzf,php71
|
||||
SUBDIR += pecl-lzf,php72
|
||||
SUBDIR += pecl-lzf,php73
|
||||
SUBDIR += pecl-rar,php71
|
||||
SUBDIR += pecl-rar,php72
|
||||
#SUBDIR += pecl-rar,php73 # not supported yet
|
||||
SUBDIR += pigz
|
||||
SUBDIR += py-libarchive-c
|
||||
SUBDIR += py-libarchive-c,python3
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.374 2019/01/23 15:16:41 jeremy Exp $
|
||||
# $OpenBSD: Makefile,v 1.375 2019/03/08 17:02:43 sthen Exp $
|
||||
|
||||
SUBDIR =
|
||||
SUBDIR += architect
|
||||
@ -127,6 +127,7 @@
|
||||
SUBDIR += p5-sybperl
|
||||
SUBDIR += pecl-redis,php71
|
||||
SUBDIR += pecl-redis,php72
|
||||
SUBDIR += pecl-redis,php73
|
||||
SUBDIR += percona-toolkit
|
||||
SUBDIR += pg-toolbox
|
||||
SUBDIR += pg_stats_reporter
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.470 2019/01/23 15:16:41 jeremy Exp $
|
||||
# $OpenBSD: Makefile,v 1.471 2019/03/08 17:02:43 sthen Exp $
|
||||
|
||||
SUBDIR =
|
||||
SUBDIR += DevIL
|
||||
@ -221,6 +221,7 @@
|
||||
SUBDIR += pdfsandwich
|
||||
SUBDIR += pecl-imagick,php71
|
||||
SUBDIR += pecl-imagick,php72
|
||||
SUBDIR += pecl-imagick,php73
|
||||
SUBDIR += pho
|
||||
SUBDIR += piglit
|
||||
SUBDIR += pinta
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
# $OpenBSD: pecl.port.mk,v 1.13 2018/12/12 23:46:18 sthen Exp $
|
||||
# $OpenBSD: pecl.port.mk,v 1.14 2019/03/08 17:02:44 sthen Exp $
|
||||
# PHP PECL module
|
||||
|
||||
MODULES += lang/php
|
||||
|
||||
FLAVORS = php71 php72
|
||||
FLAVORS ?= php71 php72 php73
|
||||
FLAVOR ?= php71
|
||||
|
||||
# MODPECL_DEFAULTV is used in PLISTs so that @pkgpath markers are only
|
||||
@ -16,6 +16,9 @@ MODPECL_DEFAULTV = ""
|
||||
.elif ${FLAVOR} == php72
|
||||
MODPHP_VERSION = 7.2
|
||||
MODPECL_DEFAULTV = "@comment "
|
||||
.elif ${FLAVOR} == php73
|
||||
MODPHP_VERSION = 7.3
|
||||
MODPECL_DEFAULTV = "@comment "
|
||||
.endif
|
||||
|
||||
CATEGORIES += www
|
||||
@ -33,8 +36,7 @@ HOMEPAGE ?= https://pecl.php.net/package/${_PECLMOD}
|
||||
EXTRACT_SUFX ?= .tgz
|
||||
.endif
|
||||
|
||||
# XXX CONFIGURE_STYLE would be nice but it can't be set here
|
||||
AUTOCONF_VERSION ?= 2.62
|
||||
AUTOCONF_VERSION ?= 2.69
|
||||
AUTOMAKE_VERSION ?= 1.9
|
||||
|
||||
LIBTOOL_FLAGS += --tag=disable-static
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.376 2019/02/13 20:01:21 bluhm Exp $
|
||||
# $OpenBSD: Makefile,v 1.377 2019/03/08 17:02:43 sthen Exp $
|
||||
|
||||
SUBDIR =
|
||||
SUBDIR += abook
|
||||
@ -175,6 +175,7 @@
|
||||
SUBDIR += pear-Mime-Type
|
||||
SUBDIR += pecl-mailparse,php71
|
||||
SUBDIR += pecl-mailparse,php72
|
||||
#SUBDIR += pecl-mailparse,php73 # not supported yet
|
||||
SUBDIR += perdition
|
||||
SUBDIR += pflogsumm
|
||||
SUBDIR += pine-pgp-filters
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
# $OpenBSD: Makefile,v 1.22 2018/12/12 23:46:18 sthen Exp $
|
||||
# $OpenBSD: Makefile,v 1.23 2019/03/08 17:02:44 sthen Exp $
|
||||
|
||||
COMMENT = PHP extension for parsing and working with rfc822/MIME mail
|
||||
|
||||
DISTNAME = mailparse-3.0.2
|
||||
CATEGORIES = mail
|
||||
REVISION = 0
|
||||
REVISION = 1
|
||||
|
||||
MAINTAINER = Stuart Henderson <sthen@openbsd.org>
|
||||
|
||||
@ -13,11 +13,11 @@ PERMIT_PACKAGE_CDROM = Yes
|
||||
|
||||
WANTLIB += c
|
||||
|
||||
AUTOCONF_VERSION = 2.52
|
||||
AUTOMAKE_VERSION = 1.4
|
||||
|
||||
MODULES = lang/php/pecl
|
||||
|
||||
# not 7.3 yet
|
||||
FLAVORS = php71 php72
|
||||
|
||||
CONFIGURE_STYLE = gnu
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.534 2019/03/07 10:23:20 sthen Exp $
|
||||
# $OpenBSD: Makefile,v 1.535 2019/03/08 17:02:44 sthen Exp $
|
||||
|
||||
SUBDIR =
|
||||
SUBDIR += ADMsnmp
|
||||
@ -247,8 +247,9 @@
|
||||
SUBDIR += pear-Auth
|
||||
SUBDIR += pear-Auth-HTTP
|
||||
SUBDIR += pear-Auth-SASL
|
||||
SUBDIR += pecl-libsodium,php71
|
||||
SUBDIR += pecl-mcrypt,php72
|
||||
SUBDIR += pecl-libsodium,php71 # in core for 7.2+
|
||||
SUBDIR += pecl-mcrypt,php72 # in core up to 7.1
|
||||
SUBDIR += pecl-mcrypt,php73
|
||||
SUBDIR += pgp5
|
||||
SUBDIR += pgpdump
|
||||
SUBDIR += pidgin-otr
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.1.1.1 2019/03/07 10:22:51 sthen Exp $
|
||||
# $OpenBSD: Makefile,v 1.2 2019/03/08 17:02:44 sthen Exp $
|
||||
|
||||
COMMENT = PHP bindings for the libmcrypt library
|
||||
|
||||
@ -15,7 +15,8 @@ PERMIT_PACKAGE_CDROM = Yes
|
||||
WANTLIB += ltdl mcrypt
|
||||
|
||||
# 7.2+ only
|
||||
FLAVOR = php72
|
||||
FLAVORS = php72 php73
|
||||
FLAVOR ?= php72
|
||||
|
||||
MODULES = lang/php/pecl
|
||||
|
||||
|
||||
11
www/Makefile
11
www/Makefile
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.893 2019/03/08 03:11:47 bentley Exp $
|
||||
# $OpenBSD: Makefile,v 1.894 2019/03/08 17:02:44 sthen Exp $
|
||||
|
||||
SUBDIR =
|
||||
SUBDIR += ajaxterm
|
||||
@ -341,21 +341,30 @@
|
||||
SUBDIR += pear-SOAP
|
||||
SUBDIR += pecl-chroot,php71
|
||||
SUBDIR += pecl-chroot,php72
|
||||
SUBDIR += pecl-chroot,php73
|
||||
SUBDIR += pecl-geoip,php71
|
||||
SUBDIR += pecl-geoip,php72
|
||||
SUBDIR += pecl-geoip,php73
|
||||
SUBDIR += pecl-memcached,php71
|
||||
SUBDIR += pecl-memcached,php72
|
||||
#SUBDIR += pecl-memcached,php73 # no 7.3 yet
|
||||
SUBDIR += pecl-pecl_http,php71
|
||||
SUBDIR += pecl-pecl_http,php72
|
||||
SUBDIR += pecl-pecl_http,php73
|
||||
SUBDIR += pecl-pledge,php72 # 7.2+-only
|
||||
SUBDIR += pecl-pledge,php73
|
||||
SUBDIR += pecl-proctitle,php71
|
||||
SUBDIR += pecl-proctitle,php72
|
||||
SUBDIR += pecl-proctitle,php73
|
||||
SUBDIR += pecl-propro,php71
|
||||
SUBDIR += pecl-propro,php72
|
||||
SUBDIR += pecl-propro,php73
|
||||
SUBDIR += pecl-raphf,php71
|
||||
SUBDIR += pecl-raphf,php72
|
||||
SUBDIR += pecl-raphf,php73
|
||||
SUBDIR += pecl-ssh2,php71
|
||||
SUBDIR += pecl-ssh2,php72
|
||||
#SUBDIR += pecl-ssh2,php73 # no 7.3 yet
|
||||
SUBDIR += pelican
|
||||
SUBDIR += perlbal
|
||||
SUBDIR += php-markdown
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.9 2018/12/12 23:46:18 sthen Exp $
|
||||
# $OpenBSD: Makefile,v 1.10 2019/03/08 17:02:44 sthen Exp $
|
||||
|
||||
COMMENT= PHP interface to memcached via libmemcached
|
||||
|
||||
@ -10,6 +10,9 @@ PERMIT_PACKAGE_CDROM= Yes
|
||||
|
||||
WANTLIB += c memcached memcachedutil pthread sasl2 z
|
||||
|
||||
# no 7.3 yet
|
||||
FLAVORS= php71 php72
|
||||
|
||||
MODULES= lang/php/pecl
|
||||
LIB_DEPENDS= devel/libmemcached
|
||||
|
||||
|
||||
@ -1,34 +1,38 @@
|
||||
# $OpenBSD: Makefile,v 1.6 2018/12/12 23:46:18 sthen Exp $
|
||||
# $OpenBSD: Makefile,v 1.7 2019/03/08 17:02:44 sthen Exp $
|
||||
|
||||
BROKEN= problems picking up libcurl
|
||||
BROKEN= builds, but has problems picking up libcurl
|
||||
|
||||
COMMENT= extended HTTP support
|
||||
|
||||
DISTNAME= pecl_http-3.1.0
|
||||
REVISION= 2
|
||||
DISTNAME= pecl_http-3.2.0
|
||||
|
||||
HOMEPAGE= http://pecl.php.net/package/pecl_http
|
||||
|
||||
# PHP
|
||||
PERMIT_PACKAGE_CDROM = Yes
|
||||
|
||||
WANTLIB += ${COMPILER_LIBCXX} event_core event_extra iconv icudata
|
||||
WANTLIB += icui18n icuuc idn intl m z
|
||||
WANTLIB += ${COMPILER_LIBCXX}
|
||||
WANTLIB += brotlicommon brotlidec brotlienc curl event_core event_extra
|
||||
WANTLIB += iconv icudata icui18n icuuc idn intl m z
|
||||
|
||||
COMPILER = base-clang ports-gcc base-gcc
|
||||
|
||||
MODULES= lang/php/pecl
|
||||
|
||||
CONFIGURE_STYLE= gnu
|
||||
CONFIGURE_ARGS= --with-http-libcurl-dir=${LOCALBASE}
|
||||
CONFIGURE_SCRIPT= ${LOCALBASE}/bin/bash configure
|
||||
|
||||
RUN_DEPENDS+= www/pecl-raphf${MODPHP_FLAVOR} \
|
||||
www/pecl-propro${MODPHP_FLAVOR}
|
||||
|
||||
TEST_DEPENDS+= ${RUN_DEPENDS}
|
||||
BUILD_DEPENDS+= ${RUN_DEPENDS}
|
||||
LIB_DEPENDS= devel/gettext \
|
||||
LIB_DEPENDS= archivers/brotli \
|
||||
devel/gettext \
|
||||
devel/libidn \
|
||||
devel/libevent2 \
|
||||
net/curl \
|
||||
textproc/icu4c
|
||||
|
||||
TEST_EXTS+= -d extension_dir=${LOCALBASE}/lib/php-${MODPHP_VERSION}/modules
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
SHA256 (pecl_http-3.1.0.tgz) = 495nsVbn1fbC5eseK18KzOtwBPEmDWjJ+LLA+WKaq/A=
|
||||
SIZE (pecl_http-3.1.0.tgz) = 214166
|
||||
SHA256 (pecl_http-3.2.0.tgz) = b7fwODZfsfMwLxt+fWtV1cQiveo2BXse/gK75q08wBs=
|
||||
SIZE (pecl_http-3.2.0.tgz) = 218829
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
$OpenBSD: patch-config9_m4,v 1.1.1.1 2018/04/26 15:02:32 sthen Exp $
|
||||
$OpenBSD: patch-config9_m4,v 1.2 2019/03/08 17:02:44 sthen Exp $
|
||||
|
||||
don't require raphf/propro to be activated before allowing pecl-http to build
|
||||
|
||||
Index: config9.m4
|
||||
--- config9.m4.orig
|
||||
+++ config9.m4
|
||||
@@ -146,13 +146,9 @@ if test "$PHP_HTTP" != "no"; then
|
||||
@@ -158,13 +158,9 @@ if test "$PHP_HTTP" != "no"; then
|
||||
dnl EXTENSIONS
|
||||
PECL_HAVE_PHP_EXT([raphf], [
|
||||
PECL_HAVE_PHP_EXT_HEADER([raphf])
|
||||
|
||||
@ -1,20 +1,25 @@
|
||||
@comment $OpenBSD: PLIST,v 1.2 2018/12/11 12:33:26 sthen Exp $
|
||||
${MODPECL_DEFAULTV}@pkgpath www/pecl56-pecl_http
|
||||
${MODPECL_DEFAULTV}@pkgpath www/pecl-pecl_http,php70
|
||||
@comment $OpenBSD: PLIST,v 1.3 2019/03/08 17:02:44 sthen Exp $
|
||||
${MODPECL_DEFAULTV}@pkgpath www/pecl56-${MODULE_NAME}
|
||||
${MODPECL_DEFAULTV}@pkgpath www/pecl-${MODULE_NAME},php70
|
||||
@extra ${SYSCONFDIR}/php-${MODPHP_VERSION}/http.ini
|
||||
lib/php-${MODPHP_VERSION}/modules/http.so
|
||||
share/examples/php-${MODPHP_VERSION}/pecl_http.ini
|
||||
@sample ${SYSCONFDIR}/php-${MODPHP_VERSION}.sample/pecl_http.ini
|
||||
share/examples/php-${MODPHP_VERSION}/${MODULE_NAME}.ini
|
||||
@sample ${SYSCONFDIR}/php-${MODPHP_VERSION}.sample/${MODULE_NAME}.ini
|
||||
share/php-${MODPHP_VERSION}/include/ext/http/
|
||||
share/php-${MODPHP_VERSION}/include/ext/http/php_http.h
|
||||
share/php-${MODPHP_VERSION}/include/ext/http/php_http_api.h
|
||||
share/php-${MODPHP_VERSION}/include/ext/http/php_http_buffer.h
|
||||
share/php-${MODPHP_VERSION}/include/ext/http/php_http_client.h
|
||||
share/php-${MODPHP_VERSION}/include/ext/http/php_http_client_curl.h
|
||||
share/php-${MODPHP_VERSION}/include/ext/http/php_http_client_curl_event.h
|
||||
share/php-${MODPHP_VERSION}/include/ext/http/php_http_client_curl_user.h
|
||||
share/php-${MODPHP_VERSION}/include/ext/http/php_http_client_request.h
|
||||
share/php-${MODPHP_VERSION}/include/ext/http/php_http_client_response.h
|
||||
share/php-${MODPHP_VERSION}/include/ext/http/php_http_cookie.h
|
||||
share/php-${MODPHP_VERSION}/include/ext/http/php_http_curl.h
|
||||
share/php-${MODPHP_VERSION}/include/ext/http/php_http_encoding.h
|
||||
share/php-${MODPHP_VERSION}/include/ext/http/php_http_encoding_brotli.h
|
||||
share/php-${MODPHP_VERSION}/include/ext/http/php_http_encoding_zlib.h
|
||||
share/php-${MODPHP_VERSION}/include/ext/http/php_http_env.h
|
||||
share/php-${MODPHP_VERSION}/include/ext/http/php_http_env_request.h
|
||||
share/php-${MODPHP_VERSION}/include/ext/http/php_http_env_response.h
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.2 2018/12/11 12:33:26 sthen Exp $
|
||||
# $OpenBSD: Makefile,v 1.3 2019/03/08 17:02:44 sthen Exp $
|
||||
|
||||
COMMENT= PHP wrapper for pledge(2) and unveil(2)
|
||||
|
||||
@ -15,8 +15,8 @@ MAINTAINER= Tom Van Looy <tom@ctors.net>
|
||||
PERMIT_PACKAGE_CDROM= Yes
|
||||
|
||||
# override default; only compatible with 7.2+
|
||||
FLAVOR= php72
|
||||
FLAVORS= php72
|
||||
FLAVORS= php72 php73
|
||||
FLAVOR?= php72
|
||||
|
||||
WANTLIB= c
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user