[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: net/silc-client update



On Sat, Mar 16, 2002 at 06:18:33PM +0000, Christian Weisgerber wrote:
> Vladimir Kotal <vlada_(_at_)_openbsd_(_dot_)_cz> wrote:
> 
> > -		--with-etcdir=${SYSCONFDIR}/silc \
> > +		--with-etcdir=${PREFIX}/share/examples/silc-client \
> 
> I'm suspicious of this change.  It's fine if etcdir is only used
> for installing the sample files, but then how is the etcdir path
> determined that is used for reading actual configuration files.
> 
> > +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
> 
> Why are you adding back crap documentation files?  These need to
> be reviewed individually, but--for example--tell me why somebody
> who installs the OpenBSD ports/package should care for INSTALL?
> 

Okay, next time I will be more careful.


v.
diff -uNr --exclude=CVS silc-client.orig/Makefile silc-client.new/Makefile
--- silc-client.orig/Makefile	Sat Mar  9 03:24:45 2002
+++ silc-client.new/Makefile	Sun Mar 17 21:30:37 2002
@@ -2,7 +2,7 @@
 
 COMMENT=	"Secure Live Internet Conferencing (SILC) client"
 
-DISTNAME=	silc-client-0.7.6
+DISTNAME=	silc-client-0.8.1
 CATEGORIES=	net
 NEED_VERSION=	1.504
 HOMEPAGE=	http://www.silcnet.org/
@@ -33,6 +33,6 @@
 		--disable-asm
 MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC} ${WRKSRC}/irssi ${WRKSRC}/lib/silcmath/mpi
 FAKE_FLAGS=	${DESTDIRNAME}=${WRKINST} \
-		silc_etcdir=${PREFIX}/share/examples/silc-client
+		silc_etcdir=${SYSCONFDIR}/silc
 
 .include <bsd.port.mk>
diff -uNr --exclude=CVS silc-client.orig/distinfo silc-client.new/distinfo
--- silc-client.orig/distinfo	Wed Feb  6 00:51:30 2002
+++ silc-client.new/distinfo	Wed Mar 13 02:09:02 2002
@@ -1,3 +1,3 @@
-MD5 (silc-client-0.7.6.tar.gz) = 1c0414a5479509949bf5e844cbdc8661
-RMD160 (silc-client-0.7.6.tar.gz) = 6f58b975cd9daba0910cc9c508b413dab22ae394
-SHA1 (silc-client-0.7.6.tar.gz) = 5f61ec25b59f9e10d8f2dcd8d78d042eaa24a2d7
+MD5 (silc-client-0.8.1.tar.gz) = 0e6573c7aeaa190ea33cb33c282b0ff8
+RMD160 (silc-client-0.8.1.tar.gz) = 5d8758c93cb45830c74b2ba7af3fb5eb95faadeb
+SHA1 (silc-client-0.8.1.tar.gz) = df314aa9e6f5ac38052cccc494e99ddfc2ff37c4
diff -uNr --exclude=CVS silc-client.orig/patches/patch-configure silc-client.new/patches/patch-configure
--- silc-client.orig/patches/patch-configure	Wed Feb  6 00:51:30 2002
+++ silc-client.new/patches/patch-configure	Tue Feb 26 22:50:12 2002
@@ -1,7 +1,6 @@
-$OpenBSD: patch-configure,v 1.3 2002/02/05 23:51:30 naddy Exp $
---- configure.orig	Sun Feb  3 18:27:11 2002
-+++ configure	Tue Feb  5 16:34:42 2002
-@@ -2660,12 +2660,6 @@ else
+--- configure.orig	Tue Feb 26 22:48:18 2002
++++ configure	Tue Feb 26 22:49:59 2002
+@@ -2660,12 +2660,6 @@
    SILC_DIST_WIN32DLL_FALSE=
  fi
  
@@ -14,7 +13,7 @@
  # Program checking
  # Find a good install program.  We prefer a C program (faster),
  # so one script is as good as another.  But avoid the broken or
-@@ -12326,16 +12320,14 @@ echo "${ECHO_T}yes" >&6
+@@ -12362,16 +12356,14 @@
  #define SILC_DEBUG 1
  EOF
  
@@ -22,13 +21,13 @@
 +    CFLAGS="-g $CFLAGS"
      ;;
    *)
-     echo "$as_me:12332: result: no" >&5
+     echo "$as_me:12368: result: no" >&5
  echo "${ECHO_T}no" >&6
 -    CFLAGS="-O2 -g $CFLAGS"
      ;;
  esac
  else
 -  CFLAGS="-O2 -g $CFLAGS"
-         echo "$as_me:12339: result: no" >&5
+         echo "$as_me:12375: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi;
diff -uNr --exclude=CVS silc-client.orig/patches/patch-irssi_src_silc_core_silc-channels_c silc-client.new/patches/patch-irssi_src_silc_core_silc-channels_c
--- silc-client.orig/patches/patch-irssi_src_silc_core_silc-channels_c	Wed Feb  6 00:51:30 2002
+++ silc-client.new/patches/patch-irssi_src_silc_core_silc-channels_c	Thu Jan  1 01:00:00 1970
@@ -1,12 +0,0 @@
-$OpenBSD: patch-irssi_src_silc_core_silc-channels_c,v 1.1 2002/02/05 23:51:30 naddy Exp $
---- irssi/src/silc/core/silc-channels.c.orig	Wed Feb  6 00:34:25 2002
-+++ irssi/src/silc/core/silc-channels.c	Wed Feb  6 00:34:37 2002
-@@ -245,7 +245,7 @@ static void event_topic(SILC_SERVER_REC 
-   char userhost[256];
-   SilcIdType idtype;
- 
--  idtype = va_arg(va, SilcIdType);
-+  idtype = va_arg(va, int);
-   entry = va_arg(va, void *);
-   topic = va_arg(va, char *);
-   channel = va_arg(va, SilcChannelEntry);
diff -uNr --exclude=CVS silc-client.orig/patches/patch-makefilein silc-client.new/patches/patch-makefilein
--- silc-client.orig/patches/patch-makefilein	Wed Feb  6 00:51:30 2002
+++ silc-client.new/patches/patch-makefilein	Wed Mar 13 02:20:38 2002
@@ -1,10 +1,14 @@
-$OpenBSD: patch-makefilein,v 1.3 2002/02/05 23:51:30 naddy Exp $
---- Makefile.in.orig	Sun Feb  3 18:27:16 2002
-+++ Makefile.in	Tue Feb  5 16:34:42 2002
-@@ -533,19 +533,10 @@ install-dirs:
- 	-mkdir -p $(docdir)
- 	-mkdir -p $(logsdir)
+--- Makefile.in.orig	Mon Mar 11 22:41:20 2002
++++ Makefile.in	Wed Mar 13 02:20:06 2002
+@@ -528,24 +528,13 @@
  
+ install-dirs:
+ 	-mkdir -p $(etcdir)
+-	-mkdir -p $(modulesdir)
+ 	-mkdir -p $(helpdir)
+ 	-mkdir -p $(docdir)
+-	-mkdir -p $(logsdir)
+-
 -generate-server-key:
 -	-_(_at_)_if test '!' -f $(etcdir)/silcd.pub ; then \
 -	  $(sbindir)/silcd -C $(etcdir); \
@@ -12,19 +16,19 @@
 -
 -sim-install:
 -	-$(INSTALL_DATA) $(srcdir)/lib/silcsim/*.so $(modulesdir)/
--
+ 
  doc-install:
  	$(INSTALL_DATA) $(srcdir)/doc/CodingStyle $(docdir)/
  	$(INSTALL_DATA) $(srcdir)/doc/FAQ $(docdir)/
 -	$(INSTALL_DATA) $(srcdir)/doc/example_* $(docdir)/
 -	$(INSTALL_DATA) $(srcdir)/doc/*.txt $(docdir)/
-+	$(INSTALL_DATA) $(srcdir)/doc/example_silc.conf $(docdir)/silc.conf.default
++	$(INSTALL_DATA) $(srcdir)/irssi/silc.conf $(docdir)/silc.conf.default
  	$(INSTALL_DATA) $(srcdir)/COPYING $(docdir)/
  	$(INSTALL_DATA) $(srcdir)/CHANGES $(docdir)/
  	$(INSTALL_DATA) $(srcdir)/CREDITS $(docdir)/
-@@ -558,24 +549,13 @@ toolkit-install:
- 	-$(INSTALL_DATA) $(srcdir)/doc/toolkit/silc* $(docdir)/toolkit
- 	-$(INSTALL_DATA) $(srcdir)/doc/toolkit/index* $(docdir)/toolkit
+@@ -558,26 +547,13 @@
+ 	-$(INSTALL_DATA) $(srcdir)/doc/toolkit/* $(docdir)/toolkit
+ 	-$(INSTALL_DATA) $(srcdir)/lib/doc/*.gif $(docdir)/toolkit
  
 -examples-install:
 -	-mkdir -p $(docdir)/examples/
@@ -35,11 +39,13 @@
  etc-install:
 -	-_(_at_)_if test '!' -f $(etcdir)/silcd.conf ; then \
 -	  $(INSTALL_DATA) $(srcdir)/doc/example_silcd.conf \
--	  $(etcdir)/silcd.conf; \
+-		$(etcdir)/silcd.conf; \
+-	  $(INSTALL_DATA) $(srcdir)/doc/silcalgs.conf \
+-		$(etcdir)/silcalgs.conf; \
 -          chmod go= $(etcdir)/silcd.conf; \
 -	fi
  	-_(_at_)_if test '!' -f $(etcdir)/silc.conf ; then \
- 	  $(INSTALL_DATA) $(srcdir)/doc/example_silc.conf \
+ 	  $(INSTALL_DATA) $(srcdir)/irssi/silc.conf \
  	  $(etcdir)/silc.conf; \
  	fi
  
diff -uNr --exclude=CVS silc-client.orig/pkg/INSTALL silc-client.new/pkg/INSTALL
--- silc-client.orig/pkg/INSTALL	Wed Jan 16 22:22:34 2002
+++ silc-client.new/pkg/INSTALL	Sun Mar 17 21:32:12 2002
@@ -7,7 +7,8 @@
 PATH=/bin:/usr/bin:/sbin:/usr/sbin
 PREFIX=${PKG_PREFIX:-/usr/local}
 CONFIG_DIR=${SYSCONFDIR}/silc
-SAMPLE_CONFIG_DIR=$PREFIX/share/examples/silc-client
+SAMPLE_CONFIG_DIR=$PREFIX/share/doc/silc
+THEME_DIR=$PREFIX/share/silc/themes
 
 do_notice_conf()
 {
@@ -24,9 +25,8 @@
 do_install_conf()
 {
     install -d -o root -g wheel -m 755 $CONFIG_DIR
-    install -o root -g wheel -m 644 $SAMPLE_CONFIG_DIR/config $CONFIG_DIR
-    install -o root -g wheel -m 644 $SAMPLE_CONFIG_DIR/default.theme $CONFIG_DIR
-    install -o root -g wheel -m 644 $SAMPLE_CONFIG_DIR/silc.conf $CONFIG_DIR
+    install -o root -g wheel -m 644 $SAMPLE_CONFIG_DIR/silc.conf.default $CONFIG_DIR/silc.conf
+    install -o root -g wheel -m 644 $THEME_DIR/default.theme $CONFIG_DIR
     echo
     echo "+---------------"
     echo "| The $1 configuration files have been installed in $CONFIG_DIR."
diff -uNr --exclude=CVS silc-client.orig/pkg/PLIST silc-client.new/pkg/PLIST
--- silc-client.orig/pkg/PLIST	Wed Jan 16 22:22:34 2002
+++ silc-client.new/pkg/PLIST	Sun Mar 17 21:39:48 2002
@@ -1,9 +1,8 @@
-_(_at_)_comment $OpenBSD: PLIST,v 1.1.1.1 2002/01/16 21:22:34 naddy Exp $
+_(_at_)_comment $OpenBSD$
 bin/silc
-share/doc/silc/README
-share/examples/silc-client/config
-share/examples/silc-client/default.theme
-share/examples/silc-client/silc.conf
+share/doc/silc/formats.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
@@ -34,6 +33,7 @@
 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
@@ -54,6 +54,7 @@
 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
@@ -68,6 +69,7 @@
 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
@@ -75,12 +77,22 @@
 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
+_(_at_)_dirrm share/silc/themes
+_(_at_)_dirrm share/silc/scripts
 @dirrm share/silc/help
 @dirrm share/silc
-_(_at_)_dirrm share/examples/silc-client
 @dirrm share/doc/silc

Visit your host, monkey.org