CVS commit: pkgsrc/www

["Juraj Lutter" <otis%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   otis
Date:           Sat Feb 27 20:58:27 UTC 2021

Modified Files:
        pkgsrc/www/unit-php: Makefile
        pkgsrc/www/unit-python: Makefile
        pkgsrc/www/unit-ruby: Makefile

Log Message:
unit: Adjust package naming, no functional changes.

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


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/www/unit-php/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/www/unit-python/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/www/unit-ruby/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/unit-php/Makefile
diff -u pkgsrc/www/unit-php/Makefile:1.3 pkgsrc/www/unit-php/Makefile:1.4
--- pkgsrc/www/unit-php/Makefile:1.3    Mon Feb 15 17:18:14 2021
+++ pkgsrc/www/unit-php/Makefile        Sat Feb 27 20:58:26 2021
@@ -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 @@ PHP_VERSIONS_ACCEPTED?=      56 73 74
 
 .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}       \

Index: pkgsrc/www/unit-python/Makefile
diff -u pkgsrc/www/unit-python/Makefile:1.2 pkgsrc/www/unit-python/Makefile:1.3
--- pkgsrc/www/unit-python/Makefile:1.2 Sun Feb 14 13:43:40 2021
+++ pkgsrc/www/unit-python/Makefile     Sat Feb 27 20:58:27 2021
@@ -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

Index: pkgsrc/www/unit-ruby/Makefile
diff -u pkgsrc/www/unit-ruby/Makefile:1.2 pkgsrc/www/unit-ruby/Makefile:1.3
--- pkgsrc/www/unit-ruby/Makefile:1.2   Sun Feb 14 13:43:40 2021
+++ pkgsrc/www/unit-ruby/Makefile       Sat Feb 27 20:58:27 2021
@@ -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