From 4c6dcdfa22c39f5217710eb577f5d327c216c8cb Mon Sep 17 00:00:00 2001 From: Alexander Weidinger Date: Thu, 15 Mar 2018 22:56:09 +0100 Subject: [PATCH 1/5] FreeBSD: additional pkg names in map.jinja --- php/ng/map.jinja | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/php/ng/map.jinja b/php/ng/map.jinja index 9558e6c..c164bd3 100644 --- a/php/ng/map.jinja +++ b/php/ng/map.jinja @@ -2405,15 +2405,22 @@ 'pkgs': { 'apache2': 'mod_php' + freebsd_phpng_version, 'composer_bin': 'composer', + 'curl': 'curl', 'filter': 'php' + freebsd_phpng_version + '-filter', + 'gd': 'php' + freebsd_phpng_version + '-gd', 'hash': 'php' + freebsd_phpng_version + '-hash', 'json': 'php' + freebsd_phpng_version + '-json', 'local_bin': '/usr/local/bin', 'mbstring': 'php' + freebsd_phpng_version + '-mbstring', + 'mcrypt': 'php' + freebsd_phpng_version + '-mcrypt', + 'mysql': 'php' + freebsd_phpng_version + '-mysqli', 'openssl': 'php' + freebsd_phpng_version + '-openssl', 'php': 'php' + freebsd_phpng_version, 'phar': 'php' + freebsd_phpng_version + '-phar', + 'snmp': 'php' + freebsd_phpng_version + '-snmp', 'temp_dir': '/tmp', + 'xml': 'php' + freebsd_phpng_version + '-xml', + 'zip': 'php' + freebsd_phpng_version + '-zip', }, }, }), From de799af282c96f9f6a40a7cb948fec834e87ddfd Mon Sep 17 00:00:00 2001 From: Alexander Weidinger Date: Thu, 15 Mar 2018 23:55:50 +0100 Subject: [PATCH 2/5] README: documented additional states --- README.rst | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/README.rst b/README.rst index f645db7..a8ea5a2 100644 --- a/README.rst +++ b/README.rst @@ -539,3 +539,23 @@ Installs the php-cache-lite package. -------------- Installs the php-console-table package. + +``php.ng.filter`` +----------------- + +Installs the php-filter package. + +``php.ng.hash`` +--------------- + +Installs the php-hash package. + +``php.ng.openssl`` +------------------ + +Installs the php-openssl package. + +``php.ng.phar`` +--------------- + +Installs the php-phar package. From c49da7e1f4aab5301c07813cb8c3c21d33d6ecbe Mon Sep 17 00:00:00 2001 From: Alexander Weidinger Date: Thu, 15 Mar 2018 23:56:36 +0100 Subject: [PATCH 3/5] Added php.ng.ctype --- README.rst | 5 +++++ php/ng/ctype.sls | 2 ++ php/ng/map.jinja | 1 + 3 files changed, 8 insertions(+) create mode 100644 php/ng/ctype.sls diff --git a/README.rst b/README.rst index a8ea5a2..beeab94 100644 --- a/README.rst +++ b/README.rst @@ -559,3 +559,8 @@ Installs the php-openssl package. --------------- Installs the php-phar package. + +``php.ng.ctype`` +---------------- + +Installs the php-ctype package. diff --git a/php/ng/ctype.sls b/php/ng/ctype.sls new file mode 100644 index 0000000..97fc910 --- /dev/null +++ b/php/ng/ctype.sls @@ -0,0 +1,2 @@ +{% set state = 'ctype' %} +{% include "php/ng/installed.jinja" %} diff --git a/php/ng/map.jinja b/php/ng/map.jinja index c164bd3..d5a3c1d 100644 --- a/php/ng/map.jinja +++ b/php/ng/map.jinja @@ -2405,6 +2405,7 @@ 'pkgs': { 'apache2': 'mod_php' + freebsd_phpng_version, 'composer_bin': 'composer', + 'ctype': 'php' + freebsd_phpng_version + '-ctype', 'curl': 'curl', 'filter': 'php' + freebsd_phpng_version + '-filter', 'gd': 'php' + freebsd_phpng_version + '-gd', From d24a6e1d988411d5ea8f9a5d9a04d3f3c8291c78 Mon Sep 17 00:00:00 2001 From: Alexander Weidinger Date: Thu, 15 Mar 2018 23:57:05 +0100 Subject: [PATCH 4/5] Added php.ng.session --- README.rst | 5 +++++ php/ng/map.jinja | 1 + php/ng/session.sls | 2 ++ 3 files changed, 8 insertions(+) create mode 100644 php/ng/session.sls diff --git a/README.rst b/README.rst index beeab94..66c25c8 100644 --- a/README.rst +++ b/README.rst @@ -564,3 +564,8 @@ Installs the php-phar package. ---------------- Installs the php-ctype package. + +``php.ng.session`` +------------------ + +Installs the php-session package. diff --git a/php/ng/map.jinja b/php/ng/map.jinja index d5a3c1d..bf8380d 100644 --- a/php/ng/map.jinja +++ b/php/ng/map.jinja @@ -2418,6 +2418,7 @@ 'openssl': 'php' + freebsd_phpng_version + '-openssl', 'php': 'php' + freebsd_phpng_version, 'phar': 'php' + freebsd_phpng_version + '-phar', + 'session': 'php' + freebsd_phpng_version + '-session', 'snmp': 'php' + freebsd_phpng_version + '-snmp', 'temp_dir': '/tmp', 'xml': 'php' + freebsd_phpng_version + '-xml', diff --git a/php/ng/session.sls b/php/ng/session.sls new file mode 100644 index 0000000..d8c7c48 --- /dev/null +++ b/php/ng/session.sls @@ -0,0 +1,2 @@ +{% set state = 'session' %} +{% include "php/ng/installed.jinja" %} From eaa5401303fb13761ff783758cf5c405086ac822 Mon Sep 17 00:00:00 2001 From: Alexander Weidinger Date: Fri, 16 Mar 2018 00:33:09 +0100 Subject: [PATCH 5/5] FreeBSD: corrected curl pkg name in map.jinja --- php/ng/map.jinja | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/php/ng/map.jinja b/php/ng/map.jinja index bf8380d..f6b21db 100644 --- a/php/ng/map.jinja +++ b/php/ng/map.jinja @@ -2406,7 +2406,7 @@ 'apache2': 'mod_php' + freebsd_phpng_version, 'composer_bin': 'composer', 'ctype': 'php' + freebsd_phpng_version + '-ctype', - 'curl': 'curl', + 'curl': 'php' + freebsd_phpng_version + '-curl', 'filter': 'php' + freebsd_phpng_version + '-filter', 'gd': 'php' + freebsd_phpng_version + '-gd', 'hash': 'php' + freebsd_phpng_version + '-hash',