sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 17:59:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Fix build with newer Tcl/Tk 8.6

Browse source 
- Add LICENSE
- Add MAKE_JOBS_SAFE

PR:		179212
Submitted by:	Ports Fury
This commit is contained in:
Martin Wilke 2013-06-04 08:23:11 +00:00
parent 189f7f3984
commit a0efd6ec9b
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=319831
7 changed files with 111 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
editors/vigor/Makefile
View file

@ -1,9 +1,5 @@
# New ports collection makefile for: vigor
# Date created: 17 Jan 2000
# Whom: Bill Fumerola <billf@chc-chimes.com>
#
# Created by: Bill Fumerola <billf@chc-chimes.com>
# $FreeBSD$
#
PORTNAME= vigor
PORTVERSION= 0.016
@ -12,7 +8,12 @@ CATEGORIES= editors tcl tk
MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= A vi clone inspired by the userfriendly comic strip
COMMENT= Vi clone inspired by the userfriendly comic strip
LICENSE= BSD
LICENSE_FILE= ${WRKSRC}/../LICENSE
WRKSRC= ${WRKDIR}/${DISTNAME}/build
USE_TCL= yes
USE_TCL_BUILD= yes
@ -20,14 +21,13 @@ USE_TK= yes
USE_TK_BUILD= yes
USE_XORG= x11
GNU_CONFIGURE= yes
CONFIGURE_ARGS+=--program-transform-name="s,0,1,"
MAKE_JOBS_SAFE= yes
CPPFLAGS+= -I${TCL_INCLUDEDIR} -I${TK_INCLUDEDIR}
LDFLAGS+= -L${LOCALBASE}/lib
WRKSRC= ${WRKDIR}/${DISTNAME}/build
CFLAGS+= -I${LOCALBASE}/include/tcl${TCL_VER} -I${LOCALBASE}/include/tk${TK_VER}
post-patch:
${REINPLACE_CMD} -e 's|tcl80|tcl${TCL_VER:S/.//} -L${LOCALBASE}/lib|; \
${REINPLACE_CMD} -e 's|tcl80|tcl${TCL_VER:S/.//}|; \
s|tk80|tk${TK_VER:S/.//}|; \
s|^grantpt|XXXgrantpt|;' \
${WRKSRC}/configure

33
editors/vigor/files/patch-ab
View file

@ -1,33 +0,0 @@
--- ../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>

11
editors/vigor/files/patch-cl__cl_read.c Normal file
View file

@ -0,0 +1,11 @@
--- ../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>

11
editors/vigor/files/patch-ex__ex_script.c Normal file
View file

@ -0,0 +1,11 @@
--- ../ex/ex_script.c.orig
+++ ../ex/ex_script.c
@@ -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>

11
editors/vigor/files/patch-ex__ex_tcl.c Normal file
View file

@ -0,0 +1,11 @@
--- ../ex/ex_tcl.c.orig
+++ ../ex/ex_tcl.c
@@ -71,7 +71,7 @@
Tcl_Eval(gp->tcl_interp, cmdp->argv[0]->bp) == TCL_OK)
return (0);
- msgq(sp, M_ERR, "Tcl: %s", ((Tcl_Interp *)gp->tcl_interp)->result);
+ msgq(sp, M_ERR, "Tcl: %s", Tcl_GetStringResult(gp->tcl_interp));
return (1);
#else
msgq(sp, M_ERR, "302|Vi was not loaded with a Tcl interpreter");

29
editors/vigor/files/patch-tcl_api__tcl.c Normal file
View file

@ -0,0 +1,29 @@
--- ../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);
}

38
editors/vigor/files/patch-vigor__vigor.c Normal file
View file

@ -0,0 +1,38 @@
--- ../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);
}