3 files changed, 32 insertions, 28 deletions

diff --git a/net/silc-client/Makefile b/net/silc-client/Makefile
index 0555a8ed7af1..0aeeaa96d1e4 100644
--- a/net/silc-client/Makefile
+++ b/net/silc-client/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	silc
 PORTVERSION=	1.0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net ipv6 security
 MASTER_SITES=	http://www.silcnet.org/download/%SUBDIR%/ \
 		http://ftp.silcnet.org/%SUBDIR%/ \
@@ -28,8 +28,6 @@ DISTNAME=	${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
 MAINTAINER=	aquatique-ports@rambler.ru
 COMMENT=	Secure Internet Live Conferencing (SILC) network client
 
-BROKEN=		"Broken pkg-plist"
-
 USE_BZIP2=	yes
 USE_PERL5=	yes
 GNU_CONFIGURE=	yes
@@ -45,7 +43,6 @@ CONFIGURE_ARGS=	--with-etcdir=${PREFIX}/etc/${PORTNAME} \
 		--without-libtoolfix
 #INSTALLS_SHLIB=	yes
 PLIST_SUB=	INSTALL_DIR="${INSTALL_DIR}"
-PLIST_SUB+=	ARCH="${ARCH}-freebsd"
 PKGDEINSTALL=	${PKGINSTALL}
 
 MAN1=		silc.1
diff --git a/net/silc-client/files/patch-irssi_configure b/net/silc-client/files/patch-irssi_configure
new file mode 100644
index 000000000000..8f209ee599c2
--- /dev/null
+++ b/net/silc-client/files/patch-irssi_configure
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- irssi/configure.orig	Mon Jul 12 14:47:11 2004
++++ irssi/configure	Mon Jul 12 14:48:29 2004
+@@ -5882,7 +5882,7 @@
+ 	else
+ 		want_perl=yes
+ 		perl_prefix_note=no
+-		PERL_MM_PARAMS="INSTALLDIRS=perl LIB=$withval"
++		PERL_MM_PARAMS="INSTALLDIRS=site INST_ARCHLIB=$withval"
+ 		perl_library_dir="PERL_USE_LIB"
+ 		perl_set_use_lib=yes
+ 	fi
diff --git a/net/silc-client/pkg-plist b/net/silc-client/pkg-plist
index 156655d3a3a6..995a2540b38a 100644
--- a/net/silc-client/pkg-plist
+++ b/net/silc-client/pkg-plist
@@ -97,23 +97,18 @@ share/silc/scripts/hello.pl
 share/silc/scripts/mail-maildir.pl
 share/silc/scripts/mail.pl
 share/silc/scripts/silc-mime.pl
-lib/silc/perl/%%ARCH%%/auto/Irssi/Silc/Silc.so
-lib/silc/perl/%%ARCH%%/auto/Irssi/Silc/Silc.bs
-lib/silc/perl/%%ARCH%%/auto/Irssi/Silc/.packlist
-lib/silc/perl/%%ARCH%%/auto/Irssi/UI/UI.so
-lib/silc/perl/%%ARCH%%/auto/Irssi/UI/UI.bs
-lib/silc/perl/%%ARCH%%/auto/Irssi/UI/.packlist
-lib/silc/perl/%%ARCH%%/auto/Irssi/TextUI/TextUI.so
-lib/silc/perl/%%ARCH%%/auto/Irssi/TextUI/TextUI.bs
-lib/silc/perl/%%ARCH%%/auto/Irssi/TextUI/.packlist
-lib/silc/perl/%%ARCH%%/auto/Irssi/Irssi.so
-lib/silc/perl/%%ARCH%%/auto/Irssi/Irssi.bs
-lib/silc/perl/%%ARCH%%/auto/Irssi/.packlist
-lib/silc/perl/%%ARCH%%/Irssi.pm
-lib/silc/perl/%%ARCH%%/perllocal.pod
-lib/silc/perl/%%ARCH%%/Irssi/UI.pm
-lib/silc/perl/%%ARCH%%/Irssi/Silc.pm
-lib/silc/perl/%%ARCH%%/Irssi/TextUI.pm
+lib/silc/perl/auto/Irssi/.exists
+lib/silc/perl/auto/Irssi/Irssi.so
+lib/silc/perl/auto/Irssi/Irssi.bs
+lib/silc/perl/auto/Irssi/UI/.exists
+lib/silc/perl/auto/Irssi/UI/UI.so
+lib/silc/perl/auto/Irssi/UI/UI.bs
+lib/silc/perl/auto/Irssi/TextUI/.exists
+lib/silc/perl/auto/Irssi/TextUI/TextUI.so
+lib/silc/perl/auto/Irssi/TextUI/TextUI.bs
+lib/silc/perl/auto/Irssi/Silc/.exists
+lib/silc/perl/auto/Irssi/Silc/Silc.so
+lib/silc/perl/auto/Irssi/Silc/Silc.bs
 %%PORTDOCS%%%%DOCSDIR%%/CodingStyle
 %%PORTDOCS%%%%DOCSDIR%%/FAQ
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
@@ -129,12 +124,10 @@ lib/silc/perl/%%ARCH%%/Irssi/TextUI.pm
 @dirrm share/silc
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @unexec rmdir %D/etc/silc 2>/dev/null || true
-@dirrm lib/silc/perl/%%ARCH%%/auto/Irssi/Silc
-@dirrm lib/silc/perl/%%ARCH%%/auto/Irssi/TextUI
-@dirrm lib/silc/perl/%%ARCH%%/auto/Irssi/UI
-@dirrm lib/silc/perl/%%ARCH%%/auto/Irssi
-@dirrm lib/silc/perl/%%ARCH%%/auto
-@dirrm lib/silc/perl/%%ARCH%%/Irssi
-@dirrm lib/silc/perl/%%ARCH%%
+@dirrm lib/silc/perl/auto/Irssi/Silc
+@dirrm lib/silc/perl/auto/Irssi/TextUI
+@dirrm lib/silc/perl/auto/Irssi/UI
+@dirrm lib/silc/perl/auto/Irssi
+@dirrm lib/silc/perl/auto
 @dirrm lib/silc/perl
 @dirrm lib/silc