diff --git a/www/unit-java/Makefile b/www/unit-java/Makefile index abb77bceba9d..acc75a49b8b1 100644 --- a/www/unit-java/Makefile +++ b/www/unit-java/Makefile @@ -1,103 +1,99 @@ 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.175 ECJ_VERSION= 3.26.0 JETTY_VERSION= 9.4.56.v20240826 TOMCAT_VERSION= 9.0.93 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} && \ ${SETENV} ${CONFIGURE_ENV} ${CONFIGURE_CMD} java \ --module=${UNIT_MODNAME} \ --local-repo=${DISTDIR} \ --jars=${JAVAJARDIR} do-build: cd ${CONFIGURE_WRKSRC} && \ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \ ${MAKEFILE} ${MAKE_ARGS} ${UNIT_MODNAME} do-install: cd ${CONFIGURE_WRKSRC} && \ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \ ${MAKEFILE} ${MAKE_ARGS} \ ${UNIT_MODNAME}-install DESTDIR=${STAGEDIR} -# Overwrite the target in the ${MASTERDIR}/Makefile -post-install: - @${DO_NADA} - .include "${MASTERDIR}/Makefile" diff --git a/www/unit-perl/Makefile b/www/unit-perl/Makefile index d24b5506ca0c..2c0ed4d5d7ab 100644 --- a/www/unit-perl/Makefile +++ b/www/unit-perl/Makefile @@ -1,36 +1,32 @@ PKGNAMESUFFIX= -${UNIT_MODNAME} UNIT_MODNAME= perl${PERL_VER} COMMENT= Perl module for NGINX Unit PLIST_FILES= libexec/unit/modules/${UNIT_MODNAME}.unit.so RUN_DEPENDS= unitd:www/unit USES= perl5 USE_RC_SUBR?= # reset to empty MASTERDIR= ${.CURDIR}/../unit post-configure: cd ${CONFIGURE_WRKSRC} && \ ${SETENV} ${CONFIGURE_ENV} ${CONFIGURE_CMD} perl \ --module=${UNIT_MODNAME} do-build: cd ${CONFIGURE_WRKSRC} && \ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \ ${MAKEFILE} ${MAKE_ARGS} ${UNIT_MODNAME} do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/libexec/unit/modules/ ${INSTALL_LIB} ${WRKSRC}/build/lib/unit/modules/${UNIT_MODNAME}.unit.so \ ${STAGEDIR}${PREFIX}/libexec/unit/modules/ -# Overwrite the target in the ${MASTERDIR}/Makefile -post-install: - @${DO_NADA} - .include "${MASTERDIR}/Makefile" diff --git a/www/unit-php/Makefile b/www/unit-php/Makefile index 34bd9a876100..b9656fd51fa4 100644 --- a/www/unit-php/Makefile +++ b/www/unit-php/Makefile @@ -1,37 +1,33 @@ PKGNAMESUFFIX= ${PHP_PKGNAMESUFFIX} UNIT_MODNAME= php${PHP_VER} COMMENT= PHP module for NGINX Unit PLIST_FILES= libexec/unit/modules/${UNIT_MODNAME}.unit.so RUN_DEPENDS= unitd:www/unit USES= php:build,embed,flavors USE_RC_SUBR= # reset to empty MASTERDIR= ${.CURDIR}/../unit post-configure: cd ${CONFIGURE_WRKSRC} && \ ${SETENV} ${CONFIGURE_ENV} ${CONFIGURE_CMD} php \ --lib-path=${LOCALBASE}/lib \ --module=${UNIT_MODNAME} do-build: cd ${CONFIGURE_WRKSRC} && \ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \ ${MAKEFILE} ${MAKE_ARGS} ${UNIT_MODNAME} do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/libexec/unit/modules/ ${INSTALL_LIB} ${WRKSRC}/build/lib/unit/modules/${UNIT_MODNAME}.unit.so \ ${STAGEDIR}${PREFIX}/libexec/unit/modules/ -# Overwrite the target in the ${MASTERDIR}/Makefile -post-install: - @${DO_NADA} - .include "${MASTERDIR}/Makefile" diff --git a/www/unit-python/Makefile b/www/unit-python/Makefile index ecf799d71392..471e6248d056 100644 --- a/www/unit-python/Makefile +++ b/www/unit-python/Makefile @@ -1,38 +1,34 @@ PKGNAMESUFFIX= -${UNIT_MODNAME} UNIT_MODNAME= python${PYTHON_SUFFIX} COMMENT= Python module for NGINX Unit USES= python:3.8-3.11 gettext-runtime USE_PYTHON= flavors PLIST_FILES= libexec/unit/modules/${UNIT_MODNAME}.unit.so RUN_DEPENDS= unitd:www/unit USE_RC_SUBR?= # reset to empty MASTERDIR= ${.CURDIR}/../unit post-configure: cd ${CONFIGURE_WRKSRC} && \ ${SETENV} ${CONFIGURE_ENV} ${CONFIGURE_CMD} python \ --module=${UNIT_MODNAME} \ --config=${PYTHON_CMD}-config do-build: cd ${CONFIGURE_WRKSRC} && \ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \ ${MAKEFILE} ${MAKE_ARGS} ${UNIT_MODNAME} do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/libexec/unit/modules/ ${INSTALL_LIB} ${WRKSRC}/build/lib/unit/modules/${UNIT_MODNAME}.unit.so \ ${STAGEDIR}${PREFIX}/libexec/unit/modules/ -# Overwrite the target in the ${MASTERDIR}/Makefile -post-install: - @${DO_NADA} - .include "${MASTERDIR}/Makefile" diff --git a/www/unit-ruby/Makefile b/www/unit-ruby/Makefile index d943980b3645..ff2884c56d7c 100644 --- a/www/unit-ruby/Makefile +++ b/www/unit-ruby/Makefile @@ -1,40 +1,36 @@ PKGNAMESUFFIX= -${UNIT_MODNAME} UNIT_MODNAME= ruby${RUBY_VER} COMMENT= Ruby module for NGINX Unit RUN_DEPENDS= rackup:www/rubygem-rackup \ unitd:www/unit PLIST_FILES= libexec/unit/modules/${UNIT_MODNAME}.unit.so USES= ruby CFLAGS+= -fdeclspec USE_RC_SUBR?= # reset to empty MASTERDIR= ${.CURDIR}/../unit post-configure: cd ${CONFIGURE_WRKSRC} && \ ${SETENV} ${CONFIGURE_ENV} ${CONFIGURE_CMD} ruby \ --ruby=ruby${RUBY_VER:S|.||} \ --module=${UNIT_MODNAME} do-build: cd ${CONFIGURE_WRKSRC} && \ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \ ${MAKEFILE} ${MAKE_ARGS} ${UNIT_MODNAME} do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/libexec/unit/modules/ ${INSTALL_LIB} ${WRKSRC}/build/lib/unit/modules/${UNIT_MODNAME}.unit.so \ ${STAGEDIR}${PREFIX}/libexec/unit/modules/ -# Overwrite the target in the ${MASTERDIR}/Makefile -post-install: - @${DO_NADA} - .include "${MASTERDIR}/Makefile" diff --git a/www/unit-wasm/Makefile b/www/unit-wasm/Makefile index 7dc4e2c28bdb..2c0c15bf2cd7 100644 --- a/www/unit-wasm/Makefile +++ b/www/unit-wasm/Makefile @@ -1,38 +1,34 @@ PKGNAMESUFFIX= -${UNIT_MODNAME} UNIT_MODNAME= wasm COMMENT= WASM module for NGINX Unit PLIST_FILES= libexec/unit/modules/${UNIT_MODNAME}.unit.so RUN_DEPENDS= unitd:www/unit LIB_DEPENDS= libwasmtime.so:devel/libwasmtime USE_RC_SUBR?= # reset to empty MASTERDIR= ${.CURDIR}/../unit post-configure: cd ${CONFIGURE_WRKSRC} && \ ${SETENV} ${CONFIGURE_ENV} ${CONFIGURE_CMD} wasm \ --module=${UNIT_MODNAME} \ --include-path=${PREFIX}/include \ --lib-path=${PREFIX}/lib do-build: cd ${CONFIGURE_WRKSRC} && \ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \ ${MAKEFILE} ${MAKE_ARGS} ${UNIT_MODNAME} do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/libexec/unit/modules/ ${INSTALL_LIB} ${WRKSRC}/build/lib/unit/modules/${UNIT_MODNAME}.unit.so \ ${STAGEDIR}${PREFIX}/libexec/unit/modules/ -# Overwrite the target in the ${MASTERDIR}/Makefile -post-install: - @${DO_NADA} - .include "${MASTERDIR}/Makefile" diff --git a/www/unit/Makefile b/www/unit/Makefile index 43a4c7744739..4dec0a08a86e 100644 --- a/www/unit/Makefile +++ b/www/unit/Makefile @@ -1,142 +1,142 @@ PORTNAME= unit PORTVERSION= ${UNIT_VERSION} PORTREVISION= 1 CATEGORIES= www MASTER_SITES?= https://unit.nginx.org/download/ MAINTAINER= osa@FreeBSD.org COMMENT?= Dynamic web application server WWW= https://unit.nginx.org LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE USES+= compiler:c11 cpe CPE_VENDOR= nginx CPE_PRODUCT= unit OPTIONS_DEFINE?= \ DEBUG \ IPV6 \ NJS \ SSL \ UNIXSOCK OPTIONS_DEFAULT?= IPV6 PCRE2 SSL UNIXSOCK OPTIONS_RADIO+= REGEX OPTIONS_RADIO_REGEX= NOPCRE PCRE PCRE2 DEBUG_DESC= Enable debug logging REGEX_DESC= Support regular expressions NJS_DESC= Enable NGINX JavaScript 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} \ --logdir=${UNIT_LOGDIR} \ --modulesdir=${PREFIX}/libexec/unit/modules \ --pid=${UNIT_PIDFILE} \ --runstatedir=${UNIT_RUNDIR} \ --statedir=${UNIT_DBDIR} \ --tmpdir=${UNIT_TMPDIR} \ --user=${WWWOWN} --group=${WWWGRP} USERS?= ${WWWOWN} GROUPS?=${WWWGRP} ALL_TARGET= PLIST_DIRS?= libexec/unit/modules \ libexec/unit PLIST_FILES?= sbin/unitd \ share/man/man8/unitd.8.gz 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:MNJS} USES+= pkgconfig BUILD_DEPENDS+= ${LOCALBASE}/lib/libnjs.a:devel/libnjs CONFIGURE_ARGS+=--njs \ --cc-opt="-I${LOCALBASE}/include" \ --ld-opt="-L${LOCALBASE}/lib" .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 defined(UNIT_MODNAME) && ${UNIT_MODNAME:Mperl*} # Fix build failure on clang >= 12 CFLAGS+= -Wno-compound-token-split-by-macro .endif -.if !target(post-install) +.if !defined(UNIT_MODNAME) 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 ${INSTALL_MAN} ${WRKSRC}/build/share/man/man8/unitd.8 \ ${STAGEDIR}${PREFIX}/share/man/man8 .endif .include "../../www/unit/version.mk" .include