svn commit: r553424 - in head/lang: cjs spidermonkey17 spidermonkey185 spidermonkey24

[Alexey Dokuchaev]

Author: danfe
Date: Tue Oct 27 08:11:23 2020
New Revision: 553424
URL: https://svnweb.freebsd.org/changeset/ports/553424

Log:
  GC outdated conflicts: lang/njs was removed on 2011-06-09 and
  CONFLICTS_BUILD=spidermonkey17 does not reflect reality these
  days, if it ever did.
  
  PR:	222289

Modified:
  head/lang/cjs/Makefile
  head/lang/spidermonkey17/Makefile
  head/lang/spidermonkey185/Makefile
  head/lang/spidermonkey24/Makefile

Modified: head/lang/cjs/Makefile
==============================================================================
--- head/lang/cjs/Makefile	Tue Oct 27 07:57:35 2020	(r553423)
+++ head/lang/cjs/Makefile	Tue Oct 27 08:11:23 2020	(r553424)
@@ -14,8 +14,6 @@ BUILD_DEPENDS=	gnome-autogen.sh:devel/gnome-common
 LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib \
 		libmozjs-24.so:lang/spidermonkey24
 
-CONFLICTS_BUILD=spidermonkey17-1.7.*
-
 USES=		autoreconf compiler:c11 gettext gmake gnome libtool pathfix \
 		pkgconfig python:build shebangfix
 USE_GNOME=	cairo glib20 gnomeprefix introspection:build

Modified: head/lang/spidermonkey17/Makefile
==============================================================================
--- head/lang/spidermonkey17/Makefile	Tue Oct 27 07:57:35 2020	(r553423)
+++ head/lang/spidermonkey17/Makefile	Tue Oct 27 08:11:23 2020	(r553424)
@@ -13,8 +13,6 @@ COMMENT=	Standalone JavaScript interpreter from the Mo
 
 LIB_DEPENDS=	libnspr4.so:devel/nspr
 
-CONFLICTS=	njs-[0-9]*
-
 MAKE_ARGS+=	JS_THREADSAFE=YES \
 		PROG_LIBS="-lreadline -lncurses -lm -lpthread" \
 		LDFLAGS="-L${LOCALBASE}/lib"

Modified: head/lang/spidermonkey185/Makefile
==============================================================================
--- head/lang/spidermonkey185/Makefile	Tue Oct 27 07:57:35 2020	(r553423)
+++ head/lang/spidermonkey185/Makefile	Tue Oct 27 08:11:23 2020	(r553424)
@@ -15,8 +15,6 @@ BUILD_DEPENDS=		zip:archivers/zip \
 			autoconf-2.13:devel/autoconf213
 LIB_DEPENDS=		libnspr4.so:devel/nspr
 
-CONFLICTS=		njs-[0-9]*
-
 USES=			gmake pathfix perl5 pkgconfig python:2.7,build
 GNU_CONFIGURE=		yes
 USE_LDCONFIG=		yes

Modified: head/lang/spidermonkey24/Makefile
==============================================================================
--- head/lang/spidermonkey24/Makefile	Tue Oct 27 07:57:35 2020	(r553423)
+++ head/lang/spidermonkey24/Makefile	Tue Oct 27 08:11:23 2020	(r553424)
@@ -15,8 +15,6 @@ COMMENT=		Standalone JavaScript based from Mozilla 24-
 BUILD_DEPENDS=		zip:archivers/zip
 LIB_DEPENDS=		libnspr4.so:devel/nspr
 
-CONFLICTS=		njs-[0-9]*
-
 GNU_CONFIGURE=		yes
 USES=			compiler:c++11-lib gmake pathfix perl5 python:2.7,build \
 			readline tar:bzip2