remove readline support per pkg/28829. readline and spice licenses were

not compatible.

4 files changed, 14 insertions, 11 deletions

diff --git a/cad/spice/Makefile b/cad/spice/Makefile
index 421262a83e5..2151f9314f5 100644
--- a/cad/spice/Makefile
+++ b/cad/spice/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.27 2004/12/03 13:37:48 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.28 2005/01/11 22:26:01 dmcmahill Exp $
 # FreeBSD Id: Makefile,v 1.10 1998/06/08 09:21:37 tg Exp
 #
 
 DISTNAME=	sp3f4.kit
 PKGNAME=	spice-3f5.1
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	cad
 MASTER_SITES=	ftp://ic.eecs.berkeley.edu/pub/Spice3/
 EXTRACT_SUFX=   .tar.Z
@@ -13,12 +13,14 @@ MAINTAINER=	dmcmahill@NetBSD.org
 HOMEPAGE=	http://bwrc.eecs.berkeley.edu/Classes/IcBook/SPICE/
 COMMENT=	General-purpose circuit simulation program
 
-BUILDLINK_DEPENDS.readline=	readline>=4.0
 
 WRKSRC=			${WRKDIR}
 USE_BUILDLINK3=		yes
 USE_X11=		# defined
-USE_GNU_READLINE=	uses rl_* interface
+# GPL license used by GNU readline is not compatible
+# with 4 clause BSD license used by spice.
+#BUILDLINK_DEPENDS.readline=	readline>=4.0
+#USE_GNU_READLINE=	uses rl_* interface
 
 # documentation in ftp://ic.eecs.berkeley.edu/pub/Spice3/um.3f3.ps
 
@@ -64,5 +66,5 @@ post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/spice3
 	${INSTALL_DATA} ${WRKSRC}/examples/*.cir ${PREFIX}/share/examples/spice3
 
-.include "../../devel/readline/buildlink3.mk"
+#.include "../../devel/readline/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/cad/spice/distinfo b/cad/spice/distinfo
index e52bf743bc6..59ccd914af1 100644
--- a/cad/spice/distinfo
+++ b/cad/spice/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.4 2002/09/23 09:28:47 jlam Exp $
+$NetBSD: distinfo,v 1.5 2005/01/11 22:26:01 dmcmahill Exp $
 
 SHA1 (sp3f4.kit.tar.Z) = bded1e078d0acfef090117490a7ac8a57887f39e
 Size (sp3f4.kit.tar.Z) = 2086528 bytes
 SHA1 (patch-aa) = 35d8d9ecfb2beaa54e0763197b551d5e26fc7f4e
 SHA1 (patch-ab) = 4cbb89af1ef070ea0f5847ee59362aa587db3652
 SHA1 (patch-ac) = 1554932f75b8532b1e2293390b5cea03a7133bb4
-SHA1 (patch-ad) = ffcc3d3a03da19134dab68ac52d510655d2af6c0
+SHA1 (patch-ad) = 265d8d6fb8fe8441d9d096c0ca20d6692a03adea
 SHA1 (patch-ae) = cad6420b959acadedeeaaa17e4d8ff06511cda10
 SHA1 (patch-af) = 23d047049d5f183af12e14b56c535adf95b9f208
 SHA1 (patch-ag) = d03a660e2e1f96eb4b5edb71c32fb0b44cc7921e
diff --git a/cad/spice/files/NetBSD b/cad/spice/files/NetBSD
index 870b2133642..c3c0310eeee 100644
--- a/cad/spice/files/NetBSD
+++ b/cad/spice/files/NetBSD
@@ -1,5 +1,5 @@
 # FreeBSD/NetBSD config exception file
-# $NetBSD: NetBSD,v 1.5 2002/02/27 17:14:28 jlam Exp $
+# $NetBSD: NetBSD,v 1.6 2005/01/11 22:26:01 dmcmahill Exp $
 
 
 MAKE		= @MAKE_PROGRAM@
@@ -7,6 +7,7 @@ INTERFACE_OPTS  = -DWANT_X11
 CC              = gcc
 CC_OPT          = -O2 -pipe -I@WRKSRC@/src/include @CFLAGS@
 CC_OPT_SAFE     = -O2 -fno-strength-reduce -pipe -I@WRKSRC@/src/include @CFLAGS@
-LDFLAGS		= @LDFLAGS@ -lreadline -lm -ltermcap
+#LDFLAGS	= @LDFLAGS@ -lreadline -lm -ltermcap
+LDFLAGS		= @LDFLAGS@ -lm -ltermcap
 ASM_HACK	= < /dev/null
 SYS_CFLAGS	= -Dbsd
diff --git a/cad/spice/patches/patch-ad b/cad/spice/patches/patch-ad
index 497b690818c..fd4068887a5 100644
--- a/cad/spice/patches/patch-ad
+++ b/cad/spice/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.2 1999/10/01 17:05:15 dmcmahill Exp $
+$NetBSD: patch-ad,v 1.3 2005/01/11 22:26:01 dmcmahill Exp $
 
 --- src/include/os_bsd.h.orig	Sat Apr 24 19:09:46 1993
 +++ src/include/os_bsd.h	Thu Sep 30 12:02:51 1999
@@ -31,5 +31,5 @@ $NetBSD: patch-ad,v 1.2 1999/10/01 17:05:15 dmcmahill Exp $
 +#define HAS_STRCHR		/* strchr( ) instead of index( )	*/
 +#define HAS_LIMITS_H		/* limits.h exists			*/
 +#define HAS_INTWAITSTATUS	/* wait(int *status)			*/
-+#define HAS_GNUREADLINE		/* compile in readline support		*/
++/*#define HAS_GNUREADLINE*/		/* compile in readline support		*/
 +#endif