git: f70a105964fe - main - lang/njs: resolve conflict
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 11 Mar 2022 21:49:58 UTC
The branch main has been updated by osa:
URL: https://cgit.FreeBSD.org/ports/commit/?id=f70a105964fe1479d0835f0893d8789dbef27dce
commit f70a105964fe1479d0835f0893d8789dbef27dce
Author: Sergey A. Osokin <osa@FreeBSD.org>
AuthorDate: 2022-03-11 21:45:26 +0000
Commit: Sergey A. Osokin <osa@FreeBSD.org>
CommitDate: 2022-03-11 21:45:26 +0000
lang/njs: resolve conflict
www/nginx installs njs command line utility into ${PREFIX}/sbin,
so no conflict.
Bump PORTREVISION.
---
lang/njs/Makefile | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/lang/njs/Makefile b/lang/njs/Makefile
index 5f9c3a1a63e4..b2afb43afb35 100644
--- a/lang/njs/Makefile
+++ b/lang/njs/Makefile
@@ -2,8 +2,8 @@
PORTNAME= njs
DISTVERSION= 0.7.2
+PORTREVISION= 1
CATEGORIES= lang www
-#DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= osa@FreeBSD.org
COMMENT= NGINX JavaScript command line utility
@@ -13,8 +13,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
USES= cpe
-CONFLICTS_INSTALL= www/nginx
-
CPE_VENDOR= f5
CPE_PRODUCT= njs