git: ca201c660e31 - main - www/unit-*: use more canonical way to configure and build
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 16 Dec 2021 04:12:10 UTC
The branch main has been updated by osa:
URL: https://cgit.FreeBSD.org/ports/commit/?id=ca201c660e313da46c4d4a3de79621c990431a9e
commit ca201c660e313da46c4d4a3de79621c990431a9e
Author: Sergey A. Osokin <osa@FreeBSD.org>
AuthorDate: 2021-12-16 04:04:49 +0000
Commit: Sergey A. Osokin <osa@FreeBSD.org>
CommitDate: 2021-12-16 04:04:49 +0000
www/unit-*: use more canonical way to configure and build
NGINX Unit modules ports depend on www/unit and require to run
an additional configure command for a specific version of a
programming language. This change make those commands more
consistent with configure and make parameters for the Unit
binary and its modules.
Bump PORTREVISIONs.
---
www/unit-java/Makefile | 13 ++++++++++---
www/unit-perl/Makefile | 8 ++++++--
www/unit-php/Makefile | 10 +++++++---
www/unit-python/Makefile | 10 +++++++---
www/unit-ruby/Makefile | 8 ++++++--
5 files changed, 36 insertions(+), 13 deletions(-)
diff --git a/www/unit-java/Makefile b/www/unit-java/Makefile
index 31bdc74473b7..c2be7d8b0a9c 100644
--- a/www/unit-java/Makefile
+++ b/www/unit-java/Makefile
@@ -16,6 +16,7 @@ MASTER_SITES= https://unit.nginx.org/download/:unit \
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}
+PORTREVISION= 1
DISTFILES= unit-${UNIT_VERSION}.tar.gz:unit \
classgraph-${CLASSGRAPH_VERSION}.jar:classgraph \
ecj-${ECJ_VERSION}.jar:ecj \
@@ -82,15 +83,21 @@ post-extract:
post-configure:
cd ${CONFIGURE_WRKSRC} && \
- ${CONFIGURE_CMD} java --module=${UNIT_MODNAME} \
+ ${SETENV} ${CONFIGURE_ENV} ${CONFIGURE_CMD} java \
+ --module=${UNIT_MODNAME} \
--local-repo=${DISTDIR} \
--jars=${JAVAJARDIR}
do-build:
- cd ${CONFIGURE_WRKSRC} && ${MAKE} ${UNIT_MODNAME}
+ cd ${CONFIGURE_WRKSRC} && \
+ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \
+ ${MAKEFILE} ${MAKE_ARGS} ${UNIT_MODNAME}
do-install:
- cd ${CONFIGURE_WRKSRC} && ${MAKE} ${UNIT_MODNAME}-install DESTDIR=${STAGEDIR}
+ 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:
diff --git a/www/unit-perl/Makefile b/www/unit-perl/Makefile
index 725afb62fefb..d62dfe12ffd7 100644
--- a/www/unit-perl/Makefile
+++ b/www/unit-perl/Makefile
@@ -1,6 +1,7 @@
# Created by: Sergey Osokin <osa@FreeBSD.org>
PKGNAMESUFFIX= -${UNIT_MODNAME}
+PORTREVISION= 1
UNIT_MODNAME= perl${PERL_VER}
@@ -18,10 +19,13 @@ MASTERDIR= ${.CURDIR}/../unit
post-configure:
cd ${CONFIGURE_WRKSRC} && \
- ${CONFIGURE_CMD} perl --module=${UNIT_MODNAME}
+ ${SETENV} ${CONFIGURE_ENV} ${CONFIGURE_CMD} perl \
+ --module=${UNIT_MODNAME}
do-build:
- cd ${CONFIGURE_WRKSRC} && ${MAKE} ${UNIT_MODNAME}
+ cd ${CONFIGURE_WRKSRC} && \
+ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \
+ ${MAKEFILE} ${MAKE_ARGS} ${UNIT_MODNAME}
do-install:
${MKDIR} ${STAGEDIR}${PREFIX}/libexec/unit/modules/
diff --git a/www/unit-php/Makefile b/www/unit-php/Makefile
index 2687b25da951..a662d2b30f32 100644
--- a/www/unit-php/Makefile
+++ b/www/unit-php/Makefile
@@ -1,6 +1,7 @@
# Created by: Li-Wen Hsu <lwhsu@FreeBSD.org>
PKGNAMESUFFIX= ${PHP_PKGNAMESUFFIX}
+PORTREVISION= 1
UNIT_MODNAME= php${PHP_VER}
@@ -18,11 +19,14 @@ MASTERDIR= ${.CURDIR}/../unit
post-configure:
cd ${CONFIGURE_WRKSRC} && \
- ${CONFIGURE_CMD} php --lib-path=${LOCALBASE}/lib \
- --module=${UNIT_MODNAME}
+ ${SETENV} ${CONFIGURE_ENV} ${CONFIGURE_CMD} php \
+ --lib-path=${LOCALBASE}/lib \
+ --module=${UNIT_MODNAME}
do-build:
- cd ${CONFIGURE_WRKSRC} && ${MAKE} ${UNIT_MODNAME}
+ cd ${CONFIGURE_WRKSRC} && \
+ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \
+ ${MAKEFILE} ${MAKE_ARGS} ${UNIT_MODNAME}
do-install:
${MKDIR} ${STAGEDIR}${PREFIX}/libexec/unit/modules/
diff --git a/www/unit-python/Makefile b/www/unit-python/Makefile
index 60968e67d707..7fde75ab0906 100644
--- a/www/unit-python/Makefile
+++ b/www/unit-python/Makefile
@@ -1,6 +1,7 @@
# Created by: Li-Wen Hsu <lwhsu@FreeBSD.org>
PKGNAMESUFFIX= -${UNIT_MODNAME}
+PORTREVISION= 1
UNIT_MODNAME= python${PYTHON_SUFFIX}
@@ -19,11 +20,14 @@ MASTERDIR= ${.CURDIR}/../unit
post-configure:
cd ${CONFIGURE_WRKSRC} && \
- ${CONFIGURE_CMD} python --module=${UNIT_MODNAME} \
- --config=${PYTHON_CMD}-config
+ ${SETENV} ${CONFIGURE_ENV} ${CONFIGURE_CMD} python \
+ --module=${UNIT_MODNAME} \
+ --config=${PYTHON_CMD}-config
do-build:
- cd ${CONFIGURE_WRKSRC} && ${MAKE} ${UNIT_MODNAME}
+ cd ${CONFIGURE_WRKSRC} && \
+ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \
+ ${MAKEFILE} ${MAKE_ARGS} ${UNIT_MODNAME}
do-install:
${MKDIR} ${STAGEDIR}${PREFIX}/libexec/unit/modules/
diff --git a/www/unit-ruby/Makefile b/www/unit-ruby/Makefile
index 0afdf124f385..f4afe176045c 100644
--- a/www/unit-ruby/Makefile
+++ b/www/unit-ruby/Makefile
@@ -1,6 +1,7 @@
# Created by: Sergey Osokin <osa@FreeBSD.org>
PKGNAMESUFFIX= -${UNIT_MODNAME}
+PORTREVISION= 1
UNIT_MODNAME= ruby${RUBY_VER}
@@ -19,10 +20,13 @@ MASTERDIR= ${.CURDIR}/../unit
post-configure:
cd ${CONFIGURE_WRKSRC} && \
- ${CONFIGURE_CMD} ruby --module=${UNIT_MODNAME}
+ ${SETENV} ${CONFIGURE_ENV} ${CONFIGURE_CMD} ruby \
+ --module=${UNIT_MODNAME}
do-build:
- cd ${CONFIGURE_WRKSRC} && ${MAKE} ${UNIT_MODNAME}
+ cd ${CONFIGURE_WRKSRC} && \
+ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \
+ ${MAKEFILE} ${MAKE_ARGS} ${UNIT_MODNAME}
do-install:
${MKDIR} ${STAGEDIR}${PREFIX}/libexec/unit/modules/