I attached a patch to update the silc-client to version 1.0.3. With this patch it compiles and installs, but the help files won't get installed and I'm not 100% sure if the patch is correct everywhere. Perhaps someone can look over it and send fixes and complains (please CC me, as I'm not subscribed to the list).
Tested on i386. Pseudo-"maintainer timeout": the patch I sent him was half-finished, perhaps he ignored it therefore... --simon
diff --exclude=CVS -ruN /usr/ports/net/silc-client/Makefile silc-client/Makefile
--- /usr/ports/net/silc-client/Makefile Thu Jul 28 23:28:43 2005
+++ silc-client/Makefile Sun Jul 9 12:17:39 2006
@@ -4,8 +4,7 @@
COMMENT= "Secure Internet Live Conferencing (SILC) client"
-DISTNAME= silc-client-1.0.2
-PKGNAME= ${DISTNAME}p1
+DISTNAME= silc-client-1.0.3
CATEGORIES= net
HOMEPAGE= http://www.silcnet.org/
@@ -37,7 +36,6 @@
CONFIGURE_STYLE= autoconf
AUTOCONF_VERSION= 2.59
-MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC} ${WRKSRC}/irssi ${WRKSRC}/lib/silcmath/mpi
CONFIGURE_ARGS+= --enable-ipv6 \
--with-helpdir=${PREFIX}/share/silc/help \
--with-docdir=${PREFIX}/share/doc/silc \
@@ -51,9 +49,7 @@
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/silc
- @mv -f ${PREFIX}/share/doc/silc/example_silc.conf \
+ @mv -f ${PREFIX}/share/doc/silc/silc.conf \
${PREFIX}/share/examples/silc/silc.conf
- ${INSTALL_DATA} ${WRKSRC}/doc/silcalgs.conf \
- ${PREFIX}/share/examples/silc
.include <bsd.port.mk>
diff --exclude=CVS -ruN /usr/ports/net/silc-client/distinfo silc-client/distinfo
--- /usr/ports/net/silc-client/distinfo Thu Apr 7 17:38:17 2005
+++ silc-client/distinfo Fri Jul 7 15:32:24 2006
@@ -1,4 +1,4 @@
-MD5 (silc-client-1.0.2.tar.gz) = d961f30933009e86561f2d09a43f561f
-RMD160 (silc-client-1.0.2.tar.gz) = 143a99a047e13e705f9339f572a086f9eb7d26d5
-SHA1 (silc-client-1.0.2.tar.gz) = fa01f9b081bda93ff9ed686c54791dac7fba8724
-SIZE (silc-client-1.0.2.tar.gz) = 2339545
+MD5 (silc-client-1.0.3.tar.gz) = 82c3ea6bf1dd64a27af39a05d35b3f16
+RMD160 (silc-client-1.0.3.tar.gz) = 12ecfc6a71f0fa20d4f3c845e3c9af9443123259
+SHA1 (silc-client-1.0.3.tar.gz) = 88446fe391be40c718a51d983ac9f58331528dd9
+SIZE (silc-client-1.0.3.tar.gz) = 1948733
diff --exclude=CVS -ruN /usr/ports/net/silc-client/patches/patch-Makefile_in
silc-client/patches/patch-Makefile_in
--- /usr/ports/net/silc-client/patches/patch-Makefile_in Thu Apr 7
17:38:17 2005
+++ silc-client/patches/patch-Makefile_in Fri Jul 7 17:08:56 2006
@@ -1,12 +1,16 @@
-$OpenBSD: patch-Makefile_in,v 1.11 2005/04/07 15:38:17 brad Exp $
---- Makefile.in.orig Wed Apr 6 09:03:35 2005
-+++ Makefile.in Wed Apr 6 11:32:29 2005
-@@ -862,7 +862,7 @@ generate-server-key:
- $(sbindir)/silcd -C $(etcdir); \
- fi
+--- Makefile.in.orig Fri Jan 6 14:46:28 2006
++++ Makefile.in Fri Jul 7 17:06:06 2006
+@@ -764,11 +764,12 @@
[EMAIL PROTECTED]@install-data-hook: install-dirs-client sim-install
doc-install-client etc-install-client
[EMAIL PROTECTED]@install-data-hook: install-dirs-client doc-install-client
etc-install-client
- @SILC_DIST_CLIENT_FALSE@@[EMAIL PROTECTED]: install-dirs-client
install-dirs-server sim-install doc-install-client doc-install-server
toolkit-install examples-install etc-install-client etc-install-server
- @SILC_DIST_CLIENT_FALSE@@[EMAIL PROTECTED]: install-dirs-server sim-install
doc-install-server examples-install etc-install-server generate-server-key
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ @[EMAIL PROTECTED]:
+ @with_irssi_TRUE@ -mkdir -p $(etcdir)
[EMAIL PROTECTED]@ -mkdir -p $(docdir)
+ @with_irssi_TRUE@ -mkdir -p $(helpdir)
+ @with_irssi_TRUE@ -mkdir -p $(mandir)/man1
+
+ @[EMAIL PROTECTED]:
[EMAIL PROTECTED]@ $(INSTALL_DATA) $(srcdir)/apps/irssi/silc.conf
$(docdir)/example_silc.conf
[EMAIL PROTECTED]@ $(INSTALL_DATA) $(srcdir)/apps/irssi/silc.conf
$(docdir)/silc.conf
+ @with_irssi_TRUE@ [EMAIL PROTECTED] test -f $(srcdir)/doc/silc.1 ; then
$(INSTALL_DATA) $(srcdir)/doc/silc.1 $(mandir)/man1; fi
+
+ @[EMAIL PROTECTED]:
diff --exclude=CVS -ruN /usr/ports/net/silc-client/patches/patch-configure_in
silc-client/patches/patch-configure_in
--- /usr/ports/net/silc-client/patches/patch-configure_in Thu Apr 7
17:38:17 2005
+++ silc-client/patches/patch-configure_in Thu Jan 1 01:00:00 1970
@@ -1,44 +0,0 @@
-$OpenBSD: patch-configure_in,v 1.7 2005/04/07 15:38:17 brad Exp $
---- configure.in.orig Wed Apr 6 09:02:28 2005
-+++ configure.in Wed Apr 6 11:32:28 2005
-@@ -39,7 +39,6 @@ AM_INIT_AUTOMAKE(silc-client, 1.0.2)
- AC_PREREQ(2.52)
- AC_CONFIG_HEADERS(includes/silcdefs.h)
-
--CFLAGS=
- AC_PROG_CC
- AC_C_INLINE
- AC_C_CONST
-@@ -295,31 +294,7 @@ AC_DEFUN([SILC_ADD_CFLAGS],
- unset tmp_CFLAGS
- ])
-
--if test "$GCC"; then
-- # GCC specific options
-- if test "x$summary_debug" = "xyes"; then
-- SILC_ADD_CFLAGS(-g -O)
-- else
-- SILC_ADD_CFLAGS(-g -O2)
-- fi
-- SILC_ADD_CFLAGS(-Wall -finline-functions)
--else
-- # Other compilers
-- case "$target" in
-- alpha*-dec-osf*)
-- SILC_ADD_CFLAGS(-g3 -O2, SILC_ADD_CFLAGS(-g3 -O, SILC_ADD_CFLAGS(-O)))
-- ;;
-- *)
-- SILC_ADD_CFLAGS(-g)
-- SILC_ADD_CFLAGS(-O2, SILC_ADD_CFLAGS(-O))
-- ;;
-- esac
--
-- # Intel C++ Compiler needs -restrict
-- if test "x$CC" = "xicc"; then
-- SILC_ADD_CFLAGS(-restrict)
-- fi
--fi
-+SILC_ADD_CFLAGS(-Wall -finline-functions)
-
- #
- # Workaround a bug in GCC 2.x which causes memory exhaustion
diff --exclude=CVS -ruN
/usr/ports/net/silc-client/patches/patch-irssi_src_perl_Makefile_in
silc-client/patches/patch-irssi_src_perl_Makefile_in
--- /usr/ports/net/silc-client/patches/patch-irssi_src_perl_Makefile_in Thu Apr
7 17:38:17 2005
+++ silc-client/patches/patch-irssi_src_perl_Makefile_in Thu Jan 1
01:00:00 1970
@@ -1,44 +0,0 @@
-$OpenBSD: patch-irssi_src_perl_Makefile_in,v 1.1 2005/04/07 15:38:17 brad Exp $
---- irssi/src/perl/Makefile.in.orig Thu Apr 7 02:21:32 2005
-+++ irssi/src/perl/Makefile.in Thu Apr 7 02:24:11 2005
-@@ -590,7 +590,7 @@ check-am: all-am
- check: check-am
- all-am: Makefile $(LTLIBRARIES) $(HEADERS) all-local
- installdirs:
-- for dir in "$(DESTDIR)$(moduledir)"; do \
-+ for dir in $(DESTDIR)$(moduledir); do \
- test -z "$$dir" || $(mkdir_p) "$$dir"; \
- done
- install: install-am
-@@ -707,7 +707,7 @@ irssi-core.pl.h: irssi-core.pl
- $(top_srcdir)/file2header.sh $(srcdir)/irssi-core.pl irssi_core_code >
irssi-core.pl.h
-
- all-local:
-- for dir in "$(perl_dirs)"; do \
-+ for dir in $(perl_dirs); do \
- cd $$dir && \
- if [ ! -f Makefile ]; then \
- $(perlpath) Makefile.PL $(PERL_MM_PARAMS); \
-@@ -717,19 +717,19 @@ all-local:
- done
-
- install-exec-local:
-- for dir in "$(perl_dirs)"; do \
-+ for dir in $(perl_dirs); do \
- cd $$dir && $(MAKE) install && cd ..; \
- done
-
- clean-generic:
-- for dir in "$(perl_dirs)"; do \
-+ for dir in $(perl_dirs); do \
- cd $$dir; \
- $(MAKE) clean; \
- cd ..; \
- done
-
- distclean-generic:
-- for dir in "$(perl_dirs)"; do \
-+ for dir in $(perl_dirs); do \
- cd $$dir && \
- $(MAKE) realclean && rm -f Makefile.PL && \
- cd ..; \
diff --exclude=CVS -ruN
/usr/ports/net/silc-client/patches/patch-lib_Makefile_in
silc-client/patches/patch-lib_Makefile_in
--- /usr/ports/net/silc-client/patches/patch-lib_Makefile_in Thu Apr 7
17:38:17 2005
+++ silc-client/patches/patch-lib_Makefile_in Sun Jul 9 12:24:36 2006
@@ -1,7 +1,6 @@
-$OpenBSD: patch-lib_Makefile_in,v 1.8 2005/04/07 15:38:17 brad Exp $
---- lib/Makefile.in.orig Wed Apr 6 09:03:19 2005
-+++ lib/Makefile.in Wed Apr 6 11:32:28 2005
-@@ -591,7 +591,6 @@ install-data-am: install-pkgconfigDATA
+--- lib/Makefile.in.orig Fri Jan 6 14:46:28 2006
++++ lib/Makefile.in Sun Jul 9 12:22:47 2006
+@@ -577,7 +577,6 @@
install-exec-am:
@$(NORMAL_INSTALL)
diff --exclude=CVS -ruN
/usr/ports/net/silc-client/patches/patch-lib_silcclient_command_reply_c
silc-client/patches/patch-lib_silcclient_command_reply_c
--- /usr/ports/net/silc-client/patches/patch-lib_silcclient_command_reply_c
Thu Jul 28 22:56:45 2005
+++ silc-client/patches/patch-lib_silcclient_command_reply_c Thu Jan 1
01:00:00 1970
@@ -1,69 +0,0 @@
-$OpenBSD: patch-lib_silcclient_command_reply_c,v 1.1 2005/07/28 20:56:45 brad
Exp $
---- lib/silcclient/command_reply.c.orig Thu Mar 31 01:07:10 2005
-+++ lib/silcclient/command_reply.c Thu Jul 28 15:20:27 2005
-@@ -230,6 +230,11 @@ silc_client_command_reply_whois_save(Sil
- client_entry =
- silc_client_add_client(cmd->client, conn, nickname, username, realname,
- client_id, mode);
-+ if (!client_entry) {
-+ if (notify)
-+ COMMAND_REPLY_ERROR(SILC_STATUS_ERR_NOT_ENOUGH_PARAMS);
-+ return;
-+ }
- } else {
- silc_client_update_client(cmd->client, conn, client_entry,
- nickname, username, realname, mode);
-@@ -413,6 +418,11 @@ silc_client_command_reply_identify_save(
- client_entry =
- silc_client_add_client(cmd->client, conn, name, info, NULL,
- silc_id_dup(client_id, id_type), 0);
-+ if (!client_entry) {
-+ if (notify)
-+ COMMAND_REPLY_ERROR(SILC_STATUS_ERR_NOT_ENOUGH_PARAMS);
-+ return;
-+ }
- } else {
- silc_client_update_client(cmd->client, conn, client_entry,
- name, info, NULL, 0);
-@@ -466,6 +476,11 @@ silc_client_command_reply_identify_save(
- /* Add new channel entry */
- channel_entry = silc_client_add_channel(client, conn, name, 0,
- channel_id);
-+ if (!channel_entry) {
-+ if (notify)
-+ COMMAND_REPLY_ERROR(SILC_STATUS_ERR_NOT_ENOUGH_PARAMS);
-+ return;
-+ }
- channel_id = NULL;
- }
-
-@@ -619,7 +634,8 @@ SILC_CLIENT_CMD_REPLY_FUNC(list)
-
- tmp = silc_argument_get_arg_type(cmd->args, 2, &len);
- if (!tmp) {
-- COMMAND_REPLY_ERROR(SILC_STATUS_ERR_NOT_ENOUGH_PARAMS);
-+ /* There were no channels in the network. */
-+ COMMAND_REPLY((SILC_ARGS, NULL, NULL, 0));
- goto out;
- }
-
-@@ -1049,6 +1065,10 @@ SILC_CLIENT_CMD_REPLY_FUNC(join)
- channel = silc_client_add_channel(cmd->client, conn, channel_name,
- mode, channel_id);
- }
-+ if (!channel) {
-+ COMMAND_REPLY_ERROR(SILC_STATUS_ERR_BAD_CHANNEL);
-+ goto out;
-+ }
-
- conn->current_channel = channel;
- channel->mode = mode;
-@@ -1112,6 +1132,8 @@ SILC_CLIENT_CMD_REPLY_FUNC(join)
- client_entry =
- silc_client_add_client(cmd->client, conn, NULL, NULL, NULL,
- silc_id_dup(client_id, SILC_ID_CLIENT), 0);
-+ if (!client_entry)
-+ goto out;
- }
-
- /* Join client to the channel */
diff --exclude=CVS -ruN /usr/ports/net/silc-client/pkg/PLIST
silc-client/pkg/PLIST
--- /usr/ports/net/silc-client/pkg/PLIST Thu Apr 7 17:38:17 2005
+++ silc-client/pkg/PLIST Sun Jul 9 11:30:21 2006
@@ -18,124 +18,14 @@
@comment libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/Irssi/UI/
@comment libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/Irssi/UI/UI.bs
@comment libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/Irssi/UI/UI.so
[EMAIL PROTECTED] libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/perllocal.pod
[EMAIL PROTECTED] man/man1/silc.1
@comment modules/
share/doc/silc/
[EMAIL PROTECTED] share/doc/silc/CHANGES
[EMAIL PROTECTED] share/doc/silc/COPYING
[EMAIL PROTECTED] share/doc/silc/CREDITS
[EMAIL PROTECTED] share/doc/silc/CodingStyle
-share/doc/silc/FAQ
[EMAIL PROTECTED] share/doc/silc/INSTALL
-share/doc/silc/README
[EMAIL PROTECTED] share/doc/silc/TODO
[EMAIL PROTECTED] share/doc/silc/draft-riikonen-presence-attrs-03.txt
[EMAIL PROTECTED] share/doc/silc/draft-riikonen-silc-commands-06.txt
[EMAIL PROTECTED] share/doc/silc/draft-riikonen-silc-flags-payloads-04.txt
[EMAIL PROTECTED] share/doc/silc/draft-riikonen-silc-ke-auth-08.txt
[EMAIL PROTECTED] share/doc/silc/draft-riikonen-silc-pp-09.txt
[EMAIL PROTECTED] share/doc/silc/draft-riikonen-silc-spec-08.txt
-share/doc/silc/formats.txt
-share/doc/silc/manual.txt
-share/doc/silc/signals.txt
-share/doc/silc/special_vars.txt
-share/doc/silc/startup-HOWTO.html
share/examples/silc/
@sample ${CONFDIR}/
share/examples/silc/silc.conf
@sample ${CONFDIR}/silc.conf
-share/examples/silc/silcalgs.conf
share/silc/
share/silc/help/
-share/silc/help/action
-share/silc/help/admin
-share/silc/help/alias
-share/silc/help/attr
-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/detach
-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/listkeys
-share/silc/help/load
-share/silc/help/log
-share/silc/help/me
-share/silc/help/mmsg
-share/silc/help/motd
-share/silc/help/msg
-share/silc/help/names
-share/silc/help/nick
-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/silcnet
-share/silc/help/silcoper
-share/silc/help/smsg
-share/silc/help/stats
-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/users
-share/silc/help/version
-share/silc/help/watch
-share/silc/help/whois
-share/silc/help/whowas
-share/silc/help/window
share/silc/scripts/
share/silc/scripts/autoop.pl
share/silc/scripts/beep.pl
pgpd05ABRQV0d.pgp
Description: PGP signature
