diff --git a/net/silc-server/Makefile b/net/silc-server/Makefile index 6931493bc1a..eda3438407e 100644 --- a/net/silc-server/Makefile +++ b/net/silc-server/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2002/12/16 03:40:02 brad Exp $ +# $OpenBSD: Makefile,v 1.2 2003/01/22 03:34:59 brad Exp $ COMMENT= "Secure Live Internet Conferencing (SILC) server" -DISTNAME= silc-server-0.9.10.1 +DISTNAME= silc-server-0.9.11 CATEGORIES= net HOMEPAGE= http://www.silcnet.org/ diff --git a/net/silc-server/distinfo b/net/silc-server/distinfo index 439f0e0786a..f8537a3b813 100644 --- a/net/silc-server/distinfo +++ b/net/silc-server/distinfo @@ -1,3 +1,3 @@ -MD5 (silc-server-0.9.10.1.tar.gz) = c9f38a023efba5147edc73ed33496855 -RMD160 (silc-server-0.9.10.1.tar.gz) = b799b7f26156a8daf17f9df97f089a927fa7c7a4 -SHA1 (silc-server-0.9.10.1.tar.gz) = c9da5fb9b9b2e515e9e4854771b337cacd11922c +MD5 (silc-server-0.9.11.tar.gz) = 26357ed07984d6621455faa9e2afb5fc +RMD160 (silc-server-0.9.11.tar.gz) = f438894a716e7beef48caa505511c043ba8fd78d +SHA1 (silc-server-0.9.11.tar.gz) = 8e87d3f4c72e45607b2e1335eba204e492cba1ff diff --git a/net/silc-server/patches/gcc-patch-lib_silccrypt_Makefile_in b/net/silc-server/patches/gcc-patch-lib_silccrypt_Makefile_in index d0ad1a0acf6..8cc067ba2bf 100644 --- a/net/silc-server/patches/gcc-patch-lib_silccrypt_Makefile_in +++ b/net/silc-server/patches/gcc-patch-lib_silccrypt_Makefile_in @@ -1,13 +1,13 @@ -$OpenBSD: gcc-patch-lib_silccrypt_Makefile_in,v 1.1.1.1 2002/12/16 03:40:02 brad Exp $ ---- lib/silccrypt/Makefile.in.orig Sat May 18 01:40:59 2002 -+++ lib/silccrypt/Makefile.in Tue May 21 20:07:34 2002 -@@ -290,6 +290,9 @@ mostlyclean-compile: +$OpenBSD: gcc-patch-lib_silccrypt_Makefile_in,v 1.2 2003/01/22 03:34:59 brad Exp $ +--- lib/silccrypt/Makefile.in.orig Wed Jan 8 10:25:45 2003 ++++ lib/silccrypt/Makefile.in Sat Jan 11 08:26:00 2003 +@@ -360,6 +360,9 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c +sha1.o: -+ $(COMPILE) -O0 -c `test -f $< || echo '$(srcdir)/'`$< ++ $(COMPILE) -O0 -c `test -f '$<' || echo '$(srcdir)/'`$< + .c.o: - $(COMPILE) -c `test -f $< || echo '$(srcdir)/'`$< + $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< diff --git a/net/silc-server/patches/gcc-patch-lib_silcsim_Makefile_in b/net/silc-server/patches/gcc-patch-lib_silcsim_Makefile_in index a2d54c16baa..b5ddfce9bf0 100644 --- a/net/silc-server/patches/gcc-patch-lib_silcsim_Makefile_in +++ b/net/silc-server/patches/gcc-patch-lib_silcsim_Makefile_in @@ -1,13 +1,13 @@ -$OpenBSD: gcc-patch-lib_silcsim_Makefile_in,v 1.1.1.1 2002/12/16 03:40:02 brad Exp $ ---- lib/silcsim/Makefile.in.orig Sat Sep 7 14:04:47 2002 -+++ lib/silcsim/Makefile.in Sat Oct 5 07:59:27 2002 -@@ -440,6 +440,9 @@ uninstall-am: uninstall-includeHEADERS u +$OpenBSD: gcc-patch-lib_silcsim_Makefile_in,v 1.2 2003/01/22 03:34:59 brad Exp $ +--- lib/silcsim/Makefile.in.orig Wed Jan 8 10:25:49 2003 ++++ lib/silcsim/Makefile.in Sat Jan 11 08:24:42 2003 +@@ -563,6 +563,9 @@ uninstall-am: uninstall-includeHEADERS u @SILC_SIM_TRUE@all: $(SIM_CIPHER_OBJS) $(SIM_HASH_OBJS) +sha1.o: + $(LTCOMPILE) -O0 -c $(srcdir)/../silccrypt/$*.c + - $(SIM_CIPHER_OBJS): ../silccrypt/libsilccrypt.a - $(LTCOMPILE) -c $(srcdir)/../silccrypt/$*.c - $(LIBTOOL) --mode=link $(LINK) -rpath $(silc_modulesdir) -o lib$*.la $*.lo + $(SIM_CIPHER_OBJS): + @if test '!' -f lib$*.la ; then \ + $(LIBTOOL) --mode=link $(CCLD) -rpath $(silc_modulesdir) \ diff --git a/net/silc-server/patches/patch-Makefile_in b/net/silc-server/patches/patch-Makefile_in index 0c5f87194af..37a52f5dfe9 100644 --- a/net/silc-server/patches/patch-Makefile_in +++ b/net/silc-server/patches/patch-Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-Makefile_in,v 1.1.1.1 2002/12/16 03:40:02 brad Exp $ ---- Makefile.in.orig Thu Dec 5 15:44:04 2002 -+++ Makefile.in Sat Dec 14 21:37:10 2002 -@@ -707,20 +707,12 @@ install-dirs-client: install-dirs +$OpenBSD: patch-Makefile_in,v 1.2 2003/01/22 03:34:59 brad Exp $ +--- Makefile.in.orig Wed Jan 8 10:25:40 2003 ++++ Makefile.in Sat Jan 11 08:20:57 2003 +@@ -709,20 +709,12 @@ install-dirs-client: install-dirs -mkdir -p $(mandir)/man1 install-dirs-server: install-dirs @@ -23,7 +23,7 @@ $OpenBSD: patch-Makefile_in,v 1.1.1.1 2002/12/16 03:40:02 brad Exp $ doc-install-client: doc-install $(INSTALL_DATA) $(srcdir)/irssi/silc.conf $(docdir)/example_silc.conf -@@ -729,13 +721,8 @@ doc-install-client: doc-install +@@ -731,13 +723,8 @@ doc-install-client: doc-install fi doc-install-server: doc-install @@ -39,7 +39,7 @@ $OpenBSD: patch-Makefile_in,v 1.1.1.1 2002/12/16 03:40:02 brad Exp $ etc-install-client: -@if test '!' -d $(srcdir)/irssi ; then \ -@@ -766,7 +753,7 @@ toolkit-install: +@@ -768,7 +755,7 @@ toolkit-install: examples-install: -mkdir -p $(docdir)/examples/ -$(INSTALL_DATA) $(srcdir)/doc/examples/README $(docdir)/examples/ @@ -48,7 +48,7 @@ $OpenBSD: patch-Makefile_in,v 1.1.1.1 2002/12/16 03:40:02 brad Exp $ generate-server-key: -@if test '!' -f $(etcdir)/silcd.pub ; then \ -@@ -775,7 +762,7 @@ generate-server-key: +@@ -777,7 +764,7 @@ generate-server-key: @SILC_DIST_CLIENT_TRUE@install-data-hook: install-dirs-client sim-install doc-install-client etc-install-client @SILC_DIST_CLIENT_FALSE@@SILC_DIST_TOOLKIT_TRUE@install-data-hook: install-dirs-client install-dirs-server sim-install doc-install-client doc-install-server toolkit-install examples-install etc-install-client etc-install-server generate-server-key diff --git a/net/silc-server/patches/patch-lib_Makefile_in b/net/silc-server/patches/patch-lib_Makefile_in index af8f63ec8ed..adab6926a2f 100644 --- a/net/silc-server/patches/patch-lib_Makefile_in +++ b/net/silc-server/patches/patch-lib_Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-lib_Makefile_in,v 1.1.1.1 2002/12/16 03:40:02 brad Exp $ ---- lib/Makefile.in.orig Fri Dec 6 13:20:38 2002 -+++ lib/Makefile.in Sun Dec 15 16:40:03 2002 -@@ -482,7 +482,6 @@ install-data-am: +$OpenBSD: patch-lib_Makefile_in,v 1.2 2003/01/22 03:34:59 brad Exp $ +--- lib/Makefile.in.orig Wed Jan 8 10:25:42 2003 ++++ lib/Makefile.in Sat Jan 11 08:20:57 2003 +@@ -484,7 +484,6 @@ install-data-am: install-exec-am: @$(NORMAL_INSTALL)