From 107a5fe66f6a5845e9cf0bff87dbcf7cff5f09d9 Mon Sep 17 00:00:00 2001 From: brad Date: Fri, 31 Oct 2003 15:17:04 +0000 Subject: [PATCH] upgrade to silc-client 0.9.15 --- net/silc-client/Makefile | 11 +++++++---- net/silc-client/distinfo | 6 +++--- net/silc-client/patches/patch-configure_in | 8 ++++---- net/silc-client/pkg/DEINSTALL | 4 ++-- net/silc-client/pkg/INSTALL | 4 ++-- net/silc-client/pkg/PLIST | 6 +++--- 6 files changed, 21 insertions(+), 18 deletions(-) diff --git a/net/silc-client/Makefile b/net/silc-client/Makefile index be29d07382e..d07f8221f48 100644 --- a/net/silc-client/Makefile +++ b/net/silc-client/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.24 2003/10/25 23:14:41 brad Exp $ +# $OpenBSD: Makefile,v 1.25 2003/10/31 15:17:04 brad Exp $ COMMENT= "Secure Internet Live Conferencing (SILC) client" -DISTNAME= silc-client-0.9.14 +DISTNAME= silc-client-0.9.15 CATEGORIES= net HOMEPAGE= http://www.silcnet.org/ @@ -27,13 +27,16 @@ LIB_DEPENDS+= glib.1.2,gmodule.1.2::devel/glib MODULES= iconv +CONFDIR= ${SYSCONFDIR}/silc +SUBST_VARS= CONFDIR + CONFIGURE_STYLE= autoconf AUTOCONF_VERSION= 2.54 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 \ - --with-etcdir=${SYSCONFDIR}/silc \ + --with-etcdir=${CONFDIR} \ --with-iconv=${LOCALBASE} \ --with-perl-lib=${DESTDIR}${PREFIX}/libdata/perl5/site_perl @@ -43,7 +46,7 @@ CONFIGURE_ARGS+= --disable-asm post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/silc - mv -f ${PREFIX}/share/doc/silc/example_silc.conf \ + @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 diff --git a/net/silc-client/distinfo b/net/silc-client/distinfo index 414e5a2bc8e..30ecec46642 100644 --- a/net/silc-client/distinfo +++ b/net/silc-client/distinfo @@ -1,3 +1,3 @@ -MD5 (silc-client-0.9.14.tar.gz) = c8affb14dc0c9b7defc6a831f6fd75a9 -RMD160 (silc-client-0.9.14.tar.gz) = 3400d10e89acd21966e83bb5d192a405967339dc -SHA1 (silc-client-0.9.14.tar.gz) = a2975635ae43d7bfa8480d5e5f6db518bf4904c3 +MD5 (silc-client-0.9.15.tar.gz) = 6e261b023044700d0cad95d55f39af90 +RMD160 (silc-client-0.9.15.tar.gz) = c556c2be011bb9f416b6e4ce2fedf9d691c0fb31 +SHA1 (silc-client-0.9.15.tar.gz) = ca10edd3f5f18363a2e85ee61e8740dc01e8ba66 diff --git a/net/silc-client/patches/patch-configure_in b/net/silc-client/patches/patch-configure_in index 419561d17db..30e0ea6b421 100644 --- a/net/silc-client/patches/patch-configure_in +++ b/net/silc-client/patches/patch-configure_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-configure_in,v 1.2 2003/10/25 23:14:41 brad Exp $ ---- configure.in.orig 2003-10-24 09:46:25.000000000 -0400 -+++ configure.in 2003-10-25 02:52:23.000000000 -0400 -@@ -40,7 +40,6 @@ AM_INIT_AUTOMAKE(silc-client, 0.9.14) +$OpenBSD: patch-configure_in,v 1.3 2003/10/31 15:17:04 brad Exp $ +--- configure.in.orig 2003-10-31 06:18:54.000000000 -0500 ++++ configure.in 2003-10-31 09:49:16.000000000 -0500 +@@ -40,7 +40,6 @@ AM_INIT_AUTOMAKE(silc-client, 0.9.15) AC_PREREQ(2.52) AC_CONFIG_HEADERS(includes/silcdefs.h) diff --git a/net/silc-client/pkg/DEINSTALL b/net/silc-client/pkg/DEINSTALL index 1646e7b8584..b5f98c36035 100644 --- a/net/silc-client/pkg/DEINSTALL +++ b/net/silc-client/pkg/DEINSTALL @@ -1,9 +1,9 @@ #!/bin/sh -# $OpenBSD: DEINSTALL,v 1.3 2003/10/25 23:14:42 brad Exp $ +# $OpenBSD: DEINSTALL,v 1.4 2003/10/31 15:17:04 brad Exp $ PATH=/bin:/usr/bin:/sbin:/usr/sbin PREFIX=${PKG_PREFIX:-/usr/local} -CONFIG_DIR=${SYSCONFDIR}/silc +CONFIG_DIR=${CONFDIR} if [ "$PKG_DELETE_EXTRA" != Yes -a -d $CONFIG_DIR ]; then echo diff --git a/net/silc-client/pkg/INSTALL b/net/silc-client/pkg/INSTALL index bee7604af29..0d54064fe68 100644 --- a/net/silc-client/pkg/INSTALL +++ b/net/silc-client/pkg/INSTALL @@ -1,9 +1,9 @@ #!/bin/sh -# $OpenBSD: INSTALL,v 1.6 2003/10/25 23:14:42 brad Exp $ +# $OpenBSD: INSTALL,v 1.7 2003/10/31 15:17:04 brad Exp $ PATH=/bin:/usr/bin:/sbin:/usr/sbin PREFIX=${PKG_PREFIX:-/usr/local} -CONFIG_DIR=${SYSCONFDIR}/silc +CONFIG_DIR=${CONFDIR} SAMPLE_CONFIG_DIR=$PREFIX/share/examples/silc do_notice_conf() diff --git a/net/silc-client/pkg/PLIST b/net/silc-client/pkg/PLIST index 5b7d9edb8b7..bbcdb19e457 100644 --- a/net/silc-client/pkg/PLIST +++ b/net/silc-client/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.11 2003/10/25 23:14:42 brad Exp $ +@comment $OpenBSD: PLIST,v 1.12 2003/10/31 15:17:04 brad Exp $ bin/silc @comment libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/Irssi.pm @comment libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/Irssi/TextUI.pm @@ -24,7 +24,6 @@ share/doc/silc/README @comment share/doc/silc/TODO share/doc/silc/draft-riikonen-presence-attrs-02.txt share/doc/silc/draft-riikonen-silc-commands-06.txt -share/doc/silc/draft-riikonen-silc-flags-payloads-03.txt share/doc/silc/draft-riikonen-silc-flags-payloads-04.txt share/doc/silc/draft-riikonen-silc-ke-auth-07.txt share/doc/silc/draft-riikonen-silc-pp-08.txt @@ -82,6 +81,7 @@ share/silc/help/list 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 @@ -144,4 +144,4 @@ share/silc/themes/default.theme @comment @dirrm libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto @comment @dirrm libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/Irssi @comment @dirrm libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd -@extraunexec rm -rf ${SYSCONFDIR}/silc +@extraunexec rm -rf ${CONFDIR}