4 files changed, 42 insertions, 45 deletions

diff --git a/irc/quirc/Makefile b/irc/quirc/Makefile
index fd02c1b34d1e..ea573ea5ed9a 100644
--- a/irc/quirc/Makefile
+++ b/irc/quirc/Makefile
@@ -6,9 +6,10 @@
 #
 
 PORTNAME=	quirc
-PORTVERSION=	0.9.79
+PORTVERSION=	0.9.80
 CATEGORIES=	irc tk82
 MASTER_SITES=	http://patearl.powersurfr.com/quirc/
+DISTNAME=	${PORTNAME}-0.9.79
 
 MAINTAINER=	ports@FreeBSD.org
 
@@ -16,13 +17,26 @@ LIB_DEPENDS=	tk82.1:${PORTSDIR}/x11-toolkits/tk82
 
 USE_XLIB=	yes
 GNU_CONFIGURE=	yes
-ALL_TARGET=	all quirc.inst
+CONFIGURE_ENV=	CXXFLAGS="${CXXFLAGS} -pedantic"
+CONFIGURE_ARGS=	--with-wish=${PREFIX}/bin/wish8.2 \
+		--with-tcl-include-dir=${LOCALBASE}/include/tcl8.2 \
+		--with-tk-include-dir=${LOCALBASE}/include/tk8.2 \
+		--with-tcl-lib-dir=${LOCALBASE}/lib/tcl8.2 \
+		--with-tk-lib-dir=${LOCALBASE}/lib/tk8.2 \
+		--with-tcl-lib=tcl82 \
+		--with-tk-lib=tk82 \
+		--with-tcl-version=8.2
 
-pre-install:
-	@${MKDIR} ${PREFIX}/share/doc/quirc/doc
+PORTDOCS=	AUTHORS ChangeLog FAQ NEWS README doc/color.txt \
+		doc/nickcomp.txt doc/quedit.txt doc/rfc1459.txt
 
 post-install:
-	@${INSTALL_SCRIPT} ${WRKSRC}/quirc.inst ${PREFIX}/bin
-	@strip ${PREFIX}/bin/quirc
+#	${INSTALL_SCRIPT} ${WRKSRC}/quirc.inst ${PREFIX}/bin
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${PREFIX}/share/doc/quirc
+.for file in ${PORTDOCS}
+	${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/quirc
+.endfor
+.endif
 
 .include <bsd.port.mk>
diff --git a/irc/quirc/distinfo b/irc/quirc/distinfo
index 76d4a71d2768..dcad1f193640 100644
--- a/irc/quirc/distinfo
+++ b/irc/quirc/distinfo
@@ -1 +1 @@
-MD5 (quirc-0.9.79.tar.gz) = f2af371083fc30700a2277c83a2d7470
+MD5 (quirc-0.9.79.tar.gz) = 46dc2bd6365a560fcbb785d18d990dd5
diff --git a/irc/quirc/files/patch-aa b/irc/quirc/files/patch-aa
index 5e95a6a713a8..d1187237e629 100644
--- a/irc/quirc/files/patch-aa
+++ b/irc/quirc/files/patch-aa
@@ -1,29 +1,11 @@
---- Makefile.in.orig	Tue Jul 13 08:55:43 1999
-+++ Makefile.in	Thu Feb  3 14:57:36 2000
-@@ -73,7 +73,7 @@
- SUBDIRS = data
+--- Makefile.in.orig	Sat Aug 19 09:10:37 2000
++++ Makefile.in	Sat Aug 19 09:54:30 2000
+@@ -70,7 +70,7 @@
+ VERSION = @VERSION@
+ WISH = @WISH@
  
- # Main binary targets
--bin_PROGRAMS = quirc quirc.inst
-+bin_PROGRAMS = quirc
- 
- # Headers
- quirc_SOURCES = arlib.c dcc.cc network.cc channel.cc echo.cc quirc.cc tcl.cc command.cc server.cc tcltk.cc complete.cc hash.cc support.cc window.cc tags.cc arlib.h complete.h hash.h messages.h query.h support.h arlibcc.h history.h mytcl.h quirc.h tags.h channel.h defines.h illist.h network.h serverdcc.h command.h echo.h llist.h nick.h window.h
-@@ -95,7 +95,7 @@
- 
- # Documentation
+-SUBDIRS = data doc
++SUBDIRS = data
  
--docdir = $(prefix)/doc/@PACKAGE@
-+docdir = $(prefix)/share/doc/@PACKAGE@
- doc_DATA = doc/rfc1459.txt doc/color.txt FAQ AUTHORS COPYING ChangeLog INSTALL NEWS README
- 
- # RPM and spec file generation
-@@ -151,7 +151,7 @@
- generate_tags_LDADD = $(LDADD)
- generate_tags_DEPENDENCIES = 
- generate_tags_LDFLAGS = 
--CXXFLAGS = @CXXFLAGS@
-+CXXFLAGS = @CXXFLAGS@ -pedantic
- CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- CXXLD = $(CXX)
- CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@
+ # Main binary targets
+ bin_PROGRAMS = quirc
diff --git a/irc/quirc/pkg-plist b/irc/quirc/pkg-plist
index 466ca7f4771d..03596c3407c5 100644
--- a/irc/quirc/pkg-plist
+++ b/irc/quirc/pkg-plist
@@ -1,21 +1,21 @@
 bin/quirc
-bin/quirc.inst
 share/doc/quirc/AUTHORS
-share/doc/quirc/COPYING
 share/doc/quirc/ChangeLog
 share/doc/quirc/FAQ
-share/doc/quirc/INSTALL
 share/doc/quirc/NEWS
 share/doc/quirc/README
-share/doc/quirc/doc/color.txt
-share/doc/quirc/doc/rfc1459.txt
+share/doc/quirc/color.txt
+share/doc/quirc/nickcomp.txt
+share/doc/quirc/quedit.txt
+share/doc/quirc/rfc1459.txt
 share/quirc/VERSION
-share/quirc/country.tcl
+share/quirc/common/install.tcl
 share/quirc/dal.tcl
-share/quirc/default.tcl
+share/quirc/doc.tcl
+share/quirc/fontsel
 share/quirc/fun.tcl
 share/quirc/global.tcl
-share/quirc/killjpq.tcl
+share/quirc/info.tcl
 share/quirc/listfile.tcl
 share/quirc/mircservers.tcl
 share/quirc/newserver.tcl
@@ -23,11 +23,12 @@ share/quirc/notify.tcl
 share/quirc/popups.tcl
 share/quirc/quedit
 share/quirc/qwidgets.tcl
+share/quirc/server.tcl
 share/quirc/servers
-share/quirc/style.tcl
-share/quirc/translate.tcl
+share/quirc/themes/default.tcl
 share/quirc/variables.tcl
 share/quirc/winpopup.tcl
-@dirrm share/doc/quirc/doc
 @dirrm share/doc/quirc
+@dirrm share/quirc/themes
+@dirrm share/quirc/common
 @dirrm share/quirc