From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Apr 2 02:20:12 2012 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 469981065673 for ; Mon, 2 Apr 2012 02:20:12 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 1F24C8FC0C for ; Mon, 2 Apr 2012 02:20:12 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q322KB94023251 for ; Mon, 2 Apr 2012 02:20:12 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q322KBV8023250; Mon, 2 Apr 2012 02:20:11 GMT (envelope-from gnats) Resent-Date: Mon, 2 Apr 2012 02:20:11 GMT Resent-Message-Id: <201204020220.q322KBV8023250@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, bf Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C6DA01065670 for ; Mon, 2 Apr 2012 02:14:13 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22]) by mx1.freebsd.org (Postfix) with ESMTP id B2A228FC20 for ; Mon, 2 Apr 2012 02:14:13 +0000 (UTC) Received: from red.freebsd.org (localhost [127.0.0.1]) by red.freebsd.org (8.14.4/8.14.4) with ESMTP id q322ED8F069664 for ; Mon, 2 Apr 2012 02:14:13 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.4/8.14.4/Submit) id q322ED7a069656; Mon, 2 Apr 2012 02:14:13 GMT (envelope-from nobody) Message-Id: <201204020214.q322ED7a069656@red.freebsd.org> Date: Mon, 2 Apr 2012 02:14:13 GMT From: bf To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/166565: [PATCH]cad/sceptre: update to 2012.061 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Apr 2012 02:20:12 -0000 >Number: 166565 >Category: ports >Synopsis: [PATCH]cad/sceptre: update to 2012.061 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Mon Apr 02 02:20:11 UTC 2012 >Closed-Date: >Last-Modified: >Originator: bf >Release: >Organization: - >Environment: >Description: Update to 2012.061; add WWW and LICENSE; use the upstream maintainer's master site. This removes one of the three remaining uses of lang/gcc34. Tinderboxed on {7.4,8.1,9.0}-{amd64,i386}. >How-To-Repeat: >Fix: Patch attached with submission follows: Index: Makefile =================================================================== RCS file: /home/pcvs/ports/cad/sceptre/Makefile,v retrieving revision 1.13 diff -u -r1.13 Makefile --- Makefile 22 Nov 2009 19:49:30 -0000 1.13 +++ Makefile 2 Apr 2012 01:33:58 -0000 @@ -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 -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 Index: distinfo =================================================================== RCS file: /home/pcvs/ports/cad/sceptre/distinfo,v retrieving revision 1.4 diff -u -r1.4 distinfo --- distinfo 20 Mar 2011 12:46:15 -0000 1.4 +++ distinfo 1 Apr 2012 19:48:15 -0000 @@ -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 Index: pkg-descr =================================================================== RCS file: /home/pcvs/ports/cad/sceptre/pkg-descr,v retrieving revision 1.1 diff -u -r1.1 pkg-descr --- pkg-descr 11 Feb 2001 06:58:03 -0000 1.1 +++ pkg-descr 1 Apr 2012 19:50:50 -0000 @@ -5,6 +5,4 @@ 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 Index: pkg-plist =================================================================== RCS file: /home/pcvs/ports/cad/sceptre/pkg-plist,v retrieving revision 1.3 diff -u -r1.3 pkg-plist --- pkg-plist 22 Oct 2003 09:31:46 -0000 1.3 +++ pkg-plist 1 Apr 2012 21:11:22 -0000 @@ -10,6 +10,3 @@ lib/libx3.a lib/usrlib.a lib/modellib.dat -%%PORTDOCS%%%%DOCSDIR%%/doc_en.pdf -%%PORTDOCS%%%%DOCSDIR%%/doc_ger.pdf -%%PORTDOCS%%@dirrm %%DOCSDIR%% Index: files/patch-aa =================================================================== RCS file: files/patch-aa diff -N files/patch-aa --- files/patch-aa 11 Feb 2001 06:58:11 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -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 - Index: files/patch-ab =================================================================== RCS file: files/patch-ab diff -N files/patch-ab --- files/patch-ab 12 Jan 2007 13:01:51 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -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 Index: files/pkg-message.in =================================================================== RCS file: files/pkg-message.in diff -N files/pkg-message.in --- files/pkg-message.in 10 Jun 2009 06:11:44 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,7 +0,0 @@ - -====================================================================== -This package does not include online documentation. You will find PDF -documents in English and German in the directory -%%DOCSDIR%% -====================================================================== - >Release-Note: >Audit-Trail: >Unformatted: