3 files changed, 63 insertions, 45 deletions
diff --git a/net/silc-server/files/patch-Makefile.in b/net/silc-server/files/patch-Makefile.in
index c672907a128d..0b606fc49091 100644
--- a/net/silc-server/files/patch-Makefile.in
+++ b/net/silc-server/files/patch-Makefile.in
@@ -1,30 +1,37 @@
---- Makefile.in.orig	Mon Jul  1 13:55:06 2002
-+++ Makefile.in	Wed Jul 17 18:43:13 2002
-@@ -151,7 +151,7 @@
+--- Makefile.in.orig	Thu Dec  5 19:43:42 2002
++++ Makefile.in	Tue Dec 31 18:26:52 2002
+@@ -231,7 +231,7 @@
  
  AUTOMAKE_OPTIONS = 1.0 no-dependencies foreign
  
 -COMMONDIRS = lib irssi silc silcd doc includes
-+COMMONDIRS = lib irssi silcd includes
++COMMONDIRS = lib irssi silcd doc includes
  
  # Sub directories defined by "distributions" file, and can be overridden
  # with ./configure, which substitutes these variables.
-@@ -531,9 +531,6 @@
- 
+@@ -700,7 +700,6 @@
  install-dirs:
  	-mkdir -p $(etcdir)
--	-mkdir -p $(modulesdir)
--	-mkdir -p $(helpdir)
+ 	-mkdir -p $(modulesdir)
 -	-mkdir -p $(docdir)
- 	-mkdir -p $(logsdir)
  
- generate-server-key:
-@@ -568,21 +565,17 @@
- 	$(INSTALL_DATA) $(srcdir)/doc/examples/cell* $(docdir)/examples/
+ install-dirs-client: install-dirs
+ 	-mkdir -p $(helpdir)
+@@ -728,8 +727,7 @@
+ 	 $(INSTALL_DATA) $(srcdir)/doc/silc.1 $(mandir)/man1; \
+ 	fi
+ 
+-doc-install-server: doc-install
+-	-$(INSTALL_DATA) $(srcdir)/doc/example_silcd.conf $(docdir)/
++doc-install-server:
+ 	-@if test -f $(srcdir)/doc/silcd.8 ; then \
+ 	 $(INSTALL_DATA) $(srcdir)/doc/silcd.8 $(mandir)/man8; \
+ 	fi
+@@ -746,13 +744,11 @@
+ 	fi
  
- etc-install:
+ etc-install-server:
 -	-@if test '!' -f $(etcdir)/silcd.conf ; then \
-+	-@if test '!' -f $(etcdir)/silcd.conf.sample ; then \
  	  $(INSTALL_DATA) $(srcdir)/doc/example_silcd.conf \
 -		$(etcdir)/silcd.conf; \
 +		$(etcdir)/silcd.conf.sample; \
@@ -32,19 +39,30 @@
 -		$(etcdir)/silcalgs.conf; \
 -          chmod go= $(etcdir)/silcd.conf; \
 -	fi
--	-@if test '!' -f $(etcdir)/silc.conf ; then \
--	  $(INSTALL_DATA) $(srcdir)/irssi/silc.conf \
--	  $(etcdir)/silc.conf; \
 +		$(etcdir)/silcalgs.conf.sample; \
-+          chmod go= $(etcdir)/silcd.conf.sample; \
- 	fi
++          chmod go= $(etcdir)/silcd.conf.sample
+ 
+ sim-install:
+ 	-$(INSTALL_DATA) $(srcdir)/lib/silcsim/*.so $(modulesdir)/
+@@ -764,9 +760,9 @@
+ 	-cp -R $(srcdir)/tutorial $(prefix)
+ 
+ examples-install:
+-	-mkdir -p $(docdir)/examples/
+-	-$(INSTALL_DATA) $(srcdir)/doc/examples/README $(docdir)/examples/
+-	-$(INSTALL_DATA) $(srcdir)/doc/examples/silc* $(docdir)/examples/
++	-mkdir -p $(prefix)/share/examples/silc
++	-$(INSTALL_DATA) $(srcdir)/doc/examples/README $(prefix)/share/examples/silc
++	-$(INSTALL_DATA) $(srcdir)/doc/examples/silc* $(prefix)/share/examples/silc
+ 
+ generate-server-key:
+ 	-@if test '!' -f $(etcdir)/silcd.pub ; then \
+@@ -775,7 +771,7 @@
  
--@SILC_DIST_CLIENT_TRUE@install-data-hook: install-dirs sim-install doc-install etc-install
--@SILC_DIST_CLIENT_FALSE@@SILC_DIST_TOOLKIT_TRUE@install-data-hook: install-dirs generate-server-key sim-install doc-install toolkit-install examples-install etc-install
--@SILC_DIST_CLIENT_FALSE@@SILC_DIST_TOOLKIT_FALSE@install-data-hook: install-dirs generate-server-key sim-install doc-install examples-install etc-install
-+@SILC_DIST_CLIENT_TRUE@install-data-hook: install-dirs etc-install
-+@SILC_DIST_CLIENT_FALSE@@SILC_DIST_TOOLKIT_TRUE@install-data-hook: install-dirs etc-install
-+@SILC_DIST_CLIENT_FALSE@@SILC_DIST_TOOLKIT_FALSE@install-data-hook: install-dirs etc-install
+ @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
+-@SILC_DIST_CLIENT_FALSE@@SILC_DIST_TOOLKIT_FALSE@install-data-hook: install-dirs-server sim-install doc-install-server examples-install etc-install-server generate-server-key
++@SILC_DIST_CLIENT_FALSE@@SILC_DIST_TOOLKIT_FALSE@install-data-hook: install-dirs-server sim-install doc-install-server examples-install etc-install-server
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
  .NOEXPORT:
diff --git a/net/silc-server/files/patch-configure b/net/silc-server/files/patch-configure
index 4dbda2cd8a03..855c335539d3 100644
--- a/net/silc-server/files/patch-configure
+++ b/net/silc-server/files/patch-configure
@@ -1,15 +1,6 @@
---- configure.orig	Thu Sep 19 18:57:28 2002
-+++ configure	Thu Sep 19 18:58:28 2002
-@@ -2626,7 +2626,7 @@
- # value. Do not edit!
- #
- silc_dist=silc-server
--SILC_DIST_SUBDIRS="lib silcd doc includes"
-+SILC_DIST_SUBDIRS="lib silcd includes"
- cat >>confdefs.h <<\EOF
- #define SILC_DIST_SERVER 1
- EOF
-@@ -11978,7 +11978,7 @@
+--- configure.orig	Tue Dec 31 17:49:16 2002
++++ configure	Tue Dec 31 17:49:55 2002
+@@ -14526,7 +14526,7 @@
        fi
        ;;
      *-*-freebsd*)
diff --git a/net/silc-server/files/patch-silcd:Makefile.in b/net/silc-server/files/patch-silcd:Makefile.in
index 7fa1d1b338e8..ab086f70c2ba 100644
--- a/net/silc-server/files/patch-silcd:Makefile.in
+++ b/net/silc-server/files/patch-silcd:Makefile.in
@@ -1,13 +1,22 @@
---- silcd/Makefile.in.orig	Wed Jul 17 18:20:09 2002
-+++ silcd/Makefile.in	Wed Jul 17 18:20:33 2002
-@@ -259,8 +259,8 @@
+--- silcd/Makefile.in.orig	Thu Dec  5 19:43:48 2002
++++ silcd/Makefile.in	Tue Dec 31 18:08:15 2002
+@@ -130,7 +130,7 @@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ LDFLAGS = @LDFLAGS@
+ 
+-LIBS = $(SILC_COMMON_LIBS) -lsilc
++LIBS = -L$(top_srcdir)/lib/.libs $(SILC_COMMON_LIBS) -lsilc
+ LIBSILCCLIENT_AGE = @LIBSILCCLIENT_AGE@
+ LIBSILCCLIENT_CURRENT = @LIBSILCCLIENT_CURRENT@
+ LIBSILCCLIENT_REVISION = @LIBSILCCLIENT_REVISION@
+@@ -326,8 +326,8 @@
  	     || test -f $$p1 \
  	  ; then \
- 	    f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \
--	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(sbindir)/$$f"; \
--	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(sbindir)/$$f; \
-+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(sbindir)/$$p"; \
-+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(sbindir)/$$p; \
+ 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) $$p $(DESTDIR)$(sbindir)/$$f"; \
+-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) $$p $(DESTDIR)$(sbindir)/$$f || exit 1; \
++	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) $$p $(DESTDIR)$(sbindir)/$$p"; \
++	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) $$p $(DESTDIR)$(sbindir)/$$p || exit 1; \
  	  else :; fi; \
  	done