- update spice to version 3f5 de facto (instead of 3f4 + patches), from pedro@

"go for it" kili@

cad/spice/Makefile

@@ -1,44 +1,27 @@
-# $OpenBSD: Makefile,v 1.22 2007/09/15 21:36:57 simon Exp $
+# $OpenBSD: Makefile,v 1.23 2007/11/06 22:01:26 rui Exp $
 
 COMMENT=	Simulation Program for Integrated Circuit Electronics
 
-DISTNAME=		sp3f4.kit
+V=			3f5
-PKGNAME=		spice-3f5p1
+DISTNAME=		spice${V}
+PKGNAME=		spice-${V}p2
 CATEGORIES=     	cad
 
-PERMIT_PACKAGE_CDROM=	no fee
+# BSD
+PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
-PERMIT_DISTFILES_CDROM=	no fee
+PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 WANTLIB=		X11 Xaw Xext Xmu Xt c m termlib
 
-MASTER_SITES=		ftp://ic.eecs.berkeley.edu/pub/Spice3/
+MASTER_SITES=		http://embedded.eecs.berkeley.edu/pubs/downloads/spice/
-DISTFILES=		sp3f4.kit.tar.gz sp3f4.patch.tar.gz
+HOMEPAGE=		http://bwrc.eecs.berkeley.edu/Classes/IcBook/SPICE/
 
 USE_X11=		Yes
-WRKDIST=		${WRKDIR}
 MAKE_ENV=		MAKE_PROGRAM='${MAKE_PROGRAM}' CC="${CC}"
 
 NO_REGRESS=		Yes
 
-# Apply the patches that make this 3f5
-#
-pre-patch:
-	@${ECHO_MSG} "===>  Applying distribution patches";
-.if defined(PATCH_DEBUG)
-	@cd ${WRKDIR}/3f4patches; \
-	  ${PATCH} -d ${WRKSRC}/src/lib/fte -E -p1 < grid.patch; \
-	  ${PATCH} -d ${WRKSRC}/src/lib/fte -E -p1 < newcoms.patch; \
-	  ${PATCH} -d ${WRKSRC}/src/lib/sparse -E -p1 < spsmp.patch
-	@find ${WRKSRC}/ -name \*.orig -exec rm -f {} \;
-.else
-	@cd ${WRKDIR}/3f4patches; \
-	  ${PATCH} -d ${WRKSRC}/src/lib/fte -N -s -E -p1 < grid.patch; \
-	  ${PATCH} -d ${WRKSRC}/src/lib/fte -N -s -E -p1 < newcoms.patch; \
-	  ${PATCH} -d ${WRKSRC}/src/lib/sparse -N -s -E -p1 < spsmp.patch
-	@find ${WRKSRC}/ -name \*.orig -exec rm -f {} \;
-.endif
-
 do-configure:
 	@cp ${FILESDIR}/Makefile ${WRKSRC}
 	@cp ${FILESDIR}/OpenBSD ${WRKSRC}/conf

cad/spice/distinfo

@@ -1,10 +1,5 @@
-MD5 (sp3f4.kit.tar.gz) = dE5hwkGt7bBVOnT432d5wQ==
+MD5 (spice3f5.tar.gz) = K20cNGvqS5kUFHvDCTf55Q==
-MD5 (sp3f4.patch.tar.gz) = zA5ZV+5WpWmc91u3FA+ykw==
+RMD160 (spice3f5.tar.gz) = WyHH21jOyEW9BsTWXOSQOxLpQEQ=
-RMD160 (sp3f4.kit.tar.gz) = Yrhdx7kRKzyMdY7N1YG6guyHMmo=
+SHA1 (spice3f5.tar.gz) = 0t16Tdvq5F4QhEeiVQ3Ar+CD9e0=
-RMD160 (sp3f4.patch.tar.gz) = MnI8GLLVwfsMp4l35LwatAQwh20=
+SHA256 (spice3f5.tar.gz) = ysEf4qdhJB5rbJ6qMbk4x/+naursrAmAlgnTpBJc0mk=
-SHA1 (sp3f4.kit.tar.gz) = cQdk/EAk0fL+OBaeqilmZe3JbGc=
+SIZE (spice3f5.tar.gz) = 1226185
-SHA1 (sp3f4.patch.tar.gz) = WjjG6C0X9k4yvI8CfARLON55MmU=
-SHA256 (sp3f4.kit.tar.gz) = b5OFS45RBA+QlmzwS03miuwljSGr/8JRXARIwWbUHlM=
-SHA256 (sp3f4.patch.tar.gz) = jyDXfDdp04P2zM/oJH523XHV+sYX9gCZQkKOp+qRjgw=
-SIZE (sp3f4.kit.tar.gz) = 1224435
-SIZE (sp3f4.patch.tar.gz) = 1632

cad/spice/patches/patch-util_skeleton_make_def_bd

@@ -1,12 +0,0 @@
-$OpenBSD: patch-util_skeleton_make_def_bd,v 1.1 2001/08/03 00:03:41 pvalchev Exp $
---- util/skeleton/make_def.bd.orig	Thu Jul 29 15:35:18 1993
-+++ util/skeleton/make_def.bd	Thu Aug  2 17:55:13 2001
-@@ -8,7 +8,7 @@ SHELL		= /bin/sh
- PATH_SEP	= /
- PS		= /
- REVISION	=
--VERSION		= 3f4
-+VERSION		= 3f5
- VERSION_REVISION= $(VERSION)$(REVISION)
- NOTICE		=
- TOP		= /projects/spice3/spice$(VERSION)

cad/spice/pkg/DESCR

@@ -1,5 +1,6 @@
-The SPICE3 Version3f3 User's Manual, a postscript document available
+The SPICE3 Version3f5 User Guide, a HTML document available at
-at ftp://ic.eecs.berkeley.edu/pub/Spice3/um.3f3.ps says:
+http://bwrc.eecs.berkeley.edu/Classes/IcBook/SPICE/UserGuide/overview_fr.html
+says:
 
   SPICE is a general-purpose circuit  simulation  program for nonlinear dc,
   nonlinear transient, and linear ac analyses. Circuits may contain resistors,