7 files changed, 184 insertions, 126 deletions

diff --git a/irc/irssi-devel/Makefile b/irc/irssi-devel/Makefile
index db0183a3d99a..b4bfb5dafcad 100644
--- a/irc/irssi-devel/Makefile
+++ b/irc/irssi-devel/Makefile
@@ -1,34 +1,40 @@
-# New ports collection makefile for:	irssi
-# Date created:			14 Apr 1999
-# Whom:				Jim Mock <jim@FreeBSD.org>
+# New ports collection makefile for:	irssi-devel
+# Date created:                 03 Mar 2005
+# Whom:                         Vsevolod Stakhov <vsevolod@highsecure.ru>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	irssi
-PORTVERSION=	0.8.9
-PORTREVISION?=	3
-CATEGORIES?=	irc
-MASTER_SITES=	http://irssi.org/files/
+PORTVERSION=	20050720
+CATEGORIES=	irc
+MASTER_SITES=	http://highsecure.ru/
+PKGNAMESUFFIX=	-devel
 
-MAINTAINER?=	vanilla@FreeBSD.org
-COMMENT?=	A modular IRC client with many features
+MAINTAINER=	vsevolod@FreeBSD.org
+COMMENT=	A modular IRC client with many features
+
+CONFLICTS=	irssi-0.8*
 
-USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 
-WANT_GNOME=	yes
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+USE_GNOME=	glib20
+USE_LIBTOOL_VER=	15
+USE_REINPLACE=	yes
+USE_GMAKE=	yes
 
 MAN1=		irssi.1
 
-# Set option defaults.
+OPTIONS=	PERL "Enable perl support" on \
+		PROXY "Enable proxy support" off \
+		SOCKS "Enable socks proxy support" off \
+		IPV6 "Enable IPv6" on \
+		BOT "Enable bot" off
 
-.if ! defined(WITH_SSL)
-WITH_SSL=	yes
-.endif
+# USE_OPENSSL must be defined before bsd.port.pre.mk so use old schema
+# for WITH_SSL option
 
-.if ${WITH_SSL:L} == "no"
+.if defined(WITHOUT_SSL)
 CONFIGURE_ARGS+=	--disable-ssl
 .else
 USE_OPENSSL=	yes
@@ -36,50 +42,9 @@ USE_OPENSSL=	yes
 
 .include <bsd.port.pre.mk>
 
-.if ! defined(WITH_GLIB)
-.if exists(${LOCALBASE}/include/glib-2.0/glib.h)
-WITH_GLIB=	2
-.else
-WITH_GLIB=	1
-.endif
-.endif
-
-.if ! defined(WITH_PERL)
-WITH_PERL=	yes
-.endif
-
-.if ! defined(WITH_PROXY)
-WITH_PROXY=	no
-.endif
-
-.if ! defined(WITH_SOCKS)
-WITH_SOCKS=	no
-.endif
-
-.if ! defined(WITH_IPV6)
-WITH_IPV6=	yes
-.endif
-
-.if ! defined(WITH_BOEHM_GC)
-WITH_BOEHM_GC=	no
-.endif
-
-.if ! defined(WITH_BOT)
-WITH_BOT=	no
-.endif
-
 # Process options.
 
-.if ${WITH_GLIB} == "2"
-USE_GNOME=	glib20
-.elif ${WITH_GLIB} == "1"
-CONFIGURE_ARGS+=	--with-glib1
-USE_GNOME=	glib12
-.else
-.error WITH_GLIB must be set to "1" or "2".
-.endif
-
-.if ${WITH_PERL:L} == "yes"
+.if defined(WITH_PERL)
 USE_PERL5=	yes
 CONFIGURE_ARGS+=	--with-perl-lib=site
 PLIST_SUB+=	WITH_PERL=""
@@ -88,57 +53,37 @@ CONFIGURE_ARGS+=	--without-perl
 PLIST_SUB+=	WITH_PERL="@comment "
 .endif
 
-.if ${WITH_PROXY:L} == "yes"
+.if defined(WITH_PROXY)
 CONFIGURE_ARGS+=	--with-proxy
 PLIST_SUB+=	WITH_PROXY=""
 .else
 PLIST_SUB+=	WITH_PROXY="@comment "
 .endif
 
-.if ${WITH_SOCKS:L} == "yes"
+.if defined(WITH_SOCKS)
 CONFIGURE_ARGS+=	--with-socks
 .endif
 
-.if ${WITH_IPV6:L} == "yes"
+.if defined(WITH_IPV6)
 .if ${OSVERSION} >= 400014
 CONFIGURE_ARGS+=	--enable-ipv6
 CATEGORIES+=	ipv6
 .else
-.error This version of FreeBSD does not support IPv6. Please use WITH_IPV6=no.
-.endif
+BROKEN=	"This version of FreeBSD does not support IPv6. Please use WITH_IPV6=no"
 .endif
-
-.if ${WITH_BOEHM_GC:L} == "yes"
-LIB_DEPENDS+=	gc.1:${PORTSDIR}/devel/boehm-gc
-CONFIGURE_ENV+=	CPPFLAGS=-I${PREFIX}/include
-CONFIGURE_ARGS+=	--with-gc
 .endif
 
-.if ${WITH_BOT:L} == "yes"
+.if defined(WITH_BOT)
 CONFIGURE_ARGS+=	--with-bot
 .endif
 
-pre-extract:
-	@${ECHO} ""
-	@${ECHO} "You may use the following build options:"
-	@${ECHO} ""
-	@${ECHO} "	WITH_GLIB=1|2		Select a GLib version to use [auto]"
-	@${ECHO} "	WITH_PERL=yes|no	Enable Perl support [yes]"
-	@${ECHO} "	WITH_PROXY=yes|no	Enable irssi-proxy [no]"
-	@${ECHO} "	WITH_SOCKS=yes|no	Enable Socks support [no]"
-	@${ECHO} "	WITH_IPV6=yes|no	Enable IPv6 support [yes]"
-	@${ECHO} "	WITH_SSL=yes|no		Enable SSL support [yes]"
-	@${ECHO} "	WITH_BOEHM_GC=yes|no	Enable GC support [no]"
-	@${ECHO} "	WITH_BOT=yes|no		Enable BOT support [no]"
-	@${ECHO} ""
-
-pre-configure:
-	@cd ${WRKSRC} && ${MV} irssi.conf irssi.conf.sample || ${TRUE}
+post-configure:
+	@${MV} ${WRKSRC}/irssi.conf ${WRKSRC}/irssi.conf.sample
 
 post-install:
-	@if [ ! -f ${LOCALBASE}/etc/irssi.conf ]; then \
+	@if [ ! -f ${PREFIX}/etc/irssi.conf ]; then \
 		${ECHO} "Installing default configuration file."; \
-		${INSTALL_DATA} ${WRKSRC}/irssi.conf.sample ${LOCALBASE}/etc/irssi.conf ; \
+		${INSTALL_DATA} ${WRKSRC}/irssi.conf.sample ${PREFIX}/etc/irssi.conf ; \
 	fi
 
 .include <bsd.port.post.mk>
diff --git a/irc/irssi-devel/distinfo b/irc/irssi-devel/distinfo
index 1875580d2784..eda5158726b8 100644
--- a/irc/irssi-devel/distinfo
+++ b/irc/irssi-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (irssi-0.8.9.tar.bz2) = 6610ee0e27922f447e40828cf7dee507
-SIZE (irssi-0.8.9.tar.bz2) = 816465
+MD5 (irssi-20050720.tar.gz) = 4714cd528117d83a2fe853170249017a
+SIZE (irssi-20050720.tar.gz) = 2074134
diff --git a/irc/irssi-devel/files/patch-aa b/irc/irssi-devel/files/patch-aa
deleted file mode 100644
index 3703ad902d46..000000000000
--- a/irc/irssi-devel/files/patch-aa
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/irc/core/irc.c.orig	Fri Oct 10 17:30:03 2003
-+++ src/irc/core/irc.c	Sat Dec 27 22:20:56 2003
-@@ -108,9 +108,14 @@
- 	int send_now;
- 
-         g_get_current_time(&now);
--	send_now = g_timeval_cmp(&now, &server->wait_cmd) >= 0 &&
--		(server->cmdcount < server->max_cmds_at_once ||
--		 server->cmd_queue_speed <= 0);
-+
-+	if (getenv("IRSSI_NOTHROTTLE")) {
-+		send_now = TRUE;
-+	} else {
-+		send_now = g_timeval_cmp(&now, &server->wait_cmd) >= 0 &&
-+			(server->cmdcount < server->max_cmds_at_once ||
-+		 	server->cmd_queue_speed <= 0);
-+	}
- 
-         irc_send_cmd_full(server, cmd, send_now, FALSE, FALSE);
- }
diff --git a/irc/irssi-devel/files/patch-eai_nodata b/irc/irssi-devel/files/patch-eai_nodata
deleted file mode 100644
index 3d5d32db54fc..000000000000
--- a/irc/irssi-devel/files/patch-eai_nodata
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/core/network.c.orig	Sat Feb  7 12:48:34 2004
-+++ src/core/network.c	Sat Feb  7 12:49:40 2004
-@@ -607,7 +607,7 @@
- int net_hosterror_notfound(int error)
- {
- #ifdef HAVE_IPV6
--	return error != 1 && (error == EAI_NONAME || error == EAI_NODATA);
-+	return error != 1 && (error == EAI_NONAME);
- #else
- 	return error == HOST_NOT_FOUND || error == NO_ADDRESS;
- #endif
diff --git a/irc/irssi-devel/files/patch-irssi-version.h.in b/irc/irssi-devel/files/patch-irssi-version.h.in
new file mode 100644
index 000000000000..cabb51b85c9e
--- /dev/null
+++ b/irc/irssi-devel/files/patch-irssi-version.h.in
@@ -0,0 +1,9 @@
+--- irssi-version.h.in.orig	Wed Jul 20 15:29:15 2005
++++ irssi-version.h.in	Wed Jul 20 15:29:38 2005
+@@ -1,4 +1,4 @@
+ /* automatically created by configure */
+ #define IRSSI_VERSION "@VERSION@"
+-#define IRSSI_VERSION_DATE @VERSION_DATE@
+-#define IRSSI_VERSION_TIME @VERSION_TIME@
++#define IRSSI_VERSION_DATE 20050720
++#define IRSSI_VERSION_TIME 1530
diff --git a/irc/irssi-devel/pkg-descr b/irc/irssi-devel/pkg-descr
index 93d192baa96d..86a27fa97f77 100644
--- a/irc/irssi-devel/pkg-descr
+++ b/irc/irssi-devel/pkg-descr
@@ -4,4 +4,7 @@ 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://www.irssi.org/
+Note: this is not official version, this is svn snapshot, so it can
+work unstable in some cases.
+
+WWW: http://svn.irssi.org/
diff --git a/irc/irssi-devel/pkg-plist b/irc/irssi-devel/pkg-plist
index 36dc918831e6..fcb7692c3a95 100644
--- a/irc/irssi-devel/pkg-plist
+++ b/irc/irssi-devel/pkg-plist
@@ -1,9 +1,6 @@
 bin/irssi
-etc/irssi.conf
+@unexec if cmp -s %D/etc/irssi.conf %D/etc/irssi.conf.sample; then rm -f %D/etc/irssi.conf; fi
 etc/irssi.conf.sample
-@exec mkdir -p %D/lib/irssi/modules
-%%WITH_PROXY%%lib/irssi/modules/libirc_proxy.a
-%%WITH_PROXY%%lib/irssi/modules/libirc_proxy.la
 %%WITH_PROXY%%lib/irssi/modules/libirc_proxy.so
 %%WITH_PROXY%%lib/irssi/modules/libirc_proxy.so.0
 %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/Irssi.pm
@@ -57,6 +54,7 @@ etc/irssi.conf.sample
 %%DATADIR%%/help/echo
 %%DATADIR%%/help/eval
 %%DATADIR%%/help/exec
+%%DATADIR%%/help/flushbuffer
 %%DATADIR%%/help/flushbuffers
 %%DATADIR%%/help/format
 %%DATADIR%%/help/hash
@@ -91,6 +89,7 @@ etc/irssi.conf.sample
 %%DATADIR%%/help/names
 %%DATADIR%%/help/nctcp
 %%DATADIR%%/help/netsplit
+%%DATADIR%%/help/network
 %%DATADIR%%/help/nick
 %%DATADIR%%/help/note
 %%DATADIR%%/help/notice
@@ -103,6 +102,7 @@ etc/irssi.conf.sample
 %%DATADIR%%/help/quit
 %%DATADIR%%/help/quote
 %%DATADIR%%/help/rawlog
+%%DATADIR%%/help/recode
 %%DATADIR%%/help/reconnect
 %%DATADIR%%/help/rehash
 %%DATADIR%%/help/reload
@@ -173,6 +173,123 @@ etc/irssi.conf.sample
 %%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi/Irc
 %%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi
 %%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Irssi
+include/irssi/src/lib-popt/findme.h
+include/irssi/src/lib-popt/popt.h
+include/irssi/src/lib-popt/poptint.h
+include/irssi/src/lib-config/iconfig.h
+include/irssi/src/lib-config/module.h
+include/irssi/src/core/args.h
+include/irssi/src/core/channels.h
+include/irssi/src/core/channels-setup.h
+include/irssi/src/core/commands.h
+include/irssi/src/core/chat-protocols.h
+include/irssi/src/core/chatnets.h
+include/irssi/src/core/core.h
+include/irssi/src/core/expandos.h
+include/irssi/src/core/ignore.h
+include/irssi/src/core/levels.h
+include/irssi/src/core/line-split.h
+include/irssi/src/core/log.h
+include/irssi/src/core/masks.h
+include/irssi/src/core/misc.h
+include/irssi/src/core/module.h
+include/irssi/src/core/modules.h
+include/irssi/src/core/modules-load.h
+include/irssi/src/core/net-disconnect.h
+include/irssi/src/core/net-nonblock.h
+include/irssi/src/core/net-sendbuffer.h
+include/irssi/src/core/network.h
+include/irssi/src/core/nick-rec.h
+include/irssi/src/core/nicklist.h
+include/irssi/src/core/nickmatch-cache.h
+include/irssi/src/core/pidwait.h
+include/irssi/src/core/queries.h
+include/irssi/src/core/rawlog.h
+include/irssi/src/core/recode.h
+include/irssi/src/core/servers.h
+include/irssi/src/core/servers-reconnect.h
+include/irssi/src/core/servers-setup.h
+include/irssi/src/core/session.h
+include/irssi/src/core/settings.h
+include/irssi/src/core/signals.h
+include/irssi/src/core/special-vars.h
+include/irssi/src/core/window-item-def.h
+include/irssi/src/core/write-buffer.h
+include/irssi/src/core/channel-rec.h
+include/irssi/src/core/channel-setup-rec.h
+include/irssi/src/core/chatnet-rec.h
+include/irssi/src/core/query-rec.h
+include/irssi/src/core/server-rec.h
+include/irssi/src/core/server-setup-rec.h
+include/irssi/src/core/server-connect-rec.h
+include/irssi/src/core/window-item-rec.h
+include/irssi/src/irc/core/bans.h
+include/irssi/src/irc/core/ctcp.h
+include/irssi/src/irc/core/channel-rejoin.h
+include/irssi/src/irc/core/irc.h
+include/irssi/src/irc/core/irc-channels.h
+include/irssi/src/irc/core/irc-chatnets.h
+include/irssi/src/irc/core/irc-commands.h
+include/irssi/src/irc/core/irc-masks.h
+include/irssi/src/irc/core/irc-nicklist.h
+include/irssi/src/irc/core/irc-queries.h
+include/irssi/src/irc/core/irc-servers.h
+include/irssi/src/irc/core/irc-servers-setup.h
+include/irssi/src/irc/core/modes.h
+include/irssi/src/irc/core/mode-lists.h
+include/irssi/src/irc/core/module.h
+include/irssi/src/irc/core/netsplit.h
+include/irssi/src/irc/core/servers-idle.h
+include/irssi/src/irc/core/servers-redirect.h
+include/irssi/src/irc/dcc/dcc-rec.h
+include/irssi/src/irc/dcc/dcc-file-rec.h
+include/irssi/src/irc/dcc/dcc.h
+include/irssi/src/irc/dcc/dcc-file.h
+include/irssi/src/irc/dcc/dcc-chat.h
+include/irssi/src/irc/dcc/dcc-get.h
+include/irssi/src/irc/dcc/dcc-send.h
+include/irssi/src/irc/dcc/dcc-queue.h
+include/irssi/src/irc/dcc/module.h
+include/irssi/src/irc/dcc/dcc-server.h
+include/irssi/src/irc/flood/module.h
+include/irssi/src/irc/notifylist/notifylist.h
+include/irssi/src/irc/notifylist/notify-setup.h
+include/irssi/src/irc/notifylist/module.h
+include/irssi/src/fe-common/core/autorun.h
+include/irssi/src/fe-common/core/command-history.h
+include/irssi/src/fe-common/core/chat-completion.h
+include/irssi/src/fe-common/core/completion.h
+include/irssi/src/fe-common/core/fe-channels.h
+include/irssi/src/fe-common/core/fe-common-core.h
+include/irssi/src/fe-common/core/fe-core-commands.h
+include/irssi/src/fe-common/core/fe-exec.h
+include/irssi/src/fe-common/core/fe-messages.h
+include/irssi/src/fe-common/core/fe-queries.h
+include/irssi/src/fe-common/core/utf8.h
+include/irssi/src/fe-common/core/formats.h
+include/irssi/src/fe-common/core/hilight-text.h
+include/irssi/src/fe-common/core/keyboard.h
+include/irssi/src/fe-common/core/module-formats.h
+include/irssi/src/fe-common/core/module.h
+include/irssi/src/fe-common/core/printtext.h
+include/irssi/src/fe-common/core/fe-recode.h
+include/irssi/src/fe-common/core/themes.h
+include/irssi/src/fe-common/core/translation.h
+include/irssi/src/fe-common/core/window-activity.h
+include/irssi/src/fe-common/core/window-items.h
+include/irssi/src/fe-common/core/windows-layout.h
+include/irssi/src/fe-common/core/fe-windows.h
+include/irssi/src/fe-common/irc/dcc/module.h
+include/irssi/src/fe-common/irc/dcc/module-formats.h
+include/irssi/src/fe-common/irc/dcc/fe-dcc.h
+include/irssi/src/fe-common/irc/notifylist/module.h
+include/irssi/src/fe-common/irc/notifylist/module-formats.h
+include/irssi/src/fe-common/irc/fe-irc-server.h
+include/irssi/src/fe-common/irc/module.h
+include/irssi/src/fe-common/irc/module-formats.h
+include/irssi/src/common.h
+include/irssi/config.h
+include/irssi/irssi-version.h
 @dirrm lib/irssi/modules
 @dirrm lib/irssi
 @dirrm %%DOCSDIR%%
@@ -180,3 +297,18 @@ etc/irssi.conf.sample
 @dirrm %%DATADIR%%/scripts
 @dirrm %%DATADIR%%/help
 @dirrm %%DATADIR%%
+@dirrm include/irssi/src/core
+@dirrm include/irssi/src/lib-popt
+@dirrm include/irssi/src/lib-config
+@dirrm include/irssi/src/irc/dcc
+@dirrm include/irssi/src/irc/core
+@dirrm include/irssi/src/irc/flood
+@dirrm include/irssi/src/irc/notifylist
+@dirrm include/irssi/src/irc
+@dirrm include/irssi/src/fe-common/core
+@dirrm include/irssi/src/fe-common/irc/dcc
+@dirrm include/irssi/src/fe-common/irc/notifylist
+@dirrm include/irssi/src/fe-common/irc
+@dirrm include/irssi/src/fe-common
+@dirrm include/irssi/src
+@dirrm include/irssi