7 files changed, 39 insertions, 48 deletions

diff --git a/cad/acs/Makefile b/cad/acs/Makefile
index e0966f188a19..3e34bff458fb 100644
--- a/cad/acs/Makefile
+++ b/cad/acs/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	acs
-PORTVERSION=	0.26
+PORTVERSION=	0.28
 CATEGORIES=	cad
 MASTER_SITES=	http://www.geda.seul.org/dist/ \
 		http://www.geda.coelacanth.com/dist/ \
@@ -17,4 +17,10 @@ MAINTAINER=	tg@FreeBSD.org
 USE_NEWGCC=	yes
 MAKE_ENV=	CCC="${CXX}"
 
+post-extract:
+	${CP} ${FILESDIR}/acs.rc ${FILESDIR}/Makefile ${WRKSRC}
+
+post-patch:
+	${PERL} -pi -e "s;%%PREFIX%%;${PREFIX};g" ${WRKSRC}/src/md.h
+
 .include <bsd.port.mk>
diff --git a/cad/acs/distinfo b/cad/acs/distinfo
index a21a1e66070d..db77006e4202 100644
--- a/cad/acs/distinfo
+++ b/cad/acs/distinfo
@@ -1 +1 @@
-MD5 (acs-0.26.tar.gz) = e2632cffff01ea8bb229f961198a4288
+MD5 (acs-0.28.tar.gz) = 83c7d2bfa160f0afebc1cd9d0cacf81b
diff --git a/cad/acs/files/Makefile b/cad/acs/files/Makefile
new file mode 100644
index 000000000000..3ea337780d9e
--- /dev/null
+++ b/cad/acs/files/Makefile
@@ -0,0 +1,19 @@
+# $FreeBSD$
+
+all:
+	cd src; \
+	mkdir FreeBSD; \
+	cat Make1 Make2.g++ Make3 Make.depend > FreeBSD/Makefile; \
+	cd FreeBSD; \
+	${MAKE} acs
+
+install:
+	@mkdir -p ${PREFIX}/share/acs
+	@mkdir -p ${PREFIX}/share/doc/acs
+	@mkdir -p ${PREFIX}/share/examples/acs
+	${BSD_INSTALL_PROGRAM} src/FreeBSD/acs ${PREFIX}/bin
+	${BSD_INSTALL_DATA} acs.rc ${PREFIX}/share/acs
+	${BSD_INSTALL_DATA} doc/[a-z]* ${PREFIX}/share/doc/acs
+	${BSD_INSTALL_DATA} man/man.pdf ${PREFIX}/share/doc/acs
+	${BSD_INSTALL_DATA} examples/*.ckt examples/*.doc ${PREFIX}/share/examples/acs
+
diff --git a/cad/acs/files/patch-aa b/cad/acs/files/patch-aa
index ea2919b99283..d598f82649ce 100644
--- a/cad/acs/files/patch-aa
+++ b/cad/acs/files/patch-aa
@@ -1,6 +1,6 @@
---- 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 @@
+--- src/md.h.orig	Tue Sep  5 09:42:44 2000
++++ src/md.h	Thu Dec 14 19:48:34 2000
+@@ -50,7 +50,7 @@
  #define	ENDDIR		"/"
  #define PATHSEP		':'
  #define SYSTEMSTARTFILE	"acs.rc"
@@ -9,10 +9,3 @@
  #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/files/patch-ab b/cad/acs/files/patch-ab
index bdacc2274186..53550230d98f 100644
--- a/cad/acs/files/patch-ab
+++ b/cad/acs/files/patch-ab
@@ -1,14 +1,14 @@
---- src/Make2.g++.orig	Thu Nov  4 07:52:00 1999
-+++ src/Make2.g++	Mon Nov  8 11:26:22 1999
+--- src/Make2.g++.orig	Tue Sep  5 09:42:44 2000
++++ src/Make2.g++	Thu Dec 14 19:50:51 2000
 @@ -3,9 +3,9 @@
  
  # Standard base for g++.
  
 -CCC = g++
-+CCC ?= c++
++CCC ?= g++
  CCFLAGS = \
---DUNIX -O3 -DNDEBUG -fno-exceptions \
-+-DUNIX -DNDEBUG -fno-exceptions ${CFLAGS} \
+--DUNIX -O3 -DNDEBUG -I.. -fno-exceptions \
++-DUNIX -DNDEBUG -I.. -fno-exceptions ${CFLAGS} \
  -Wall -W -Wno-sign-compare \
  -Wundef -Wpointer-arith -Wbad-function-cast -Wcast-qual \
- -Wcast-align -Wwrite-strings -Wconversion \
+ -Wwrite-strings -Wconversion \
diff --git a/cad/acs/pkg-plist b/cad/acs/pkg-plist
index 4dcb97c3c354..8e3c9c3a7307 100644
--- a/cad/acs/pkg-plist
+++ b/cad/acs/pkg-plist
@@ -1,10 +1,10 @@
 bin/acs
 share/acs/acs.rc
-share/doc/acs/acs-0.26.lsm
+share/doc/acs/acs-0.28.lsm
 share/doc/acs/acs-tutorial
 share/doc/acs/history
 share/doc/acs/man.pdf
-share/doc/acs/relnotes.026
+share/doc/acs/relnotes.028
 share/doc/acs/whatisit
 share/examples/acs/eq.doc
 share/examples/acs/eq2-145.ckt
@@ -15,6 +15,7 @@ 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/eq4-9217.tran.ckt
 share/examples/acs/eqboost.ckt
 share/examples/acs/eqflat.ckt
 share/examples/acs/eqmodify.ckt
diff --git a/cad/acs/scripts/configure b/cad/acs/scripts/configure
deleted file mode 100644
index 3712ad27709a..000000000000
--- a/cad/acs/scripts/configure
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-set +vx
-# fill in $PREFIX
-sedpgm=`eval echo \'s,@PREFIX@,$PREFIX,g\'`
-sed -e "$sedpgm" <${WRKSRC}/src/md.h >/tmp/sed$$
-cp /tmp/sed$$ ${WRKSRC}/src/md.h
-rm /tmp/sed$$
-
-# copy sample acs.rc
-cp ${FILESDIR}/acs.rc ${WRKSRC}
-
-# write a simple Makefile to $WRKSRC
-cat >${WRKSRC}/Makefile <<EOF
-all:
-	(cd src; make freebsd)
-
-install:
-	@mkdir -p ${PREFIX}/bin
-	@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} [a-z]* ${PREFIX}/share/doc/acs)
-	(cd examples; ${BSD_INSTALL_DATA} *.ckt *.doc ${PREFIX}/share/examples/acs)
-
-EOF