Date: Tue, 14 May 2013 09:04:59 +0000 (UTC) From: Pietro Cerutti <gahr@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r318150 - in head/irc/quirc: . files Message-ID: <201305140904.r4E94xcC043404@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gahr Date: Tue May 14 09:04:59 2013 New Revision: 318150 URL: http://svnweb.freebsd.org/changeset/ports/318150 Log: - Fix build with Tcl 8.6 [1] - Trim Makefile header - Remove article from COMMENT Reported by: miwi (Tcl/Tk 86 exp-run) [1] Modified: head/irc/quirc/Makefile (contents, props changed) head/irc/quirc/files/patch-tcltk.cc (contents, props changed) Modified: head/irc/quirc/Makefile ============================================================================== --- head/irc/quirc/Makefile Tue May 14 08:54:55 2013 (r318149) +++ head/irc/quirc/Makefile Tue May 14 09:04:59 2013 (r318150) @@ -1,9 +1,5 @@ -# New ports collection makefile for: QuIRC -# Date created: 21 May 1999 -# Whom: Chris Piazza <cpiazza@FreeBSD.org> -# +# Created by: Chris Piazza <cpiazza@FreeBSD.org> # $FreeBSD$ -# PORTNAME= quirc PORTVERSION= 0.9.84 @@ -12,9 +8,9 @@ CATEGORIES= irc tk MASTER_SITES= ${MASTER_SITE_LOCAL:S/$/:local/} MAINTAINER= ports@FreeBSD.org -COMMENT= An irc client for the X Window System that uses TCL/TK +COMMENT= Tcl/Tk IRC client for the X Window System -USE_TK= 84+ +USE_TK= 84 USE_XORG= xt GNU_CONFIGURE= yes @@ -23,7 +19,8 @@ MYPORTDOCS= AUTHORS ChangeLog FAQ NEWS R doc/dccresum.txt doc/links.txt doc/nickcomp.txt \ doc/quedit.txt doc/rfc1459.txt doc/tdcc.txt -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> + CONFIGURE_ARGS= --with-wish=${WISH} \ --with-tcl-include-dir=${TCL_INCLUDEDIR} \ --with-tk-include-dir=${TK_INCLUDEDIR} \ @@ -38,11 +35,11 @@ post-install: ${LN} -sf ../install.tcl ${DATADIR}/common @${MKDIR} ${DATADIR}/themes ${LN} -sf ../default.tcl ${DATADIR}/themes -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} .for file in ${MYPORTDOCS} ${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR} .endfor .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/irc/quirc/files/patch-tcltk.cc ============================================================================== --- head/irc/quirc/files/patch-tcltk.cc Tue May 14 08:54:55 2013 (r318149) +++ head/irc/quirc/files/patch-tcltk.cc Tue May 14 09:04:59 2013 (r318150) @@ -1,5 +1,5 @@ ---- tcltk.cc.orig Mon Jan 12 18:25:11 2004 -+++ tcltk.cc Tue Feb 3 23:18:41 2004 +--- tcltk.cc.orig 2004-01-12 10:25:11.000000000 +0100 ++++ tcltk.cc 2013-05-14 10:57:51.000000000 +0200 @@ -1,6 +1,7 @@ #include <stdlib.h> #include <stdarg.h> @@ -8,3 +8,21 @@ #ifdef DMALLOC #include <dmalloc.h> +@@ -33,7 +34,7 @@ + #endif + + if (Tcl_Init(TT_Interp) == TCL_ERROR) { +- fprintf(stderr,"Error initializing Tcl:\n%s\n",TT_Interp->result); ++ fprintf(stderr,"Error initializing Tcl:\n%s\n",Tcl_GetStringResult(TT_Interp)); + return TCL_ERROR; + } + +@@ -43,7 +44,7 @@ + // uses Tk_Init to process its command-line arguments). + + if (Tk_Init(TT_Interp) == TCL_ERROR) { +- fprintf(stderr,"Error initializing Tk:\n%s\n",TT_Interp->result); ++ fprintf(stderr,"Error initializing Tk:\n%s\n",Tcl_GetStringResult(TT_Interp)); + return TCL_ERROR; + } +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201305140904.r4E94xcC043404>