6 files changed, 51 insertions, 96 deletions

diff --git a/irc/irssi-devel/Makefile b/irc/irssi-devel/Makefile
index d27f8b6639e1..3db8ac5a6e2a 100644
--- a/irc/irssi-devel/Makefile
+++ b/irc/irssi-devel/Makefile
@@ -6,23 +6,24 @@
 #
 
 PORTNAME=	irssi
-PORTVERSION=	0.7.98.4
+PORTVERSION=	0.8.0-20020217
 PORTREVISION?=	0
 CATEGORIES+=	irc ipv6	# `+=' is for slave ports
-MASTER_SITES=	http://irssi.org/files/
+MASTER_SITES=	http://irssi.org/files/snapshots/
+DISTFILES=	${PORTNAME}-20020217${EXTRACT_SUFX}
 
 MAINTAINER?=	vanilla@FreeBSD.org
 
 LIB_DEPENDS=	intl.1:${PORTSDIR}/devel/gettext
 
-USE_BZIP2=	yes
+WRKSRC=		${WRKDIR}/${PORTNAME}-0.8.0
+#USE_BZIP2=	yes
 USE_PERL5=	yes
 USE_GLIB=	yes
 GNU_CONFIGURE=	yes
 # `+=' is for slave ports
-CONFIGURE_ARGS+=	--without-socks --with-bot --without-servertest \
-		--enable-perl-path=${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
-CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib -lintl"
+CONFIGURE_ARGS+=	--without-socks --with-bot --with-textui \
+		--with-perl-lib=${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
 
 .include <bsd.port.pre.mk>
 
@@ -39,12 +40,12 @@ pre-patch:
 		 s|\$$\(top_builddir\)/intl/libintl.a|-lintl|g' ${WRKSRC}/configure
 
 pre-configure:
-	@cd ${WRKSRC} && ${MV} config config.sample
+	@cd ${WRKSRC} && ${MV} irssi.conf irssi.conf.sample
 
 post-install:
-	@if [ ! -f ${LOCALBASE}/etc/irssi/config ]; then \
+	@if [ ! -f ${LOCALBASE}/etc/irssi.conf ]; then \
 		${ECHO} "Installing default configuration file."; \
-		${INSTALL_SCRIPT} -m 644 ${WRKSRC}/config.sample ${LOCALBASE}/etc/irssi/config; \
+		${INSTALL_SCRIPT} -m 644 ${WRKSRC}/irssi.conf.sample ${LOCALBASE}/etc/irssi.conf ; \
 	fi
 
 .include <bsd.port.post.mk>
diff --git a/irc/irssi-devel/distinfo b/irc/irssi-devel/distinfo
index 4bd414d6f8d7..69da29320f96 100644
--- a/irc/irssi-devel/distinfo
+++ b/irc/irssi-devel/distinfo
@@ -1 +1 @@
-MD5 (irssi-0.7.98.4.tar.bz2) = b0d761ec1c55d9057cd65c1fb46eb670
+MD5 (irssi-20020217.tar.gz) = 9922c523125333edca648e470870e80c
diff --git a/irc/irssi-devel/files/patch-ah b/irc/irssi-devel/files/patch-ah
deleted file mode 100644
index ca8bbf35c677..000000000000
--- a/irc/irssi-devel/files/patch-ah
+++ /dev/null
@@ -1,22 +0,0 @@
---- 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-devel/files/patch-ai b/irc/irssi-devel/files/patch-ai
deleted file mode 100644
index 60657c702737..000000000000
--- a/irc/irssi-devel/files/patch-ai
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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-devel/files/patch-src_perl_Makefile.in b/irc/irssi-devel/files/patch-src_perl_Makefile.in
deleted file mode 100644
index 1d45946c5098..000000000000
--- a/irc/irssi-devel/files/patch-src_perl_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/perl/Makefile.in.orig	Thu Apr 26 10:31:06 2001
-+++ src/perl/Makefile.in	Thu Apr 26 10:32:04 2001
-@@ -473,7 +473,7 @@
- 	cat $(top_srcdir)/docs/signals.txt | $(perlpath) $(srcdir)/get-signals.pl > perl-signals-list.h
- 
- all-local:
--	for dir in common irc; do cd $$dir && if [ ! -f Makefile ]; then if [ "x$(PERL_LIB_DIR)" = "x" ]; then $(perlpath) Makefile.PL; else $(perlpath) Makefile.PL LIB=$(PERL_LIB_DIR) PREFIX=$(PERL_LIB_DIR); fi; fi && ($(MAKE) || $(MAKE)) && cd ..; done
-+	for dir in common irc; do cd $$dir && if [ ! -f Makefile ]; then if [ "x$(PERL_LIB_DIR)" = "x" ]; then $(perlpath) Makefile.PL; else $(perlpath) Makefile.PL ; fi; fi && ($(MAKE) || $(MAKE)) && cd ..; done
- 
- install-exec-local:
- 	for dir in common irc; do cd $$dir && $(MAKE) install && cd ..; done
diff --git a/irc/irssi-devel/pkg-plist b/irc/irssi-devel/pkg-plist
index e1f852e9bd5a..5959d7e77ff7 100644
--- a/irc/irssi-devel/pkg-plist
+++ b/irc/irssi-devel/pkg-plist
@@ -1,7 +1,29 @@
-bin/irssi
 bin/botti
+bin/irssi
+etc/irssi.conf
+etc/irssi.conf.sample
+lib/irssi/modules/libirc_bot.a
+lib/irssi/modules/libirc_bot.la
+lib/irssi/modules/libirc_bot.so
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Irssi.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Irssi/Irc.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Irssi/TextUI.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Irssi/UI.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Irssi/.packlist
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Irssi/Irssi.bs
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Irssi/Irssi.so
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Irssi/Irc/.packlist
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Irssi/Irc/Irc.bs
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Irssi/Irc/Irc.so
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Irssi/TextUI/.packlist
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Irssi/TextUI/TextUI.bs
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Irssi/TextUI/TextUI.so
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Irssi/UI/.packlist
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Irssi/UI/UI.bs
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Irssi/UI/UI.so
 share/doc/irssi/botnet.txt
 share/doc/irssi/design.txt
+share/doc/irssi/faq.txt
 share/doc/irssi/formats.txt
 share/doc/irssi/manual.txt
 share/doc/irssi/perl.txt
@@ -9,45 +31,6 @@ share/doc/irssi/signals.txt
 share/doc/irssi/special_vars.txt
 share/doc/irssi/startup-HOWTO.txt
 share/doc/irssi/startup-HOWTO.html
-etc/irssi/config.sample
-etc/irssi/default.theme
-etc/irssi/colorless.theme
-etc/irssi/config
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Irssi/Irssi.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Irssi/Irssi.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Irssi/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Irssi/Irc/Irc.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Irssi/Irc/Irc.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Irssi/Irc/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Irssi.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Irssi/Irc.pm
-lib/irssi/modules/libfe_irc_dcc.a
-lib/irssi/modules/libfe_irc_dcc.la
-lib/irssi/modules/libfe_irc_dcc.so
-lib/irssi/modules/libfe_irc_notifylist.a
-lib/irssi/modules/libfe_irc_notifylist.la
-lib/irssi/modules/libfe_irc_notifylist.so
-lib/irssi/modules/libfe_perl.la
-lib/irssi/modules/libfe_perl.so
-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/libperl_core.la
-lib/irssi/modules/libperl_core.so
-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
@@ -126,6 +109,7 @@ share/irssi/help/rmrejoins
 share/irssi/help/rping
 share/irssi/help/run
 share/irssi/help/save
+share/irssi/help/say
 share/irssi/help/sconnect
 share/irssi/help/scrollback
 share/irssi/help/server
@@ -135,6 +119,7 @@ share/irssi/help/silence
 share/irssi/help/squery
 share/irssi/help/squit
 share/irssi/help/stats
+share/irssi/help/statusbar
 share/irssi/help/time
 share/irssi/help/toggle
 share/irssi/help/topic
@@ -156,18 +141,31 @@ share/irssi/help/wait
 share/irssi/help/wall
 share/irssi/help/wallchops
 share/irssi/help/wallops
+share/irssi/help/watch
 share/irssi/help/who
 share/irssi/help/whois
 share/irssi/help/whowas
 share/irssi/help/window
 share/irssi/help/wjoin
 share/irssi/help/wquery
-@dirrm share/doc/irssi
-@dirrm etc/irssi
+share/irssi/scripts/autoop.pl
+share/irssi/scripts/autorejoin.pl
+share/irssi/scripts/clones.pl
+share/irssi/scripts/hello.pl
+share/irssi/scripts/privmsg.pl
+share/irssi/scripts/quitmsg.pl
+share/irssi/scripts/realname.pl
+share/irssi/themes/colorless.theme
+share/irssi/themes/default.theme
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Irssi/UI
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Irssi/TextUI
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Irssi/Irc
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Irssi
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Irssi
 @dirrm lib/irssi/modules
 @dirrm lib/irssi
+@dirrm share/doc/irssi
+@dirrm share/irssi/themes
+@dirrm share/irssi/scripts
 @dirrm share/irssi/help
 @dirrm share/irssi