Index: head/devel/libunit/Makefile =================================================================== --- head/devel/libunit/Makefile (revision 564129) +++ head/devel/libunit/Makefile (revision 564130) @@ -1,46 +1,47 @@ # Created by: Sergey A. Osokin # $FreeBSD$ PORTNAME= libunit -PORTVERSION= 1.22.0 +PORTVERSION= ${UNIT_VERSION} MASTER_SITES?= https://unit.nginx.org/download/ DISTNAME= unit-${PORTVERSION} MAINTAINER= osa@FreeBSD.org COMMENT= Development kit for dynamic web application server LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE CATEGORIES= devel www USES+= compiler:c11 cpe CPE_VENDOR= nginx CPE_PRODUCT= unit HAS_CONFIGURE= yes CONFIGURE_ARGS= --prefix=${PREFIX} \ --ld-opt="-L${LOCALBASE}/lib" \ --no-regex PLIST_FILES+= include/nxt_auto_config.h \ include/nxt_unit_field.h \ include/nxt_unit_request.h \ include/nxt_unit_response.h \ include/nxt_unit_sptr.h \ include/nxt_unit_typedefs.h \ include/nxt_unit_websocket.h \ include/nxt_unit.h \ include/nxt_version.h \ include/nxt_websocket_header.h \ lib/libunit.a do-build: @cd ${WRKSRC} && ${MAKE} build/libunit.a do-install: ${MAKE} -C ${WRKSRC} libunit-install DESTDIR=${STAGEDIR} +.include "../../www/unit/version.mk" .include Index: head/www/unit/Makefile =================================================================== --- head/www/unit/Makefile (revision 564129) +++ head/www/unit/Makefile (revision 564130) @@ -1,124 +1,125 @@ # Created by: Sergey A. Osokin # $FreeBSD$ PORTNAME= unit -PORTVERSION= 1.22.0 +PORTVERSION= ${UNIT_VERSION} PORTREVISION= 1 CATEGORIES= www MASTER_SITES?= https://unit.nginx.org/download/ MAINTAINER= osa@FreeBSD.org COMMENT?= Dynamic web application server LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE USES+= compiler:c11 cpe CPE_VENDOR= nginx CPE_PRODUCT= unit OPTIONS_DEFINE?= \ DEBUG \ IPV6 \ SSL \ UNIXSOCK OPTIONS_DEFAULT?= IPV6 PCRE2 SSL UNIXSOCK OPTIONS_RADIO+= REGEX OPTIONS_RADIO_REGEX= NOPCRE PCRE PCRE2 DEBUG_DESC= Enable debug logging DEVKIT_DESC= Install headers and library REGEX_DESC= Support regular expressions NOPCRE_DESC= No support for Regular Expressions PCRE_DESC= Regular Expressions via devel/pcre PCRE2_DESC= Regular Expressions via devel/pcre2 SSL_DESC= Enable SSL/TLS UNIXSOCK_DESC= Enable unix sockets .include HAS_CONFIGURE= yes UNIT_VARDIR?= /var UNIT_DBDIR?= ${UNIT_VARDIR}/db/${PORTNAME} UNIT_LOGDIR?= ${UNIT_VARDIR}/log/${PORTNAME} UNIT_LOGFILE?= ${UNIT_LOGDIR}/${PORTNAME}.log UNIT_PIDFILE?= ${UNIT_RUNDIR}/${PORTNAME}.pid UNIT_RUNDIR?= ${UNIT_VARDIR}/run/unit UNIT_SOCK?= ${UNIT_RUNDIR}/control.unit.sock UNIT_TMPDIR?= ${UNIT_VARDIR}/tmp/unit CONFIGURE_ARGS= --prefix=${PREFIX} \ --ld-opt="-L${LOCALBASE}/lib" \ --log=${UNIT_LOGFILE} \ --modules=libexec/unit/modules \ --pid=${UNIT_PIDFILE} \ --state=${UNIT_DBDIR} \ --tmp=${UNIT_TMPDIR} \ --user=${WWWOWN} --group=${WWWGRP} USERS?= ${WWWOWN} GROUPS?=${WWWGRP} ALL_TARGET= PLIST_DIRS?= libexec/unit/modules \ libexec/unit PLIST_FILES?= sbin/unitd USE_RC_SUBR?= unitd SUB_LIST= PREFIX=${PREFIX} \ UNIT_PIDFILE=${UNIT_PIDFILE} \ UNIT_SOCK=${UNIT_SOCK} \ UNIT_TMPDIR=${UNIT_TMPDIR} \ WWWOWN=${WWWOWN} \ WWWGRP=${WWWGRP} .if ${PORT_OPTIONS:MDEBUG} CONFIGURE_ARGS+=--debug .endif .if empty(PORT_OPTIONS:MIPV6) CONFIGURE_ARGS+=--no-ipv6 .endif .if ${PORT_OPTIONS:MNOPCRE} CONFIGURE_ARGS+=--no-regex .endif .if ${PORT_OPTIONS:MPCRE} CONFIGURE_ARGS+=--no-pcre2 LIB_DEPENDS+= libpcre.so:devel/pcre .endif .if ${PORT_OPTIONS:MPCRE2} LIB_DEPENDS+= libpcre2-8.so:devel/pcre2 .endif .if ${PORT_OPTIONS:MSSL} CONFIGURE_ARGS+=--openssl USES+= ssl .endif .if empty(PORT_OPTIONS:MUNIXSOCK) CONFIGURE_ARGS+=--no-unix-sockets .else CONFIGURE_ARGS+=--control=unix:${UNIT_SOCK} .endif .if !target(post-install) post-install: ${MKDIR} ${STAGEDIR}${UNIT_DBDIR} ${MKDIR} ${STAGEDIR}${UNIT_LOGDIR} ${MKDIR} ${STAGEDIR}${UNIT_RUNDIR} ${MKDIR} ${STAGEDIR}${UNIT_TMPDIR} ${ECHO_CMD} @dir ${UNIT_DBDIR} >> ${TMPPLIST} ${ECHO_CMD} @dir ${UNIT_LOGDIR} >> ${TMPPLIST} ${ECHO_CMD} @dir ${UNIT_RUNDIR} >> ${TMPPLIST} ${ECHO_CMD} @dir ${UNIT_TMPDIR} >> ${TMPPLIST} ${MKDIR} ${STAGEDIR}${PREFIX}/libexec/unit/modules .endif +.include "../../www/unit/version.mk" .include Index: head/www/unit/version.mk =================================================================== --- head/www/unit/version.mk (nonexistent) +++ head/www/unit/version.mk (revision 564130) @@ -0,0 +1,7 @@ +.if !defined(UNITVERSION_MK) +UNITVERSION_MK= defined + +# Define NGINX Unit's version. +UNIT_VERSION= 1.22.0 + +.endif # UNITVERSION_MK Property changes on: head/www/unit/version.mk ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/unit-java/Makefile =================================================================== --- head/www/unit-java/Makefile (revision 564129) +++ head/www/unit-java/Makefile (revision 564130) @@ -1,101 +1,100 @@ # Created by: Sergey Osokin # $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.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 \ %%JAVAJARDIR%%/jetty-http-${JETTY_VERSION}.jar \ %%JAVAJARDIR%%/jetty-server-${JETTY_VERSION}.jar \ %%JAVAJARDIR%%/jetty-util-${JETTY_VERSION}.jar \ %%JAVAJARDIR%%/nginx-unit-jsc-java${JAVA_PORT_VERSION}-${UNIT_VERSION}.jar \ %%JAVAJARDIR%%/tomcat-api-${TOMCAT_VERSION}.jar \ %%JAVAJARDIR%%/tomcat-el-api-${TOMCAT_VERSION}.jar \ %%JAVAJARDIR%%/tomcat-jasper-${TOMCAT_VERSION}.jar \ %%JAVAJARDIR%%/tomcat-jasper-el-${TOMCAT_VERSION}.jar \ %%JAVAJARDIR%%/tomcat-jsp-api-${TOMCAT_VERSION}.jar \ %%JAVAJARDIR%%/tomcat-juli-${TOMCAT_VERSION}.jar \ %%JAVAJARDIR%%/tomcat-servlet-api-${TOMCAT_VERSION}.jar \ %%JAVAJARDIR%%/tomcat-util-${TOMCAT_VERSION}.jar \ %%JAVAJARDIR%%/tomcat-util-scan-${TOMCAT_VERSION}.jar \ %%JAVAJARDIR%%/websocket-api-java${JAVA_PORT_VERSION}-${UNIT_VERSION}.jar \ libexec/unit/modules/${UNIT_MODNAME}.unit.so USE_JAVA= yes JAVA_VERSION= 8+ #JAVA_VERSION= 8 11 12 13 14 15 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"