Attachment #134527 for bug #179212

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

Lines 1-9 Link Here

(-)editors/vigor/Makefile (-11 / +11 lines)
1	# New ports collection makefile for: vigor	1	# Created by: Bill Fumerola <billf@chc-chimes.com>
2	# Date created: 17 Jan 2000
3	# Whom: Bill Fumerola <billf@chc-chimes.com>
4	#
5	# $FreeBSD: head/editors/vigor/Makefile 300896 2012-07-14 13:54:48Z beat $	2	# $FreeBSD: head/editors/vigor/Makefile 300896 2012-07-14 13:54:48Z beat $
6	#
7		3
8	PORTNAME= vigor	4	PORTNAME= vigor
9	PORTVERSION= 0.016	5	PORTVERSION= 0.016
Lines 12-18 Link Here
12	MASTER_SITES= SF	8	MASTER_SITES= SF
13		9
14	MAINTAINER= ports@FreeBSD.org	10	MAINTAINER= ports@FreeBSD.org
15	COMMENT= A vi clone inspired by the userfriendly comic strip	11	COMMENT= Vi clone inspired by the userfriendly comic strip
		12
		13	LICENSE= BSD
		14	LICENSE_FILE= ${WRKSRC}/../LICENSE
		15
		16	WRKSRC= ${WRKDIR}/${DISTNAME}/build
16		17
17	USE_TCL= yes	18	USE_TCL= yes
18	USE_TCL_BUILD= yes	19	USE_TCL_BUILD= yes
Lines 20-33 Link Here
20	USE_TK_BUILD= yes	21	USE_TK_BUILD= yes
21	USE_XORG= x11	22	USE_XORG= x11
22	GNU_CONFIGURE= yes	23	GNU_CONFIGURE= yes
23	CONFIGURE_ARGS+=--program-transform-name="s,0,1,"	24	MAKE_JOBS_SAFE= yes
24	LDFLAGS+= -L${LOCALBASE}/lib
25		25
26	WRKSRC= ${WRKDIR}/${DISTNAME}/build	26	CPPFLAGS+= -I${TCL_INCLUDEDIR} -I${TK_INCLUDEDIR}
27	CFLAGS+= -I${LOCALBASE}/include/tcl${TCL_VER} -I${LOCALBASE}/include/tk${TK_VER}	27	LDFLAGS+= -L${LOCALBASE}/lib
28		28
29	post-patch:	29	post-patch:
30	${REINPLACE_CMD} -e 's\|tcl80\|tcl${TCL_VER:S/.//} -L${LOCALBASE}/lib\|; \	30	${REINPLACE_CMD} -e 's\|tcl80\|tcl${TCL_VER:S/.//}\|; \
31	s\|tk80\|tk${TK_VER:S/.//}\|; \	31	s\|tk80\|tk${TK_VER:S/.//}\|; \
32	s\|^grantpt\|XXXgrantpt\|;' \	32	s\|^grantpt\|XXXgrantpt\|;' \
33	${WRKSRC}/configure	33	${WRKSRC}/configure




--- ../vigor/vigor.c.orig	Fri Sep 15 18:41:47 2000
+++ ../vigor/vigor.c	Fri Sep 15 18:41:54 2000
@@ -13,7 +13,7 @@
 #include <sys/types.h>
 #include <sys/queue.h>
 #include <sys/time.h>
-#ifdef HAVE_SYS_SELECT_H
+#if 0
 #include <sys/select.h>
 #endif
 
--- ../cl/cl_read.c.orig	Fri Sep 15 18:37:07 2000
+++ ../cl/cl_read.c	Fri Sep 15 18:40:21 2000
@@ -15,7 +15,7 @@
 
 #include <sys/types.h>
 #include <sys/queue.h>
-#ifdef HAVE_SYS_SELECT_H
+#if 0
 #include <sys/select.h>
 #endif
 #include <sys/time.h>
--- ../ex/ex_script.c.orig	Fri Sep 15 18:40:53 2000
+++ ../ex/ex_script.c	Fri Sep 15 18:41:02 2000
@@ -19,7 +19,7 @@
 #include <sys/types.h>
 #include <sys/ioctl.h>
 #include <sys/queue.h>
-#ifdef HAVE_SYS_SELECT_H
+#if 0
 #include <sys/select.h>
 #endif
 #include <sys/stat.h>

Line 0 Link Here

(-)editors/vigor/files/patch-cl__cl_read.c (+11 lines)
	1	--- ../cl/cl_read.c.orig Fri Sep 15 18:37:07 2000
	2	+++ ../cl/cl_read.c Fri Sep 15 18:40:21 2000
	3	@@ -15,7 +15,7 @@
	4
	5	#include <sys/types.h>
	6	#include <sys/queue.h>
	7	-#ifdef HAVE_SYS_SELECT_H
	8	+#if 0
	9	#include <sys/select.h>
	10	#endif
	11	#include <sys/time.h>

Line 0 Link Here

(-)editors/vigor/files/patch-ex__ex_script.c (+11 lines)
	1	--- ../ex/ex_script.c.orig
	2	+++ ../ex/ex_script.c
	3	@@ -19,7 +19,7 @@
	4	#include <sys/types.h>
	5	#include <sys/ioctl.h>
	6	#include <sys/queue.h>
	7	-#ifdef HAVE_SYS_SELECT_H
	8	+#if 0
	9	#include <sys/select.h>
	10	#endif
	11	#include <sys/stat.h>

Line 0 Link Here

(-)editors/vigor/files/patch-ex__ex_tcl.c (+11 lines)
	1	--- ../ex/ex_tcl.c.orig
	2	+++ ../ex/ex_tcl.c
	3	@@ -71,7 +71,7 @@
	4	Tcl_Eval(gp->tcl_interp, cmdp->argv[0]->bp) == TCL_OK)
	5	return (0);
	6
	7	- msgq(sp, M_ERR, "Tcl: %s", ((Tcl_Interp *)gp->tcl_interp)->result);
	8	+ msgq(sp, M_ERR, "Tcl: %s", Tcl_GetStringResult(gp->tcl_interp));
	9	return (1);
	10	#else
	11	msgq(sp, M_ERR, "302\|Vi was not loaded with a Tcl interpreter");




--- ../tcl_api/tcl.c.orig
+++ ../tcl_api/tcl.c
@@ -73,7 +73,7 @@
 	if (getscreenid(interp, &sp, NULL, argv[1]))
 		return (TCL_ERROR);
 
-	(void)sprintf(interp->result, "%d", sp->id);
+	(void)sprintf(Tcl_GetStringResult(interp), "%d", sp->id);
 	return (TCL_OK);
 }
 
@@ -254,7 +254,7 @@
 	if (rval)
 		return (TCL_ERROR);
 
-	(void)sprintf(interp->result, "%lu", (unsigned long)last);
+	(void)sprintf(Tcl_GetStringResult(interp), "%lu", (unsigned long)last);
 	return (TCL_OK);
 }
 
@@ -520,7 +520,7 @@
 	if (rval)
 		return (TCL_ERROR);
 
-	(void)sprintf(interp->result, "%d", nsp->id);
+	(void)sprintf(Tcl_GetStringResult(interp), "%d", nsp->id);
 	return (TCL_OK);
 }
 




--- ../vigor/vigor.c.orig
+++ ../vigor/vigor.c
@@ -13,7 +13,7 @@
 #include <sys/types.h>
 #include <sys/queue.h>
 #include <sys/time.h>
-#ifdef HAVE_SYS_SELECT_H
+#if 0
 #include <sys/select.h>
 #endif
 
@@ -78,7 +78,7 @@
 	 * to want tk's main window cluttering up the place.  I should
 	 * use a wm_withdraw instead. */
 	if (Tk_Init(vigor_interp) == TCL_ERROR) {
-		fprintf(stderr, "%s\n", vigor_interp->result);		
+		fprintf(stderr, "%s\n", Tcl_GetStringResult(vigor_interp));		
 		return (1);
 	}
 
@@ -87,7 +87,7 @@
 		return (1);
 #endif
 	if (Tcl_Eval(vigor_interp, vigor_tcl) == TCL_ERROR) {
-		fprintf(stderr, "%s\n", vigor_interp->result);
+		fprintf(stderr, "%s\n", Tcl_GetStringResult(vigor_interp));
 		return (1);
 	}
 
@@ -127,7 +127,7 @@
 	init_vigor_phrases();
 
 	if (Tcl_Eval(vigor_interp, "vigor_init") == TCL_ERROR) {
-		fprintf(stderr, "%s\n", vigor_interp->result);
+		fprintf(stderr, "%s\n", Tcl_GetStringResult(vigor_interp));
 	        return (1);
 	}


Return to bug 179212

Lines 1-33 Link Here

(-)editors/vigor/files/patch-ab (-33 lines)
1	--- ../vigor/vigor.c.orig Fri Sep 15 18:41:47 2000
2	+++ ../vigor/vigor.c Fri Sep 15 18:41:54 2000
3	@@ -13,7 +13,7 @@
4	#include <sys/types.h>
5	#include <sys/queue.h>
6	#include <sys/time.h>
7	-#ifdef HAVE_SYS_SELECT_H
8	+#if 0
9	#include <sys/select.h>
10	#endif
11
12	--- ../cl/cl_read.c.orig Fri Sep 15 18:37:07 2000
13	+++ ../cl/cl_read.c Fri Sep 15 18:40:21 2000
14	@@ -15,7 +15,7 @@
15
16	#include <sys/types.h>
17	#include <sys/queue.h>
18	-#ifdef HAVE_SYS_SELECT_H
19	+#if 0
20	#include <sys/select.h>
21	#endif
22	#include <sys/time.h>
23	--- ../ex/ex_script.c.orig Fri Sep 15 18:40:53 2000
24	+++ ../ex/ex_script.c Fri Sep 15 18:41:02 2000
25	@@ -19,7 +19,7 @@
26	#include <sys/types.h>
27	#include <sys/ioctl.h>
28	#include <sys/queue.h>
29	-#ifdef HAVE_SYS_SELECT_H
30	+#if 0
31	#include <sys/select.h>
32	#endif
33	#include <sys/stat.h>

Line 0 Link Here

(-)editors/vigor/files/patch-tcl_api__tcl.c (+29 lines)
	1	--- ../tcl_api/tcl.c.orig
	2	+++ ../tcl_api/tcl.c
	3	@@ -73,7 +73,7 @@
	4	if (getscreenid(interp, &sp, NULL, argv[1]))
	5	return (TCL_ERROR);
	6
	7	- (void)sprintf(interp->result, "%d", sp->id);
	8	+ (void)sprintf(Tcl_GetStringResult(interp), "%d", sp->id);
	9	return (TCL_OK);
	10	}
	11
	12	@@ -254,7 +254,7 @@
	13	if (rval)
	14	return (TCL_ERROR);
	15
	16	- (void)sprintf(interp->result, "%lu", (unsigned long)last);
	17	+ (void)sprintf(Tcl_GetStringResult(interp), "%lu", (unsigned long)last);
	18	return (TCL_OK);
	19	}
	20
	21	@@ -520,7 +520,7 @@
	22	if (rval)
	23	return (TCL_ERROR);
	24
	25	- (void)sprintf(interp->result, "%d", nsp->id);
	26	+ (void)sprintf(Tcl_GetStringResult(interp), "%d", nsp->id);
	27	return (TCL_OK);
	28	}
	29

Line 0 Link Here

(-)editors/vigor/files/patch-vigor__vigor.c (+38 lines)
	1	--- ../vigor/vigor.c.orig
	2	+++ ../vigor/vigor.c
	3	@@ -13,7 +13,7 @@
	4	#include <sys/types.h>
	5	#include <sys/queue.h>
	6	#include <sys/time.h>
	7	-#ifdef HAVE_SYS_SELECT_H
	8	+#if 0
	9	#include <sys/select.h>
	10	#endif
	11
	12	@@ -78,7 +78,7 @@
	13	* to want tk's main window cluttering up the place. I should
	14	* use a wm_withdraw instead. */
	15	if (Tk_Init(vigor_interp) == TCL_ERROR) {
	16	- fprintf(stderr, "%s\n", vigor_interp->result);
	17	+ fprintf(stderr, "%s\n", Tcl_GetStringResult(vigor_interp));
	18	return (1);
	19	}
	20
	21	@@ -87,7 +87,7 @@
	22	return (1);
	23	#endif
	24	if (Tcl_Eval(vigor_interp, vigor_tcl) == TCL_ERROR) {
	25	- fprintf(stderr, "%s\n", vigor_interp->result);
	26	+ fprintf(stderr, "%s\n", Tcl_GetStringResult(vigor_interp));
	27	return (1);
	28	}
	29
	30	@@ -127,7 +127,7 @@
	31	init_vigor_phrases();
	32
	33	if (Tcl_Eval(vigor_interp, "vigor_init") == TCL_ERROR) {
	34	- fprintf(stderr, "%s\n", vigor_interp->result);
	35	+ fprintf(stderr, "%s\n", Tcl_GetStringResult(vigor_interp));
	36	return (1);
	37	}
	38