Attachment #165068 for bug #205891

View | Details | Raw Unified | Return to bug 205891
Collapse All | Expand All




# $FreeBSD: head/cad/jspice3/Makefile 403633 2015-12-12 21:36:03Z bapt $

PORTNAME=	jspice3
PORTVERSION=	2.5.110615
PORTREVISION=	1
CATEGORIES=	cad
MASTER_SITES=	http://www.wrcad.com/ftp/pub/
DISTNAME=	${PORTNAME}-${PORTVERSION:R}-${PORTVERSION:E}

MAINTAINER=	ports@FreeBSD.org
COMMENT=	Adaptation of the Berkeley Spice3f4 with superconductivity

WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}


CONFLICTS=	spice-[0-9]*

OPTIONS_DEFINE=		EXAMPLES X11
OPTIONS_DEFAULT=	X11
OPTIONS_SUB=		yes

X11_USE=		XORG=x11,xaw,xt

post-patch:
	@${REINPLACE_CMD} -e \
		'/^prefix/s|=.*|= ${PREFIX}| ; \
		 /^SPICE_HOST/s|=.*|= localhost| ; \
		 /^CC_OPT/s|=.*|= ${CFLAGS}|' \
		${WRKSRC}/conf/unixconf/mkheader.0

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)

do-install:
.for i in help jspice3 multidec nutmeg proc2mod spiced xeditor
	(cd ${WRKSRC}/src/bin && ${INSTALL_PROGRAM} ${i} \
		${STAGEDIR}${PREFIX}/bin)
.endfor
	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/jspice3
	(cd ${WRKSRC}/lib && ${INSTALL_DATA} mfbcap news \
		${STAGEDIR}${PREFIX}/lib/jspice3)
	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/jspice3/helpdir
	(cd ${WRKSRC}/lib/helpdir && ${INSTALL_DATA} * \
		${STAGEDIR}${PREFIX}/lib/jspice3/helpdir)
	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/jspice3/sced
	(cd ${WRKSRC}/lib/sced && ${INSTALL_DATA} * \
		${STAGEDIR}${PREFIX}/lib/jspice3/sced)
	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/jspice3/scripts
	(cd ${WRKSRC}/lib/scripts && ${INSTALL_DATA} * \
		${STAGEDIR}${PREFIX}/lib/jspice3/scripts)

do-install-EXAMPLES-on:
	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
	(cd ${WRKSRC}/examples && ${INSTALL_DATA} *.* \
		${STAGEDIR}${EXAMPLESDIR})
	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/cryocmos
	(cd ${WRKSRC}/examples/cryocmos && ${INSTALL_DATA} * \
		${STAGEDIR}${EXAMPLESDIR}/cryocmos)
	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/josephson
	(cd ${WRKSRC}/examples/josephson && ${INSTALL_DATA} * \
		${STAGEDIR}${EXAMPLESDIR}/josephson)

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)cad/jspice3/distinfo (-2 / +2 lines)
1	SHA256 (jspice3-2.5-011109.tar.gz) = 4fa5492584fb201b0f396ce805424b3128db4a70450506158854788aea68d7bf	1	SHA256 (jspice3-2.5-110615.tar.gz) = f40e23b2d5c554a5b7be7037fe41c6f179c33e07ab9da365d97c2b517dcd6af6
2	SIZE (jspice3-2.5-011109.tar.gz) = 1149738	2	SIZE (jspice3-2.5-110615.tar.gz) = 1145726




--- 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

         echo '#######################################################################'>> conf/mkheader.in
         cat conf/unixconf/mkheader.0 >> conf/mkheader.in
     else
@@ -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 ] || \
@@ -102,8 +102,14 @@ if [ -f conf/mkheader ]; then
         echo Installing config.h
@@ -92,8 +92,14 @@
         fi
         echo Creating makefiles in the subdirectories...
         $makeprog make




--- conf/unixconf/mkheader.0.orig	Tue Jan 15 19:15:36 2002
+++ conf/unixconf/mkheader.0	Fri Jul 21 06:11:55 2006
@@ -18,7 +18,7 @@
 BUG_ADDR = stevew@srware.com
 
 # name of host for remote spice runs
-SPICE_HOST =
+SPICE_HOST = localhost
 
 # spice daemon log file
 SPICED_LOG = /tmp/spiced.log
@@ -43,6 +43,6 @@
 LDFLAGS = @LIBS@
 RANLIB = @RANLIB@
 INCX = @X_CFLAGS@
-LIBX = @X_PRE_LIBS@ @X_LIBS@ -lXaw -lXt -lXext -lXmu -lX11 @X_EXTRA_LIBS@
+#%%WITH_X%%LIBX = @X_PRE_LIBS@ @X_LIBS@ -lXaw -lXt -lXext -lXmu -lX11 @X_EXTRA_LIBS@
 INTERFACE_OPTS = -DWANT_MFB -DWANT_X11
 MFB = mfb

Lines 1-4 Link Here

(-)cad/jspice3/files/patch-conf_util_configure (-1 / +1 lines)
1	--- conf/util/configure.orig 2002-01-15 19:21:25.000000000 +0000	1	--- conf/util/configure.orig 2002-01-15 19:21:25 UTC
2	+++ conf/util/configure	2	+++ conf/util/configure
3	@@ -805,11 +805,7 @@ else	3	@@ -805,11 +805,7 @@ else
4	fi	4	fi




--- src/bin/help.c.orig	2015-11-05 17:57:50 UTC
+++ src/bin/help.c
@@ -14,6 +14,7 @@ Authors: 1986 Wayne A. Christopher
 #include <pwd.h>
 #endif
 

 #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 String fallback_resources[] = {
     
@@ -188,7 +188,7 @@ int t;
 {
     if (!strcmp(n, kw_hcopydev)) {
         strcpy(r, hcopydev);

Lines 1-31 Link Here

(-)cad/jspice3/files/patch-src+lib+dev+ltra+ltramisc.c (-31 lines)
1	--- src/lib/dev/ltra/ltramisc.c.orig Wed Jan 5 03:25:41 2005
2	+++ src/lib/dev/ltra/ltramisc.c Thu Jul 20 23:59:44 2006
3	@@ -965,10 +965,12 @@
4	double ax = fabs(x);
5	if (ax < 3.75) {
6	double y = x/3.75;
7	+ double ans1;
8	+ double ans2;
9	y *= y;
10	- double ans1 = 1.0+y(3.5156229+y(3.0899424+y*(1.2067492
11	+ ans1 = 1.0+y(3.5156229+y(3.0899424+y*(1.2067492
12	+y(0.2659732+y(0.360768e-1+y*0.45813e-2)))));
13	- double ans2 = ax(0.5+y(0.87890594+y(0.51498869+y(0.15084934
14	+ ans2 = ax(0.5+y(0.87890594+y(0.51498869+y(0.15084934
15	+y(0.2658733e-1+y(0.301532e-2+y*0.32411e-3))))));
16	if (x > 0)
17	ans1 += ans2;
18	@@ -978,11 +980,12 @@
19	}
20	else {
21	double y = 3.75/ax;
22	+ double ans2;
23	double ans1 = (0.39894228+y*(0.1328592e-1
24	+y(0.225319e-2+y(-0.157565e-2+y*(0.916281e-2
25	+y(-0.2057706e-1+y(0.2635537e-1+y*(-0.1647633e-1
26	+y*0.392377e-2))))))));
27	- double ans2 = 0.2282967e-1+y(-0.2895312e-1+y(0.1787654e-1
28	+ ans2 = 0.2282967e-1+y(-0.2895312e-1+y(0.1787654e-1
29	-y*0.420059e-2));
30	ans2 = 0.39894228+y(-0.3988024e-1+y(-0.362018e-2
31	+y(0.163801e-2+y(-0.1031555e-1+y*ans2))));

Lines 1-6 Link Here

(-)cad/jspice3/files/patch-src+lib+fte+misccoms.c (-3 / +3 lines)
1	--- src/lib/fte/misccoms.c.orig Tue Feb 28 16:57:47 2006	1	--- src/lib/fte/misccoms.c.orig 2001-05-01 20:58:18 UTC
2	+++ src/lib/fte/misccoms.c Tue Feb 28 16:59:28 2006	2	+++ src/lib/fte/misccoms.c
3	@@ -284,7 +284,7 @@	3	@@ -284,7 +284,7 @@ wordlist *wl;
4	pl->pl_title,	4	pl->pl_title,
5	pl->pl_name);	5	pl->pl_name);
6	}	6	}

Lines 1-6 Link Here

(-)cad/jspice3/files/patch-src+lib+plot+x11.c (-4 / +4 lines)
1	--- src/lib/plot/x11.c.orig Thu Sep 2 21:43:35 2004	1	--- src/lib/plot/x11.c.orig 2004-09-02 21:43:35 UTC
2	+++ src/lib/plot/x11.c Fri Jul 21 06:06:00 2006	2	+++ src/lib/plot/x11.c
3	@@ -2205,7 +2205,7 @@	3	@@ -2205,7 +2205,7 @@ ScedESC()
4	void	4	void
5	com_setrdb(wl)	5	com_setrdb(wl)
6		6
Lines 9-15 Link Here
9	{	9	{
10	/* be silent */	10	/* be silent */
11	}	11	}
12	@@ -2213,7 +2213,7 @@	12	@@ -2213,7 +2213,7 @@ wordlist *wl;
13	int	13	int
14	PopUpErrMessage(fp)	14	PopUpErrMessage(fp)
15		15

Lines 1-11 Link Here

(-)cad/jspice3/files/patch-src_bin_help.c (-11 lines)
1	--- src/bin/help.c.intermediate 2014-08-18 06:30:22.000000000 +0000
2	+++ src/bin/help.c
3	@@ -53,7 +53,7 @@ XErrorEvent *errorev;
4
5	XGetErrorText(display, errorev->error_code, ErrorMessage, 1024);
6	printf(ErrorMessage);
7	- return;
8	+ return (NULL);
9	}
10
11




--- 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.
 

 #include <sys/types.h>
 
 #ifdef HAVE_SOCKET
@@ -293,7 +292,7 @@ sigchild()
         (void) fclose(fp);
     } else
         nrunning--;
-    return;
+    return 0;
 }
 
 #else /* not HAVE_SOCKET */

Lines 1-11 Link Here

(-)cad/jspice3/files/patch-src_lib_ckt_cktdelt.c (-11 lines)
1	--- src/lib/ckt/cktdelt.c.orig 1997-03-21 22:04:30.000000000 +0000
2	+++ src/lib/ckt/cktdelt.c
3	@@ -20,7 +20,7 @@ GENERIC *task;
4	{
5	JOB job, next;
6
7	- if (task == NULL) return;
8	+ if (task == NULL) return (OK);
9
10	for (job = ((TSKtask*)task)->jobs; job; job = next) {
11	next = job->JOBnextJob;




--- src/lib/fte/options.c.orig	2009-01-11 20:27:11.000000000 +0000
+++ src/lib/fte/options.c
@@ -66,7 +66,7 @@ def_fn(_iv_cpdebug)
 
 def_fn(_iv_history)
 {
-    if (!flag) return;
+    if (!flag) return (US_OK);
     if (v->va_type == VT_NUM)
         cp_maxhistlength = v->va_num;
     else if (v->va_type == VT_REAL)
@@ -930,27 +930,27 @@ struct variable **v1, **v2;
         v =  va_copy(plot_cur->pl_env);
     else
         v = NULL;
-    if (tv = cp_enqvar(kw_plots)) {
+    if ((tv = cp_enqvar(kw_plots))) {
         tv->va_next = v;
         v = tv;
     }
-    if (tv = cp_enqvar(kw_curplot)) {
+    if ((tv = cp_enqvar(kw_curplot))) {
         tv->va_next = v;
         v = tv;
     }
-    if (tv = cp_enqvar(kw_curplottitle)) {
+    if ((tv = cp_enqvar(kw_curplottitle))) {
         tv->va_next = v;
         v = tv;
     }
-    if (tv = cp_enqvar(kw_curplotname)) {
+    if ((tv = cp_enqvar(kw_curplotname))) {
         tv->va_next = v;
         v = tv;
     }
-    if (tv = cp_enqvar(kw_curplotdate)) {
+    if ((tv = cp_enqvar(kw_curplotdate))) {
         tv->va_next = v;
         v = tv;
     }
-    if (tv = cp_enqvar(kw_display)) {
+    if ((tv = cp_enqvar(kw_display))) {
         tv->va_next = v;
         v = tv;
     }

Lines 1-6 Link Here

(-)cad/jspice3/files/patch-src_lib_fte_resource.c (-3 / +3 lines)
1	--- src/lib/fte/resource.c.orig Tue Nov 14 18:23:27 2006	1	--- src/lib/fte/resource.c.orig 1997-03-21 22:03:41 UTC
2	+++ src/lib/fte/resource.c Tue Nov 14 18:23:33 2006	2	+++ src/lib/fte/resource.c
3	@@ -36,7 +36,7 @@	3	@@ -36,7 +36,7 @@ static struct timeb lasttime;
4	#endif	4	#endif
5	#endif	5	#endif
6	#endif	6	#endif

Lines 1-11 Link Here

(-)cad/jspice3/files/patch-src_lib_inp_ifeval.c (-11 lines)
1	--- src/lib/inp/ifeval.c.orig 1997-03-21 22:04:12.000000000 +0000
2	+++ src/lib/inp/ifeval.c
3	@@ -37,7 +37,7 @@ double step, finaltime;
4	int i;
5
6	if (!tree)
7	- return;
8	+ return (OK);
9	for (i = 0; i < tree->numVars; i++)
10	init_node(pt->derivs[i],step,finaltime);
11	init_node(pt->tree,step,finaltime);

Lines 1-29 Link Here

(-)cad/jspice3/files/patch-src_lib_mfb_mfbgnc.c (-29 lines)
1	--- src/lib/mfb/mfbgnc.c.orig 2001-05-01 19:45:26.000000000 +0000
2	+++ src/lib/mfb/mfbgnc.c
3	@@ -120,7 +120,7 @@ char *PM;
4	cp = PM;
5	dp = result;
6	if (cp == NULL) {
7	- return;
8	+ return (NULL);
9	}
10	while (c = *cp++) {
11	if(c == '$') {
12	@@ -300,7 +300,7 @@ char *PM;
13	y1 = reg;
14	}
15	else
16	- return;
17	+ return (NULL);
18	hiy = (y1 >> 7) & 037;
19	extra = x1 & 03 \| ((y1 & 03) << 2);
20	loy = (y1 >> 2) & 037;
21	@@ -427,7 +427,7 @@ char *PM;
22	continue;
23
24	default:
25	- return;
26	+ return (NULL);
27	}
28	}
29	*dp='\0';




--- src/lib/plot/postsc.c.orig	1997-03-21 22:03:37.000000000 +0000
+++ src/lib/plot/postsc.c
@@ -343,12 +343,12 @@ int linestyleid;
         get it when PS_Text restores a -1 linestyle */
     if (linestyleid == -1) {
         currentgraph->linestyle = -1;
-        return;
+        return (0);
     }
 
     if (linestyleid < 0) {
         internalerror("bad linestyleid");
-        return;
+        return (0);
     }
 
     if (linestyleid > dispdev->numlinestyles)
@@ -407,7 +407,7 @@ int x, y, Xform;
 
     if (Xform == (char)0) {
         PS_Text(text,x,y);
-        return;
+        return (0);
     }
 
     s = tbuf;




--- src/lib/sced/labeltxt.c.orig	1997-03-21 22:04:16.000000000 +0000
+++ src/lib/sced/labeltxt.c
@@ -175,7 +175,7 @@ int x, y, degrees, scale;
     if (!strcmp(dispdev->name,"wp")) {
         /* use plain text for now */
         DevText(text,x,y);
-        return;
+        return (0);
     }
 
     /* Hack!  If degrees is >= 90, an angle is assumed.
@@ -185,7 +185,7 @@ int x, y, degrees, scale;
 
     if (!strcmp(dispdev->name,"postscript")) {
         PS_ScaledText(text,x,y,degrees);
-        return;
+        return (0);
     }
 
     if (degrees & 1) {

Lines 1-11 Link Here

(-)cad/jspice3/files/patch-src_lib_sced_scedintr.c (-11 lines)
1	--- src/lib/sced/scedintr.c.orig 2001-05-01 20:54:05.000000000 +0000
2	+++ src/lib/sced/scedintr.c
3	@@ -1009,7 +1009,7 @@ char *string;
4	strcat(TypeOut,string);
5	else
6	strcat(TypeOut,"\n");
7	- if (strchr(TypeOut,'\n') == NULL) return;
8	+ if (strchr(TypeOut,'\n') == NULL) return (False);
9	if (MoreLine(TypeOut))
10	EnableMore(False);
11	*TypeOut = '\0';

Lines 1-5 Link Here

(-)cad/jspice3/pkg-plist (-1 / +1 lines)
1	bin/jspice3	1	bin/jspice3
2	bin/help	2	%%X11%%bin/help
3	bin/nutmeg	3	bin/nutmeg
4	bin/proc2mod	4	bin/proc2mod
5	bin/multidec	5	bin/multidec

Return to bug 205891

Lines 2-62 Link Here

(-)cad/jspice3/Makefile (-36 / +46 lines)
2	# $FreeBSD: head/cad/jspice3/Makefile 403633 2015-12-12 21:36:03Z bapt $	2	# $FreeBSD: head/cad/jspice3/Makefile 403633 2015-12-12 21:36:03Z bapt $
3		3
4	PORTNAME= jspice3	4	PORTNAME= jspice3
5	PORTVERSION= 2.5.011109	5	PORTVERSION= 2.5.110615
6	PORTREVISION= 1
7	CATEGORIES= cad	6	CATEGORIES= cad
8	MASTER_SITES= http://www.wrcad.com/ftp/pub/	7	MASTER_SITES= http://www.wrcad.com/ftp/pub/
9	DISTNAME= ${PORTNAME}-2.5-011109	8	DISTNAME= ${PORTNAME}-${PORTVERSION:R}-${PORTVERSION:E}
10		9
11	MAINTAINER= ports@FreeBSD.org	10	MAINTAINER= ports@FreeBSD.org
12	COMMENT= Adaptation of the Berkeley Spice3f4 with superconductivity	11	COMMENT= Adaptation of the Berkeley Spice3f4 with superconductivity
13		12
14	BROKEN= unfetchable	13	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
		14
15		15
16	CONFLICTS= spice-[0-9]*	16	CONFLICTS= spice-[0-9]*
17		17
18	OPTIONS_DEFINE= X11 EXAMPLES	18	OPTIONS_DEFINE= EXAMPLES X11
19	OPTIONS_DEFAULT= X11	19	OPTIONS_DEFAULT= X11
20	WRKSRC= ${WRKDIR}/${PORTNAME}-2.5	20	OPTIONS_SUB= yes
21		21
22	X11_USE= XORG=x11,xaw,xt	22	X11_USE= XORG=x11,xaw,xt
23		23
24	pre-configure:	24	post-patch:
25	@${REINPLACE_CMD} -e 's+/usr/local+${PREFIX}+g;s+-O -g+${CFLAGS}+g;' \	25	@${REINPLACE_CMD} -e \
		26	'/^prefix/s\|=.*\|= ${PREFIX}\| ; \
		27	/^SPICE_HOST/s\|=.*\|= localhost\| ; \
		28	/^CC_OPT/s\|=.*\|= ${CFLAGS}\|' \
26	${WRKSRC}/conf/unixconf/mkheader.0	29	${WRKSRC}/conf/unixconf/mkheader.0
27		30
28	pre-configure-X11-on:	31	post-patch-X11-off:
29	@${REINPLACE_CMD} -e 's+#%%WITH_X%%++g' \	32	@${REINPLACE_CMD} -e \
		33	'/$$makeprog depend/s\|^\|#\|' \
		34	${WRKSRC}/build
		35	@${REINPLACE_CMD} -e \
		36	's\|^LIBX\|#LIBX\| ; \
		37	s\|-DWANT_X11\|\|' \
30	${WRKSRC}/conf/unixconf/mkheader.0	38	${WRKSRC}/conf/unixconf/mkheader.0
31		39
32	pre-configure-X11-off:
33	@${ECHO} "#undef HAVE_X11" >> ${WRKSRC}/src/include/spice.h
34
35	do-build:	40	do-build:
36	(cd ${WRKSRC};${SETENV} ${MAKE_ENV} ${SH} build)	41	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${SH} build)
37		42
38	do-install:	43	do-install:
39	${MKDIR} ${STAGEDIR}${PREFIX}/lib/jspice3/helpdir \	44	.for i in help jspice3 multidec nutmeg proc2mod spiced xeditor
40	${STAGEDIR}${PREFIX}/lib/jspice3/sced \	45	(cd ${WRKSRC}/src/bin && ${INSTALL_PROGRAM} ${i} \
41	${STAGEDIR}${PREFIX}/lib/jspice3/scripts	46	${STAGEDIR}${PREFIX}/bin)
42	(cd ${WRKSRC}/src/bin && ${INSTALL_PROGRAM} jspice3 nutmeg help \	47	.endfor
43	multidec proc2mod spiced xeditor ${STAGEDIR}${PREFIX}/bin)	48	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/jspice3
44	${INSTALL_DATA} ${WRKSRC}/lib/mfbcap ${WRKSRC}/lib/news \	49	(cd ${WRKSRC}/lib && ${INSTALL_DATA} mfbcap news \
45	${STAGEDIR}${PREFIX}/lib/jspice3	50	${STAGEDIR}${PREFIX}/lib/jspice3)
46	${INSTALL_DATA} ${WRKSRC}/lib/helpdir/* \	51	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/jspice3/helpdir
47	${STAGEDIR}${PREFIX}/lib/jspice3/helpdir	52	(cd ${WRKSRC}/lib/helpdir && ${INSTALL_DATA} * \
48	${INSTALL_DATA} ${WRKSRC}//lib/sced/* \	53	${STAGEDIR}${PREFIX}/lib/jspice3/helpdir)
49	${STAGEDIR}${PREFIX}/lib/jspice3/sced	54	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/jspice3/sced
50	${INSTALL_DATA} ${WRKSRC}/lib/scripts/* \	55	(cd ${WRKSRC}/lib/sced && ${INSTALL_DATA} * \
51	${STAGEDIR}${PREFIX}/lib/jspice3/scripts	56	${STAGEDIR}${PREFIX}/lib/jspice3/sced)
		57	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/jspice3/scripts
		58	(cd ${WRKSRC}/lib/scripts && ${INSTALL_DATA} * \
		59	${STAGEDIR}${PREFIX}/lib/jspice3/scripts)
		60
52	do-install-EXAMPLES-on:	61	do-install-EXAMPLES-on:
53	${MKDIR} ${STAGEDIR}${PREFIX}/share/examples/jspice3/cryocmos \	62	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
54	${STAGEDIR}${PREFIX}/share/examples/jspice3/josephson	63	(cd ${WRKSRC}/examples && ${INSTALL_DATA} . \
55	${INSTALL_DATA} ${WRKSRC}/examples/. \	64	${STAGEDIR}${EXAMPLESDIR})
56	${STAGEDIR}${PREFIX}/share/examples/jspice3	65	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/cryocmos
57	${INSTALL_DATA} ${WRKSRC}/examples/cryocmos/* \	66	(cd ${WRKSRC}/examples/cryocmos && ${INSTALL_DATA} * \
58	${STAGEDIR}${PREFIX}/share/examples/jspice3/cryocmos	67	${STAGEDIR}${EXAMPLESDIR}/cryocmos)
59	${INSTALL_DATA} ${WRKSRC}/examples/josephson/* \	68	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/josephson
60	${STAGEDIR}${PREFIX}/share/examples/jspice3/josephson	69	(cd ${WRKSRC}/examples/josephson && ${INSTALL_DATA} * \
		70	${STAGEDIR}${EXAMPLESDIR}/josephson)
61		71
62	.include <bsd.port.mk>	72	.include <bsd.port.mk>

Lines 1-6 Link Here

(-)cad/jspice3/files/patch-build (-11 / +11 lines)
1	--- build.orig Tue May 1 13:37:12 2001	1	--- build.orig 2015-11-05 18:10:02 UTC
2	+++ build Sat Nov 25 00:38:47 2006	2	+++ build
3	@@ -22,7 +22,7 @@	3	@@ -22,7 +22,7 @@ if [ -d conf/unixconf ]; then
4	echo '#######################################################################'> conf/mkheader.in	4	echo '#######################################################################'> conf/mkheader.in
5	echo '####### Makefile generated by build script ############################'>> conf/mkheader.in	5	echo '####### Makefile generated by build script ############################'>> conf/mkheader.in
6	echo VERSION = $version>> conf/mkheader.in	6	echo VERSION = $version>> conf/mkheader.in
Lines 9-24 Link Here
9	echo '#######################################################################'>> conf/mkheader.in	9	echo '#######################################################################'>> conf/mkheader.in
10	cat conf/unixconf/mkheader.0 >> conf/mkheader.in	10	cat conf/unixconf/mkheader.0 >> conf/mkheader.in
11	else	11	else
12	@@ -43,7 +43,7 @@	12	@@ -51,7 +51,7 @@ if [ -f conf/util/configure ]; then
		13	if [ `uname -s` = Darwin -a -d /opt/X11 ]; then
		14	util/configure --x-includes=/opt/X11/include --x-libraries=/opt/X11/lib -srcdir .
		15	else
		16	- util/configure -srcdir .
		17	+ util/configure --prefix=${PREFIX} --x-includes=${LOCALBASE}/include --x-libraries=${LOCALBASE}/lib -srcdir .
		18	fi
13		19
14	if [ -f conf/util/configure ]; then
15	cd conf
16	- util/configure -srcdir .
17	+ util/configure -srcdir . --prefix=${PREFIX} -x-includes="${LOCALBASE}/include" -x-libraries="${LOCALBASE}/lib"
18	if [ ! -f ../src/include/config.h ] \|\| \	20	if [ ! -f ../src/include/config.h ] \|\| \
19	[ "`diff config.h ../src/include/config.h \|head`" ]; then	21	@@ -102,8 +102,14 @@ if [ -f conf/mkheader ]; then
20	echo Installing config.h
21	@@ -92,8 +92,14 @@
22	fi	22	fi
23	echo Creating makefiles in the subdirectories...	23	echo Creating makefiles in the subdirectories...
24	$makeprog make	24	$makeprog make

Lines 1-19 Link Here

(-)cad/jspice3/files/patch-conf+unixconf+mkheader.0 (-19 lines)
1	--- conf/unixconf/mkheader.0.orig Tue Jan 15 19:15:36 2002
2	+++ conf/unixconf/mkheader.0 Fri Jul 21 06:11:55 2006
3	@@ -18,7 +18,7 @@
4	BUG_ADDR = stevew@srware.com
5
6	# name of host for remote spice runs
7	-SPICE_HOST =
8	+SPICE_HOST = localhost
9
10	# spice daemon log file
11	SPICED_LOG = /tmp/spiced.log
12	@@ -43,6 +43,6 @@
13	LDFLAGS = @LIBS@
14	RANLIB = @RANLIB@
15	INCX = @X_CFLAGS@
16	-LIBX = @X_PRE_LIBS@ @X_LIBS@ -lXaw -lXt -lXext -lXmu -lX11 @X_EXTRA_LIBS@
17	+#%%WITH_X%%LIBX = @X_PRE_LIBS@ @X_LIBS@ -lXaw -lXt -lXext -lXmu -lX11 @X_EXTRA_LIBS@
18	INTERFACE_OPTS = -DWANT_MFB -DWANT_X11
19	MFB = mfb

Lines 1-6 Link Here

(-)cad/jspice3/files/patch-src+bin+help.c (-5 / +5 lines)
1	--- src/bin/help.c.orig Fri Jul 21 06:16:08 2006	1	--- src/bin/help.c.orig 2015-11-05 17:57:50 UTC
2	+++ src/bin/help.c Fri Jul 21 06:18:15 2006	2	+++ src/bin/help.c
3	@@ -14,6 +14,7 @@	3	@@ -14,6 +14,7 @@ Authors: 1986 Wayne A. Christopher
4	#include <pwd.h>	4	#include <pwd.h>
5	#endif	5	#endif
6		6
Lines 8-14 Link Here
8	#ifdef HAVE_X11	8	#ifdef HAVE_X11
9		9
10	#include <X11/Intrinsic.h>	10	#include <X11/Intrinsic.h>
11	@@ -22,7 +23,6 @@	11	@@ -22,7 +23,6 @@ Authors: 1986 Wayne A. Christopher
12	Display *Xdisplay;	12	Display *Xdisplay;
13	static XtAppContext app_con;	13	static XtAppContext app_con;
14	static Widget toplevel;	14	static Widget toplevel;
Lines 16-22 Link Here
16		16
17	static String fallback_resources[] = {	17	static String fallback_resources[] = {
18		18
19	@@ -188,7 +188,7 @@	19	@@ -188,7 +188,7 @@ int t;
20	{	20	{
21	if (!strcmp(n, kw_hcopydev)) {	21	if (!strcmp(n, kw_hcopydev)) {
22	strcpy(r, hcopydev);	22	strcpy(r, hcopydev);

Lines 1-4 Link Here

(-)cad/jspice3/files/patch-src_bin_spiced.c (-10 / +1 lines)
1	--- src/bin/spiced.c.orig 2001-05-01 21:56:08.000000000 +0000	1	--- src/bin/spiced.c.orig 2015-11-05 17:58:45 UTC
2	+++ src/bin/spiced.c	2	+++ src/bin/spiced.c
3	@@ -16,12 +16,11 @@ Author: 1985 Wayne A. Christopher, U. C.	3	@@ -16,12 +16,11 @@ Author: 1985 Wayne A. Christopher, U. C.
4		4
Lines 16-27 Link Here
16	#include <sys/types.h>	16	#include <sys/types.h>
17		17
18	#ifdef HAVE_SOCKET	18	#ifdef HAVE_SOCKET
19	@@ -293,7 +292,7 @@ sigchild()
20	(void) fclose(fp);
21	} else
22	nrunning--;
23	- return;
24	+ return 0;
25	}
26
27	#else /* not HAVE_SOCKET */

Lines 1-45 Link Here

(-)cad/jspice3/files/patch-src_lib_fte_options.c (-45 lines)
1	--- src/lib/fte/options.c.orig 2009-01-11 20:27:11.000000000 +0000
2	+++ src/lib/fte/options.c
3	@@ -66,7 +66,7 @@ def_fn(_iv_cpdebug)
4
5	def_fn(_iv_history)
6	{
7	- if (!flag) return;
8	+ if (!flag) return (US_OK);
9	if (v->va_type == VT_NUM)
10	cp_maxhistlength = v->va_num;
11	else if (v->va_type == VT_REAL)
12	@@ -930,27 +930,27 @@ struct variable v1, v2;
13	v = va_copy(plot_cur->pl_env);
14	else
15	v = NULL;
16	- if (tv = cp_enqvar(kw_plots)) {
17	+ if ((tv = cp_enqvar(kw_plots))) {
18	tv->va_next = v;
19	v = tv;
20	}
21	- if (tv = cp_enqvar(kw_curplot)) {
22	+ if ((tv = cp_enqvar(kw_curplot))) {
23	tv->va_next = v;
24	v = tv;
25	}
26	- if (tv = cp_enqvar(kw_curplottitle)) {
27	+ if ((tv = cp_enqvar(kw_curplottitle))) {
28	tv->va_next = v;
29	v = tv;
30	}
31	- if (tv = cp_enqvar(kw_curplotname)) {
32	+ if ((tv = cp_enqvar(kw_curplotname))) {
33	tv->va_next = v;
34	v = tv;
35	}
36	- if (tv = cp_enqvar(kw_curplotdate)) {
37	+ if ((tv = cp_enqvar(kw_curplotdate))) {
38	tv->va_next = v;
39	v = tv;
40	}
41	- if (tv = cp_enqvar(kw_display)) {
42	+ if ((tv = cp_enqvar(kw_display))) {
43	tv->va_next = v;
44	v = tv;
45	}

Lines 1-26 Link Here

(-)cad/jspice3/files/patch-src_lib_plot_postsc.c (-26 lines)
1	--- src/lib/plot/postsc.c.orig 1997-03-21 22:03:37.000000000 +0000
2	+++ src/lib/plot/postsc.c
3	@@ -343,12 +343,12 @@ int linestyleid;
4	get it when PS_Text restores a -1 linestyle */
5	if (linestyleid == -1) {
6	currentgraph->linestyle = -1;
7	- return;
8	+ return (0);
9	}
10
11	if (linestyleid < 0) {
12	internalerror("bad linestyleid");
13	- return;
14	+ return (0);
15	}
16
17	if (linestyleid > dispdev->numlinestyles)
18	@@ -407,7 +407,7 @@ int x, y, Xform;
19
20	if (Xform == (char)0) {
21	PS_Text(text,x,y);
22	- return;
23	+ return (0);
24	}
25
26	s = tbuf;

Lines 1-20 Link Here

(-)cad/jspice3/files/patch-src_lib_sced_labeltxt.c (-20 lines)
1	--- src/lib/sced/labeltxt.c.orig 1997-03-21 22:04:16.000000000 +0000
2	+++ src/lib/sced/labeltxt.c
3	@@ -175,7 +175,7 @@ int x, y, degrees, scale;
4	if (!strcmp(dispdev->name,"wp")) {
5	/* use plain text for now */
6	DevText(text,x,y);
7	- return;
8	+ return (0);
9	}
10
11	/* Hack! If degrees is >= 90, an angle is assumed.
12	@@ -185,7 +185,7 @@ int x, y, degrees, scale;
13
14	if (!strcmp(dispdev->name,"postscript")) {
15	PS_ScaledText(text,x,y,degrees);
16	- return;
17	+ return (0);
18	}
19
20	if (degrees & 1) {