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.
Responsible Changed From-To: freebsd-ports-bugs->vanilla Over to maintainer. Note to submitter: please CC maintainer on your PR next time.
Some additional corrections and cleanups: diff -ruN /usr/ports/irc/irssi/Makefile irssi/Makefile --- /usr/ports/irc/irssi/Makefile Sun Nov 16 05:51:01 2003 +++ irssi/Makefile Mon Nov 24 04:45:19 2003 @@ -2,45 +2,111 @@ # Date created: 14 Apr 1999 # Whom: Jim Mock <jim@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 -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 +.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 -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 -@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
State Changed From-To: open->closed Committed, thanks.