Enable perl and iconv support.

PR:		ports/126771
Submitted by:	Matt <freebsdbugs@fjarlq.com>

2 files changed, 46 insertions, 1 deletions

diff --git a/net/silc-client/Makefile b/net/silc-client/Makefile
index 088c0b36a64b..a4b71c159913 100644
--- a/net/silc-client/Makefile
+++ b/net/silc-client/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	silc
 PORTVERSION=	1.1.4
+PORTREVISION=	1
 CATEGORIES=	net ipv6 security
 MASTER_SITES=	http://www.silcnet.org/download/%SUBDIR%/ \
 		http://ftp.silcnet.org/%SUBDIR%/ \
@@ -32,11 +33,12 @@ GNU_CONFIGURE=	yes
 USE_GNOME=	glib12
 USE_GMAKE=	yes
 CONFIGURE_ARGS=	--docdir=${DOCSDIR} \
-		--with-perl=no \
 		--without-libtoolfix
 
 OPTIONS=	PTHREADS "Enable pthreads support" off \
 		IPV6 "Enable IPv6 support" on \
+		ICONV "Enable international character support" on \
+		PERL "Enable perl support" on \
 		OPTIMIZED_ASM "Use assembler optimizations (i386 only)" on
 
 .ifdef(IRSSI_PLUGIN)
@@ -82,6 +84,23 @@ WITHOUT_OPTIMIZED_ASM=	yes
 CONFIGURE_ARGS+=	--disable-ipv6
 .endif
 
+.if defined(WITH_ICONV)
+USE_ICONV=		yes
+CONFIGURE_ARGS+=	--with-iconv
+.else
+CONFIGURE_ARGS+=	--without-iconv
+.endif
+
+.if defined(WITH_PERL)
+USE_PERL5=		yes
+PERL_ARCHNAME!=		${PERL} -V:archname 2>/dev/null || true
+PLIST_SUB+=		WITH_PERL="" PERL_ARCHNAME=${PERL_ARCHNAME:S/archname='//:S/';//}
+CONFIGURE_ARGS+=	--with-perl-lib=${PREFIX}/lib/${PORTNAME}/perl
+.else
+CONFIGURE_ARGS+=	--without-perl
+PLIST_SUB+=		WITH_PERL="@comment "
+.endif
+
 .if defined(WITHOUT_OPTIMIZED_ASM)
 CONFIGURE_ARGS+=	--disable-asm
 .endif
diff --git a/net/silc-client/pkg-plist b/net/silc-client/pkg-plist
index ffcbf57c585c..0b432d6ca210 100644
--- a/net/silc-client/pkg-plist
+++ b/net/silc-client/pkg-plist
@@ -1,4 +1,21 @@
 bin/silc
+%%WITH_PERL%%lib/silc/perl/%%PERL_ARCHNAME%%/Irssi.pm
+%%WITH_PERL%%lib/silc/perl/%%PERL_ARCHNAME%%/Irssi/Silc.pm
+%%WITH_PERL%%lib/silc/perl/%%PERL_ARCHNAME%%/Irssi/TextUI.pm
+%%WITH_PERL%%lib/silc/perl/%%PERL_ARCHNAME%%/Irssi/UI.pm
+%%WITH_PERL%%lib/silc/perl/%%PERL_ARCHNAME%%/auto/Irssi/.packlist
+%%WITH_PERL%%lib/silc/perl/%%PERL_ARCHNAME%%/auto/Irssi/Irssi.bs
+%%WITH_PERL%%lib/silc/perl/%%PERL_ARCHNAME%%/auto/Irssi/Irssi.so
+%%WITH_PERL%%lib/silc/perl/%%PERL_ARCHNAME%%/auto/Irssi/Silc/.packlist
+%%WITH_PERL%%lib/silc/perl/%%PERL_ARCHNAME%%/auto/Irssi/Silc/Silc.bs
+%%WITH_PERL%%lib/silc/perl/%%PERL_ARCHNAME%%/auto/Irssi/Silc/Silc.so
+%%WITH_PERL%%lib/silc/perl/%%PERL_ARCHNAME%%/auto/Irssi/TextUI/.packlist
+%%WITH_PERL%%lib/silc/perl/%%PERL_ARCHNAME%%/auto/Irssi/TextUI/TextUI.bs
+%%WITH_PERL%%lib/silc/perl/%%PERL_ARCHNAME%%/auto/Irssi/TextUI/TextUI.so
+%%WITH_PERL%%lib/silc/perl/%%PERL_ARCHNAME%%/auto/Irssi/UI/.packlist
+%%WITH_PERL%%lib/silc/perl/%%PERL_ARCHNAME%%/auto/Irssi/UI/UI.bs
+%%WITH_PERL%%lib/silc/perl/%%PERL_ARCHNAME%%/auto/Irssi/UI/UI.so
+%%WITH_PERL%%lib/silc/perl/%%PERL_ARCHNAME%%/perllocal.pod
 %%DATADIR%%/help/action
 %%DATADIR%%/help/admin
 %%DATADIR%%/help/alias
@@ -108,6 +125,15 @@ bin/silc
 @unexec if cmp -s %D/etc/silc.conf.sample %D/etc/silc.conf; then rm -f %D/etc/silc.conf; fi
 etc/silc.conf.sample
 @exec if [ ! -f %D/etc/silc.conf ] ; then cp -p %D/%F %B/silc.conf; fi
+%%WITH_PERL%%@dirrm lib/silc/perl/%%PERL_ARCHNAME%%/auto/Irssi/Silc
+%%WITH_PERL%%@dirrm lib/silc/perl/%%PERL_ARCHNAME%%/auto/Irssi/TextUI
+%%WITH_PERL%%@dirrm lib/silc/perl/%%PERL_ARCHNAME%%/auto/Irssi/UI
+%%WITH_PERL%%@dirrm lib/silc/perl/%%PERL_ARCHNAME%%/auto/Irssi
+%%WITH_PERL%%@dirrm lib/silc/perl/%%PERL_ARCHNAME%%/auto
+%%WITH_PERL%%@dirrm lib/silc/perl/%%PERL_ARCHNAME%%/Irssi
+%%WITH_PERL%%@dirrm lib/silc/perl/%%PERL_ARCHNAME%%
+%%WITH_PERL%%@dirrm lib/silc/perl
+@dirrmtry lib/silc
 @dirrm %%DATADIR%%/themes
 @dirrm %%DATADIR%%/help
 @dirrm %%DATADIR%%/scripts