aboutsummaryrefslogtreecommitdiffstats
path: root/irc
diff options
context:
space:
mode:
authorgahr <gahr@FreeBSD.org>2013-05-14 17:04:59 +0800
committergahr <gahr@FreeBSD.org>2013-05-14 17:04:59 +0800
commit2c239f1248c9bd7072d56033ec9c7bda70e65c6f (patch)
tree565c86a715db994828f1dc96363d9edd114bb54f /irc
parent6bfae971537d4c5c2d6e9674adefcbe9d39e4464 (diff)
downloadfreebsd-ports-gnome-2c239f1248c9bd7072d56033ec9c7bda70e65c6f.tar.gz
freebsd-ports-gnome-2c239f1248c9bd7072d56033ec9c7bda70e65c6f.tar.zst
freebsd-ports-gnome-2c239f1248c9bd7072d56033ec9c7bda70e65c6f.zip
- Fix build with Tcl 8.6 [1]
- Trim Makefile header - Remove article from COMMENT Reported by: miwi (Tcl/Tk 86 exp-run) [1]
Diffstat (limited to 'irc')
-rw-r--r--irc/quirc/Makefile17
-rw-r--r--irc/quirc/files/patch-tcltk.cc22
2 files changed, 27 insertions, 12 deletions
diff --git a/irc/quirc/Makefile b/irc/quirc/Makefile
index 3ed04ac79f93..9d799967ff97 100644
--- a/irc/quirc/Makefile
+++ b/irc/quirc/Makefile
@@ -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 README doc/color.txt \
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>
diff --git a/irc/quirc/files/patch-tcltk.cc b/irc/quirc/files/patch-tcltk.cc
index f9b4722a6603..5a32a574652a 100644
--- a/irc/quirc/files/patch-tcltk.cc
+++ b/irc/quirc/files/patch-tcltk.cc
@@ -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;
+ }
+