pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/www unit: Adjust package naming, no functional changes.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/6a5e9ef5c96e
branches:  trunk
changeset: 447850:6a5e9ef5c96e
user:      otis <otis%pkgsrc.org@localhost>
date:      Sat Feb 27 20:58:26 2021 +0000

description:
unit: Adjust package naming, no functional changes.

- Adjust package names
- Check for embedded PHP support in unit-php build.

diffstat:

 www/unit-php/Makefile    |  9 +++++----
 www/unit-python/Makefile |  4 ++--
 www/unit-ruby/Makefile   |  4 ++--
 3 files changed, 9 insertions(+), 8 deletions(-)

diffs (47 lines):

diff -r ec660c9232c1 -r 6a5e9ef5c96e www/unit-php/Makefile
--- a/www/unit-php/Makefile     Sat Feb 27 20:14:22 2021 +0000
+++ b/www/unit-php/Makefile     Sat Feb 27 20:58:26 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2021/02/15 17:18:14 otis Exp $
+# $NetBSD: Makefile,v 1.4 2021/02/27 20:58:26 otis Exp $
 
 PKGNAME=       unit-${LANG}${PHP_VERSION:R:S|.||g}-${UNIT_VERSION}
 COMMENT=       PHP module for NGINX Unit
@@ -12,9 +12,10 @@
 
 .include "../../lang/php/phpversion.mk"
 
-#.if empty(PKG_BUILD_OPTIONS.${PHP_PKG_PREFIX}:Mphp-embed)
-#BROKEN=               "Requires the php-embed option enabled in PHP."
-#.endif
+PHP_BUILD_OPTIONS!=    ${RUN} ${PKG_INFO} -Bn php | ${GREP} PKG_OPTIONS
+.if empty(PHP_BUILD_OPTIONS:Mphp-embed)
+BROKEN=                "Requires the php-embed option enabled in PHP."
+.endif
 
 post-configure:
        ${RUN} cd ${WRKSRC} && ${SETENV} ${_CONFIGURE_SCRIPT_ENV}       \
diff -r ec660c9232c1 -r 6a5e9ef5c96e www/unit-python/Makefile
--- a/www/unit-python/Makefile  Sat Feb 27 20:14:22 2021 +0000
+++ b/www/unit-python/Makefile  Sat Feb 27 20:58:26 2021 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2021/02/14 13:43:40 otis Exp $
+# $NetBSD: Makefile,v 1.3 2021/02/27 20:58:27 otis Exp $
 
-PKGNAME=       unit-${LANG}-${UNIT_VERSION}
+PKGNAME=       unit-${LANG}${PYVERSSUFFIX}-${UNIT_VERSION}
 COMMENT=       Python module for NGINX Unit
 
 LANG=          python
diff -r ec660c9232c1 -r 6a5e9ef5c96e www/unit-ruby/Makefile
--- a/www/unit-ruby/Makefile    Sat Feb 27 20:14:22 2021 +0000
+++ b/www/unit-ruby/Makefile    Sat Feb 27 20:58:26 2021 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2021/02/14 13:43:40 otis Exp $
+# $NetBSD: Makefile,v 1.3 2021/02/27 20:58:27 otis Exp $
 
-PKGNAME=       unit-${LANG}-${UNIT_VERSION}
+PKGNAME=       unit-${LANG}${RUBY_VER}-${UNIT_VERSION}
 COMMENT=       Ruby module for NGINX Unit
 
 LANG=          ruby



Home | Main Index | Thread Index | Old Index