From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Jun 2 18:10:02 2013 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id F3532226 for ; Sun, 2 Jun 2013 18:10:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id D24401204 for ; Sun, 2 Jun 2013 18:10:01 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id r52IA1DH099431 for ; Sun, 2 Jun 2013 18:10:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id r52IA1OO099430; Sun, 2 Jun 2013 18:10:01 GMT (envelope-from gnats) Resent-Date: Sun, 2 Jun 2013 18:10:01 GMT Resent-Message-Id: <201306021810.r52IA1OO099430@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, KATO Tsuguru Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id E281EF5E for ; Sun, 2 Jun 2013 18:00:37 +0000 (UTC) (envelope-from tkato432@yahoo.com) Received: from msa102lp.auone-net.jp (msa102lp.auone-net.jp [222.3.140.165]) by mx1.freebsd.org (Postfix) with ESMTP id 8B8C811B6 for ; Sun, 2 Jun 2013 18:00:37 +0000 (UTC) Received: from localhost.localdomain (ZT029100.ppp.dion.ne.jp [59.128.29.100]) by msa102lp.auone-net.jp (au one net msa) with ESMTP id B83FF4AC036 for ; Mon, 3 Jun 2013 03:00:27 +0900 (JST) Message-Id: <20130603025039.1e1ebf7d87761134a3d0d804@yahoo.com> Date: Mon, 3 Jun 2013 02:50:39 +0900 From: KATO Tsuguru To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/179212: editors/vigor: Fix build with Tcl/Tk 8.6 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 Jun 2013 18:10:02 -0000 >Number: 179212 >Category: ports >Synopsis: editors/vigor: Fix build with Tcl/Tk 8.6 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sun Jun 02 18:10:01 UTC 2013 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 8.4-RELEASE i386 >Organization: >Environment: >Description: - Fix build with newer Tcl/Tk 8.6 - Add LICENSE - Add MAKE_JOBS_SAFE New file: files/patch-cl__cl_read.c files/patch-ex__ex_script.c files/patch-ex__ex_tcl.c files/patch-tcl_api__tcl.c files/patch-vigor__vigor.c Remove file: files/patch-ab >How-To-Repeat: >Fix: diff -urN /usr/ports/editors/vigor/Makefile editors/vigor/Makefile --- /usr/ports/editors/vigor/Makefile 2012-11-08 07:03:21.000000000 +0900 +++ editors/vigor/Makefile 2013-06-03 00:00:00.000000000 +0900 @@ -1,9 +1,5 @@ -# New ports collection makefile for: vigor -# Date created: 17 Jan 2000 -# Whom: Bill Fumerola -# +# Created by: Bill Fumerola # $FreeBSD: head/editors/vigor/Makefile 300896 2012-07-14 13:54:48Z beat $ -# PORTNAME= vigor PORTVERSION= 0.016 @@ -12,7 +8,12 @@ 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_BUILD= yes USE_XORG= x11 GNU_CONFIGURE= yes -CONFIGURE_ARGS+=--program-transform-name="s,0,1," -LDFLAGS+= -L${LOCALBASE}/lib +MAKE_JOBS_SAFE= yes -WRKSRC= ${WRKDIR}/${DISTNAME}/build -CFLAGS+= -I${LOCALBASE}/include/tcl${TCL_VER} -I${LOCALBASE}/include/tk${TK_VER} +CPPFLAGS+= -I${TCL_INCLUDEDIR} -I${TK_INCLUDEDIR} +LDFLAGS+= -L${LOCALBASE}/lib 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 diff -urN /usr/ports/editors/vigor/files/patch-ab editors/vigor/files/patch-ab --- /usr/ports/editors/vigor/files/patch-ab 2012-11-08 07:03:21.000000000 +0900 +++ editors/vigor/files/patch-ab 1970-01-01 09:00:00.000000000 +0900 @@ -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 - #include - #include --#ifdef HAVE_SYS_SELECT_H -+#if 0 - #include - #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 - #include --#ifdef HAVE_SYS_SELECT_H -+#if 0 - #include - #endif - #include ---- ../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 - #include - #include --#ifdef HAVE_SYS_SELECT_H -+#if 0 - #include - #endif - #include diff -urN /usr/ports/editors/vigor/files/patch-cl__cl_read.c editors/vigor/files/patch-cl__cl_read.c --- /usr/ports/editors/vigor/files/patch-cl__cl_read.c 1970-01-01 09:00:00.000000000 +0900 +++ editors/vigor/files/patch-cl__cl_read.c 2013-06-03 00:00:00.000000000 +0900 @@ -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 + #include +-#ifdef HAVE_SYS_SELECT_H ++#if 0 + #include + #endif + #include diff -urN /usr/ports/editors/vigor/files/patch-ex__ex_script.c editors/vigor/files/patch-ex__ex_script.c --- /usr/ports/editors/vigor/files/patch-ex__ex_script.c 1970-01-01 09:00:00.000000000 +0900 +++ editors/vigor/files/patch-ex__ex_script.c 2013-06-03 00:00:00.000000000 +0900 @@ -0,0 +1,11 @@ +--- ../ex/ex_script.c.orig ++++ ../ex/ex_script.c +@@ -19,7 +19,7 @@ + #include + #include + #include +-#ifdef HAVE_SYS_SELECT_H ++#if 0 + #include + #endif + #include diff -urN /usr/ports/editors/vigor/files/patch-ex__ex_tcl.c editors/vigor/files/patch-ex__ex_tcl.c --- /usr/ports/editors/vigor/files/patch-ex__ex_tcl.c 1970-01-01 09:00:00.000000000 +0900 +++ editors/vigor/files/patch-ex__ex_tcl.c 2013-06-03 00:00:00.000000000 +0900 @@ -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"); diff -urN /usr/ports/editors/vigor/files/patch-tcl_api__tcl.c editors/vigor/files/patch-tcl_api__tcl.c --- /usr/ports/editors/vigor/files/patch-tcl_api__tcl.c 1970-01-01 09:00:00.000000000 +0900 +++ editors/vigor/files/patch-tcl_api__tcl.c 2013-06-03 00:00:00.000000000 +0900 @@ -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); + } + diff -urN /usr/ports/editors/vigor/files/patch-vigor__vigor.c editors/vigor/files/patch-vigor__vigor.c --- /usr/ports/editors/vigor/files/patch-vigor__vigor.c 1970-01-01 09:00:00.000000000 +0900 +++ editors/vigor/files/patch-vigor__vigor.c 2013-06-03 00:00:00.000000000 +0900 @@ -0,0 +1,38 @@ +--- ../vigor/vigor.c.orig ++++ ../vigor/vigor.c +@@ -13,7 +13,7 @@ + #include + #include + #include +-#ifdef HAVE_SYS_SELECT_H ++#if 0 + #include + #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); + } + >Release-Note: >Audit-Trail: >Unformatted: