From nobody Thu Dec 16 04:12:10 2021 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id CDFEB18EB29E; Thu, 16 Dec 2021 04:12:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JDzGL3MHHz4nLb; Thu, 16 Dec 2021 04:12:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 531E02917D; Thu, 16 Dec 2021 04:12:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BG4CA8i048239; Thu, 16 Dec 2021 04:12:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BG4CAp1048238; Thu, 16 Dec 2021 04:12:10 GMT (envelope-from git) Date: Thu, 16 Dec 2021 04:12:10 GMT Message-Id: <202112160412.1BG4CAp1048238@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Sergey A. Osokin" Subject: git: ca201c660e31 - main - www/unit-*: use more canonical way to configure and build List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: osa X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ca201c660e313da46c4d4a3de79621c990431a9e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639627930; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X+9sE+l1voRXOqAk+n+1nRF0O76cCq5Kkt6k3QQG204=; b=Unqw7MCpAAWCtFkZsXfBGxW19GkMJPmZUPKW3v5Fmr8UBk4jYdKc/N8eYB+8ytlc1jEV98 8W4r/yUtlltKognww6UAyziJ07GxHjf+/Js6Hmg660ZVHdH5p6VwC9YY0T2bkPE7xnMshH 6m8F/7ecn18MMCUPRgl8w25IHSrI6YoRk7GalH7PCi1Id/KwmkZqOLA2/R2Yp5+ijSHYZj kSrywGrKzXCA0awoZQRF3CbYq55PXFpSIqrquImKxim5qatCBMqO6g42JLzmfikFVRBY7V Vt7i6wzYtYuEdOiCyrX9vQE2Iq0zbX0AShBvORIkwb4dkywe0S/9sauCAVr4Wg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639627930; a=rsa-sha256; cv=none; b=OxormYMmKP2D99muoNAWGtry/4GjM8NQI9g7Iautfpe1DsL45ZkgnCUHRKuN65giBHFV5K 4CFjusioTofp3t78ZqO/H+xlKzTIwAcDpret4xETqKOO0uNX1gO7YR5qiUndqjQLamopNi N10pBc0qdqEZC8CSs/N/2LWb8dH4GbMjIOAyOq2tSj+OEDIS/lFkUwUlhR9OmZgjINwqkj oBQM3ITv1X8WVQMUlYvMvf8IYpXK5+GW3WbYAjskKLmzonrLvPrzzQEYEf3R6y+Qi6sHa5 v1Tpqkt/CUFqbA0ThdVa+GEL1nrmik0Xm/24//t5EYMGjAx7oIOWCXMGXcAVRA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by osa: URL: https://cgit.FreeBSD.org/ports/commit/?id=ca201c660e313da46c4d4a3de79621c990431a9e commit ca201c660e313da46c4d4a3de79621c990431a9e Author: Sergey A. Osokin AuthorDate: 2021-12-16 04:04:49 +0000 Commit: Sergey A. Osokin 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 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 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 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 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/