6 files changed, 90 insertions, 37 deletions

diff --git a/devel/silc-toolkit/Makefile b/devel/silc-toolkit/Makefile
index bdbff9b15b22..dbde47c24b62 100644
--- a/devel/silc-toolkit/Makefile
+++ b/devel/silc-toolkit/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	silc
-PORTVERSION=	0.7.2
-PORTREVISION=	1
+PORTVERSION=	0.9.3
 CATEGORIES=	devel ipv6 net security
 MASTER_SITES=	http://www.silcnet.org/download/toolkit/sources/ \
 		ftp://ftp.silcnet.org/silc/toolkit/sources/ \
@@ -25,6 +24,7 @@ MAINTAINER=	lioux@FreeBSD.org
 RUN_DEPENDS=	silc:${PORTSDIR}/net/silc-client
 
 USE_BZIP2=	yes
+USE_PERL5=	yes
 GNU_CONFIGURE=	yes
 USE_GNOMENG=	yes
 USE_GNOME=	glib12
diff --git a/devel/silc-toolkit/distinfo b/devel/silc-toolkit/distinfo
index 175c0dd154f6..7241a25ea7e5 100644
--- a/devel/silc-toolkit/distinfo
+++ b/devel/silc-toolkit/distinfo
@@ -1 +1 @@
-MD5 (silc-toolkit-0.7.2.tar.bz2) = bed13685ce7bb22714f72ebb7d9771d9
+MD5 (silc-toolkit-0.9.3.tar.bz2) = f4e63a9c6455e91323482a3b840a8361
diff --git a/devel/silc-toolkit/files/patch-Makefile.in b/devel/silc-toolkit/files/patch-Makefile.in
index f000069e8aad..d250e42c79b8 100644
--- a/devel/silc-toolkit/files/patch-Makefile.in
+++ b/devel/silc-toolkit/files/patch-Makefile.in
@@ -1,19 +1,15 @@
---- Makefile.in.orig	Thu Jan 17 19:25:58 2002
-+++ Makefile.in	Sat Jan 19 21:16:03 2002
-@@ -151,9 +151,9 @@
+--- Makefile.in.orig	Wed Jul 17 19:19:16 2002
++++ Makefile.in	Wed Jul 17 19:21:10 2002
+@@ -151,7 +151,7 @@
  
  AUTOMAKE_OPTIONS = 1.0 no-dependencies foreign
  
 -COMMONDIRS = lib irssi silc silcd doc includes
--SUBDIRS = lib irssi silc silcd doc includes win32
--DIST_SUBDIRS = lib irssi silc silcd doc includes win32
 +COMMONDIRS = lib irssi doc includes
-+SUBDIRS = lib irssi doc includes
-+DIST_SUBDIRS = lib irssi doc includes
  
- #
- # INCLUDE defines
-@@ -528,11 +528,8 @@
+ # Sub directories defined by "distributions" file, and can be overridden
+ # with ./configure, which substitutes these variables.
+@@ -530,11 +530,8 @@
  	-rm -rf $(distdir)
  
  install-dirs:
@@ -25,7 +21,7 @@
  
  generate-server-key:
  	-@if test '!' -f $(etcdir)/silcd.pub ; then \
-@@ -545,7 +542,8 @@
+@@ -547,7 +544,8 @@
  doc-install:
  	$(INSTALL_DATA) $(srcdir)/doc/CodingStyle $(docdir)/
  	$(INSTALL_DATA) $(srcdir)/doc/FAQ $(docdir)/
@@ -35,14 +31,16 @@
  	$(INSTALL_DATA) $(srcdir)/doc/*.txt $(docdir)/
  	$(INSTALL_DATA) $(srcdir)/COPYING $(docdir)/
  	$(INSTALL_DATA) $(srcdir)/CHANGES $(docdir)/
-@@ -571,8 +569,8 @@
+@@ -580,9 +578,9 @@
  	  $(etcdir)/silc.conf; \
  	fi
  
 -@SILC_DIST_CLIENT_TRUE@install-data-hook: install-dirs sim-install doc-install etc-install
--@SILC_DIST_CLIENT_FALSE@install-data-hook: install-dirs generate-server-key sim-install doc-install examples-install etc-install
+-@SILC_DIST_CLIENT_FALSE@@SILC_DIST_TOOLKIT_TRUE@install-data-hook: install-dirs generate-server-key sim-install doc-install toolkit-install examples-install etc-install
+-@SILC_DIST_CLIENT_FALSE@@SILC_DIST_TOOLKIT_FALSE@install-data-hook: install-dirs generate-server-key sim-install doc-install examples-install etc-install
 +@SILC_DIST_CLIENT_TRUE@install-data-hook: install-dirs doc-install
-+@SILC_DIST_CLIENT_FALSE@install-data-hook: install-dirs doc-install
++@SILC_DIST_CLIENT_FALSE@@SILC_DIST_TOOLKIT_TRUE@install-data-hook: install-dirs doc-install
++@SILC_DIST_CLIENT_FALSE@@SILC_DIST_TOOLKIT_FALSE@install-data-hook: install-dirs doc-install
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
  .NOEXPORT:
diff --git a/devel/silc-toolkit/files/patch-configure b/devel/silc-toolkit/files/patch-configure
index f5f0c54865f3..d08e95853205 100644
--- a/devel/silc-toolkit/files/patch-configure
+++ b/devel/silc-toolkit/files/patch-configure
@@ -1,10 +1,20 @@
---- configure.orig	Sat Jan 19 21:06:08 2002
-+++ configure	Sat Jan 19 21:06:48 2002
-@@ -12567,7 +12567,6 @@
+--- configure.orig	Wed Jul 17 19:21:52 2002
++++ configure	Wed Jul 17 19:23:28 2002
+@@ -2623,7 +2623,7 @@
+ # Distribution definition. ./prepare will automatically add here a correct
+ # value. Do not edit!
+ silc_dist=silc-toolkit
+-SILC_DIST_SUBDIRS="lib irssi silc silcd doc includes win32"
++SILC_DIST_SUBDIRS="lib irssi doc includes"
+ cat >>confdefs.h <<\EOF
+ #define SILC_DIST_TOOLKIT 1
+ EOF
+@@ -11313,7 +11313,7 @@
        fi
        ;;
      *-freebsd2.2*)
 -      CFLAGS="$CFLAGS -D_THREAD_SAFE"
++      CFLAGS="$CFLAGS"
        ;;
      *-sysv5uw7*)  # UnixWare 7
        if test "$GCC" != "yes"; then
diff --git a/devel/silc-toolkit/files/patch-irssi:Makefile.in b/devel/silc-toolkit/files/patch-irssi:Makefile.in
index 9e37b282b895..4d7387ccecb8 100644
--- a/devel/silc-toolkit/files/patch-irssi:Makefile.in
+++ b/devel/silc-toolkit/files/patch-irssi:Makefile.in
@@ -1,11 +1,11 @@
---- irssi/Makefile.in.orig	Sat Jan 19 21:07:04 2002
-+++ irssi/Makefile.in	Sat Jan 19 21:07:24 2002
-@@ -486,7 +486,7 @@
+--- irssi/Makefile.in.orig	Wed Jul 17 19:24:11 2002
++++ irssi/Makefile.in	Wed Jul 17 19:24:37 2002
+@@ -543,7 +543,7 @@
  
  info-am:
  
--install-data-am: install-confDATA
-+install-data-am:
+-install-data-am: install-confDATA install-themeDATA
++install-data-am: install-themeDATA
  
  install-exec-am:
  
diff --git a/devel/silc-toolkit/pkg-plist b/devel/silc-toolkit/pkg-plist
index 3a4cd715666c..3d0d079b91aa 100644
--- a/devel/silc-toolkit/pkg-plist
+++ b/devel/silc-toolkit/pkg-plist
@@ -1,45 +1,52 @@
 bin/silc
 include/silc/aes.h
-include/silc/bitmove.h
 include/silc/blowfish.h
 include/silc/cast.h
 include/silc/ciphers.h
 include/silc/ciphers_def.h
 include/silc/client.h
-include/silc/clientlibincludes.h
 include/silc/command.h
 include/silc/command_reply.h
-include/silc/groups.h
+include/silc/getopt.h
 include/silc/idlist.h
 include/silc/mars.h
 include/silc/md5.h
 include/silc/mp_gmp.h
 include/silc/mp_mpi.h
+include/silc/mpi-config.h
+include/silc/mpi.h
+include/silc/mplogic.h
+include/silc/mpprime.h
 include/silc/none.h
-include/silc/payload.h
 include/silc/pkcs1.h
 include/silc/protocol.h
 include/silc/rc5.h
 include/silc/rc6.h
+include/silc/regex.h
 include/silc/rsa.h
 include/silc/sha1.h
-include/silc/silcapi.h
 include/silc/silcargument.h
 include/silc/silcauth.h
+include/silc/silcbeos.h
 include/silc/silcbuffer.h
 include/silc/silcbuffmt.h
-include/silc/silcbufutil.h
 include/silc/silcchannel.h
 include/silc/silccipher.h
+include/silc/silcclient.h
 include/silc/silccommand.h
 include/silc/silcconfig.h
+include/silc/silcdefs.h
 include/silc/silcdh.h
+include/silc/silcdlist.h
+include/silc/silcepoc.h
+include/silc/silcfileutil.h
 include/silc/silchash.h
 include/silc/silchashtable.h
 include/silc/silchmac.h
 include/silc/silcid.h
 include/silc/silcidcache.h
 include/silc/silcincludes.h
+include/silc/silclist.h
 include/silc/silclog.h
 include/silc/silcmath.h
 include/silc/silcmemory.h
@@ -48,6 +55,7 @@ include/silc/silcmp.h
 include/silc/silcmutex.h
 include/silc/silcnet.h
 include/silc/silcnotify.h
+include/silc/silcos2.h
 include/silc/silcpacket.h
 include/silc/silcpkcs.h
 include/silc/silcprivate.h
@@ -55,17 +63,26 @@ include/silc/silcprotocol.h
 include/silc/silcrng.h
 include/silc/silcschedule.h
 include/silc/silcsftp.h
+include/silc/silcsftp_fs.h
 include/silc/silcsim.h
 include/silc/silcsimutil.h
 include/silc/silcske.h
+include/silc/silcske_groups.h
+include/silc/silcske_payload.h
 include/silc/silcske_status.h
 include/silc/silcsockconn.h
+include/silc/silcstatus.h
+include/silc/silcstrutil.h
 include/silc/silcthread.h
+include/silc/silctypes.h
 include/silc/silcutil.h
+include/silc/silcversion.h
 include/silc/silcwin32.h
+include/silc/stacktrace.h
 include/silc/twofish.h
-include/silc/version.h
 include/silc/version_internal.h
+lib/libsilc.a
+lib/libsilcclient.a
 %%PORTDOCS%%share/doc/silc-toolkit/CHANGES
 %%PORTDOCS%%share/doc/silc-toolkit/COPYING
 %%PORTDOCS%%share/doc/silc-toolkit/CREDITS
@@ -73,6 +90,9 @@ include/silc/version_internal.h
 %%PORTDOCS%%share/doc/silc-toolkit/FAQ
 %%PORTDOCS%%share/doc/silc-toolkit/INSTALL
 %%PORTDOCS%%share/doc/silc-toolkit/README
+%%PORTDOCS%%share/doc/silc-toolkit/README.CVS
+%%PORTDOCS%%share/doc/silc-toolkit/README.MACOSX
+%%PORTDOCS%%share/doc/silc-toolkit/README.WIN32
 %%PORTDOCS%%share/doc/silc-toolkit/TODO
 %%PORTDOCS%%share/doc/silc-toolkit/cell1_backup.conf
 %%PORTDOCS%%share/doc/silc-toolkit/cell1_router.conf
@@ -84,14 +104,20 @@ include/silc/version_internal.h
 %%PORTDOCS%%share/doc/silc-toolkit/cell3_router.conf
 %%PORTDOCS%%share/doc/silc-toolkit/cell3_server1.conf
 %%PORTDOCS%%share/doc/silc-toolkit/cell3_server2.conf
-%%PORTDOCS%%share/doc/silc-toolkit/draft-riikonen-silc-commands-02.txt
-%%PORTDOCS%%share/doc/silc-toolkit/draft-riikonen-silc-ke-auth-04.txt
-%%PORTDOCS%%share/doc/silc-toolkit/draft-riikonen-silc-pp-04.txt
-%%PORTDOCS%%share/doc/silc-toolkit/draft-riikonen-silc-spec-04.txt
-%%PORTDOCS%%share/doc/silc-toolkit/example_silc.conf
+%%PORTDOCS%%share/doc/silc-toolkit/cell_router.conf
+%%PORTDOCS%%share/doc/silc-toolkit/draft-riikonen-presence-attrs-00.txt
+%%PORTDOCS%%share/doc/silc-toolkit/draft-riikonen-silc-commands-03.txt
+%%PORTDOCS%%share/doc/silc-toolkit/draft-riikonen-silc-flags-payloads-00.txt
+%%PORTDOCS%%share/doc/silc-toolkit/draft-riikonen-silc-ke-auth-05.txt
+%%PORTDOCS%%share/doc/silc-toolkit/draft-riikonen-silc-pp-05.txt
+%%PORTDOCS%%share/doc/silc-toolkit/draft-riikonen-silc-spec-05.txt
 %%PORTDOCS%%share/doc/silc-toolkit/example_silcd.conf
+%%PORTDOCS%%share/doc/silc-toolkit/formats.txt
+%%PORTDOCS%%share/doc/silc-toolkit/manual.txt
+%%PORTDOCS%%share/doc/silc-toolkit/signals.txt
 %%PORTDOCS%%share/doc/silc-toolkit/silcd.prv
 %%PORTDOCS%%share/doc/silc-toolkit/silcd.pub
+%%PORTDOCS%%share/doc/silc-toolkit/startup-HOWTO.html
 share/silc-toolkit/help/action
 share/silc-toolkit/help/admin
 share/silc-toolkit/help/alias
@@ -110,6 +136,7 @@ share/silc-toolkit/help/cumode
 share/silc-toolkit/help/cycle
 share/silc-toolkit/help/date
 share/silc-toolkit/help/dehilight
+share/silc-toolkit/help/detach
 share/silc-toolkit/help/disconnect
 share/silc-toolkit/help/echo
 share/silc-toolkit/help/eval
@@ -122,6 +149,7 @@ share/silc-toolkit/help/hilight
 share/silc-toolkit/help/ignore
 share/silc-toolkit/help/info
 share/silc-toolkit/help/invite
+share/silc-toolkit/help/invitelist
 share/silc-toolkit/help/join
 share/silc-toolkit/help/key
 share/silc-toolkit/help/kick
@@ -139,9 +167,11 @@ share/silc-toolkit/help/motd
 share/silc-toolkit/help/msg
 share/silc-toolkit/help/names
 share/silc-toolkit/help/nick
+share/silc-toolkit/help/note
 share/silc-toolkit/help/notice
 share/silc-toolkit/help/oper
 share/silc-toolkit/help/part
+share/silc-toolkit/help/perlflush
 share/silc-toolkit/help/ping
 share/silc-toolkit/help/query
 share/silc-toolkit/help/quit
@@ -151,11 +181,13 @@ share/silc-toolkit/help/rmreconns
 share/silc-toolkit/help/rmrejoins
 share/silc-toolkit/help/save
 share/silc-toolkit/help/sconnect
+share/silc-toolkit/help/script
 share/silc-toolkit/help/scrollback
 share/silc-toolkit/help/server
 share/silc-toolkit/help/set
 share/silc-toolkit/help/shutdown
 share/silc-toolkit/help/silcoper
+share/silc-toolkit/help/statusbar
 share/silc-toolkit/help/toggle
 share/silc-toolkit/help/topic
 share/silc-toolkit/help/umode
@@ -163,12 +195,25 @@ share/silc-toolkit/help/unalias
 share/silc-toolkit/help/unignore
 share/silc-toolkit/help/unload
 share/silc-toolkit/help/unquery
+share/silc-toolkit/help/upgrade
 share/silc-toolkit/help/users
 share/silc-toolkit/help/version
+share/silc-toolkit/help/watch
 share/silc-toolkit/help/whois
 share/silc-toolkit/help/whowas
 share/silc-toolkit/help/window
+share/silc/scripts/autoop.pl
+share/silc/scripts/beep.pl
+share/silc/scripts/clones.pl
+share/silc/scripts/dns.pl
+share/silc/scripts/hello.pl
+share/silc/scripts/mail-maildir.pl
+share/silc/scripts/mail.pl
+share/silc/themes/default.theme
+@dirrm share/silc/themes
+@dirrm share/silc/scripts
 @dirrm share/silc-toolkit/help
 @dirrm share/silc-toolkit
+@dirrm share/silc
 %%PORTDOCS%%@dirrm share/doc/silc-toolkit
 @dirrm include/silc