svn commit: r552902 - in head/www: unit-perl unit-php unit-python unit-ruby

[Sergey A. Osokin]

Author: osa
Date: Wed Oct 21 21:59:57 2020
New Revision: 552902
URL: https://svnweb.freebsd.org/changeset/ports/552902

Log:
  Introduce the UNIT_MODNAME variable.
  Since this is just an infrastructure change, do not bump
  PORTREVISION.

Modified:
  head/www/unit-perl/Makefile
  head/www/unit-php/Makefile
  head/www/unit-python/Makefile
  head/www/unit-ruby/Makefile

Modified: head/www/unit-perl/Makefile
==============================================================================
--- head/www/unit-perl/Makefile	Wed Oct 21 21:59:40 2020	(r552901)
+++ head/www/unit-perl/Makefile	Wed Oct 21 21:59:57 2020	(r552902)
@@ -2,11 +2,13 @@
 # $FreeBSD$
 
 PORTREVISION=	2
-PKGNAMESUFFIX=	-perl${PERL_VER}
+PKGNAMESUFFIX=	-${UNIT_MODNAME}
 
+UNIT_MODNAME=	perl${PERL_VER}
+
 COMMENT=	Perl module for NGINX Unit
 
-PLIST_FILES=	libexec/unit/modules/perl${PERL_VER}.unit.so
+PLIST_FILES=	libexec/unit/modules/${UNIT_MODNAME}.unit.so
 
 RUN_DEPENDS=	unitd:www/unit
 
@@ -18,14 +20,14 @@ MASTERDIR=	${.CURDIR}/../unit
 
 post-configure:
 	cd ${CONFIGURE_WRKSRC} && \
-	./configure perl --module=perl${PERL_VER}
+	./configure perl --module=${UNIT_MODNAME}
 
 do-build:
-	cd ${CONFIGURE_WRKSRC} && ${MAKE} perl${PERL_VER}
+	cd ${CONFIGURE_WRKSRC} && ${MAKE} ${UNIT_MODNAME}
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/libexec/unit/modules/
-	${INSTALL_LIB} ${WRKSRC}/build/perl${PERL_VER}.unit.so \
+	${INSTALL_LIB} ${WRKSRC}/build/${UNIT_MODNAME}.unit.so \
 		${STAGEDIR}${PREFIX}/libexec/unit/modules/
 
 .include "${MASTERDIR}/Makefile"

Modified: head/www/unit-php/Makefile
==============================================================================
--- head/www/unit-php/Makefile	Wed Oct 21 21:59:40 2020	(r552901)
+++ head/www/unit-php/Makefile	Wed Oct 21 21:59:57 2020	(r552902)
@@ -4,9 +4,11 @@
 PORTREVISION=	2
 PKGNAMESUFFIX=	${PHP_PKGNAMESUFFIX}
 
+UNIT_MODNAME=	php${PHP_VER}
+
 COMMENT=	PHP module for NGINX Unit
 
-PLIST_FILES=	libexec/unit/modules/php${PHP_VER}.unit.so
+PLIST_FILES=	libexec/unit/modules/${UNIT_MODNAME}.unit.so
 
 RUN_DEPENDS=	unitd:www/unit
 
@@ -19,14 +21,14 @@ MASTERDIR=	${.CURDIR}/../unit
 post-configure:
 	cd ${CONFIGURE_WRKSRC} && \
 	./configure php --lib-path=${LOCALBASE}/lib \
-			--module=php${PHP_VER}
+			--module=${UNIT_MODNAME}
 
 do-build:
-	cd ${CONFIGURE_WRKSRC} && ${MAKE} php${PHP_VER}
+	cd ${CONFIGURE_WRKSRC} && ${MAKE} ${UNIT_MODNAME}
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/libexec/unit/modules/
-	${INSTALL_LIB} ${WRKSRC}/build/php${PHP_VER}.unit.so \
+	${INSTALL_LIB} ${WRKSRC}/build/${UNIT_MODNAME}.unit.so \
 		${STAGEDIR}${PREFIX}/libexec/unit/modules/
 
 .include "${MASTERDIR}/Makefile"

Modified: head/www/unit-python/Makefile
==============================================================================
--- head/www/unit-python/Makefile	Wed Oct 21 21:59:40 2020	(r552901)
+++ head/www/unit-python/Makefile	Wed Oct 21 21:59:57 2020	(r552902)
@@ -2,14 +2,16 @@
 # $FreeBSD$
 
 PORTREVISION=	2
-PKGNAMESUFFIX=	-python${PYTHON_SUFFIX}
+PKGNAMESUFFIX=	-${UNIT_MODNAME}
 
+UNIT_MODNAME=	python${PYTHON_SUFFIX}
+
 COMMENT=	Python module for NGINX Unit
 
 USES=		python gettext-runtime
 USE_PYTHON=	flavors
 
-PLIST_FILES=	libexec/unit/modules/python${PYTHON_SUFFIX}.unit.so
+PLIST_FILES=	libexec/unit/modules/${UNIT_MODNAME}.unit.so
 
 RUN_DEPENDS=	unitd:www/unit
 
@@ -19,15 +21,15 @@ MASTERDIR=	${.CURDIR}/../unit
 
 post-configure:
 	cd ${CONFIGURE_WRKSRC} && \
-	./configure python --module=python${PYTHON_SUFFIX} \
+	./configure python --module=${UNIT_MODNAME} \
 			--config=${PYTHON_CMD}-config
 
 do-build:
-	cd ${CONFIGURE_WRKSRC} && ${MAKE} python${PYTHON_SUFFIX}
+	cd ${CONFIGURE_WRKSRC} && ${MAKE} ${UNIT_MODNAME}
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/libexec/unit/modules/
-	${INSTALL_LIB} ${WRKSRC}/build/python${PYTHON_SUFFIX}.unit.so \
+	${INSTALL_LIB} ${WRKSRC}/build/${UNIT_MODNAME}.unit.so \
 		${STAGEDIR}${PREFIX}/libexec/unit/modules/
 
 .include "${MASTERDIR}/Makefile"

Modified: head/www/unit-ruby/Makefile
==============================================================================
--- head/www/unit-ruby/Makefile	Wed Oct 21 21:59:40 2020	(r552901)
+++ head/www/unit-ruby/Makefile	Wed Oct 21 21:59:57 2020	(r552902)
@@ -2,14 +2,16 @@
 # $FreeBSD$
 
 PORTREVISION=	3
-PKGNAMESUFFIX=	-ruby${RUBY_VER}
+PKGNAMESUFFIX=	-${UNIT_MODNAME}
 
+UNIT_MODNAME=	ruby${RUBY_VER}
+
 COMMENT=	Ruby module for NGINX Unit
 
 RUN_DEPENDS=	rackup:www/rubygem-rack \
 		unitd:www/unit
 
-PLIST_FILES=	libexec/unit/modules/ruby${RUBY_VER}.unit.so
+PLIST_FILES=	libexec/unit/modules/${UNIT_MODNAME}.unit.so
 
 USE_RUBY=	yes
 
@@ -19,14 +21,14 @@ MASTERDIR=	${.CURDIR}/../unit
 
 post-configure:
 	cd ${CONFIGURE_WRKSRC} && \
-	./configure ruby --module=ruby${RUBY_VER}
+	./configure ruby --module=${UNIT_MODNAME}
 
 do-build:
-	cd ${CONFIGURE_WRKSRC} && ${MAKE} ruby${RUBY_VER}
+	cd ${CONFIGURE_WRKSRC} && ${MAKE} ${UNIT_MODNAME}
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/libexec/unit/modules/
-	${INSTALL_LIB} ${WRKSRC}/build/ruby${RUBY_VER}.unit.so \
+	${INSTALL_LIB} ${WRKSRC}/build/${UNIT_MODNAME}.unit.so \
 		${STAGEDIR}${PREFIX}/libexec/unit/modules/
 
 .include "${MASTERDIR}/Makefile"