Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 22 Oct 2020 22:01:41 +0000 (UTC)
From:      "Sergey A. Osokin" <osa@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r553058 - in head/www: . unit unit-java unit-java/files
Message-ID:  <202010222201.09MM1f0o015210@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: osa
Date: Thu Oct 22 22:01:41 2020
New Revision: 553058
URL: https://svnweb.freebsd.org/changeset/ports/553058

Log:
  Add NGINX Unit's Java module.

Added:
  head/www/unit-java/
  head/www/unit-java/Makefile   (contents, props changed)
  head/www/unit-java/distinfo   (contents, props changed)
  head/www/unit-java/files/
  head/www/unit-java/files/patch-auto-modules-java_get_jar   (contents, props changed)
Modified:
  head/www/Makefile
  head/www/unit/Makefile

Modified: head/www/Makefile
==============================================================================
--- head/www/Makefile	Thu Oct 22 21:26:51 2020	(r553057)
+++ head/www/Makefile	Thu Oct 22 22:01:41 2020	(r553058)
@@ -2259,6 +2259,7 @@
     SUBDIR += uchiwa
     SUBDIR += ufdbguard
     SUBDIR += unit
+    SUBDIR += unit-java
     SUBDIR += unit-perl
     SUBDIR += unit-php
     SUBDIR += unit-python

Added: head/www/unit-java/Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/unit-java/Makefile	Thu Oct 22 22:01:41 2020	(r553058)
@@ -0,0 +1,100 @@
+# Created by: Sergey Osokin <osa@FreeBSD.org>
+# $FreeBSD$
+
+MASTER_SITES=	https://unit.nginx.org/download/:unit \
+	https://repo1.maven.org/maven2/io/github/classgraph/classgraph/${CLASSGRAPH_VERSION}/:classgraph \
+	https://repo1.maven.org/maven2/org/apache/tomcat/tomcat-api/${TOMCAT_VERSION}/:api \
+	https://repo1.maven.org/maven2/org/apache/tomcat/tomcat-el-api/${TOMCAT_VERSION}/:elapi \
+	https://repo1.maven.org/maven2/org/apache/tomcat/tomcat-jasper/${TOMCAT_VERSION}/:jasper \
+	https://repo1.maven.org/maven2/org/apache/tomcat/tomcat-jasper-el/${TOMCAT_VERSION}/:jasperel \
+	https://repo1.maven.org/maven2/org/apache/tomcat/tomcat-jsp-api/${TOMCAT_VERSION}/:jsp \
+	https://repo1.maven.org/maven2/org/apache/tomcat/tomcat-juli/${TOMCAT_VERSION}/:juli \
+	https://repo1.maven.org/maven2/org/apache/tomcat/tomcat-servlet-api/${TOMCAT_VERSION}/:servlet \
+	https://repo1.maven.org/maven2/org/apache/tomcat/tomcat-util/${TOMCAT_VERSION}/:tutil \
+	https://repo1.maven.org/maven2/org/apache/tomcat/tomcat-util-scan/${TOMCAT_VERSION}/:utilscan \
+	https://repo1.maven.org/maven2/org/eclipse/jdt/ecj/${ECJ_VERSION}/:ecj \
+	https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-http/${JETTY_VERSION}/:http \
+	https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-server/${JETTY_VERSION}/:server \
+	https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-util/${JETTY_VERSION}/:jutil
+PKGNAMESUFFIX=	-${UNIT_MODNAME}
+DISTFILES=	unit-${UNIT_VERSION}.tar.gz:unit \
+	classgraph-${CLASSGRAPH_VERSION}.jar:classgraph \
+	ecj-${ECJ_VERSION}.jar:ecj \
+	jetty-http-${JETTY_VERSION}.jar:http \
+	jetty-server-${JETTY_VERSION}.jar:server \
+	jetty-util-${JETTY_VERSION}.jar:jutil \
+	tomcat-api-${TOMCAT_VERSION}.jar:api \
+	tomcat-el-api-${TOMCAT_VERSION}.jar:elapi \
+	tomcat-jsp-api-${TOMCAT_VERSION}.jar:jsp \
+	tomcat-jasper-${TOMCAT_VERSION}.jar:jasper \
+	tomcat-jasper-el-${TOMCAT_VERSION}.jar:jasperel \
+	tomcat-juli-${TOMCAT_VERSION}.jar:juli \
+	tomcat-servlet-api-${TOMCAT_VERSION}.jar:servlet \
+	tomcat-util-${TOMCAT_VERSION}.jar:tutil \
+	tomcat-util-scan-${TOMCAT_VERSION}.jar:utilscan
+EXTRACT_ONLY=	unit-${UNIT_VERSION}.tar.gz
+
+DISTINFO_FILE=	${.CURDIR}/distinfo	
+PATCHDIR=	${.CURDIR}/files
+
+COMMENT=	Java module for NGINX Unit
+
+RUN_DEPENDS=	unitd:www/unit
+
+UNIT_MODNAME=	java${JAVA_PORT_VERSION}
+CLASSGRAPH_VERSION=	4.4.11
+ECJ_VERSION=	3.13.102
+JETTY_VERSION=	9.4.12.v20180830
+TOMCAT_VERSION=	9.0.13
+UNIT_VERSION=	1.20.0
+
+PLIST_FILES=	libexec/unit/modules/${UNIT_MODNAME}.unit.so \
+		%%JAVAJARDIR%%/classgraph-4.4.11.jar \
+		%%JAVAJARDIR%%/ecj-3.13.102.jar \
+		%%JAVAJARDIR%%/jetty-http-9.4.12.v20180830.jar \
+		%%JAVAJARDIR%%/jetty-server-9.4.12.v20180830.jar \
+		%%JAVAJARDIR%%/jetty-util-9.4.12.v20180830.jar \
+		%%JAVAJARDIR%%/nginx-unit-jsc-java${JAVA_PORT_VERSION}-1.20.0.jar \
+		%%JAVAJARDIR%%/tomcat-api-9.0.13.jar \
+		%%JAVAJARDIR%%/tomcat-el-api-9.0.13.jar \
+		%%JAVAJARDIR%%/tomcat-jasper-9.0.13.jar \
+		%%JAVAJARDIR%%/tomcat-jasper-el-9.0.13.jar \
+		%%JAVAJARDIR%%/tomcat-jsp-api-9.0.13.jar \
+		%%JAVAJARDIR%%/tomcat-juli-9.0.13.jar \
+		%%JAVAJARDIR%%/tomcat-servlet-api-9.0.13.jar \
+		%%JAVAJARDIR%%/tomcat-util-scan-9.0.13.jar \
+		%%JAVAJARDIR%%/tomcat-util-9.0.13.jar \
+		%%JAVAJARDIR%%/websocket-api-java${JAVA_PORT_VERSION}-1.20.0.jar
+
+USE_JAVA=	yes
+JAVA_VERSION=	8+
+
+USE_RC_SUBR?=	# reset to empty
+
+MASTERDIR=	${.CURDIR}/../unit
+
+# Do not run the sha512 checker because:
+# - it tries to create a checksum file in ${DISTDIR} and in case
+#   of failure build also fails;
+# - the checker can be useful when the NGINX Unit Java module
+#   downloads those jars by itself.
+post-extract:
+	${CP} /dev/null ${WRKSRC}/auto/modules/java_chk_sha512
+
+post-configure:
+	cd ${CONFIGURE_WRKSRC} && \
+	${CONFIGURE_CMD} java --module=${UNIT_MODNAME} \
+		--local-repo=${DISTDIR} \
+		--jars=${JAVAJARDIR}
+
+do-build:
+	cd ${CONFIGURE_WRKSRC} && ${MAKE} ${UNIT_MODNAME}
+
+do-install:
+	cd ${CONFIGURE_WRKSRC} && ${MAKE} ${UNIT_MODNAME}-install DESTDIR=${STAGEDIR}
+
+# Overwrite the target in the ${MASTERDIR}/Makefile
+post-install:
+	@${DO_NADA}
+
+.include "${MASTERDIR}/Makefile"

Added: head/www/unit-java/distinfo
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/unit-java/distinfo	Thu Oct 22 22:01:41 2020	(r553058)
@@ -0,0 +1,31 @@
+TIMESTAMP = 1603377477
+SHA256 (unit-1.20.0.tar.gz) = ee39a801f83aff5dfff94336f688fd9cfbd02fee270edd8711b10be4fe298d32
+SIZE (unit-1.20.0.tar.gz) = 787607
+SHA256 (tomcat-servlet-api-9.0.13.jar) = fa3a1033f9dc667ee9ebd73730c7a77d4d4fc0be308ab9bfce4712bd8b53a230
+SIZE (tomcat-servlet-api-9.0.13.jar) = 282576
+SHA256 (tomcat-el-api-9.0.13.jar) = dca3f1ea1c74d0405dc878756a5220504158e4e12d5fd1f6e04b9e816859736c
+SIZE (tomcat-el-api-9.0.13.jar) = 87515
+SHA256 (tomcat-jsp-api-9.0.13.jar) = adbd132ea8e3fb9e5ae8f4e3e6a7e5f1165334dbaaeef21df448e72d5682240d
+SIZE (tomcat-jsp-api-9.0.13.jar) = 63167
+SHA256 (tomcat-jasper-9.0.13.jar) = 75857eb4f272a0b9ebacc613ac206bbfae2bc0206f4dc436af9e9aef49434b60
+SIZE (tomcat-jasper-9.0.13.jar) = 557374
+SHA256 (tomcat-jasper-el-9.0.13.jar) = c5c4adf83900eb254933ab18bec442050241324143a80339c9a11dafa83d85fe
+SIZE (tomcat-jasper-el-9.0.13.jar) = 167490
+SHA256 (tomcat-juli-9.0.13.jar) = a5dbeb4cb972ab2b48e74ada1248a88baccade811b4c3d1a93b5f2dcdeb405b2
+SIZE (tomcat-juli-9.0.13.jar) = 47122
+SHA256 (tomcat-api-9.0.13.jar) = 90d6dc48bccaeab1c9ffcb745e439344cd4d5c234a9ea33d58a9ef313b186179
+SIZE (tomcat-api-9.0.13.jar) = 11212
+SHA256 (tomcat-util-scan-9.0.13.jar) = 18a13ec3f8d0a1511babf4f97b357f379da5b7efb9a92694b2dfa8aa85067252
+SIZE (tomcat-util-scan-9.0.13.jar) = 208966
+SHA256 (tomcat-util-9.0.13.jar) = 44d57b3a4ea8500fd43cc60c6e07ebd8f2024204fe6c9ac9b03022a5c8835986
+SIZE (tomcat-util-9.0.13.jar) = 165171
+SHA256 (ecj-3.13.102.jar) = e6b938338b7bb12388ca32ba8dfe91c6ab1c56bf5bd8dab6d6e6265fec3b9be3
+SIZE (ecj-3.13.102.jar) = 2769774
+SHA256 (jetty-http-9.4.12.v20180830.jar) = 20547da653be9942cc63f57e632a732608559aebde69753bc7312cfe16e8d9c0
+SIZE (jetty-http-9.4.12.v20180830.jar) = 195664
+SHA256 (jetty-server-9.4.12.v20180830.jar) = 4833644e5c5a09bbddc85f75c53e0c8ed750de120ba248fffd8508028528252d
+SIZE (jetty-server-9.4.12.v20180830.jar) = 609290
+SHA256 (jetty-util-9.4.12.v20180830.jar) = 60ad53e118a3e7d10418b155b9944d90b2e4e4c732e53ef4f419473288d3f48c
+SIZE (jetty-util-9.4.12.v20180830.jar) = 502985
+SHA256 (classgraph-4.4.11.jar) = 8942c74972f682fcc515e7b4d36ffe7962cbb89cc28a24cc28ea764e870b7bd1
+SIZE (classgraph-4.4.11.jar) = 385664

Added: head/www/unit-java/files/patch-auto-modules-java_get_jar
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/unit-java/files/patch-auto-modules-java_get_jar	Thu Oct 22 22:01:41 2020	(r553058)
@@ -0,0 +1,11 @@
+--- auto/modules/java_get_jar.orig	2020-10-22 11:10:42.666358000 -0400
++++ auto/modules/java_get_jar	2020-10-22 11:10:15.914572000 -0400
+@@ -8,7 +8,7 @@
+ # NXT_JAR_LOCAL_REPO=$HOME/.m2/repository/
+ 
+ NXT_JAR_FILE=${NXT_JAR_NAME}-${NXT_JAR_VERSION}.jar
+-NXT_JAR_LOCAL_DIR="${NXT_JAR_LOCAL_REPO}${NXT_JAR_NAMESPACE}${NXT_JAR_NAME}/${NXT_JAR_VERSION}"
++NXT_JAR_LOCAL_DIR="${NXT_JAR_LOCAL_REPO}"
+ NXT_JAR_LOCAL="${NXT_JAR_LOCAL_DIR}/${NXT_JAR_FILE}"
+ NXT_JAR_LOCAL_TMP="${NXT_JAR_LOCAL_DIR}/.${NXT_JAR_FILE}.$$"
+ NXT_JAR_URL=${NXT_JAR_REPO}${NXT_JAR_NAMESPACE}${NXT_JAR_NAME}/${NXT_JAR_VERSION}/${NXT_JAR_FILE}

Modified: head/www/unit/Makefile
==============================================================================
--- head/www/unit/Makefile	Thu Oct 22 21:26:51 2020	(r553057)
+++ head/www/unit/Makefile	Thu Oct 22 22:01:41 2020	(r553058)
@@ -4,7 +4,7 @@
 PORTNAME=	unit
 PORTVERSION=	1.20.0
 CATEGORIES=	www
-MASTER_SITES=	https://unit.nginx.org/download/
+MASTER_SITES?=	https://unit.nginx.org/download/
 
 MAINTAINER=	osa@FreeBSD.org
 COMMENT?=	Dynamic web application server



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202010222201.09MM1f0o015210>