9 files changed, 116 insertions, 74 deletions

diff --git a/irc/quirc/Makefile b/irc/quirc/Makefile
index 3b832b154f6f..9a3def068069 100644
--- a/irc/quirc/Makefile
+++ b/irc/quirc/Makefile
@@ -6,43 +6,41 @@
 #
 
 PORTNAME=	quirc
-PORTVERSION=	0.9.83
-CATEGORIES=	irc tk83
+PORTVERSION=	0.9.84
+CATEGORIES=	irc tk84
 MASTER_SITES=	http://quirc.org/
 
 MAINTAINER=	kevlo@FreeBSD.org
 COMMENT=	An irc client for the X Window System that uses TCL/TK
 
-LIB_DEPENDS=	tk83.1:${PORTSDIR}/x11-toolkits/tk83
+LIB_DEPENDS=	tk84.1:${PORTSDIR}/x11-toolkits/tk84
 
 USE_XLIB=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CXXFLAGS="${CXXFLAGS} -pedantic"
-CONFIGURE_ARGS=	--with-wish=${PREFIX}/bin/wish8.3 \
-		--with-tcl-include-dir=${LOCALBASE}/include/tcl8.3 \
-		--with-tk-include-dir=${LOCALBASE}/include/tk8.3 \
-		--with-tcl-lib-dir=${LOCALBASE}/lib/tcl8.3 \
-		--with-tk-lib-dir=${LOCALBASE}/lib/tk8.3 \
-		--with-tcl-lib=tcl83 \
-		--with-tk-lib=tk83 \
-		--with-tcl-version=8.3
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ARGS=	--with-wish=${LOCALBASE}/bin/wish8.4 \
+		--with-tcl-include-dir=${LOCALBASE}/include/tcl8.4 \
+		--with-tk-include-dir=${LOCALBASE}/include/tk8.4 \
+		--with-tcl-lib-dir=${LOCALBASE}/lib/tcl8.4 \
+		--with-tk-lib-dir=${LOCALBASE}/lib/tk8.4 \
+		--with-tcl-lib=tcl84 \
+		--with-tk-lib=tk84 \
+		--with-tcl-version=8.4
 
 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>
-
-.if ${OSVERSION} >= 500113
-BROKEN=		"Does not compile on FreeBSD ${OSVERSION}"
-.endif
-
 post-install:
+	@${MKDIR} ${DATADIR}/common
+	${LN} -sf ../install.tcl ${DATADIR}/common
+	@${MKDIR} ${DATADIR}/themes
+	${LN} -sf ../default.tcl ${DATADIR}/themes
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/doc/quirc
+	@${MKDIR} ${DOCSDIR}
 .for file in ${MYPORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/quirc
+	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
 .endfor
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/irc/quirc/distinfo b/irc/quirc/distinfo
index bbddc77e7df1..71027a6da9cf 100644
--- a/irc/quirc/distinfo
+++ b/irc/quirc/distinfo
@@ -1 +1,2 @@
-MD5 (quirc-0.9.83.tar.gz) = 27f357aac1f305682ae79c9f0163c069
+MD5 (quirc-0.9.84.tar.gz) = 412155a371be4960c032745b1fc5eec9
+SIZE (quirc-0.9.84.tar.gz) = 341962
diff --git a/irc/quirc/files/patch-aa b/irc/quirc/files/patch-aa
index 4ddb47fa69b0..e1d12d473b8f 100644
--- a/irc/quirc/files/patch-aa
+++ b/irc/quirc/files/patch-aa
@@ -1,23 +1,20 @@
---- Makefile.in.orig	Wed Aug  2 19:24:59 2000
-+++ Makefile.in	Tue Oct 24 02:31:35 2000
-@@ -70,7 +70,7 @@
- VERSION = @VERSION@
- WISH = @WISH@
+--- Makefile.in.orig	Tue Jan 13 16:23:10 2004
++++ Makefile.in	Tue Feb  3 23:03:59 2004
+@@ -210,7 +210,7 @@
+ target_alias = @target_alias@
  
+ # Data files
 -SUBDIRS = data doc
 +SUBDIRS = data
  
- # Main binary targets
- bin_PROGRAMS = quirc
-@@ -90,11 +90,6 @@
+ # Source in order of C, C++, derived C++
+ # Removed arlib.c
+@@ -709,7 +709,7 @@
  
- noinst_PROGRAMS = generate_tags
- generate_tags_SOURCES = generate_tags.cc
--
--# Documentation
--
--docdir = $(prefix)/doc/@PACKAGE@
--doc_DATA = FAQ AUTHORS COPYING ChangeLog INSTALL NEWS README ChangeLog.themes
+ info-am:
  
- # RPM and spec file generation
+-install-data-am: install-docDATA
++install-data-am:
+ 
+ install-exec-am: install-binPROGRAMS install-exec-local
  
diff --git a/irc/quirc/files/patch-channel.cc b/irc/quirc/files/patch-channel.cc
new file mode 100644
index 000000000000..1968f89455a7
--- /dev/null
+++ b/irc/quirc/files/patch-channel.cc
@@ -0,0 +1,9 @@
+--- channel.cc.orig	Mon Jan 12 18:16:50 2004
++++ channel.cc	Tue Feb  3 23:17:24 2004
+@@ -1,5 +1,6 @@
+ #include <string.h>
+ #include <assert.h>
++#include <sys/types.h>
+ 
+ #ifdef DMALLOC
+ #include <dmalloc.h>
diff --git a/irc/quirc/files/patch-format.cc b/irc/quirc/files/patch-format.cc
new file mode 100644
index 000000000000..b2c258ab06f2
--- /dev/null
+++ b/irc/quirc/files/patch-format.cc
@@ -0,0 +1,8 @@
+--- format.cc.orig	Mon Jan 12 18:32:01 2004
++++ format.cc	Tue Feb  3 23:19:28 2004
+@@ -1,4 +1,5 @@
+ #include <stdarg.h>
++#include <sys/types.h>
+ 
+ #include "quirc.h"
+ #include "hash.h"
diff --git a/irc/quirc/files/patch-hash.cc b/irc/quirc/files/patch-hash.cc
new file mode 100644
index 000000000000..7db738895fa4
--- /dev/null
+++ b/irc/quirc/files/patch-hash.cc
@@ -0,0 +1,9 @@
+--- hash.cc.orig	Mon Jan 12 17:53:35 2004
++++ hash.cc	Tue Feb  3 23:19:58 2004
+@@ -1,5 +1,6 @@
+ #include <stdlib.h>
+ #include <string.h>
++#include <sys/types.h>
+ 
+ #ifdef DMALLOC
+ #include <dmalloc.h>
diff --git a/irc/quirc/files/patch-tcltk.cc b/irc/quirc/files/patch-tcltk.cc
new file mode 100644
index 000000000000..f9b4722a6603
--- /dev/null
+++ b/irc/quirc/files/patch-tcltk.cc
@@ -0,0 +1,10 @@
+--- tcltk.cc.orig	Mon Jan 12 18:25:11 2004
++++ tcltk.cc	Tue Feb  3 23:18:41 2004
+@@ -1,6 +1,7 @@
+ #include <stdlib.h>
+ #include <stdarg.h>
+ #include <string.h>
++#include <sys/types.h>
+ 
+ #ifdef DMALLOC
+ #include <dmalloc.h>
diff --git a/irc/quirc/files/patch-window.cc b/irc/quirc/files/patch-window.cc
new file mode 100644
index 000000000000..254daa121a82
--- /dev/null
+++ b/irc/quirc/files/patch-window.cc
@@ -0,0 +1,8 @@
+--- window.cc.orig	Sat May 15 14:20:48 1999
++++ window.cc	Tue Feb  3 23:20:36 2004
+@@ -1,3 +1,5 @@
++#include <sys/types.h>
++
+ #ifdef DMALLOC
+ #include <dmalloc.h>
+ #endif
diff --git a/irc/quirc/pkg-plist b/irc/quirc/pkg-plist
index 960636e09831..4b016ef080ac 100644
--- a/irc/quirc/pkg-plist
+++ b/irc/quirc/pkg-plist
@@ -1,37 +1,39 @@
 bin/quirc
-%%PORTDOCS%%share/doc/quirc/AUTHORS
-%%PORTDOCS%%share/doc/quirc/ChangeLog
-%%PORTDOCS%%share/doc/quirc/FAQ
-%%PORTDOCS%%share/doc/quirc/NEWS
-%%PORTDOCS%%share/doc/quirc/README
-%%PORTDOCS%%share/doc/quirc/color.txt
-%%PORTDOCS%%share/doc/quirc/dccresum.txt
-%%PORTDOCS%%share/doc/quirc/links.txt
-%%PORTDOCS%%share/doc/quirc/nickcomp.txt
-%%PORTDOCS%%share/doc/quirc/quedit.txt
-%%PORTDOCS%%share/doc/quirc/rfc1459.txt
-%%PORTDOCS%%share/doc/quirc/tdcc.txt
-share/quirc/VERSION
-share/quirc/common/install.tcl
-share/quirc/dal.tcl
-share/quirc/doc.tcl
-share/quirc/fontsel
-share/quirc/fun.tcl
-share/quirc/global.tcl
-share/quirc/info.tcl
-share/quirc/listfile.tcl
-share/quirc/mircservers.tcl
-share/quirc/newserver.tcl
-share/quirc/notify.tcl
-share/quirc/popups.tcl
-share/quirc/quedit
-share/quirc/qwidgets.tcl
-share/quirc/server.tcl
-share/quirc/servers
-share/quirc/themes/default.tcl
-share/quirc/variables.tcl
-share/quirc/winpopup.tcl
-@dirrm share/quirc/themes
-@dirrm share/quirc/common
-@dirrm share/quirc
-%%PORTDOCS%%@dirrm share/doc/quirc
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/FAQ
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/color.txt
+%%PORTDOCS%%%%DOCSDIR%%/dccresum.txt
+%%PORTDOCS%%%%DOCSDIR%%/links.txt
+%%PORTDOCS%%%%DOCSDIR%%/nickcomp.txt
+%%PORTDOCS%%%%DOCSDIR%%/quedit.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc1459.txt
+%%PORTDOCS%%%%DOCSDIR%%/tdcc.txt
+%%DATADIR%%/VERSION
+%%DATADIR%%/common/install.tcl
+%%DATADIR%%/dal.tcl
+%%DATADIR%%/default.tcl
+%%DATADIR%%/doc.tcl
+%%DATADIR%%/fontsel
+%%DATADIR%%/fun.tcl
+%%DATADIR%%/global.tcl
+%%DATADIR%%/info.tcl
+%%DATADIR%%/install.tcl
+%%DATADIR%%/listfile.tcl
+%%DATADIR%%/mircservers.tcl
+%%DATADIR%%/newserver.tcl
+%%DATADIR%%/notify.tcl
+%%DATADIR%%/popups.tcl
+%%DATADIR%%/quedit
+%%DATADIR%%/qwidgets.tcl
+%%DATADIR%%/server.tcl
+%%DATADIR%%/servers
+%%DATADIR%%/themes/default.tcl
+%%DATADIR%%/variables.tcl
+%%DATADIR%%/winpopup.tcl
+@dirrm %%DATADIR%%/themes
+@dirrm %%DATADIR%%/common
+@dirrm %%DATADIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%