svn commit: r564130 - in head: devel/libunit www/unit www/unit-java

[Sergey A. Osokin]

Author: osa
Date: Fri Feb  5 16:28:39 2021
New Revision: 564130
URL: https://svnweb.freebsd.org/changeset/ports/564130

Log:
  Use common way to access NGINX Unit's version.
  Do not bump PORTREVISIONs because of no functional changes.

Added:
  head/www/unit/version.mk   (contents, props changed)
Modified:
  head/devel/libunit/Makefile
  head/www/unit-java/Makefile
  head/www/unit/Makefile

Modified: head/devel/libunit/Makefile
==============================================================================
--- head/devel/libunit/Makefile	Fri Feb  5 16:21:15 2021	(r564129)
+++ head/devel/libunit/Makefile	Fri Feb  5 16:28:39 2021	(r564130)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	libunit
-PORTVERSION=	1.22.0
+PORTVERSION=	${UNIT_VERSION}
 MASTER_SITES?=	https://unit.nginx.org/download/
 DISTNAME=	unit-${PORTVERSION}
 
@@ -43,4 +43,5 @@ do-build:
 do-install:
 	${MAKE} -C ${WRKSRC} libunit-install DESTDIR=${STAGEDIR}
 
+.include "../../www/unit/version.mk"
 .include <bsd.port.mk>

Modified: head/www/unit-java/Makefile
==============================================================================
--- head/www/unit-java/Makefile	Fri Feb  5 16:21:15 2021	(r564129)
+++ head/www/unit-java/Makefile	Fri Feb  5 16:28:39 2021	(r564130)
@@ -46,7 +46,6 @@ CLASSGRAPH_VERSION=	4.8.90
 ECJ_VERSION=	3.23.0
 JETTY_VERSION=	9.4.33.v20201020
 TOMCAT_VERSION=	9.0.39
-UNIT_VERSION=	1.22.0
 
 PLIST_FILES=	%%JAVAJARDIR%%/classgraph-${CLASSGRAPH_VERSION}.jar \
 		%%JAVAJARDIR%%/ecj-${ECJ_VERSION}.jar \

Modified: head/www/unit/Makefile
==============================================================================
--- head/www/unit/Makefile	Fri Feb  5 16:21:15 2021	(r564129)
+++ head/www/unit/Makefile	Fri Feb  5 16:28:39 2021	(r564130)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	unit
-PORTVERSION=	1.22.0
+PORTVERSION=	${UNIT_VERSION}
 PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES?=	https://unit.nginx.org/download/
@@ -121,4 +121,5 @@ post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/libexec/unit/modules
 .endif
 
+.include "../../www/unit/version.mk"
 .include <bsd.port.mk>

Added: head/www/unit/version.mk
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/unit/version.mk	Fri Feb  5 16:28:39 2021	(r564130)
@@ -0,0 +1,7 @@
+.if !defined(UNITVERSION_MK)
+UNITVERSION_MK= defined
+
+# Define NGINX Unit's version.
+UNIT_VERSION=   1.22.0
+
+.endif	# UNITVERSION_MK