Based on simons diff, except it adds:
* fix for amd64 mp_div() (patch-lib_silcmath_tma.c)
* suppresses linking against silc-toolkit (patch-configure_ac)
* install docs and helps (patch-apps_irssi_docs_Makefile_in,
patch-apps_irssi_docs_help_Makefile_in, patch-doc_Makefile_in)
* adds @conflict with upcomming irssi-silc port
Index: silc-client/Makefile
===================================================================
RCS file: /cvs/ports/net/silc-client/Makefile,v
retrieving revision 1.35
diff -u -r1.35 Makefile
--- silc-client/Makefile 18 Sep 2006 05:41:10 -0000 1.35
+++ silc-client/Makefile 1 Oct 2006 07:47:00 -0000
@@ -4,8 +4,7 @@
COMMENT= "Secure Internet Live Conferencing (SILC) client"
-DISTNAME= silc-client-1.0.2
-PKGNAME= ${DISTNAME}p2
+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 \
@@ -53,7 +51,5 @@
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/silc
@mv -f ${PREFIX}/share/doc/silc/example_silc.conf \
${PREFIX}/share/examples/silc/silc.conf
- ${INSTALL_DATA} ${WRKSRC}/doc/silcalgs.conf \
- ${PREFIX}/share/examples/silc
.include <bsd.port.mk>
Index: silc-client/distinfo
===================================================================
RCS file: /cvs/ports/net/silc-client/distinfo,v
retrieving revision 1.20
diff -u -r1.20 distinfo
--- silc-client/distinfo 7 Apr 2005 15:38:17 -0000 1.20
+++ silc-client/distinfo 1 Oct 2006 07:47:00 -0000
@@ -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
Index: silc-client/patches/patch-Makefile_in
===================================================================
RCS file: silc-client/patches/patch-Makefile_in
diff -N silc-client/patches/patch-Makefile_in
--- silc-client/patches/patch-Makefile_in 7 Apr 2005 15:38:17 -0000
1.11
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$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
-
[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.
Index: silc-client/patches/patch-apps_irssi_docs_Makefile_in
===================================================================
RCS file: silc-client/patches/patch-apps_irssi_docs_Makefile_in
diff -N silc-client/patches/patch-apps_irssi_docs_Makefile_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ silc-client/patches/patch-apps_irssi_docs_Makefile_in 1 Oct 2006
07:47:00 -0000
@@ -0,0 +1,18 @@
+--- apps/irssi/docs/Makefile.in Fri Jan 6 15:46:28 2006
++++ apps/irssi/docs/Makefile.in Fri Sep 29 18:38:44 2006
+@@ -313,12 +313,12 @@
+ uninstall-info-am:
+ install-docDATA: $(doc_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(docdir)" || $(mkdir_p) "$(DESTDIR)$(docdir)"
++ test -z "$(docdir)" || $(mkdir_p) "$(docdir)"
+ @list='$(doc_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+- echo " $(docDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(docdir)/$$f'"; \
+- $(docDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(docdir)/$$f"; \
++ echo " $(docDATA_INSTALL) '$$d$$p' '$(docdir)/$$f'"; \
++ $(docDATA_INSTALL) "$$d$$p" "$(docdir)/$$f"; \
+ done
+
+ uninstall-docDATA:
Index: silc-client/patches/patch-apps_irssi_docs_help_Makefile_in
===================================================================
RCS file: silc-client/patches/patch-apps_irssi_docs_help_Makefile_in
diff -N silc-client/patches/patch-apps_irssi_docs_help_Makefile_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ silc-client/patches/patch-apps_irssi_docs_help_Makefile_in 1 Oct 2006
07:47:00 -0000
@@ -0,0 +1,18 @@
+--- apps/irssi/docs/help/Makefile.in Fri Jan 6 15:46:28 2006
++++ apps/irssi/docs/help/Makefile.in Fri Sep 29 18:53:22 2006
+@@ -403,12 +403,12 @@
+ uninstall-info-am:
+ install-helpDATA: $(help_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(helpdir)" || $(mkdir_p) "$(DESTDIR)$(helpdir)"
++ test -z "$(helpdir)" || $(mkdir_p) "$(helpdir)"
+ @list='$(help_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+- echo " $(helpDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(helpdir)/$$f'"; \
+- $(helpDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(helpdir)/$$f"; \
++ echo " $(helpDATA_INSTALL) '$$d$$p' '$(helpdir)/$$f'"; \
++ $(helpDATA_INSTALL) "$$d$$p" "$(helpdir)/$$f"; \
+ done
+
+ uninstall-helpDATA:
Index: silc-client/patches/patch-configure_ac
===================================================================
RCS file: silc-client/patches/patch-configure_ac
diff -N silc-client/patches/patch-configure_ac
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ silc-client/patches/patch-configure_ac 1 Oct 2006 07:47:00 -0000
@@ -0,0 +1,14 @@
+--- configure.ac Fri Jan 6 15:46:28 2006
++++ configure.ac Fri Sep 29 17:10:01 2006
+@@ -455,8 +455,9 @@
+
+ else
+ # pkg-config check
+- PKG_CHECK_MODULES(SILC, silc, compile_libs=false, compile_libs=true)
+- PKG_CHECK_MODULES(SILCCLIENT, silcclient, compile_libs=false,
compile_libs=true)
++ #PKG_CHECK_MODULES(SILC, silc, compile_libs=false, compile_libs=true)
++ #PKG_CHECK_MODULES(SILCCLIENT, silcclient, compile_libs=false,
compile_libs=true)
++ compile_libs=true
+
+ if test x$compile_libs = xfalse; then
+ LIBSUBDIR=
Index: silc-client/patches/patch-configure_in
===================================================================
RCS file: silc-client/patches/patch-configure_in
diff -N silc-client/patches/patch-configure_in
--- silc-client/patches/patch-configure_in 7 Apr 2005 15:38:17 -0000
1.7
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -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
Index: silc-client/patches/patch-doc_Makefile_in
===================================================================
RCS file: silc-client/patches/patch-doc_Makefile_in
diff -N silc-client/patches/patch-doc_Makefile_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ silc-client/patches/patch-doc_Makefile_in 1 Oct 2006 07:47:00 -0000
@@ -0,0 +1,10 @@
+--- doc/Makefile.in Fri Jan 6 15:46:28 2006
++++ doc/Makefile.in Fri Sep 29 19:25:46 2006
+@@ -234,6 +234,7 @@
+ target_vendor = @target_vendor@
+ with_irssi_FALSE = @with_irssi_FALSE@
+ with_irssi_TRUE = @with_irssi_TRUE@
++docdir = $(DESTDIR)$(DOCDIR)
+ AUTOMAKE_OPTIONS = 1.0 no-dependencies foreign
+ all: all-am
+
Index: silc-client/patches/patch-irssi_src_perl_Makefile_in
===================================================================
RCS file: silc-client/patches/patch-irssi_src_perl_Makefile_in
diff -N silc-client/patches/patch-irssi_src_perl_Makefile_in
--- silc-client/patches/patch-irssi_src_perl_Makefile_in 7 Apr 2005
15:38:17 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -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 ..; \
Index: silc-client/patches/patch-lib_Makefile_in
===================================================================
RCS file: /cvs/ports/net/silc-client/patches/patch-lib_Makefile_in,v
retrieving revision 1.8
diff -u -r1.8 patch-lib_Makefile_in
--- silc-client/patches/patch-lib_Makefile_in 7 Apr 2005 15:38:17 -0000
1.8
+++ silc-client/patches/patch-lib_Makefile_in 1 Oct 2006 07:47:00 -0000
@@ -1,7 +1,7 @@
$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)
Index: silc-client/patches/patch-lib_silcclient_client_c
===================================================================
RCS file: silc-client/patches/patch-lib_silcclient_client_c
diff -N silc-client/patches/patch-lib_silcclient_client_c
--- silc-client/patches/patch-lib_silcclient_client_c 28 Jul 2005 21:28:10
-0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-lib_silcclient_client_c,v 1.1 2005/07/28 21:28:10 brad Exp $
---- lib/silcclient/client.c.orig Thu Mar 31 01:07:10 2005
-+++ lib/silcclient/client.c Thu Jul 28 15:23:55 2005
-@@ -137,7 +137,7 @@ bool silc_client_init(SilcClient client)
- SILC_LOG_ERROR(("Malformed hostname '%s'", client->hostname));
- return FALSE;
- }
-- if (!silc_utf8_valid(client->realname, strlen(client->realname))) {
-+ if ((*client->realname != '\0') && (!silc_utf8_valid(client->realname,
strlen(client->realname)))) {
- SILC_LOG_ERROR(("Malformed realname '%s'", client->realname));
- return FALSE;
- }
Index: silc-client/patches/patch-lib_silcclient_command_reply_c
===================================================================
RCS file: silc-client/patches/patch-lib_silcclient_command_reply_c
diff -N silc-client/patches/patch-lib_silcclient_command_reply_c
--- silc-client/patches/patch-lib_silcclient_command_reply_c 28 Jul 2005
20:56:45 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -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 */
Index: silc-client/patches/patch-lib_silcmath_tma.c
===================================================================
RCS file: silc-client/patches/patch-lib_silcmath_tma.c
diff -N silc-client/patches/patch-lib_silcmath_tma.c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ silc-client/patches/patch-lib_silcmath_tma.c 1 Oct 2006 07:47:00
-0000
@@ -0,0 +1,10 @@
+--- lib/silcmath/tma.c Fri Sep 29 17:16:58 2006
++++ lib/silcmath/tma.c Fri Sep 29 17:17:40 2006
+@@ -1488,6 +1488,7 @@
+ * Tom St Denis, [EMAIL PROTECTED], http://math.libtomcrypt.org
+ */
+
++#define BN_MP_DIV_SMALL
+ #ifdef BN_MP_DIV_SMALL
+
+ /* slower bit-bang division... also smaller */
Index: silc-client/pkg/PLIST
===================================================================
RCS file: /cvs/ports/net/silc-client/pkg/PLIST,v
retrieving revision 1.17
diff -u -r1.17 PLIST
--- silc-client/pkg/PLIST 7 Apr 2005 15:38:17 -0000 1.17
+++ silc-client/pkg/PLIST 1 Oct 2006 07:47:00 -0000
@@ -1,4 +1,5 @@
@comment $OpenBSD: PLIST,v 1.17 2005/04/07 15:38:17 brad Exp $
[EMAIL PROTECTED] irssi-silc-*
bin/silc
@comment libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/
@comment libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/Irssi/
@@ -19,14 +20,12 @@
@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
@comment libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/perllocal.pod
[EMAIL PROTECTED] man/man1/silc.1
@comment modules/
share/doc/silc/
@comment share/doc/silc/CHANGES
@comment share/doc/silc/COPYING
@comment share/doc/silc/CREDITS
@comment share/doc/silc/CodingStyle
-share/doc/silc/FAQ
@comment share/doc/silc/INSTALL
share/doc/silc/README
@comment share/doc/silc/TODO
@@ -45,7 +44,6 @@
@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
