[pkgsrc/trunk]: pkgsrc/chat/silc-client Update to version 1.0.2

[salo <salo%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d9eb937e3dc2
branches:  trunk
changeset: 492272:d9eb937e3dc2
user:      salo <salo%pkgsrc.org@localhost>
date:      Fri Apr 08 15:12:48 2005 +0000

description:
Update to version 1.0.2

Changes:
- convert to options.mk

1.0.2:
======
Due to the new SILC Server release with support to the UTF-8 nicknames and
channel names new version of the SILC Client is released as it seems the
older ones do not function very well with the new server.  This version
includes support to the UTF-8 encoded nicknames and channel names, however,
certain problems may still exists, as this is a slight premature release.

- Added support for UTF-8 encoded nicknames and channel names.
- Command queue implemented for better UTF-8 support.
- --with-silc-includes and --with-silc-libs added gto configure to use
  pre-installed SILC Toolkit.

diffstat:

 chat/silc-client/Makefile         |  30 +++---------------------------
 chat/silc-client/Makefile.common  |   4 ++--
 chat/silc-client/distinfo         |  13 +++++--------
 chat/silc-client/options.mk       |  26 ++++++++++++++++++++++++++
 chat/silc-client/patches/patch-ac |  26 ++++++++++++++++++++++----
 chat/silc-client/patches/patch-ad |  38 --------------------------------------
 chat/silc-client/patches/patch-ae |  15 ---------------
 chat/silc-client/patches/patch-af |  15 ---------------
 8 files changed, 58 insertions(+), 109 deletions(-)

diffs (249 lines):

diff -r 651da62df8f9 -r d9eb937e3dc2 chat/silc-client/Makefile
--- a/chat/silc-client/Makefile Fri Apr 08 15:09:43 2005 +0000
+++ b/chat/silc-client/Makefile Fri Apr 08 15:12:48 2005 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.36 2004/10/03 00:13:15 tv Exp $
+# $NetBSD: Makefile,v 1.37 2005/04/08 15:12:48 salo Exp $
 #
 
 DISTNAME=              ${SILC_CLIENT_DISTNAME}
-PKGREVISION=           2
 CATEGORIES=            chat security
 MASTER_SITES=          http://www.silcnet.org/download/client/sources/ \
                        ftp://ftp.silcnet.org/silc/client/sources/ \
@@ -42,8 +41,6 @@
 
 .include "../../mk/bsd.prefs.mk"
 
-BUILD_DEFS+=           USE_INET6 SILC_CLIENT_WITH_PERL
-
 # Use native curses library.
 .if (${OPSYS} == "NetBSD") || (${OPSYS} == "SunOS")
 CONFIGURE_ARGS+=       --with-vcurses
@@ -54,41 +51,20 @@
 CONFIGURE_ARGS+=        --with-ncurses
 .endif
 
-.if defined(USE_INET6) && !empty(USE_INET6:M[Yy][Ee][Ss])
-CONFIGURE_ARGS+=       --enable-ipv6
-.endif
-
-# Optional support for perl scripting.
-# If you want to disable it, set SILC_CLIENT_WITH_PERL to NO
-# in your /etc/mk.conf
-
-.if defined(SILC_CLIENT_WITH_PERL) && !empty(SILC_CLIENT_WITH_PERL:M[Yy][Ee][Ss])
-CONFIGURE_ARGS+=       --with-perl-lib=${PREFIX}/lib/${PKGBASE}/perl5
-PERL5_REQD+=           5.6.1nb10
-.include "../../lang/perl5/buildlink3.mk"
-DEPENDS+=              p5-File-MMagic>=1.20:../../misc/p5-File-MMagic
-PLIST_SRC+=            ${PKGDIR}/PLIST.perl
-PLIST_SRC+=            ${WRKDIR}/PLIST.perl
-.else
-CONFIGURE_ARGS+=       --with-perl=no
-.endif
-
 # Assembler optimizations.
 #
 .if (${MACHINE_ARCH} != "i386")
 CONFIGURE_ARGS+=       --disable-asm
 .endif
 
-# If you want to debug silc-client, uncomment this.
-#
-#CONFIGURE_ARGS+=      --enable-debug
+.include "options.mk"
 
 PLIST_SRC+=            ${PKGDIR}/PLIST
 
 post-install:
        ${INSTALL_DATA} ${WRKSRC}/irssi/config.h ${SILC_CLIENT_CONFIG_H}
        ${INSTALL_DATA} ${WRKSRC}/irssi/irssi-config ${SILC_CLIENT_CONFIG}
-.if defined(SILC_CLIENT_WITH_PERL) && !empty(SILC_CLIENT_WITH_PERL:M[Yy][Ee][Ss])
+.if !empty(PKG_OPTIONS:Mperl)
        ${INSTALL_DATA_DIR} ${PREFIX}/libexec/${PKGBASE}/scripts
        ${INSTALL_DATA} ${WRKSRC}/irssi/scripts/*.pl    \
                ${PREFIX}/libexec/${PKGBASE}/scripts
diff -r 651da62df8f9 -r d9eb937e3dc2 chat/silc-client/Makefile.common
--- a/chat/silc-client/Makefile.common  Fri Apr 08 15:09:43 2005 +0000
+++ b/chat/silc-client/Makefile.common  Fri Apr 08 15:12:48 2005 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.8 2004/06/06 11:45:06 salo Exp $
+# $NetBSD: Makefile.common,v 1.9 2005/04/08 15:12:48 salo Exp $
 #
 
 # Distribution specific information.
 #
-SILC_CLIENT_VERSION=           1.0.1
+SILC_CLIENT_VERSION=           1.0.2
 SILC_CLIENT_DISTNAME=          silc-client-${SILC_CLIENT_VERSION}
 SILC_CLIENT_EXTRACT_SUFX=      .tar.bz2
 SILC_CLIENT_DISTFILE=          ${SILC_CLIENT_DISTNAME}${SILC_CLIENT_EXTRACT_SUFX}
diff -r 651da62df8f9 -r d9eb937e3dc2 chat/silc-client/distinfo
--- a/chat/silc-client/distinfo Fri Apr 08 15:09:43 2005 +0000
+++ b/chat/silc-client/distinfo Fri Apr 08 15:12:48 2005 +0000
@@ -1,11 +1,8 @@
-$NetBSD: distinfo,v 1.28 2005/02/23 15:59:13 agc Exp $
+$NetBSD: distinfo,v 1.29 2005/04/08 15:12:48 salo Exp $
 
-SHA1 (silc-client-1.0.1.tar.bz2) = e53a8f9577282734723fe9ad8eaf5d3bce035048
-RMD160 (silc-client-1.0.1.tar.bz2) = 85e32ba0d5a16e93238fb92d607cd089b4476993
-Size (silc-client-1.0.1.tar.bz2) = 1404404 bytes
+SHA1 (silc-client-1.0.2.tar.bz2) = 9ba36cfde614a9d1db742d3ff50bea6395359226
+RMD160 (silc-client-1.0.2.tar.bz2) = 8d4ca317b455f74782706e9dd685a0f707a5603b
+Size (silc-client-1.0.2.tar.bz2) = 1696581 bytes
 SHA1 (patch-aa) = b9ae5da26840b193d3c9484c975af89294fa8049
 SHA1 (patch-ab) = fffda0e4c9a9227c1eb8d8646a02ce9ec5cdefef
-SHA1 (patch-ac) = 3102941eea03bbd78d361fb0e00bfedb064d93f5
-SHA1 (patch-ad) = 9511132935ecc38e6192458e61e2445a381f0ea4
-SHA1 (patch-ae) = c4d1e29691dc993a5d27b3b8242e0bb4ae4dc018
-SHA1 (patch-af) = a265c4d5f98e0dc10080fbcc29a9c0c43659907d
+SHA1 (patch-ac) = f319907521b5d1caecfa47ac6e6239979370ea52
diff -r 651da62df8f9 -r d9eb937e3dc2 chat/silc-client/options.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/chat/silc-client/options.mk       Fri Apr 08 15:12:48 2005 +0000
@@ -0,0 +1,26 @@
+# $NetBSD: options.mk,v 1.1 2005/04/08 15:12:48 salo Exp $
+#
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.silc-client
+PKG_SUPPORTED_OPTIONS= debug inet6 perl
+PKG_DEFAULT_OPTIONS=   inet6 perl
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mdebug)
+CONFIGURE_ARGS+=       --enable-debug
+.endif
+
+.if !empty(PKG_OPTIONS:Minet6)
+CONFIGURE_ARGS+=       --enable-ipv6
+.endif
+
+.if !empty(PKG_OPTIONS:Mperl)
+CONFIGURE_ARGS+=       --with-perl-lib=${PREFIX}/lib/${PKGBASE}/perl5
+PERL5_REQD+=           5.6.1nb10
+.include "../../lang/perl5/buildlink3.mk"
+DEPENDS+=              p5-File-MMagic>=1.20:../../misc/p5-File-MMagic
+PLIST_SRC+=            ${PKGDIR}/PLIST.perl
+PLIST_SRC+=            ${WRKDIR}/PLIST.perl
+.else
+CONFIGURE_ARGS+=       --with-perl=no
+.endif
diff -r 651da62df8f9 -r d9eb937e3dc2 chat/silc-client/patches/patch-ac
--- a/chat/silc-client/patches/patch-ac Fri Apr 08 15:09:43 2005 +0000
+++ b/chat/silc-client/patches/patch-ac Fri Apr 08 15:12:48 2005 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.7 2004/06/06 11:45:06 salo Exp $
+$NetBSD: patch-ac,v 1.8 2005/04/08 15:12:48 salo Exp $
 
---- irssi/src/perl/Makefile.in.orig    2004-01-14 14:29:06.000000000 +0100
-+++ irssi/src/perl/Makefile.in 2004-06-05 14:50:35.000000000 +0200
-@@ -265,7 +265,7 @@
+--- irssi/src/perl/Makefile.in.orig    2005-04-06 15:04:38.000000000 +0200
++++ irssi/src/perl/Makefile.in 2005-04-08 16:13:33.000000000 +0200
+@@ -284,7 +284,7 @@
        -I$(top_srcdir)/src/fe-common/core \
        -I$(top_srcdir)/src/fe-common/silc \
        $(GLIB_CFLAGS) \
@@ -11,3 +11,21 @@
        -DPERL_USE_LIB=\""$(PERL_USE_LIB)"\" \
        -DPERL_STATIC_LIBS=$(PERL_STATIC_LIBS) \
        $(PERL_CFLAGS)
+@@ -707,7 +707,7 @@
+       $(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,7 +717,7 @@
+       done
+ 
+ install-exec-local:
+-      for dir in "$(perl_dirs)"; do \
++      for dir in $(perl_dirs); do \
+         cd $$dir && $(MAKE) install && cd ..; \
+       done
+ 
diff -r 651da62df8f9 -r d9eb937e3dc2 chat/silc-client/patches/patch-ad
--- a/chat/silc-client/patches/patch-ad Fri Apr 08 15:09:43 2005 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2004/06/11 10:05:06 salo Exp $
-
---- configure.orig     Wed Jan 14 14:28:30 2004
-+++ configure  Wed Jun  9 10:22:17 2004
-@@ -10456,9 +10456,16 @@
- 
- fi
- if test $ac_cv_header_regex_h = yes; then
-+
-+    cat >>confdefs.h <<\_ACEOF
-+#define HAVE_REGEX 1
-+_ACEOF
-+
-   have_regex=1
-+
- else
-   have_regex=0
-+
- fi
- 
- 
-@@ -10563,9 +10570,16 @@
- echo "$as_me:$LINENO: result: $ac_cv_func_getopt_long" >&5
- echo "${ECHO_T}$ac_cv_func_getopt_long" >&6
- if test $ac_cv_func_getopt_long = yes; then
-+
-+    cat >>confdefs.h <<\_ACEOF
-+#define HAVE_GETOPT_LONG 1
-+_ACEOF
-+
-   have_getopt_long=1
-+
- else
-   have_getopt_long=0
-+
- fi
- 
- 
diff -r 651da62df8f9 -r d9eb937e3dc2 chat/silc-client/patches/patch-ae
--- a/chat/silc-client/patches/patch-ae Fri Apr 08 15:09:43 2005 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2004/06/11 10:05:06 salo Exp $
-
---- includes/silcdefs.h.in.orig        Wed Jan 14 14:33:17 2004
-+++ includes/silcdefs.h.in     Wed Jun  9 10:22:31 2004
-@@ -42,6 +42,10 @@
- #undef SILC_MP_GMP
- #undef SILC_MP_NSS_MPI
- 
-+/* contrib library */
-+#undef HAVE_REGEX
-+#undef HAVE_GETOPT_LONG
-+
- /* Redefs for SOCKS5 library */
- /* macros/curses checks */
- #undef HAS_CURSES
diff -r 651da62df8f9 -r d9eb937e3dc2 chat/silc-client/patches/patch-af
--- a/chat/silc-client/patches/patch-af Fri Apr 08 15:09:43 2005 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-af,v 1.1 2004/06/11 10:05:06 salo Exp $
-
---- lib/contrib/Makefile.in.orig       2004-02-29 16:10:01.000000000 +0100
-+++ lib/contrib/Makefile.in    2004-06-11 11:31:45.000000000 +0200
-@@ -287,7 +298,9 @@
- target_os = @target_os@
- target_vendor = @target_vendor@
- AUTOMAKE_OPTIONS = 1.0 no-dependencies foreign
--noinst_LTLIBRARIES = libcontrib.la
-+@HAVE_GETOPT_LONG_FALSE@noinst_LTLIBRARIES = libcontrib.la
-+@HAVE_GETOPT_LONG_TRUE@@HAVE_REGEX_FALSE@noinst_LTLIBRARIES = libcontrib.la
-+@HAVE_GETOPT_LONG_TRUE@@HAVE_REGEX_TRUE@noinst_LTLIBRARIES = 
- @HAVE_GETOPT_LONG_FALSE@GETOPT = getopt.c getopt1.c
- @HAVE_GETOPT_LONG_TRUE@GETOPT = 
- @HAVE_REGEX_FALSE@REGEX = regex.c