Update to 2012.061.

This also removes one of the three remaining uses of lang/gcc34.

PR:		166565
Submitted by:	bf@
Feature safe:	yes

7 files changed, 45 insertions, 94 deletions

diff --git a/cad/sceptre/Makefile b/cad/sceptre/Makefile
index d4146d670fab..8b4ad2630826 100644
--- a/cad/sceptre/Makefile
+++ b/cad/sceptre/Makefile
@@ -6,39 +6,62 @@
 #
 
 PORTNAME=	sceptre
-PORTVERSION=	00.317
-PORTREVISION=	2
+PORTVERSION=	2012.061
 CATEGORIES=	cad
-MASTER_SITES=	http://ftp.osuosl.org/pub/FreeBSD/distfiles/
+MASTER_SITES=	http://alpha.fh-friedberg.de/iem/fileadmin/user_upload/novender/sceptre/
 
 MAINTAINER=	maho@FreeBSD.org
-COMMENT=	SCEPTRE is a general purpose circuit analysis program
+COMMENT=	General-purpose circuit analysis program
 
-.if !defined(NOPORTDOCS)
-SUB_FILES+=	pkg-message
-.endif
+LICENSE=	GPLv2
+
+USE_FORTRAN=	yes
 
 MAKE_JOBS_UNSAFE=	yes
+NO_WRKSUBDIR=		yes
 
 .include <bsd.port.pre.mk>
 
-USE_FORTRAN=	g77
-FFLAGS+=	-fno-automatic -O
-.if ${ARCH} == "sparc64"
-BROKEN=		Internal compiler error
-.endif
+FFLAGS+=	-fno-automatic
 
-NO_WRKSUBDIR=	YES
+.if !defined(NOPORTDOCS)
+PORTDOCS=	doc_en.pdf doc_ger.pdf install.pdf
+.endif
 
-post-extract:
-	@${REINPLACE_CMD} 's,INSTDIR = /usr/local,INSTDIR = ${PREFIX},' \
-		${WRKSRC}/Makefile
+post-patch:
+	@${REINPLACE_CMD} -E \
+		-e '/^(FC|FFLAGS)[[:blank:]]*=/d' \
+		-e 's!/usr/local!${PREFIX}!' \
+		-e '/install.*BINDIR/{ s/install -s.*755/${INSTALL_PROGRAM}/ ; \
+			s/install -m.*755/${INSTALL_SCRIPT}/ ; }' \
+		-e '/install.*(ETCDIR|LIBDIR)/{ /install -d/d ; \
+			s/install.*644/${INSTALL_DATA}/ ; }' \
+				${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -E \
+		-e '/^(FC|FFLAGS)[[:blank:]]*=/d' \
+		-e 's!ar rv!${AR} ${ARFLAGS}!' \
+		-e 's!ranlib!${RANLIB}!' \
+				${WRKSRC}/x[123]/Makefile
+	@${REINPLACE_CMD} \
+		-e 's!/usr/local!${PREFIX}!' \
+				${WRKSRC}/bin/ngp \
+				${WRKSRC}/bin/sceptre.inst
+	@${REINPLACE_CMD} -E \
+		-e 's!/usr/local!${PREFIX}!' \
+		-e "s!^(FC=')(.*)(')!\1${FC} ${FFLAGS}\3!" \
+				${WRKSRC}/bin/sceptre
 
 post-install:
 .if !defined(NOPORTDOCS)
-	${INSTALL} -o ${DOCOWN} -g ${DOCGRP} -m 555 -d ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/*.pdf ${DOCSDIR}
-	@${CAT} ${PKGMESSAGE}
+	${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/install.pdf ${DOCSDIR}
+	cd ${WRKSRC}/doc ; ${INSTALL_DATA} ${PORTDOCS:Mdoc_*} ${DOCSDIR}
+.endif
+
+.if !defined(BATCH)
+check test: install
+	cd ${WRKSRC}/samples; for s in ${WRKSRC}/samples/*.d ; \
+	do ${WRKSRC}/bin/sceptre $${s%.d} ; done
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/cad/sceptre/distinfo b/cad/sceptre/distinfo
index 81dfd3c309ab..6c9557f85467 100644
--- a/cad/sceptre/distinfo
+++ b/cad/sceptre/distinfo
@@ -1,2 +1,2 @@
-SHA256 (sceptre-00.317.tar.gz) = 3031401627277ab431ee2ac8700c1d014eff2985f3807ffa8b1cc3daff70f817
-SIZE (sceptre-00.317.tar.gz) = 1081722
+SHA256 (sceptre-2012.061.tar.gz) = 6ca602bab7e63c84747f243f72e02dc4bac1e0491cedca192e1a1c365349ae61
+SIZE (sceptre-2012.061.tar.gz) = 1190280
diff --git a/cad/sceptre/files/patch-aa b/cad/sceptre/files/patch-aa
index 6323c53be39f..e69de29bb2d1 100644
--- a/cad/sceptre/files/patch-aa
+++ b/cad/sceptre/files/patch-aa
@@ -1,19 +0,0 @@
---- x3/qqqcpu.f    Mon Oct  4 03:53:42 1999
-+++ x3/qqqcpu.f   Sun Feb 11 14:34:50 2001
-@@ -9,9 +9,14 @@
-       data       r0 /1d6/ 
-       intrinsic  ETime
-  
--      CALL ETime(RESULT, TARRAY)
-+C     This appears not to be complete.  The original code contained the
-+C     following two code lines, which generate an "incorrect type" error.
-+C     Since I don't have a description of ETIME, just carry out the sentiment 
-+C     of the comment above
-+C     CALL ETime(RESULT, TARRAY)
- 
--      r2 = r0 - tarray(1)
-+C     r2 = r0 - tarray(1)
-+      r2 = r0
- 
-       RETURN 
- 
diff --git a/cad/sceptre/files/patch-ab b/cad/sceptre/files/patch-ab
index a64e5cfeea72..e69de29bb2d1 100644
--- a/cad/sceptre/files/patch-ab
+++ b/cad/sceptre/files/patch-ab
@@ -1,41 +0,0 @@
---- Makefile.orig	Sun Nov 12 16:25:44 2000
-+++ Makefile	Fri Jan 12 21:27:09 2007
-@@ -1,5 +1,3 @@
--FC      = g77
--FFLAGS  = -fno-automatic -O
- BASEDIR = `pwd`
- INSTDIR = /usr/local
- LIBDIR  = ${INSTDIR}/lib
-@@ -13,19 +11,19 @@
- 	cd x1;  ${MAKE} "FC=${FC}" "FFLAGS=${FFLAGS}" 
- 	cd x2;  ${MAKE} "FC=${FC}" "FFLAGS=${FFLAGS}" 
- install:
--	install -s -m 755 x1/exec1          ${BINDIR}
--	install -m 644    x2/exec2.o        ${LIBDIR}
--	install -m 644    x2/libx2.a        ${LIBDIR}
--	install -s -m 755 x3/ngp_gnu        ${BINDIR}
--	install -s -m 755 x3/asa            ${BINDIR}
--	install -m 644    x3/libx3.a        ${LIBDIR}
--	install -m 755    bin/sceptre       ${BINDIR}
--	install -m 755    bin/sceptre.inst  ${BINDIR}
--	install -m 755    bin/ngp           ${BINDIR}
--	install -m 644    lib/usrlib.a      ${LIBDIR}
--	install -m 644    lib/modellib.dat  ${LIBDIR}
--	install -d 			    ${ETCDIR}
--	install -m 644    etc/ngp.rc        ${ETCDIR}
-+	install -c -s -m 755 x1/exec1          ${BINDIR}
-+	install -c -m 644    x2/exec2.o        ${LIBDIR}
-+	install -c -m 644    x2/libx2.a        ${LIBDIR}
-+	install -c -s -m 755 x3/ngp_gnu        ${BINDIR}
-+	install -c -s -m 755 x3/asa            ${BINDIR}
-+	install -c -m 644    x3/libx3.a        ${LIBDIR}
-+	install -c -m 755    bin/sceptre       ${BINDIR}
-+	install -c -m 755    bin/sceptre.inst  ${BINDIR}
-+	install -c -m 755    bin/ngp           ${BINDIR}
-+	install -c -m 644    lib/usrlib.a      ${LIBDIR}
-+	install -c -m 644    lib/modellib.dat  ${LIBDIR}
-+	install -c -d 			    ${ETCDIR}
-+	install -c -m 644    etc/ngp.rc        ${ETCDIR}
- 	@echo "installation finished"
- uninstall:
- 	@rm -fv ${BINDIR}/exec1 
diff --git a/cad/sceptre/files/pkg-message.in b/cad/sceptre/files/pkg-message.in
index 2285e2e1ecc7..e69de29bb2d1 100644
--- a/cad/sceptre/files/pkg-message.in
+++ b/cad/sceptre/files/pkg-message.in
@@ -1,7 +0,0 @@
-
-======================================================================
-This package does not include online documentation.  You will find PDF
-documents in English and German in the directory
-%%DOCSDIR%%
-======================================================================
-
diff --git a/cad/sceptre/pkg-descr b/cad/sceptre/pkg-descr
index ea372ceab1ec..691f5a6def38 100644
--- a/cad/sceptre/pkg-descr
+++ b/cad/sceptre/pkg-descr
@@ -5,6 +5,4 @@ either linear or nonlinear networks.  It employs a free-form input
 language and state variable methods to simulate problems of interest
 to electrical engineers.
 
-This package does not include online documentation.  Documentation in
-PDF format, in English and German, is available in the directory
-work/sceptre*/doc.
+WWW: http://alpha.fh-friedberg.de/iem/84.html
diff --git a/cad/sceptre/pkg-plist b/cad/sceptre/pkg-plist
index d06537b2b91b..2b6afe0cd3ac 100644
--- a/cad/sceptre/pkg-plist
+++ b/cad/sceptre/pkg-plist
@@ -10,6 +10,3 @@ lib/libx2.a
 lib/libx3.a
 lib/usrlib.a
 lib/modellib.dat
-%%PORTDOCS%%%%DOCSDIR%%/doc_en.pdf
-%%PORTDOCS%%%%DOCSDIR%%/doc_ger.pdf
-%%PORTDOCS%%@dirrm %%DOCSDIR%%