Upgrade to 0.8.8, add WITH_PERL, WITH_SOCKS, WITHOUT_IPV6, WITHOUT_GLIB2 knob.

PR:		ports/59614
Submitted by:	Jean-Yves Lefort <jylefort@brutele.be>

4 files changed, 117 insertions, 46 deletions

diff --git a/irc/irssi/Makefile b/irc/irssi/Makefile
index d2a860503e46..c40d9d15d759 100644
--- a/irc/irssi/Makefile
+++ b/irc/irssi/Makefile
@@ -6,41 +6,110 @@
 #
 
 PORTNAME=	irssi
-PORTVERSION=	0.8.6
-PORTREVISION?=	3
-CATEGORIES+=	irc	# `+=' is for slave ports
+PORTVERSION=	0.8.8
+CATEGORIES=	irc
 MASTER_SITES=	http://irssi.org/files/
 
-MAINTAINER?=	vanilla@FreeBSD.org
-COMMENT?=	A modular IRC client with many features
+MAINTAINER=	vanilla@FreeBSD.org
+COMMENT=	A modular IRC client with many features
 
 USE_BZIP2=	yes
-USE_PERL5=	yes
-USE_GNOME=	glib12
 GNU_CONFIGURE=	yes
-# `+=' is for slave ports
-CONFIGURE_ARGS+=	--without-socks --without-bot --with-textui \
-		--with-perl-lib=site
+
+MAN1=		irssi.1
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_PROXY)
+# Set option defaults.
+
+.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=	no
+.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_SSL)
+WITH_SSL=	yes
+.endif
+
+# Process options.
+
+.if ${WITH_GLIB} == "2"
+USE_GNOME=	glib20
+LIB_DEPENDS+=	gc.1:${PORTSDIR}/deve/boehm-gc
+CONFIGURE_ENV+=	CPPFLAGS=-I${PREFIX}/include
+CONFIGURE_ARGS+=	--with-gc
+.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"
+USE_PERL5=	yes
+CONFIGURE_ARGS+=	--with-perl-lib=site
+PLIST_SUB+=	WITH_PERL=""
+.else
+CONFIGURE_ARGS+=	--without-perl
+PLIST_SUB+=	WITH_PERL="@comment "
+.endif
+
+.if ${WITH_PROXY:L} == "yes"
 CONFIGURE_ARGS+=	--with-proxy
 PLIST_SUB+=	WITH_PROXY=""
 .else
 PLIST_SUB+=	WITH_PROXY="@comment "
 .endif
 
-.if defined(WITH_IPV6)
+.if ${WITH_SOCKS:L} == "yes"
+CONFIGURE_ARGS+=	--with-socks
+.endif
+
+.if ${WITH_IPV6:L} == "yes"
 .if ${OSVERSION} >= 400014
-CONFIGURE_ARGS+= --enable-ipv6
+CONFIGURE_ARGS+=	--enable-ipv6
 CATEGORIES+=	ipv6
+.else
+.error This version of FreeBSD does not support IPv6. Please use WITH_IPV6=no.
+.endif
 .endif
+
+.if ${WITH_SSL:L} == "yes"
+USE_OPENSSL=	yes
 .else
-CONFIGURE_ARGS+= --disable-ipv6
+CONFIGURE_ARGS+=	--disable-ssl
 .endif
 
-MAN1=		irssi.1
+pre-everything::
+	@${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 [no]"
+	@${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} ""
 
 pre-configure:
 	@cd ${WRKSRC} && ${MV} irssi.conf irssi.conf.sample
diff --git a/irc/irssi/distinfo b/irc/irssi/distinfo
index 004e264e441a..b02e5726b3bf 100644
--- a/irc/irssi/distinfo
+++ b/irc/irssi/distinfo
@@ -1 +1 @@
-MD5 (irssi-0.8.6.tar.bz2) = 6d66982723e2eb8780ae3b8b3a7ba08d
+MD5 (irssi-0.8.8.tar.bz2) = 7220d149b938012c96b064767dafc7de
diff --git a/irc/irssi/files/patch-Makefile.in b/irc/irssi/files/patch-Makefile.in
index 1bbfd7a7c4ff..294e8838ef81 100644
--- a/irc/irssi/files/patch-Makefile.in
+++ b/irc/irssi/files/patch-Makefile.in
@@ -1,7 +1,7 @@
---- Makefile.in.orig	Sun Feb 17 12:02:33 2002
-+++ Makefile.in	Sun Feb 17 14:00:58 2002
-@@ -110,7 +110,7 @@
- SUBDIRS = src $(SERVERTEST) docs scripts
+--- Makefile.in.orig	Sun Nov 23 15:15:19 2003
++++ Makefile.in	Sun Nov 23 15:24:26 2003
+@@ -119,7 +119,7 @@
+ SUBDIRS = src docs scripts
  
  confdir = $(sysconfdir)
 -conf_DATA = irssi.conf
@@ -9,7 +9,7 @@
  
  themedir = $(datadir)/irssi/themes
  theme_DATA = default.theme colorless.theme
-@@ -452,8 +452,8 @@
+@@ -459,8 +459,8 @@
  
  config.h: default-config.h default-theme.h
  
diff --git a/irc/irssi/pkg-plist b/irc/irssi/pkg-plist
index e19da79643a9..1f6935823284 100644
--- a/irc/irssi/pkg-plist
+++ b/irc/irssi/pkg-plist
@@ -1,26 +1,26 @@
 bin/irssi
 etc/irssi.conf
 etc/irssi.conf.sample
-%%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
-%%SITE_PERL%%/%%PERL_ARCH%%/Irssi.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Irssi/Irc.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Irssi/TextUI.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Irssi/UI.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi/Irssi.bs
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi/Irssi.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi/Irc/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi/Irc/Irc.bs
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi/Irc/Irc.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi/TextUI/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi/TextUI/TextUI.bs
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi/TextUI/TextUI.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi/UI/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi/UI/UI.bs
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi/UI/UI.so
+%%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
+%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/Irssi/Irc.pm
+%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/Irssi/TextUI.pm
+%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/Irssi/UI.pm
+%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi/.packlist
+%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi/Irssi.bs
+%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi/Irssi.so
+%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi/Irc/.packlist
+%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi/Irc/Irc.bs
+%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi/Irc/Irc.so
+%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi/TextUI/.packlist
+%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi/TextUI/TextUI.bs
+%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi/TextUI/TextUI.so
+%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi/UI/.packlist
+%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi/UI/UI.bs
+%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi/UI/UI.so
 share/doc/irssi/botnet.txt
 share/doc/irssi/design.txt
 share/doc/irssi/faq.html
@@ -56,6 +56,7 @@ share/irssi/help/disconnect
 share/irssi/help/echo
 share/irssi/help/eval
 share/irssi/help/exec
+share/irssi/help/flushbuffers
 share/irssi/help/format
 share/irssi/help/hash
 share/irssi/help/help
@@ -70,6 +71,7 @@ share/irssi/help/join
 share/irssi/help/kick
 share/irssi/help/kickban
 share/irssi/help/kill
+share/irssi/help/knock
 share/irssi/help/knockout
 share/irssi/help/lastlog
 share/irssi/help/layout
@@ -165,11 +167,11 @@ share/irssi/scripts/splitlong.pl
 share/irssi/scripts/usercount.pl
 share/irssi/themes/colorless.theme
 share/irssi/themes/default.theme
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi/UI
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi/TextUI
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi/Irc
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Irssi
+%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi/UI
+%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi/TextUI
+%%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
 @dirrm lib/irssi/modules
 @dirrm lib/irssi
 @dirrm share/doc/irssi