diff options
| author | edwin <edwin@FreeBSD.org> | 2003-10-14 15:13:40 +0800 |
|---|---|---|
| committer | edwin <edwin@FreeBSD.org> | 2003-10-14 15:13:40 +0800 |
| commit | e6fea089011a530bcecfe2ee2dffc0b3c820216c (patch) | |
| tree | 06cdca6b6c261081d8e9c074612d1579593cc8a0 | |
| parent | bd8865f9344192baad17e396e58b79cbc20d5b30 (diff) | |
| download | freebsd-ports-gnome-e6fea089011a530bcecfe2ee2dffc0b3c820216c.tar.gz freebsd-ports-gnome-e6fea089011a530bcecfe2ee2dffc0b3c820216c.tar.zst freebsd-ports-gnome-e6fea089011a530bcecfe2ee2dffc0b3c820216c.zip | |
lang/njs: changing conflicts.
- removing conflict detection with converters/kdesupport11;
- lang/njs and lang/spidermonkey install bin/js
(noted by Oliver Eikemeier <eikemeier@fillmore-labs.com>).
PR: ports/57972
Submitted by: Thierry Thomas <thierry@pompo.net>
| -rw-r--r-- | lang/njs/Makefile | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/lang/njs/Makefile b/lang/njs/Makefile index 4759c1b92c46..8599573ae27e 100644 --- a/lang/njs/Makefile +++ b/lang/njs/Makefile @@ -17,6 +17,8 @@ DISTNAME= js-${PORTVERSION} MAINTAINER= thierry@pompo.net COMMENT= NJS (NGS) is a standalone JavaScript/ECMAScript interpreter +CONFLICTS= js-1.5.* + GNU_CONFIGURE= yes USE_LIBTOOL= yes .if defined(NOPORTDOCS) @@ -30,14 +32,6 @@ MAN1= js.1 jsdas.1 post-extract: @${RM} ${WRKSRC}/docs/js.info* -pre-configure: - @if [ -f ${LOCALBASE}/include/js.h ]; then \ - ${ECHO_MSG} "" ; \ - ${ECHO_MSG} "Conflict: please deinstall the port converters/kdesupport11." ; \ - ${ECHO_MSG} "" ; \ - ${FALSE} ; \ - fi - pre-install: .if defined(NOPORTDOCS) @${REINPLACE_CMD} -e "s:docs micros examples:micros:g" ${WRKSRC}/Makefile |