summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--chat/silc-client/Makefile24
-rw-r--r--chat/silc-client/PLIST5
-rw-r--r--chat/silc-client/PLIST.modules12
-rw-r--r--chat/silc-client/PLIST.perl114
-rw-r--r--chat/silc-client/distinfo8
-rw-r--r--chat/silc-client/patches/patch-aa24
6 files changed, 45 insertions, 142 deletions
diff --git a/chat/silc-client/Makefile b/chat/silc-client/Makefile
index 11cc6492d8f..1739ed6c288 100644
--- a/chat/silc-client/Makefile
+++ b/chat/silc-client/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2002/03/29 11:29:22 rh Exp $
+# $NetBSD: Makefile,v 1.11 2002/05/03 21:51:56 hubertf Exp $
-DISTNAME= silc-client-0.8.3
+DISTNAME= silc-client-0.8.6
CATEGORIES= chat
MASTER_SITES= http://www.silcnet.org/download/client/sources/ \
ftp://ftp.silcnet.org/silc/client/sources/ \
@@ -20,6 +20,7 @@ USE_GMAKE= yes
USE_NCURSES= yes
USE_LIBTOOL= yes
USE_BUILDLINK_ONLY= yes
+LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
.include "../../mk/bsd.prefs.mk"
@@ -28,6 +29,7 @@ PKG_SYSCONFSUBDIR?= silc
CONFIGURE_ARGS+= --with-helpdir=${PREFIX}/share/silc/help
CONFIGURE_ARGS+= --with-docdir=${PREFIX}/share/doc/silc
CONFIGURE_ARGS+= --with-etcdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+= --with-simdir=${PREFIX}/lib/silc/modules
CONFIGURE_ARGS+= --with-ncurses=${BUILDLINK_DIR}
# list it into IPv6-ready packages
@@ -36,26 +38,36 @@ CONFIGURE_ARGS+= --enable-ipv6
# Optional support for perl scripting.
# If you want to disable it, set SILC_CLIENT_WITH_PERL to NO
+# in your /etc/mk.conf
#
SILC_CLIENT_WITH_PERL?= YES
.if defined(SILC_CLIENT_WITH_PERL) && ${SILC_CLIENT_WITH_PERL} == YES
CONFIGURE_ARGS+= --with-perl-lib=${PREFIX}/lib/silc/perl5
-CONFIGURE_ARGS+= --with-simdir=
-PLIST_SRC= ${PKGDIR}/PLIST.perl
.include "../../lang/perl5/buildlink.mk"
+PLIST_SRC+= ${PKGDIR}/PLIST.perl
.else
CONFIGURE_ARGS+= --with-perl=no
.endif
-# If you want to help with testing silc-client, uncomment this
+# Loadable modules support.
#
-#CONFIGURE_ARGS+= --enable-debug
+.if (${OPSYS} == "SunOS") || (${OPSYS} == "Linux")
+PLIST_SRC+= ${PKGDIR}/PLIST.modules
+.endif
+# Assembler optimizations.
+#
.if (${MACHINE_ARCH} != "i386")
CONFIGURE_ARGS+= --disable-asm
.endif
+# If you want to help with testing silc-client, uncomment this.
+#
+#CONFIGURE_ARGS+= --enable-debug
+
+PLIST_SRC+= ${PKGDIR}/PLIST
+
.include "../../devel/ncurses/buildlink.mk"
.include "../../devel/glib/buildlink.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/chat/silc-client/PLIST b/chat/silc-client/PLIST
index 50d1aff06f5..0a170400c11 100644
--- a/chat/silc-client/PLIST
+++ b/chat/silc-client/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2002/03/29 11:29:22 rh Exp $
+@comment $NetBSD: PLIST,v 1.5 2002/05/03 21:51:56 hubertf Exp $
bin/silc
etc/silc/silc.conf
share/doc/silc/CHANGES
@@ -62,7 +62,6 @@ share/silc/help/motd
share/silc/help/msg
share/silc/help/names
share/silc/help/nick
-share/silc/help/note
share/silc/help/notice
share/silc/help/oper
share/silc/help/part
@@ -110,3 +109,5 @@ share/silc/themes/default.theme
@dirrm share/silc
@dirrm share/doc/silc
@dirrm etc/silc
+@dirrm lib/silc/modules
+@dirrm lib/silc
diff --git a/chat/silc-client/PLIST.modules b/chat/silc-client/PLIST.modules
new file mode 100644
index 00000000000..1b443ccbeed
--- /dev/null
+++ b/chat/silc-client/PLIST.modules
@@ -0,0 +1,12 @@
+@comment $NetBSD: PLIST.modules,v 1.1 2002/05/03 21:51:56 hubertf Exp $
+lib/silc/modules/aes.sim.so
+lib/silc/modules/blowfish.sim.so
+lib/silc/modules/cast.sim.so
+lib/silc/modules/mars.sim.so
+lib/silc/modules/md5.sim.so
+lib/silc/modules/none.sim.so
+lib/silc/modules/rc5.sim.so
+lib/silc/modules/rc6.sim.so
+lib/silc/modules/rsa.sim.so
+lib/silc/modules/sha1.sim.so
+lib/silc/modules/twofish.sim.so
diff --git a/chat/silc-client/PLIST.perl b/chat/silc-client/PLIST.perl
index da196ad0537..6752c9b54ff 100644
--- a/chat/silc-client/PLIST.perl
+++ b/chat/silc-client/PLIST.perl
@@ -1,6 +1,4 @@
-@comment $NetBSD: PLIST.perl,v 1.3 2002/03/29 11:29:22 rh Exp $
-bin/silc
-etc/silc/silc.conf
+@comment $NetBSD: PLIST.perl,v 1.4 2002/05/03 21:51:56 hubertf Exp $
lib/silc/perl5/${MACHINE_ARCH}-${LOWER_OPSYS}/Irssi.pm
lib/silc/perl5/${MACHINE_ARCH}-${LOWER_OPSYS}/Irssi/TextUI.pm
lib/silc/perl5/${MACHINE_ARCH}-${LOWER_OPSYS}/Irssi/UI.pm
@@ -14,114 +12,6 @@ lib/silc/perl5/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Irssi/UI/.packlist
lib/silc/perl5/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Irssi/UI/UI.bs
lib/silc/perl5/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Irssi/UI/UI.so
lib/silc/perl5/${MACHINE_ARCH}-${LOWER_OPSYS}/perllocal.pod
-share/doc/silc/CHANGES
-share/doc/silc/COPYING
-share/doc/silc/CREDITS
-share/doc/silc/CodingStyle
-share/doc/silc/FAQ
-share/doc/silc/INSTALL
-share/doc/silc/README
-share/doc/silc/TODO
-share/doc/silc/formats.txt
-share/doc/silc/manual.txt
-share/doc/silc/signals.txt
-share/doc/silc/silc.conf.default
-share/doc/silc/startup-HOWTO.html
-share/silc/help/action
-share/silc/help/admin
-share/silc/help/alias
-share/silc/help/away
-share/silc/help/ban
-share/silc/help/beep
-share/silc/help/bind
-share/silc/help/cat
-share/silc/help/cd
-share/silc/help/channel
-share/silc/help/clear
-share/silc/help/close
-share/silc/help/cmode
-share/silc/help/connect
-share/silc/help/cumode
-share/silc/help/cycle
-share/silc/help/date
-share/silc/help/dehilight
-share/silc/help/disconnect
-share/silc/help/echo
-share/silc/help/eval
-share/silc/help/exec
-share/silc/help/file
-share/silc/help/format
-share/silc/help/getkey
-share/silc/help/help
-share/silc/help/hilight
-share/silc/help/ignore
-share/silc/help/info
-share/silc/help/invite
-share/silc/help/invitelist
-share/silc/help/join
-share/silc/help/key
-share/silc/help/kick
-share/silc/help/kickban
-share/silc/help/kill
-share/silc/help/knockout
-share/silc/help/lastlog
-share/silc/help/layout
-share/silc/help/levels
-share/silc/help/list
-share/silc/help/load
-share/silc/help/log
-share/silc/help/me
-share/silc/help/motd
-share/silc/help/msg
-share/silc/help/names
-share/silc/help/nick
-share/silc/help/note
-share/silc/help/notice
-share/silc/help/oper
-share/silc/help/part
-share/silc/help/perlflush
-share/silc/help/ping
-share/silc/help/query
-share/silc/help/quit
-share/silc/help/reconnect
-share/silc/help/reload
-share/silc/help/rmreconns
-share/silc/help/rmrejoins
-share/silc/help/save
-share/silc/help/sconnect
-share/silc/help/script
-share/silc/help/scrollback
-share/silc/help/server
-share/silc/help/set
-share/silc/help/shutdown
-share/silc/help/silcoper
-share/silc/help/statusbar
-share/silc/help/toggle
-share/silc/help/topic
-share/silc/help/umode
-share/silc/help/unalias
-share/silc/help/unignore
-share/silc/help/unload
-share/silc/help/unquery
-share/silc/help/upgrade
-share/silc/help/users
-share/silc/help/version
-share/silc/help/whois
-share/silc/help/whowas
-share/silc/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/help
-@dirrm share/silc
-@dirrm share/doc/silc
@dirrm lib/silc/perl5/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Irssi/UI
@dirrm lib/silc/perl5/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Irssi/TextUI
@dirrm lib/silc/perl5/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Irssi
@@ -129,5 +19,3 @@ share/silc/themes/default.theme
@dirrm lib/silc/perl5/${MACHINE_ARCH}-${LOWER_OPSYS}/Irssi
@dirrm lib/silc/perl5/${MACHINE_ARCH}-${LOWER_OPSYS}
@dirrm lib/silc/perl5
-@dirrm lib/silc
-@dirrm etc/silc
diff --git a/chat/silc-client/distinfo b/chat/silc-client/distinfo
index cc899e6fdaa..39205cf0706 100644
--- a/chat/silc-client/distinfo
+++ b/chat/silc-client/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.9 2002/03/29 11:29:22 rh Exp $
+$NetBSD: distinfo,v 1.10 2002/05/03 21:51:56 hubertf Exp $
-SHA1 (silc-client-0.8.3.tar.bz2) = e372666e168946ecd14a173eaf808d94b5819057
-Size (silc-client-0.8.3.tar.bz2) = 1354211 bytes
-SHA1 (patch-aa) = 01df960bcc19ec601f7f3cb713a40986bed57cd8
+SHA1 (silc-client-0.8.6.tar.bz2) = e9ec6a0ed233432ba223023b047a1af9df389d7a
+Size (silc-client-0.8.6.tar.bz2) = 1313927 bytes
+SHA1 (patch-aa) = 70dbd7ae4e0cf465f39086e0490781c61d48d7e1
diff --git a/chat/silc-client/patches/patch-aa b/chat/silc-client/patches/patch-aa
index 00a5f031936..358c924d35a 100644
--- a/chat/silc-client/patches/patch-aa
+++ b/chat/silc-client/patches/patch-aa
@@ -1,19 +1,16 @@
-$NetBSD: patch-aa,v 1.6 2002/03/03 23:27:49 hubertf Exp $
+$NetBSD: patch-aa,v 1.7 2002/05/03 21:51:57 hubertf Exp $
---- Makefile.in.orig Tue Feb 26 12:25:52 2002
-+++ Makefile.in Thu Feb 28 19:36:32 2002
-@@ -528,10 +528,8 @@
-
- install-dirs:
- -mkdir -p $(etcdir)
-- -mkdir -p $(modulesdir)
+--- Makefile.in.orig Tue Apr 16 18:30:05 2002
++++ Makefile.in Wed May 1 15:18:56 2002
+@@ -531,7 +531,6 @@
+ -mkdir -p $(modulesdir)
-mkdir -p $(helpdir)
-mkdir -p $(docdir)
- -mkdir -p $(logsdir)
generate-server-key:
-@if test '!' -f $(etcdir)/silcd.pub ; then \
-@@ -544,8 +542,7 @@
+@@ -544,8 +543,7 @@
doc-install:
$(INSTALL_DATA) $(srcdir)/doc/CodingStyle $(docdir)/
$(INSTALL_DATA) $(srcdir)/doc/FAQ $(docdir)/
@@ -23,7 +20,7 @@ $NetBSD: patch-aa,v 1.6 2002/03/03 23:27:49 hubertf Exp $
$(INSTALL_DATA) $(srcdir)/COPYING $(docdir)/
$(INSTALL_DATA) $(srcdir)/CHANGES $(docdir)/
$(INSTALL_DATA) $(srcdir)/CREDITS $(docdir)/
-@@ -565,19 +562,12 @@
+@@ -565,13 +563,6 @@
$(INSTALL_DATA) $(srcdir)/doc/examples/cell* $(docdir)/examples/
etc-install:
@@ -37,10 +34,3 @@ $NetBSD: patch-aa,v 1.6 2002/03/03 23:27:49 hubertf Exp $
-@if test '!' -f $(etcdir)/silc.conf ; then \
$(INSTALL_DATA) $(srcdir)/irssi/silc.conf \
$(etcdir)/silc.conf; \
- fi
-
--@SILC_DIST_CLIENT_TRUE@install-data-hook: install-dirs sim-install doc-install etc-install
-+@SILC_DIST_CLIENT_TRUE@install-data-hook: install-dirs doc-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
- # Tell versions [3.59,3.63) of GNU make to not export all variables.