Upgrade to 0.25.

6 files changed, 71 insertions, 75 deletions

diff --git a/cad/acs/Makefile b/cad/acs/Makefile
index ed412b46ca4c..eff118c4b1af 100644
--- a/cad/acs/Makefile
+++ b/cad/acs/Makefile
@@ -1,19 +1,20 @@
 # New ports collection makefile for:	acs
-# Version required:	0.21
+# Version required:	0.25
 # Date created:		01 January 1995
-# Whom:			thomas@ghpc8.ihf.rwth-aachen.de
+# Whom:			Thomas Gellekum <tg@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	acs021
-PKGNAME=	acs-0.21
+DISTNAME=	acs-0.25
 CATEGORIES=	cad
-MASTER_SITES=	ftp://ee.rochester.edu/pub/acs/ \
-		ftp://ftp.uni-trier.de/pub/unix/cad+vlsi/acs/ \
-		ftp://ftp.unina.it/pub/electronics/electrical/unix/acs/
-EXTRACT_SUFX=	.tgz
+MASTER_SITES=	http://www.geda.seul.org/dist/ \
+		http://www.geda.coelacanth.com/dist/ \
+		ftp://ftp.geda.seul.org/pub/geda/dist/
 
-MAINTAINER=	tg@freebsd.org
+MAINTAINER=	tg@FreeBSD.org
+
+USE_NEWGCC=	yes
+MAKE_ENV=	CCC="${CXX}"
 
 .include <bsd.port.mk>
diff --git a/cad/acs/distinfo b/cad/acs/distinfo
index 521e4b8cf1ba..984671be8e0c 100644
--- a/cad/acs/distinfo
+++ b/cad/acs/distinfo
@@ -1 +1 @@
-MD5 (acs021.tgz) = 3679d1cb6609a0f60d176f7d322e03ac
+MD5 (acs-0.25.tar.gz) = 0cd5cf8edc46a02835eb1d0065970f03
diff --git a/cad/acs/files/acs.rc b/cad/acs/files/acs.rc
index a76f02bdb916..f4f968110d1f 100644
--- a/cad/acs/files/acs.rc
+++ b/cad/acs/files/acs.rc
@@ -48,7 +48,6 @@ Initializing system-wide startup configuration...
 .set diodeflags		0
 .set dtmin		1e-12
 .set dtratio		1e9
-.set floor		1e-20
 .set foooo		0
 .set gmin		1e-12
 .set harmonics		9
diff --git a/cad/acs/files/patch-aa b/cad/acs/files/patch-aa
index d2e03d982516..ea2919b99283 100644
--- a/cad/acs/files/patch-aa
+++ b/cad/acs/files/patch-aa
@@ -1,31 +1,18 @@
-*** src/md_unix.h.orig	Sun Mar 31 00:09:51 1996
---- src/md_unix.h	Mon Apr  1 18:51:55 1996
-***************
-*** 49,61 ****
-  #define	ENDDIR		"/"
-  #define PATHSEP		':'
-  #define SYSTEMSTARTFILE	"acs.rc"
-! #define SYSTEMSTARTPATH	getenv("PATH")
-  #define USERSTARTFILE	".acsrc"
-  #define	USERSTARTPATH	getenv("HOME")
-  #define STEPFILE   	"/tmp/SXXXXXX"
-  #define PLOTFILE    	"acs.plot"
-  #define HELPFILE    	"acs.hlp"
-! #define HELPPATH	getenv("PATH")
-  /*--------------------------------------------------------------------------*/
-  #if defined(__GNUG__)
-    #define MANUAL_TEMPLATES
---- 49,61 ----
-  #define	ENDDIR		"/"
-  #define PATHSEP		':'
-  #define SYSTEMSTARTFILE	"acs.rc"
-! #define SYSTEMSTARTPATH	"@PREFIX@/share/acs"
-  #define USERSTARTFILE	".acsrc"
-  #define	USERSTARTPATH	getenv("HOME")
-  #define STEPFILE   	"/tmp/SXXXXXX"
-  #define PLOTFILE    	"acs.plot"
-  #define HELPFILE    	"acs.hlp"
-! #define HELPPATH	"@PREFIX@/share/acs"
-  /*--------------------------------------------------------------------------*/
-  #if defined(__GNUG__)
-    #define MANUAL_TEMPLATES
+--- src/md.h.orig	Fri Nov  5 07:11:00 1999
++++ src/md.h	Mon Nov  8 11:24:55 1999
+@@ -46,13 +46,13 @@
+ #define	ENDDIR		"/"
+ #define PATHSEP		':'
+ #define SYSTEMSTARTFILE	"acs.rc"
+-#define SYSTEMSTARTPATH	OS::getenv("PATH")
++#define SYSTEMSTARTPATH	"@PREFIX@/share/acs"
+ #define USERSTARTFILE	".acsrc"
+ #define	USERSTARTPATH	OS::getenv("HOME")
+ #define STEPFILE   	"/tmp/SXXXXXX"
+ #define PLOTFILE    	"acs.plot"
+ #define HELPFILE    	"acs.hlp"
+-#define HELPPATH	OS::getenv("PATH")
++#define HELPPATH	"@PREFIX@/share/acs"
+ /* constants related to memory size, word size, etc */
+ enum {
+   BUFLEN = 256,
diff --git a/cad/acs/pkg-plist b/cad/acs/pkg-plist
index ef15dc56a21c..f385abc28dfc 100644
--- a/cad/acs/pkg-plist
+++ b/cad/acs/pkg-plist
@@ -1,30 +1,35 @@
 bin/acs
 share/acs/acs.hlp
 share/acs/acs.rc
-share/acs/examples/eq.doc
-share/acs/examples/eq2-145.ckt
-share/acs/examples/eq2-289.ckt
-share/acs/examples/eq2-577.ckt
-share/acs/examples/eq3-1153.ckt
-share/acs/examples/eq4-2305.ckt
-share/acs/examples/eq4-4609.ckt
-share/acs/examples/eq4-6913.ckt
-share/acs/examples/eq4-9217.ckt
-share/acs/examples/eqboost.ckt
-share/acs/examples/eqflat.ckt
-share/acs/examples/eqmodify.ckt
-share/acs/examples/killzap.ckt
-share/acs/examples/killzap.doc
-share/acs/examples/nmos.doc
-share/acs/examples/nmos100.ckt
-share/acs/examples/nmos15.ckt
-share/acs/examples/nmos18.ckt
-share/acs/examples/nmos30.ckt
-share/acs/examples/nmp100.ckt
-share/acs/examples/opamp-ol.ckt
-share/acs/examples/opamp-vf.ckt
-share/acs/examples/opamp.doc
-share/acs/examples/opol.ckt
-share/acs/examples/sc18.ckt
-@dirrm share/acs/examples
+share/doc/acs/history
+share/doc/acs/man.pdf
+share/doc/acs/relnotes.024
+share/doc/acs/relnotes.025
+share/doc/acs/whatisit
+share/examples/acs/eq.doc
+share/examples/acs/eq2-145.ckt
+share/examples/acs/eq2-289.ckt
+share/examples/acs/eq2-577.ckt
+share/examples/acs/eq3-1153.ckt
+share/examples/acs/eq4-2305.ckt
+share/examples/acs/eq4-4609.ckt
+share/examples/acs/eq4-6913.ckt
+share/examples/acs/eq4-9217.ckt
+share/examples/acs/eqboost.ckt
+share/examples/acs/eqflat.ckt
+share/examples/acs/eqmodify.ckt
+share/examples/acs/killzap.ckt
+share/examples/acs/killzap.doc
+share/examples/acs/nmos.doc
+share/examples/acs/nmos100.ckt
+share/examples/acs/nmos15.ckt
+share/examples/acs/nmos18.ckt
+share/examples/acs/nmos30.ckt
+share/examples/acs/nmp100.ckt
+share/examples/acs/opamp-ol.ckt
+share/examples/acs/opamp-vf.ckt
+share/examples/acs/opamp.doc
+share/examples/acs/sc18.ckt
 @dirrm share/acs
+@dirrm share/doc/acs
+@dirrm share/examples/acs
diff --git a/cad/acs/scripts/configure b/cad/acs/scripts/configure
index dbf7f196fe44..685771d4dce0 100644
--- a/cad/acs/scripts/configure
+++ b/cad/acs/scripts/configure
@@ -2,8 +2,8 @@
 set +vx
 # fill in $PREFIX
 sedpgm=`eval echo \'s,@PREFIX@,$PREFIX,g\'`
-sed -e "$sedpgm" <${WRKSRC}/src/md_unix.h >/tmp/sed$$
-cp /tmp/sed$$ ${WRKSRC}/src/md_unix.h
+sed -e "$sedpgm" <${WRKSRC}/src/md.h >/tmp/sed$$
+cp /tmp/sed$$ ${WRKSRC}/src/md.h
 rm /tmp/sed$$
 
 # copy sample acs.rc
@@ -16,10 +16,14 @@ all:
 
 install:
 	@mkdir -p ${PREFIX}/bin
-	@mkdir -p ${PREFIX}/share/acs/examples
-	(cd src/FreeBSD; install -c -s -m 755 -g bin -o bin acs ${PREFIX}/bin)
-	(cd doc; install -c -m 644 -g bin -o bin acs.hlp ${PREFIX}/share/acs)
-	install -c -m 644 -g bin -o bin acs.rc ${PREFIX}/share/acs
-	(cd examples; install -c -m 644 -g bin -o bin *.ckt *.doc ${PREFIX}/share/acs/examples)
+	@mkdir -p ${PREFIX}/share/acs
+	@mkdir -p ${PREFIX}/share/doc/acs
+	@mkdir -p ${PREFIX}/share/examples/acs
+	(cd src/FreeBSD; ${BSD_INSTALL_PROGRAM} acs ${PREFIX}/bin)
+	${BSD_INSTALL_DATA} acs.rc ${PREFIX}/share/acs
+	(cd doc; \
+		${BSD_INSTALL_DATA} acs.hlp ${PREFIX}/share/acs; \
+		${BSD_INSTALL_DATA} [b-z]* ${PREFIX}/share/doc/acs)
+	(cd examples; ${BSD_INSTALL_DATA} *.ckt *.doc ${PREFIX}/share/examples/acs)
 
 EOF