pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Update NGINX Unit's PHP module.
Module Name: pkgsrc-wip
Committed By: Sergey A. Osokin <osa%FreeBSD.org@localhost>
Pushed By: osa
Date: Fri Nov 13 17:00:50 2020 -0500
Changeset: f8e76d17acb1ade5eb5f2e1e09062e632a3e4089
Modified Files:
unit-php/Makefile
Added Files:
unit-php/DESCR
unit-php/PLIST
unit-php/distinfo
unit-php/patches/patch-auto-modules-php
Log Message:
Update NGINX Unit's PHP module.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=f8e76d17acb1ade5eb5f2e1e09062e632a3e4089
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
unit-php/DESCR | 1 +
unit-php/Makefile | 23 ++++++++++++-----------
unit-php/PLIST | 2 ++
unit-php/distinfo | 7 +++++++
unit-php/patches/patch-auto-modules-php | 11 +++++++++++
5 files changed, 33 insertions(+), 11 deletions(-)
diffs:
diff --git a/unit-php/DESCR b/unit-php/DESCR
new file mode 100644
index 0000000000..571bf9030d
--- /dev/null
+++ b/unit-php/DESCR
@@ -0,0 +1 @@
+PHP module for NGINX Unit.
diff --git a/unit-php/Makefile b/unit-php/Makefile
index 6473548fed..f722777a2f 100644
--- a/unit-php/Makefile
+++ b/unit-php/Makefile
@@ -1,35 +1,36 @@
# $NetBSD$
-PKGNAME= unit-php${PHP_VERSION:R:S|.||g}-1.18.0
-DISTNAME= unit-1.18.0
+PKGNAME= unit-php${PHP_VERSION:R:S|.||g}-1.20.0
+DISTNAME= unit-1.20.0
COMMENT= PHP module for NGINX Unit
-MAINTAINER= osa%FreeBSD.org@localhost
+UNIT_MODNAME= php${PHP_VERSION}
-DISTINFO_FILE= ../../www/unit/distinfo
-PATCHDIR= ../../www/unit/patches
+MAINTAINER= osa%FreeBSD.org@localhost
PHP_VERSIONS_ACCEPTED?= 56 72 73 74
-MAKE_ENV+= WITHOUT_RPATH_FIX=1
-
USE_LANGUAGES+= c
+PLIST_SUBST+= UNIT_MODNAME=${UNIT_MODNAME}
+
.include "../../lang/php/phpversion.mk"
-# FIX ME
#.if empty(PKG_BUILD_OPTIONS.${PHP_PKG_PREFIX}:Mphp-embed)
#BROKEN= "Requires the php-embed option enabled in PHP."
#.endif
post-configure:
cd ${WRKSRC} && \
- ./configure php --lib-path=${PREFIX}/lib
- --module=php${PHP_VERSION}
+ ./configure php --lib-path=${PREFIX}/lib \
+ --module=${UNIT_MODNAME}
+
+do-build:
+ cd ${WRKSRC} && ${MAKE} ${UNIT_MODNAME}
do-install:
${MKDIR} ${DESTDIR}${PREFIX}/libexec/unit/modules/
- ${INSTALL_LIB} ${WRKSRC}/build/php${PHP_VERSION}.unit.so \
+ ${INSTALL_LIB} ${WRKSRC}/build/${UNIT_MODNAME}.unit.so \
${DESTDIR}${PREFIX}/libexec/unit/modules/
.include "${PHPPKGSRCDIR}/buildlink3.mk"
diff --git a/unit-php/PLIST b/unit-php/PLIST
new file mode 100644
index 0000000000..ad09103f78
--- /dev/null
+++ b/unit-php/PLIST
@@ -0,0 +1,2 @@
+@comment $NetBSD$
+libexec/unit/modules/${UNIT_MODNAME}.unit.so
diff --git a/unit-php/distinfo b/unit-php/distinfo
new file mode 100644
index 0000000000..2819071556
--- /dev/null
+++ b/unit-php/distinfo
@@ -0,0 +1,7 @@
+$NetBSD$
+
+SHA1 (unit-1.20.0.tar.gz) = f4a2d2a6b622742acd138a66008407b5f674b08f
+RMD160 (unit-1.20.0.tar.gz) = 8964e056dbe19e659b157a89d1cf39f213ffd952
+SHA512 (unit-1.20.0.tar.gz) = dd68103795acbdcd87a951c92c72f3cb74b5e622eca4e687194508b55a592ac4312de3a8ff7ddb9a5df9750363b24dca9e1b48c7ef42c78aca3a18aca6a51f42
+Size (unit-1.20.0.tar.gz) = 787607 bytes
+SHA1 (patch-auto-modules-php) = 4386e6adaf806d83af88de8da9ad0a9a83eeac8f
diff --git a/unit-php/patches/patch-auto-modules-php b/unit-php/patches/patch-auto-modules-php
new file mode 100644
index 0000000000..902832760d
--- /dev/null
+++ b/unit-php/patches/patch-auto-modules-php
@@ -0,0 +1,11 @@
+--- auto/modules/php.orig 2020-10-09 11:15:55.011861773 -0400
++++ auto/modules/php 2020-10-09 11:16:18.986144628 -0400
+@@ -112,7 +112,7 @@
+ # "php-config --ldflags" does not contain path to libphp, but
+ # contains usually path to libraries required by extensions.
+ NXT_PHP_LDFLAGS="-L${NXT_PHP_LIB_PATH} \
+- -Wl,-rpath ${NXT_PHP_LIB_PATH}"
++ -Wl,-rpath,${NXT_PHP_LIB_PATH}"
+ fi
+ fi
+
Home |
Main Index |
Thread Index |
Old Index