ports/59614: Update port: irc/irssi to 0.8.8

Jean-Yves Lefort jylefort at brutele.be
Sun Nov 23 15:00:46 UTC 2003 

>Number:         59614
>Category:       ports
>Synopsis:       Update port: irc/irssi to 0.8.8
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Nov 23 07:00:41 PST 2003
>Closed-Date:
>Last-Modified:
>Originator:     Jean-Yves Lefort
>Release:        FreeBSD 4.9-RELEASE i386
>Organization:
>Environment:
System: FreeBSD jsite.lefort.net 4.9-RELEASE FreeBSD 4.9-RELEASE #0: Wed Oct 29 13:50:04 CET 2003 jylefort at jsite.lefort.net:/usr/obj/usr/src/sys/JSITE i386
	
>Description:
I seased the occasion to add some knobs (WITH_PERL, WITH_SOCKS,
WITHOUT_IPV6 and WITHOUT_GLIB2). By default, the port is now compiled
without Perl, with IPv6 and using GLib 2.x.
	
>How-To-Repeat:
	
>Fix:
diff -ruN /usr/ports/irc/irssi/Makefile irssi/Makefile
--- /usr/ports/irc/irssi/Makefile	Sun Nov 16 05:51:01 2003
+++ irssi/Makefile	Sun Nov 23 15:50:20 2003
@@ -2,12 +2,11 @@
 # Date created:			14 Apr 1999
 # Whom:				Jim Mock <jim at FreeBSD.org>
 #
-# $FreeBSD: ports/irc/irssi/Makefile,v 1.69 2003/11/15 12:38:07 sf Exp $
+# $FreeBSD$
 #
 
 PORTNAME=	irssi
-PORTVERSION=	0.8.6
-PORTREVISION?=	3
+PORTVERSION=	0.8.8
 CATEGORIES+=	irc	# `+=' is for slave ports
 MASTER_SITES=	http://irssi.org/files/
 
@@ -15,15 +14,29 @@
 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
+CONFIGURE_ARGS+=	--without-bot --with-textui
+
+MAN1=		irssi.1
 
 .include <bsd.port.pre.mk>
 
+.if defined(WITH_PERL)
+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 defined(WITH_SOCKS)
+CONFIGURE_ARGS+=	--with-socks
+.else
+CONFIGURE_ARGS+=	--without-socks
+.endif
+
 .if defined(WITH_PROXY)
 CONFIGURE_ARGS+=	--with-proxy
 PLIST_SUB+=	WITH_PROXY=""
@@ -31,16 +44,31 @@
 PLIST_SUB+=	WITH_PROXY="@comment "
 .endif
 
-.if defined(WITH_IPV6)
-.if ${OSVERSION} >= 400014
-CONFIGURE_ARGS+= --enable-ipv6
+.if ! defined(WITHOUT_IPV6) && ${OSVERSION} >= 400014
+CONFIGURE_ARGS+=	--enable-ipv6
 CATEGORIES+=	ipv6
+.else
+CONFIGURE_ARGS+=	--disable-ipv6
 .endif
+
+.if ! defined(WITHOUT_GLIB2)
+CONFIGURE_ARGS+=	--with-glib2
+USE_GNOME=	glib20
 .else
-CONFIGURE_ARGS+= --disable-ipv6
+CONFIGURE_ARGS+=	--without-glib2
+USE_GNOME=	glib12
 .endif
 
-MAN1=		irssi.1
+pre-everything::
+	@${ECHO} ""
+	@${ECHO} "You may use the following build options:"
+	@${ECHO} ""
+	@${ECHO} "	WITH_PERL=yes		Enable Perl support"
+	@${ECHO} "	WITH_SOCKS=yes		Enable Socks support"
+	@${ECHO} "	WITH_PROXY=yes		Enable irssi-proxy"
+	@${ECHO} "	WITHOUT_IPV6=yes	Disable IPv6 support"
+	@${ECHO} "	WITHOUT_GLIB2=yes	Use GLib 1.x instead of 2.x"
+	@${ECHO} ""
 
 pre-configure:
 	@cd ${WRKSRC} && ${MV} irssi.conf irssi.conf.sample
diff -ruN /usr/ports/irc/irssi/distinfo irssi/distinfo
--- /usr/ports/irc/irssi/distinfo	Thu Nov 21 07:23:00 2002
+++ irssi/distinfo	Sun Nov 23 15:51:59 2003
@@ -1 +1 @@
-MD5 (irssi-0.8.6.tar.bz2) = 6d66982723e2eb8780ae3b8b3a7ba08d
+MD5 (irssi-0.8.8.tar.bz2) = 7220d149b938012c96b064767dafc7de
diff -ruN /usr/ports/irc/irssi/files/patch-Makefile.in irssi/files/patch-Makefile.in
--- /usr/ports/irc/irssi/files/patch-Makefile.in	Sun Feb 17 08:49:10 2002
+++ irssi/files/patch-Makefile.in	Sun Nov 23 15:24:40 2003
@@ -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 -ruN /usr/ports/irc/irssi/pkg-plist irssi/pkg-plist
--- /usr/ports/irc/irssi/pkg-plist	Sat Oct 25 07:11:38 2003
+++ irssi/pkg-plist	Sun Nov 23 15:37:38 2003
@@ -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/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/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/usercount.pl
 share/irssi/themes/colorless.theme
 share/irssi/themes/default.theme
- at dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi/UI
- at dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi/TextUI
- at dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi/Irc
- at dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi
- at 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

	
>Release-Note:
>Audit-Trail:
>Unformatted:

More information about the freebsd-ports-bugs mailing list