Date: Tue, 8 Mar 2016 16:03:53 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r410625 - in head/cad/jspice3: . files Message-ID: <201603081603.u28G3rbV025545@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Tue Mar 8 16:03:52 2016 New Revision: 410625 URL: https://svnweb.freebsd.org/changeset/ports/410625 Log: Update to 2.5.110615. PR: 205891 Submitted by: tkato432 yahoo com Sponsored by: Absolight Added: head/cad/jspice3/files/patch-src_lib_fte_misccoms.c (contents, props changed) - copied, changed from r410624, head/cad/jspice3/files/patch-src+lib+fte+misccoms.c head/cad/jspice3/files/patch-src_lib_plot_x11.c (contents, props changed) - copied, changed from r410624, head/cad/jspice3/files/patch-src+lib+plot+x11.c Deleted: head/cad/jspice3/files/patch-conf+unixconf+mkheader.0 head/cad/jspice3/files/patch-src+bin+help.c head/cad/jspice3/files/patch-src+lib+dev+ltra+ltramisc.c head/cad/jspice3/files/patch-src+lib+fte+misccoms.c head/cad/jspice3/files/patch-src+lib+plot+x11.c head/cad/jspice3/files/patch-src_lib_ckt_cktdelt.c head/cad/jspice3/files/patch-src_lib_fte_options.c head/cad/jspice3/files/patch-src_lib_inp_ifeval.c head/cad/jspice3/files/patch-src_lib_mfb_mfbgnc.c head/cad/jspice3/files/patch-src_lib_plot_postsc.c head/cad/jspice3/files/patch-src_lib_sced_labeltxt.c head/cad/jspice3/files/patch-src_lib_sced_scedintr.c Modified: head/cad/jspice3/Makefile head/cad/jspice3/distinfo head/cad/jspice3/files/patch-build (contents, props changed) head/cad/jspice3/files/patch-conf_util_configure (contents, props changed) head/cad/jspice3/files/patch-src_bin_help.c (contents, props changed) head/cad/jspice3/files/patch-src_bin_spiced.c (contents, props changed) head/cad/jspice3/files/patch-src_lib_fte_resource.c (contents, props changed) head/cad/jspice3/pkg-plist Modified: head/cad/jspice3/Makefile ============================================================================== --- head/cad/jspice3/Makefile Tue Mar 8 16:03:45 2016 (r410624) +++ head/cad/jspice3/Makefile Tue Mar 8 16:03:52 2016 (r410625) @@ -2,36 +2,39 @@ # $FreeBSD$ PORTNAME= jspice3 -PORTVERSION= 2.5.011109 -PORTREVISION= 1 +DISTVERSION= 2.5-110615 CATEGORIES= cad MASTER_SITES= http://www.wrcad.com/ftp/pub/ -DISTNAME= ${PORTNAME}-2.5-011109 MAINTAINER= ports@FreeBSD.org COMMENT= Adaptation of the Berkeley Spice3f4 with superconductivity -BROKEN= unfetchable - CONFLICTS= spice-[0-9]* OPTIONS_DEFINE= X11 EXAMPLES OPTIONS_DEFAULT= X11 -WRKSRC= ${WRKDIR}/${PORTNAME}-2.5 +OPTIONS_SUB= yes + +WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:R} X11_USE= XORG=x11,xaw,xt -pre-configure: - @${REINPLACE_CMD} -e 's+/usr/local+${PREFIX}+g;s+-O -g+${CFLAGS}+g;' \ +post-patch: + @${REINPLACE_CMD} -e \ + '/^prefix/s|=.*|= ${PREFIX}| ; \ + /^SPICE_HOST/s|=.*|= localhost| ; \ + /^CC_OPT/s|=.*|= ${CFLAGS}|' \ ${WRKSRC}/conf/unixconf/mkheader.0 -pre-configure-X11-on: - @${REINPLACE_CMD} -e 's+#%%WITH_X%%++g' \ +post-patch-X11-off: + @${REINPLACE_CMD} -e \ + '/$$makeprog depend/s|^|#|' \ + ${WRKSRC}/build + @${REINPLACE_CMD} -e \ + 's|^LIBX|#LIBX| ; \ + s|-DWANT_X11||' \ ${WRKSRC}/conf/unixconf/mkheader.0 -pre-configure-X11-off: - @${ECHO} "#undef HAVE_X11" >> ${WRKSRC}/src/include/spice.h - do-build: (cd ${WRKSRC};${SETENV} ${MAKE_ENV} ${SH} build) Modified: head/cad/jspice3/distinfo ============================================================================== --- head/cad/jspice3/distinfo Tue Mar 8 16:03:45 2016 (r410624) +++ head/cad/jspice3/distinfo Tue Mar 8 16:03:52 2016 (r410625) @@ -1,2 +1,2 @@ -SHA256 (jspice3-2.5-011109.tar.gz) = 4fa5492584fb201b0f396ce805424b3128db4a70450506158854788aea68d7bf -SIZE (jspice3-2.5-011109.tar.gz) = 1149738 +SHA256 (jspice3-2.5-110615.tar.gz) = f40e23b2d5c554a5b7be7037fe41c6f179c33e07ab9da365d97c2b517dcd6af6 +SIZE (jspice3-2.5-110615.tar.gz) = 1145726 Modified: head/cad/jspice3/files/patch-build ============================================================================== --- head/cad/jspice3/files/patch-build Tue Mar 8 16:03:45 2016 (r410624) +++ head/cad/jspice3/files/patch-build Tue Mar 8 16:03:52 2016 (r410625) @@ -1,6 +1,6 @@ ---- build.orig Tue May 1 13:37:12 2001 -+++ build Sat Nov 25 00:38:47 2006 -@@ -22,7 +22,7 @@ +--- build.orig 2015-11-05 18:10:02 UTC ++++ build +@@ -22,7 +22,7 @@ if [ -d conf/unixconf ]; then echo '#######################################################################'> conf/mkheader.in echo '####### Makefile generated by build script ############################'>> conf/mkheader.in echo VERSION = $version>> conf/mkheader.in @@ -9,16 +9,16 @@ echo '#######################################################################'>> conf/mkheader.in cat conf/unixconf/mkheader.0 >> conf/mkheader.in else -@@ -43,7 +43,7 @@ +@@ -51,7 +51,7 @@ if [ -f conf/util/configure ]; then + if [ `uname -s` = Darwin -a -d /opt/X11 ]; then + util/configure --x-includes=/opt/X11/include --x-libraries=/opt/X11/lib -srcdir . + else +- util/configure -srcdir . ++ util/configure --prefix=${PREFIX} --x-includes=${LOCALBASE}/include --x-libraries=${LOCALBASE}/lib -srcdir . + fi - if [ -f conf/util/configure ]; then - cd conf -- util/configure -srcdir . -+ util/configure -srcdir . --prefix=${PREFIX} -x-includes="${LOCALBASE}/include" -x-libraries="${LOCALBASE}/lib" if [ ! -f ../src/include/config.h ] || \ - [ "`diff config.h ../src/include/config.h |head`" ]; then - echo Installing config.h -@@ -92,8 +92,14 @@ +@@ -102,8 +102,14 @@ if [ -f conf/mkheader ]; then fi echo Creating makefiles in the subdirectories... $makeprog make Modified: head/cad/jspice3/files/patch-conf_util_configure ============================================================================== --- head/cad/jspice3/files/patch-conf_util_configure Tue Mar 8 16:03:45 2016 (r410624) +++ head/cad/jspice3/files/patch-conf_util_configure Tue Mar 8 16:03:52 2016 (r410625) @@ -1,4 +1,4 @@ ---- conf/util/configure.orig 2002-01-15 19:21:25.000000000 +0000 +--- conf/util/configure.orig 2002-01-15 19:21:25 UTC +++ conf/util/configure @@ -805,11 +805,7 @@ else fi Modified: head/cad/jspice3/files/patch-src_bin_help.c ============================================================================== --- head/cad/jspice3/files/patch-src_bin_help.c Tue Mar 8 16:03:45 2016 (r410624) +++ head/cad/jspice3/files/patch-src_bin_help.c Tue Mar 8 16:03:52 2016 (r410625) @@ -1,11 +1,27 @@ ---- src/bin/help.c.intermediate 2014-08-18 06:30:22.000000000 +0000 +--- src/bin/help.c.orig 2015-11-05 17:57:50 UTC +++ src/bin/help.c -@@ -53,7 +53,7 @@ XErrorEvent *errorev; +@@ -14,6 +14,7 @@ Authors: 1986 Wayne A. Christopher + #include <pwd.h> + #endif - XGetErrorText(display, errorev->error_code, ErrorMessage, 1024); - printf(ErrorMessage); -- return; -+ return (NULL); - } ++static char *hcopydev; + #ifdef HAVE_X11 + #include <X11/Intrinsic.h> +@@ -22,7 +23,6 @@ Authors: 1986 Wayne A. Christopher + Display *Xdisplay; + static XtAppContext app_con; + static Widget toplevel; +-static char *hcopydev; + static String fallback_resources[] = { + +@@ -188,7 +188,7 @@ int t; + { + if (!strcmp(n, kw_hcopydev)) { + strcpy(r, hcopydev); +- return (True); ++ return (1); + } + return (false); + } Modified: head/cad/jspice3/files/patch-src_bin_spiced.c ============================================================================== --- head/cad/jspice3/files/patch-src_bin_spiced.c Tue Mar 8 16:03:45 2016 (r410624) +++ head/cad/jspice3/files/patch-src_bin_spiced.c Tue Mar 8 16:03:52 2016 (r410625) @@ -1,4 +1,4 @@ ---- src/bin/spiced.c.orig 2001-05-01 21:56:08.000000000 +0000 +--- src/bin/spiced.c.orig 2015-11-05 17:58:45 UTC +++ src/bin/spiced.c @@ -16,12 +16,11 @@ Author: 1985 Wayne A. Christopher, U. C. @@ -16,12 +16,3 @@ #include <sys/types.h> #ifdef HAVE_SOCKET -@@ -293,7 +292,7 @@ sigchild() - (void) fclose(fp); - } else - nrunning--; -- return; -+ return 0; - } - - #else /* not HAVE_SOCKET */ Copied and modified: head/cad/jspice3/files/patch-src_lib_fte_misccoms.c (from r410624, head/cad/jspice3/files/patch-src+lib+fte+misccoms.c) ============================================================================== --- head/cad/jspice3/files/patch-src+lib+fte+misccoms.c Tue Mar 8 16:03:45 2016 (r410624, copy source) +++ head/cad/jspice3/files/patch-src_lib_fte_misccoms.c Tue Mar 8 16:03:52 2016 (r410625) @@ -1,6 +1,6 @@ ---- src/lib/fte/misccoms.c.orig Tue Feb 28 16:57:47 2006 -+++ src/lib/fte/misccoms.c Tue Feb 28 16:59:28 2006 -@@ -284,7 +284,7 @@ +--- src/lib/fte/misccoms.c.orig 2001-05-01 20:58:18 UTC ++++ src/lib/fte/misccoms.c +@@ -284,7 +284,7 @@ wordlist *wl; pl->pl_title, pl->pl_name); } Modified: head/cad/jspice3/files/patch-src_lib_fte_resource.c ============================================================================== --- head/cad/jspice3/files/patch-src_lib_fte_resource.c Tue Mar 8 16:03:45 2016 (r410624) +++ head/cad/jspice3/files/patch-src_lib_fte_resource.c Tue Mar 8 16:03:52 2016 (r410625) @@ -1,6 +1,6 @@ ---- src/lib/fte/resource.c.orig Tue Nov 14 18:23:27 2006 -+++ src/lib/fte/resource.c Tue Nov 14 18:23:33 2006 -@@ -36,7 +36,7 @@ +--- src/lib/fte/resource.c.orig 1997-03-21 22:03:41 UTC ++++ src/lib/fte/resource.c +@@ -36,7 +36,7 @@ static struct timeb lasttime; #endif #endif #endif Copied and modified: head/cad/jspice3/files/patch-src_lib_plot_x11.c (from r410624, head/cad/jspice3/files/patch-src+lib+plot+x11.c) ============================================================================== --- head/cad/jspice3/files/patch-src+lib+plot+x11.c Tue Mar 8 16:03:45 2016 (r410624, copy source) +++ head/cad/jspice3/files/patch-src_lib_plot_x11.c Tue Mar 8 16:03:52 2016 (r410625) @@ -1,6 +1,6 @@ ---- src/lib/plot/x11.c.orig Thu Sep 2 21:43:35 2004 -+++ src/lib/plot/x11.c Fri Jul 21 06:06:00 2006 -@@ -2205,7 +2205,7 @@ +--- src/lib/plot/x11.c.orig 2004-09-02 21:43:35 UTC ++++ src/lib/plot/x11.c +@@ -2205,7 +2205,7 @@ ScedESC() void com_setrdb(wl) @@ -9,7 +9,7 @@ { /* be silent */ } -@@ -2213,7 +2213,7 @@ +@@ -2213,7 +2213,7 @@ wordlist *wl; int PopUpErrMessage(fp) Modified: head/cad/jspice3/pkg-plist ============================================================================== --- head/cad/jspice3/pkg-plist Tue Mar 8 16:03:45 2016 (r410624) +++ head/cad/jspice3/pkg-plist Tue Mar 8 16:03:52 2016 (r410625) @@ -1,5 +1,5 @@ bin/jspice3 -bin/help +%%X11%%bin/help bin/nutmeg bin/proc2mod bin/multidec
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201603081603.u28G3rbV025545>