Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 24 Oct 2024 03:43:08 GMT
From:      Li-Wen Hsu <lwhsu@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 82177cb1ed02 - main - www/unit*: Remove use of DO_NADA
Message-ID:  <202410240343.49O3h8N1098155@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by lwhsu:

URL: https://cgit.FreeBSD.org/ports/commit/?id=82177cb1ed02842a23310cc9d1e8b2ad59707de8

commit 82177cb1ed02842a23310cc9d1e8b2ad59707de8
Author:     Li-Wen Hsu <lwhsu@FreeBSD.org>
AuthorDate: 2024-10-24 03:41:56 +0000
Commit:     Li-Wen Hsu <lwhsu@FreeBSD.org>
CommitDate: 2024-10-24 03:41:56 +0000

    www/unit*: Remove use of DO_NADA
    
    Reviewed by:    osa
    Differential Revision:          https://reviews.freebsd.org/D47225
---
 www/unit-java/Makefile   | 4 ----
 www/unit-perl/Makefile   | 4 ----
 www/unit-php/Makefile    | 4 ----
 www/unit-python/Makefile | 4 ----
 www/unit-ruby/Makefile   | 4 ----
 www/unit-wasm/Makefile   | 4 ----
 www/unit/Makefile        | 2 +-
 7 files changed, 1 insertion(+), 25 deletions(-)

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
@@ -96,8 +96,4 @@ do-install:
 			${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
@@ -29,8 +29,4 @@ do-install:
 	${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
@@ -30,8 +30,4 @@ do-install:
 	${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
@@ -31,8 +31,4 @@ do-install:
 	${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
@@ -33,8 +33,4 @@ do-install:
 	${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
@@ -31,8 +31,4 @@ do-install:
 	${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
@@ -123,7 +123,7 @@ CONFIGURE_ARGS+=--control=unix:${UNIT_SOCK}
 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}



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