Update to version 0.7.90. The author has removed all GTK/GNOME bits for

the time being, but says ``they might come back later'', but for now this
is a text-only client.

Submitted by:	ade

16 files changed, 118 insertions, 136 deletions

diff --git a/irc/irssi-devel/Makefile b/irc/irssi-devel/Makefile
index 4a4771d13681..50e7bc4adbf8 100644
--- a/irc/irssi-devel/Makefile
+++ b/irc/irssi-devel/Makefile
@@ -6,37 +6,24 @@
 #
 
 PORTNAME=	irssi
-PORTVERSION=	0.7.28.3
-CATEGORIES=	irc ipv6 gnome
+PORTVERSION=	0.7.90
+CATEGORIES=	irc ipv6
 MASTER_SITES=	http://xlife.dhs.org/irssi/files/
-DISTNAME=	irssi-0.7.28-3
 
 MAINTAINER=	jim@FreeBSD.org
 
-LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
-		PropList.2:${PORTSDIR}/devel/libPropList
-.if defined(WITH_GNOME)
-LIB_DEPENDS+=	gnome.4:${PORTSDIR}/x11/gnomelibs
-.endif
+LIB_DEPENDS=	glib12.3:${PORTSDIR}/devel/glib12 \
+		intl.1:${PORTSDIR}/devel/gettext
 
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
 
-WRKSRC=		${WRKDIR}/${PKGNAME}
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
-USE_X_PREFIX=	yes
 USE_LIBTOOL=	yes
 
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--without-pthreads --without-socks --with-textui \
-		--with-proplist=${LOCALBASE} --without-servertest \
-		--disable-nls
-
-.if defined(WITH_GNOME)
-PLIST=		${PKGDIR}/PLIST.gnome
-.endif
+CONFIGURE_ARGS=	--without-socks --with-textui --with-bot \
+		--without-servertest
 
 .include <bsd.port.pre.mk>
 
@@ -46,18 +33,8 @@ CONFIGURE_ARGS+= --enable-ipv6
 CONFIGURE_ARGS+= --disable-ipv6
 .endif
 
-.if defined(WITH_GNOME)
-CONFIGURE_ARGS+= --with-gnome
-.if defined(WITH_PANEL)
-CONFIGURE_ARGS+= --with-gnome-panel
-.else
-CONFIGURE_ARGS+= --without-gnome-panel
-.endif
-.else
-CONFIGURE_ARGS+= --without-gnome
-.endif
-
-CONFIGURE_ENV=	GTK_CONFIG="${GTK_CONFIG}" \
-		GLIB_CONFIG="${GLIB_CONFIG}"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		GLIB_CONFIG="${GLIB_CONFIG}" \
+		LIBS="-L${LOCALBASE}/lib -lintl"
 
 .include <bsd.port.post.mk>
diff --git a/irc/irssi-devel/distinfo b/irc/irssi-devel/distinfo
index cc94a141c620..26075ce06d4b 100644
--- a/irc/irssi-devel/distinfo
+++ b/irc/irssi-devel/distinfo
@@ -1 +1 @@
-MD5 (irssi-0.7.28-3.tar.bz2) = 865d89237318e6c1cde5c9860bd096c2
+MD5 (irssi-0.7.90.tar.bz2) = cd8c14c9becf551862707a50ca08f99d
diff --git a/irc/irssi-devel/files/patch-ad b/irc/irssi-devel/files/patch-ad
index d13d381541be..b097283d3244 100644
--- a/irc/irssi-devel/files/patch-ad
+++ b/irc/irssi-devel/files/patch-ad
@@ -1,6 +1,15 @@
---- configure	Fri Feb 25 18:31:01 2000
-+++ configure.new	Fri Feb 25 19:33:01 2000
-@@ -7337,6 +7337,7 @@
+--- configure.orig	Sun Jun  4 10:48:10 2000
++++ configure	Fri Jun  9 18:03:22 2000
+@@ -4831,7 +4831,7 @@
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   CATOBJEXT=.mo
+-		   DATADIRNAME=lib
++		   DATADIRNAME=share
+ fi
+ rm -f conftest*
+ 		INSTOBJEXT=.mo
+@@ -5546,6 +5546,7 @@
  s%@oldincludedir@%$oldincludedir%g
  s%@infodir@%$infodir%g
  s%@mandir@%$mandir%g
diff --git a/irc/irssi-devel/files/patch-ae b/irc/irssi-devel/files/patch-ae
index 540b4fbc3aba..7017f356fc90 100644
--- a/irc/irssi-devel/files/patch-ae
+++ b/irc/irssi-devel/files/patch-ae
@@ -1,9 +1,9 @@
---- plugins/perl/xs/Makefile.PL.in	Fri Feb 25 12:52:31 2000
-+++ plugins/perl/xs/Makefile.PL.in.new	Fri Feb 25 19:38:08 2000
+--- 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 @GLIB_CFLAGS@ -I@proplist_dir@/include',
++              '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-devel/files/patch-af b/irc/irssi-devel/files/patch-af
index 80203aeade03..ff8684949c83 100644
--- a/irc/irssi-devel/files/patch-af
+++ b/irc/irssi-devel/files/patch-af
@@ -1,5 +1,5 @@
---- plugins/perl/Makefile.in	Sat Mar 11 15:10:46 2000
-+++ plugins/perl/Makefile.in.new	Fri May 19 20:36:24 2000
+--- 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 ..
  
diff --git a/irc/irssi-devel/pkg-comment b/irc/irssi-devel/pkg-comment
index be746efd40e5..94a5bde331f9 100644
--- a/irc/irssi-devel/pkg-comment
+++ b/irc/irssi-devel/pkg-comment
@@ -1 +1 @@
-An IRC client that uses GTK+ and (optionally) GNOME
+An IRC client that used to use GTK+ and GNOME, but doesn't any more
diff --git a/irc/irssi-devel/pkg-descr b/irc/irssi-devel/pkg-descr
index 610167447e43..e8a5ed563c1c 100644
--- a/irc/irssi-devel/pkg-descr
+++ b/irc/irssi-devel/pkg-descr
@@ -1,6 +1,4 @@
-Irssi is an IRC client made with the GTK+ toolkit and (optional) GNOME 
-libraries.  A small text mode version also works somewhat, and a
-really simple daemon version that can be used as bot will most likely
-be available soon.
+Irssi is an IRC client that used to be GTK/GNOME, but seems to have
+degenerated into text-only (using GLIB).
 
 WWW: http://xlife.dhs.org/irssi/
diff --git a/irc/irssi-devel/pkg-plist b/irc/irssi-devel/pkg-plist
index 1b4611c0939b..410106a32865 100644
--- a/irc/irssi-devel/pkg-plist
+++ b/irc/irssi-devel/pkg-plist
@@ -1,29 +1,36 @@
+bin/botti
 bin/irssi
-bin/irssi-bot
-bin/irssi-text
-lib/irssi/plugins/libbot.a
-lib/irssi/plugins/libbot.so
-lib/irssi/plugins/libbot.so.0
-lib/irssi/plugins/libexternal.a
-lib/irssi/plugins/libexternal.so
-lib/irssi/plugins/libexternal.so.0
-lib/irssi/plugins/libproxy.a
-lib/irssi/plugins/libproxy.so
-lib/irssi/plugins/libproxy.so.0
-lib/irssi/plugins/libsample.a
-lib/irssi/plugins/libsample.so
-lib/irssi/plugins/libsample.so.0
-lib/irssi/plugins/libspeech.a
-lib/irssi/plugins/libspeech.so
-lib/irssi/plugins/libspeech.so.0
-lib/irssi/plugins/libsound.a
-lib/irssi/plugins/libsound.so
-lib/irssi/plugins/libsound.so.0
 etc/irssi/colorless.theme
 etc/irssi/config
+etc/irssi/split.theme
+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
 share/irssi/help/help
+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/irssi/help
+@dirrm share/irssi
 @dirrm lib/irssi/plugins
 @dirrm lib/irssi
 @dirrm etc/irssi
-@dirrm share/irssi/help
-@dirrm share/irssi
diff --git a/irc/irssi/Makefile b/irc/irssi/Makefile
index 4a4771d13681..50e7bc4adbf8 100644
--- a/irc/irssi/Makefile
+++ b/irc/irssi/Makefile
@@ -6,37 +6,24 @@
 #
 
 PORTNAME=	irssi
-PORTVERSION=	0.7.28.3
-CATEGORIES=	irc ipv6 gnome
+PORTVERSION=	0.7.90
+CATEGORIES=	irc ipv6
 MASTER_SITES=	http://xlife.dhs.org/irssi/files/
-DISTNAME=	irssi-0.7.28-3
 
 MAINTAINER=	jim@FreeBSD.org
 
-LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
-		PropList.2:${PORTSDIR}/devel/libPropList
-.if defined(WITH_GNOME)
-LIB_DEPENDS+=	gnome.4:${PORTSDIR}/x11/gnomelibs
-.endif
+LIB_DEPENDS=	glib12.3:${PORTSDIR}/devel/glib12 \
+		intl.1:${PORTSDIR}/devel/gettext
 
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
 
-WRKSRC=		${WRKDIR}/${PKGNAME}
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
-USE_X_PREFIX=	yes
 USE_LIBTOOL=	yes
 
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--without-pthreads --without-socks --with-textui \
-		--with-proplist=${LOCALBASE} --without-servertest \
-		--disable-nls
-
-.if defined(WITH_GNOME)
-PLIST=		${PKGDIR}/PLIST.gnome
-.endif
+CONFIGURE_ARGS=	--without-socks --with-textui --with-bot \
+		--without-servertest
 
 .include <bsd.port.pre.mk>
 
@@ -46,18 +33,8 @@ CONFIGURE_ARGS+= --enable-ipv6
 CONFIGURE_ARGS+= --disable-ipv6
 .endif
 
-.if defined(WITH_GNOME)
-CONFIGURE_ARGS+= --with-gnome
-.if defined(WITH_PANEL)
-CONFIGURE_ARGS+= --with-gnome-panel
-.else
-CONFIGURE_ARGS+= --without-gnome-panel
-.endif
-.else
-CONFIGURE_ARGS+= --without-gnome
-.endif
-
-CONFIGURE_ENV=	GTK_CONFIG="${GTK_CONFIG}" \
-		GLIB_CONFIG="${GLIB_CONFIG}"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		GLIB_CONFIG="${GLIB_CONFIG}" \
+		LIBS="-L${LOCALBASE}/lib -lintl"
 
 .include <bsd.port.post.mk>
diff --git a/irc/irssi/distinfo b/irc/irssi/distinfo
index cc94a141c620..26075ce06d4b 100644
--- a/irc/irssi/distinfo
+++ b/irc/irssi/distinfo
@@ -1 +1 @@
-MD5 (irssi-0.7.28-3.tar.bz2) = 865d89237318e6c1cde5c9860bd096c2
+MD5 (irssi-0.7.90.tar.bz2) = cd8c14c9becf551862707a50ca08f99d
diff --git a/irc/irssi/files/patch-ad b/irc/irssi/files/patch-ad
index d13d381541be..b097283d3244 100644
--- a/irc/irssi/files/patch-ad
+++ b/irc/irssi/files/patch-ad
@@ -1,6 +1,15 @@
---- configure	Fri Feb 25 18:31:01 2000
-+++ configure.new	Fri Feb 25 19:33:01 2000
-@@ -7337,6 +7337,7 @@
+--- configure.orig	Sun Jun  4 10:48:10 2000
++++ configure	Fri Jun  9 18:03:22 2000
+@@ -4831,7 +4831,7 @@
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   CATOBJEXT=.mo
+-		   DATADIRNAME=lib
++		   DATADIRNAME=share
+ fi
+ rm -f conftest*
+ 		INSTOBJEXT=.mo
+@@ -5546,6 +5546,7 @@
  s%@oldincludedir@%$oldincludedir%g
  s%@infodir@%$infodir%g
  s%@mandir@%$mandir%g
diff --git a/irc/irssi/files/patch-ae b/irc/irssi/files/patch-ae
index 540b4fbc3aba..7017f356fc90 100644
--- a/irc/irssi/files/patch-ae
+++ b/irc/irssi/files/patch-ae
@@ -1,9 +1,9 @@
---- plugins/perl/xs/Makefile.PL.in	Fri Feb 25 12:52:31 2000
-+++ plugins/perl/xs/Makefile.PL.in.new	Fri Feb 25 19:38:08 2000
+--- 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 @GLIB_CFLAGS@ -I@proplist_dir@/include',
++              '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
index 80203aeade03..ff8684949c83 100644
--- a/irc/irssi/files/patch-af
+++ b/irc/irssi/files/patch-af
@@ -1,5 +1,5 @@
---- plugins/perl/Makefile.in	Sat Mar 11 15:10:46 2000
-+++ plugins/perl/Makefile.in.new	Fri May 19 20:36:24 2000
+--- 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 ..
  
diff --git a/irc/irssi/pkg-comment b/irc/irssi/pkg-comment
index be746efd40e5..94a5bde331f9 100644
--- a/irc/irssi/pkg-comment
+++ b/irc/irssi/pkg-comment
@@ -1 +1 @@
-An IRC client that uses GTK+ and (optionally) GNOME
+An IRC client that used to use GTK+ and GNOME, but doesn't any more
diff --git a/irc/irssi/pkg-descr b/irc/irssi/pkg-descr
index 610167447e43..e8a5ed563c1c 100644
--- a/irc/irssi/pkg-descr
+++ b/irc/irssi/pkg-descr
@@ -1,6 +1,4 @@
-Irssi is an IRC client made with the GTK+ toolkit and (optional) GNOME 
-libraries.  A small text mode version also works somewhat, and a
-really simple daemon version that can be used as bot will most likely
-be available soon.
+Irssi is an IRC client that used to be GTK/GNOME, but seems to have
+degenerated into text-only (using GLIB).
 
 WWW: http://xlife.dhs.org/irssi/
diff --git a/irc/irssi/pkg-plist b/irc/irssi/pkg-plist
index 1b4611c0939b..410106a32865 100644
--- a/irc/irssi/pkg-plist
+++ b/irc/irssi/pkg-plist
@@ -1,29 +1,36 @@
+bin/botti
 bin/irssi
-bin/irssi-bot
-bin/irssi-text
-lib/irssi/plugins/libbot.a
-lib/irssi/plugins/libbot.so
-lib/irssi/plugins/libbot.so.0
-lib/irssi/plugins/libexternal.a
-lib/irssi/plugins/libexternal.so
-lib/irssi/plugins/libexternal.so.0
-lib/irssi/plugins/libproxy.a
-lib/irssi/plugins/libproxy.so
-lib/irssi/plugins/libproxy.so.0
-lib/irssi/plugins/libsample.a
-lib/irssi/plugins/libsample.so
-lib/irssi/plugins/libsample.so.0
-lib/irssi/plugins/libspeech.a
-lib/irssi/plugins/libspeech.so
-lib/irssi/plugins/libspeech.so.0
-lib/irssi/plugins/libsound.a
-lib/irssi/plugins/libsound.so
-lib/irssi/plugins/libsound.so.0
 etc/irssi/colorless.theme
 etc/irssi/config
+etc/irssi/split.theme
+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
 share/irssi/help/help
+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/irssi/help
+@dirrm share/irssi
 @dirrm lib/irssi/plugins
 @dirrm lib/irssi
 @dirrm etc/irssi
-@dirrm share/irssi/help
-@dirrm share/irssi