ports/57972: lang/njs: changing conflicts.

[Thierry Thomas]

>Number:         57972
>Category:       ports
>Synopsis:       lang/njs: changing conflicts.
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Oct 13 12:50:26 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     Thierry Thomas
>Release:        FreeBSD 4.9-RC i386
>Organization:
Kabbale Eros
>Environment:
System: FreeBSD graf.pompo.net 4.9-RC FreeBSD 4.9-RC #0: Mon Oct 6 21:15:52 CEST 2003 thierry at graf.pompo.net:/usr/obj/mntsrc/src/sys/GRAF020727 i386


	
>Description:
	- removing conflict detection with converters/kdesupport11;
	- lang/njs and lang/spidermonkey install bin/js
	(noted by Oliver Eikemeier <eikemeier at fillmore-labs.com>).

>How-To-Repeat:
	N/A.

>Fix:
	Please apply the following patch:

--- njs.diff begins here ---
--- lang/njs/Makefile.orig	Sat Feb 22 22:16:21 2003
+++ lang/njs/Makefile	Mon Oct 13 21:41:10 2003
@@ -17,6 +17,8 @@
 MAINTAINER=	thierry at pompo.net
 COMMENT=	NJS (NGS) is a standalone JavaScript/ECMAScript interpreter
 
+CONFLICTS=	js-1.5.*
+
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 .if defined(NOPORTDOCS)
@@ -29,14 +31,6 @@
 
 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)
--- njs.diff ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: