5 files changed, 22 insertions, 19 deletions

diff --git a/irc/irssi-devel/Makefile b/irc/irssi-devel/Makefile
index 6406526cdc80..da6cd3ee146b 100644
--- a/irc/irssi-devel/Makefile
+++ b/irc/irssi-devel/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	irssi
-PORTVERSION=	20050720
-PORTREVISION=	1
+PORTVERSION=	20060326
 CATEGORIES=	irc
-MASTER_SITES=	http://highsecure.ru/
+MASTER_SITES=	http://www.irssi.org/files/snapshots/ \
+		http://mirror.inerd.com/FreeBSD/distfiles/irssi-devel/
 PKGNAMESUFFIX=	-devel
 
 MAINTAINER=	ports@FreeBSD.org
@@ -23,12 +23,14 @@ USE_GMAKE=	yes
 
 MAN1=		irssi.1
 
-OPTIONS=	PERL "Enable perl support" on \
+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
 
+WRKSRC=		${WRKDIR}/${PORTNAME}-0.8.10
+
 # USE_OPENSSL must be defined before bsd.port.pre.mk so use old schema
 # for WITH_SSL option
 
@@ -42,7 +44,7 @@ USE_OPENSSL=	yes
 
 # Process options.
 
-.if defined(WITH_PERL)
+.if !defined(WITHOUT_PERL)
 USE_PERL5=	yes
 CONFIGURE_ARGS+=	--with-perl-lib=site
 PLIST_SUB+=	WITH_PERL=""
@@ -62,12 +64,12 @@ PLIST_SUB+=	WITH_PROXY="@comment "
 CONFIGURE_ARGS+=	--with-socks
 .endif
 
-.if defined(WITH_IPV6)
+.if !defined(WITHOUT_IPV6)
 .if ${OSVERSION} >= 400014
 CONFIGURE_ARGS+=	--enable-ipv6
 CATEGORIES+=	ipv6
 .else
-BROKEN=	"This version of FreeBSD does not support IPv6. Please use WITH_IPV6=no"
+BROKEN=	This version of FreeBSD does not support IPv6. Please define WITHOUT_IPV6
 .endif
 .endif
 
diff --git a/irc/irssi-devel/distinfo b/irc/irssi-devel/distinfo
index 09a4c8d64a70..7c29a952bc38 100644
--- a/irc/irssi-devel/distinfo
+++ b/irc/irssi-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (irssi-20050720.tar.gz) = 4714cd528117d83a2fe853170249017a
-SHA256 (irssi-20050720.tar.gz) = 3301d3bc07c527af7c59714ffae181c9603c010ef4505e28dc0f87233a771561
-SIZE (irssi-20050720.tar.gz) = 2074134
+MD5 (irssi-20060326.tar.gz) = 7c8e5368b4b068c768fb553f5146964e
+SHA256 (irssi-20060326.tar.gz) = 72dfa30cd9dc5267bce52cdac7c138da607d1ff4d01cee9982dcfd564e8d8e65
+SIZE (irssi-20060326.tar.gz) = 1324291
diff --git a/irc/irssi-devel/files/patch-Makefile.in b/irc/irssi-devel/files/patch-Makefile.in
index 294e8838ef81..443e1da124c0 100644
--- a/irc/irssi-devel/files/patch-Makefile.in
+++ b/irc/irssi-devel/files/patch-Makefile.in
@@ -1,16 +1,16 @@
---- Makefile.in.orig	Sun Nov 23 15:15:19 2003
-+++ Makefile.in	Sun Nov 23 15:24:26 2003
-@@ -119,7 +119,7 @@
+--- Makefile.in.orig	Fri Mar 24 23:02:58 2006
++++ Makefile.in	Mon May 15 02:44:38 2006
+@@ -255,7 +255,7 @@
+ @BUILD_PLUGINS_TRUE@PLUGINS = plugins
  SUBDIRS = src docs scripts
- 
  confdir = $(sysconfdir)
 -conf_DATA = irssi.conf
 +conf_DATA = irssi.conf.sample
- 
  themedir = $(datadir)/irssi/themes
  theme_DATA = default.theme colorless.theme
-@@ -459,8 +459,8 @@
- 
+ pkginclude_HEADERS = config.h irssi-version.h
+@@ -784,8 +784,8 @@
+ # create default-config.h
  config.h: default-config.h default-theme.h
  
 -default-config.h: $(srcdir)/irssi.conf
diff --git a/irc/irssi-devel/files/patch-irssi-version.h.in b/irc/irssi-devel/files/patch-irssi-version.h.in
index cabb51b85c9e..030b5208bd09 100644
--- a/irc/irssi-devel/files/patch-irssi-version.h.in
+++ b/irc/irssi-devel/files/patch-irssi-version.h.in
@@ -5,5 +5,5 @@
  #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
++#define IRSSI_VERSION_DATE 20060326
++#define IRSSI_VERSION_TIME 2300
diff --git a/irc/irssi-devel/pkg-plist b/irc/irssi-devel/pkg-plist
index fcb7692c3a95..9013b954d4f2 100644
--- a/irc/irssi-devel/pkg-plist
+++ b/irc/irssi-devel/pkg-plist
@@ -290,6 +290,7 @@ include/irssi/src/fe-common/irc/module-formats.h
 include/irssi/src/common.h
 include/irssi/config.h
 include/irssi/irssi-version.h
+@exec mkdir -p %D/lib/irssi/modules
 @dirrm lib/irssi/modules
 @dirrm lib/irssi
 @dirrm %%DOCSDIR%%