diff options
| author | Edwin Groothuis <edwin@FreeBSD.org> | 2003-10-14 07:13:40 +0000 |
|---|---|---|
| committer | Edwin Groothuis <edwin@FreeBSD.org> | 2003-10-14 07:13:40 +0000 |
| commit | 812dd09f936f24bcb92daad2bd18c99cc19d3a11 (patch) | |
| tree | 3ac22bd4760bebd5e443f8ccb00db438b5cfa598 /lang | |
| parent | update security/samhain: 1.7.11 -> 1.7.12 (diff) | |
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>
Notes
Notes:
svn path=/head/; revision=91139
Diffstat (limited to 'lang')
| -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 |