Update to version 0.7.97.

Parts submitted by:	Sean-Paul Rees <sean@seanrees.com>

11 files changed, 113 insertions, 95 deletions

diff --git a/irc/irssi/Makefile b/irc/irssi/Makefile
index ef354c958215..b7af678f25ad 100644
--- a/irc/irssi/Makefile
+++ b/irc/irssi/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	irssi
-PORTVERSION=	0.7.95
+PORTVERSION=	0.7.97
 CATEGORIES=	irc ipv6
 MASTER_SITES=	http://irssi.org/files/
-DISTNAME=	${PORTNAME}-${PORTVERSION}-3
+DISTNAME=	${PORTNAME}-${PORTVERSION}.1
 
 MAINTAINER=	jim@FreeBSD.org
 
@@ -18,12 +18,13 @@ LIB_DEPENDS=	intl.1:${PORTSDIR}/devel/gettext
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 USE_BZIP2=	yes
-USE_GMAKE=	yes
 USE_PERL5=	yes
 USE_GLIB=	yes
-USE_LIBTOOL=	yes
+GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-socks --with-textui --with-bot \
-		--without-servertest
+		--without-servertest \
+		--enable-perl-path=${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib -lintl"
 
@@ -41,4 +42,13 @@ pre-patch:
 		 s|USE_INCLUDED_LIBINTL=yes|#USE_INCLUDED_LIBINTL=yes|g ; \
 		 s|\$$\(top_builddir\)/intl/libintl.a|-lintl|g' ${WRKSRC}/configure
 
+pre-configure:
+	@cd ${WRKSRC} && ${MV} config config.sample
+
+post-install:
+	@if [ ! -f ${LOCALBASE}/etc/irssi/config ]; then \
+		${ECHO} "Installing default configuration file."; \
+		${INSTALL_SCRIPT} -m 644 ${WRKSRC}/config.sample ${LOCALBASE}/etc/irssi/config; \
+	fi
+
 .include <bsd.port.post.mk>
diff --git a/irc/irssi/distinfo b/irc/irssi/distinfo
index ef255ee6beaa..0ec9464c8f74 100644
--- a/irc/irssi/distinfo
+++ b/irc/irssi/distinfo
@@ -1 +1 @@
-MD5 (irssi-0.7.95-3.tar.bz2) = 1dcfee6d8f0e1650cf2358e67c840151
+MD5 (irssi-0.7.97.1.tar.bz2) = 6f97d69b605c9e902086b9e9009da0cb
diff --git a/irc/irssi/files/patch-ad b/irc/irssi/files/patch-ad
deleted file mode 100644
index ac93ec27b945..000000000000
--- a/irc/irssi/files/patch-ad
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.orig	Sun Jun  4 10:48:10 2000
-+++ configure	Fri Jun  9 18:03:22 2000
-@@ -5546,6 +5546,7 @@
- s%@oldincludedir@%$oldincludedir%g
- s%@infodir@%$infodir%g
- s%@mandir@%$mandir%g
-+s%@proplist_dir@%$proplist_dir%g
- s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
- s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
- s%@INSTALL_DATA@%$INSTALL_DATA%g
diff --git a/irc/irssi/files/patch-ae b/irc/irssi/files/patch-ae
deleted file mode 100644
index 7017f356fc90..000000000000
--- a/irc/irssi/files/patch-ae
+++ /dev/null
@@ -1,9 +0,0 @@
---- src/perl/xs/Makefile.PL.in	Fri Feb 25 12:52:31 2000
-+++ src/perl/xs/Makefile.PL.in.new	Fri Feb 25 19:38:08 2000
-@@ -2,5 +2,5 @@
- 
- WriteMakefile('NAME' => 'Irssi',
-               'LIBS' => '',
--              'INC' => '-I@top_srcdir@/src @GLIB_CFLAGS@',
-+              'INC' => '-I@top_srcdir@/src -I@top_srcdir@/src/core @GLIB_CFLAGS@ -I@proplist_dir@/include',
- 	      'VERSION_FROM' => '@srcdir@/Irssi.pm');
diff --git a/irc/irssi/files/patch-af b/irc/irssi/files/patch-af
deleted file mode 100644
index ff8684949c83..000000000000
--- a/irc/irssi/files/patch-af
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/perl/Makefile.in	Sat Mar 11 15:10:46 2000
-+++ src/perl/Makefile.in.new	Fri May 19 20:36:24 2000
-@@ -240,7 +240,7 @@
- 	cd xs && if [ ! -f Makefile ]; then $(perlpath) Makefile.PL; fi && $(MAKE) && cd ..
- 
- install-exec-local:
--	cd xs && make install && cd ..
-+	${MAKE} -C xs install
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/irc/irssi/files/patch-ag b/irc/irssi/files/patch-ag
deleted file mode 100644
index 33ac9df8cfcc..000000000000
--- a/irc/irssi/files/patch-ag
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/perl/irssi-perl.c.orig	Sat Sep  9 01:48:00 2000
-+++ src/perl/irssi-perl.c	Sat Sep  9 01:47:49 2000
-@@ -18,6 +18,8 @@
-     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
- 
-+#define PERL_POLLUTE
-+
- #include <EXTERN.h>
- #ifndef _SEM_SEMUN_UNDEFINED
- #define HAS_UNION_SEMUN
diff --git a/irc/irssi/files/patch-ah b/irc/irssi/files/patch-ah
new file mode 100644
index 000000000000..ca8bbf35c677
--- /dev/null
+++ b/irc/irssi/files/patch-ah
@@ -0,0 +1,22 @@
+--- Makefile.in.orig	Sat Dec  2 23:24:11 2000
++++ Makefile.in	Sat Dec  9 14:00:49 2000
+@@ -121,7 +121,7 @@
+ SUBDIRS = po intl $(GLIB_DIR) src $(SERVERTEST) docs scripts
+ 
+ confdir = $(sysconfdir)/irssi
+-conf_DATA = config default.theme colorless.theme
++conf_DATA = config.sample default.theme colorless.theme
+ 
+ noinst_HEADERS = irssi-version.h
+ 
+@@ -439,8 +439,8 @@
+ 
+ config.h: default-config.h default-theme.h
+ 
+-default-config.h: $(srcdir)/config
+-	$(srcdir)/file2header.sh $(srcdir)/config default_config > default-config.h
++default-config.h: $(srcdir)/config.sample
++	$(srcdir)/file2header.sh $(srcdir)/config.sample default_config > default-config.h
+ default-theme.h: $(srcdir)/default.theme
+ 	$(srcdir)/file2header.sh $(srcdir)/default.theme default_theme > default-theme.h
+ 
diff --git a/irc/irssi/files/patch-ai b/irc/irssi/files/patch-ai
new file mode 100644
index 000000000000..60657c702737
--- /dev/null
+++ b/irc/irssi/files/patch-ai
@@ -0,0 +1,11 @@
+--- docs/Makefile.in.orig	Mon Dec 11 11:49:34 2000
++++ docs/Makefile.in	Mon Dec 11 11:50:01 2000
+@@ -113,7 +113,7 @@
+ sedpath = @sedpath@
+ static_lib = @static_lib@
+ 
+-docdir = $(prefix)/doc/irssi
++docdir = $(prefix)/share/doc/irssi
+ 
+ doc_DATA =  	botnet.txt 	design.txt 	formats.txt 	manual.txt 	perl.txt 	signals.txt 	special_vars.txt 	startup-HOWTO.txt
+ 
diff --git a/irc/irssi/pkg-comment b/irc/irssi/pkg-comment
index 94a5bde331f9..16346160f0a5 100644
--- a/irc/irssi/pkg-comment
+++ b/irc/irssi/pkg-comment
@@ -1 +1 @@
-An IRC client that used to use GTK+ and GNOME, but doesn't any more
+A modular IRC client with many features
diff --git a/irc/irssi/pkg-descr b/irc/irssi/pkg-descr
index e8a5ed563c1c..382196d2b55e 100644
--- a/irc/irssi/pkg-descr
+++ b/irc/irssi/pkg-descr
@@ -1,4 +1,7 @@
-Irssi is an IRC client that used to be GTK/GNOME, but seems to have
-degenerated into text-only (using GLIB).
+Irssi is a modular IRC client that currently has only text mode user
+interface, but 80-90% of the code isn't text mode specific, so other UIs could
+be created pretty easily. Also, Irssi isn't really even IRC specific anymore,
+there's already a working SILC module available. Support for other protocols
+like ICQ could be created some day too.
 
-WWW: http://xlife.dhs.org/irssi/
+WWW: http://www.irssi.org
diff --git a/irc/irssi/pkg-plist b/irc/irssi/pkg-plist
index 0c479166b741..d37b884019ca 100644
--- a/irc/irssi/pkg-plist
+++ b/irc/irssi/pkg-plist
@@ -1,39 +1,54 @@
-bin/botti
 bin/irssi
-doc/irssi/botnet.txt
-doc/irssi/design.txt
-doc/irssi/formats.txt
-doc/irssi/manual.txt
-doc/irssi/perl.txt
-doc/irssi/signals.txt
-doc/irssi/special_vars.txt
+bin/botti
+share/doc/irssi/botnet.txt
+share/doc/irssi/design.txt
+share/doc/irssi/formats.txt
+share/doc/irssi/manual.txt
+share/doc/irssi/perl.txt
+share/doc/irssi/signals.txt
+share/doc/irssi/special_vars.txt
+share/doc/irssi/startup-HOWTO.txt
+etc/irssi/config.sample
+etc/irssi/default.theme
 etc/irssi/colorless.theme
 etc/irssi/config
-etc/irssi/split.theme
-i386-freebsd/auto/Irssi/.packlist
-i386-freebsd/auto/Irssi/Irssi.bs
-i386-freebsd/auto/Irssi/Irssi.so
-lib/irssi/plugins/libfe_common_irc_dcc.a
-lib/irssi/plugins/libfe_common_irc_dcc.so
-lib/irssi/plugins/libfe_common_irc_dcc.so.0
-lib/irssi/plugins/libfe_common_irc_flood.a
-lib/irssi/plugins/libfe_common_irc_flood.so
-lib/irssi/plugins/libfe_common_irc_flood.so.0
-lib/irssi/plugins/libfe_common_irc_notifylist.a
-lib/irssi/plugins/libfe_common_irc_notifylist.so
-lib/irssi/plugins/libfe_common_irc_notifylist.so.0
-lib/irssi/plugins/libirc_bot.a
-lib/irssi/plugins/libirc_bot.so
-lib/irssi/plugins/libirc_bot.so.0
-lib/irssi/plugins/libirc_dcc.a
-lib/irssi/plugins/libirc_dcc.so
-lib/irssi/plugins/libirc_dcc.so.0
-lib/irssi/plugins/libirc_flood.a
-lib/irssi/plugins/libirc_flood.so
-lib/irssi/plugins/libirc_flood.so.0
-lib/irssi/plugins/libirc_notifylist.a
-lib/irssi/plugins/libirc_notifylist.so
-lib/irssi/plugins/libirc_notifylist.so.0
+lib/perl5/site_perl/5.005/i386-freebsd/auto/Irssi/Irssi.so
+lib/perl5/site_perl/5.005/i386-freebsd/auto/Irssi/Irssi.bs
+lib/perl5/site_perl/5.005/i386-freebsd/auto/Irssi/.packlist
+lib/perl5/site_perl/5.005/i386-freebsd/auto/Irssi/Irc/Irc.so
+lib/perl5/site_perl/5.005/i386-freebsd/auto/Irssi/Irc/Irc.bs
+lib/perl5/site_perl/5.005/i386-freebsd/auto/Irssi/Irc/.packlist
+lib/perl5/site_perl/5.005/i386-freebsd/Irssi.pm
+lib/perl5/site_perl/5.005/i386-freebsd/perllocal.pod
+lib/perl5/site_perl/5.005/i386-freebsd/Irssi/Irc.pm
+lib/irssi/modules/libirc_bot.so
+lib/irssi/modules/libirc_bot.la
+lib/irssi/modules/libirc_bot.a
+lib/irssi/modules/libirc_dcc.so
+lib/irssi/modules/libirc_dcc.la
+lib/irssi/modules/libirc_dcc.a
+lib/irssi/modules/libirc_flood.so
+lib/irssi/modules/libirc_flood.la
+lib/irssi/modules/libirc_flood.a
+lib/irssi/modules/libirc_notifylist.so
+lib/irssi/modules/libirc_notifylist.la
+lib/irssi/modules/libirc_notifylist.a
+lib/irssi/modules/libfe_common_irc_dcc.so
+lib/irssi/modules/libfe_common_irc_dcc.la
+lib/irssi/modules/libfe_common_irc_dcc.a
+lib/irssi/modules/libfe_common_irc_flood.so
+lib/irssi/modules/libfe_common_irc_flood.la
+lib/irssi/modules/libfe_common_irc_flood.a
+lib/irssi/modules/libfe_common_irc_notifylist.so
+lib/irssi/modules/libfe_common_irc_notifylist.la
+lib/irssi/modules/libfe_common_irc_notifylist.a
+lib/irssi/modules/libperl.so
+lib/irssi/modules/libperl.la
+share/locale/pl/LC_MESSAGES/irssi.mo
+share/locale/pt_BR/LC_MESSAGES/irssi.mo
+share/locale/fr/LC_MESSAGES/irssi.mo
+share/locale/de/LC_MESSAGES/irssi.mo
+share/locale/sv/LC_MESSAGES/irssi.mo
 share/irssi/help/action
 share/irssi/help/admin
 share/irssi/help/alias
@@ -125,9 +140,10 @@ share/irssi/help/unban
 share/irssi/help/unignore
 share/irssi/help/unnotify
 share/irssi/help/unquery
+share/irssi/help/unsilence
 share/irssi/help/uping
-share/irssi/help/userhost
 share/irssi/help/ver
+share/irssi/help/userhost
 share/irssi/help/version
 share/irssi/help/voice
 share/irssi/help/wall
@@ -139,15 +155,12 @@ share/irssi/help/whowas
 share/irssi/help/window
 share/irssi/help/wjoin
 share/irssi/help/wquery
-share/locale/de/LC_MESSAGES/irssi.mo
-share/locale/fr/LC_MESSAGES/irssi.mo
-share/locale/pl/LC_MESSAGES/irssi.mo
-share/locale/pt_BR/LC_MESSAGES/irssi.mo
+@dirrm share/doc/irssi
+@dirrm etc/irssi
+@dirrm lib/perl5/site_perl/5.005/i386-freebsd/auto/Irssi/Irc
+@dirrm lib/perl5/site_perl/5.005/i386-freebsd/auto/Irssi
+@dirrm lib/perl5/site_perl/5.005/i386-freebsd/Irssi
+@dirrm lib/irssi/modules
+@dirrm lib/irssi
 @dirrm share/irssi/help
 @dirrm share/irssi
-@dirrm lib/irssi/plugins
-@dirrm lib/irssi
-@dirrm i386-freebsd/auto/Irssi
-@dirrm etc/irssi
-@dirrm doc/irssi
-@dirrm doc