4 files changed, 32 insertions, 27 deletions

diff --git a/net/silc-client/Makefile b/net/silc-client/Makefile
index 485ed8259899..7f4f9626deea 100644
--- a/net/silc-client/Makefile
+++ b/net/silc-client/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	silc
-PORTVERSION=	0.9.10.1
+PORTVERSION=	0.9.12.1
 CATEGORIES=	net ipv6 security
 MASTER_SITES=	http://www.silcnet.org/download/%SUBDIR%/ \
 		http://ftp.silcnet.org/%SUBDIR%/ \
@@ -24,21 +24,19 @@ MASTER_SITE_SUBDIR=	client/sources
 PKGNAMESUFFIX=	-client
 DISTNAME=	${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	aquatique@rusunix.org
 COMMENT=	Secure Internet Live Conferencing (SILC) network client
 
-.ifndef(NOPORTDOCS)
-RUN_DEPENDS=	${LOCALBASE}/share/doc/silc/CREDITS:${.CURDIR}/../silc-doc
-.endif
-
 USE_BZIP2=	yes
 USE_PERL5=	yes
 GNU_CONFIGURE=	yes
 USE_GNOME=	glib12
 USE_LIBTOOL=	yes
+USE_GMAKE=	yes
 CONFIGURE_ARGS=	--with-etcdir=${PREFIX}/etc/${PORTNAME} \
 		--with-simdir=${PREFIX}/lib/silcsim/client \
-		--with-helpdir=${PREFIX}/share/${PORTNAME}/help
+		--with-helpdir=${PREFIX}/share/${PORTNAME}/help \
+		--with-docdir=${PREFIX}/share/doc/silc
 INSTALLS_SHLIB=	yes
 PLIST_SUB=	INSTALL_DIR="${INSTALL_DIR}"
 PKGDEINSTALL=	${PKGINSTALL}
diff --git a/net/silc-client/distinfo b/net/silc-client/distinfo
index 4cb471a142c2..46f2c657d1f8 100644
--- a/net/silc-client/distinfo
+++ b/net/silc-client/distinfo
@@ -1 +1 @@
-MD5 (silc-client-0.9.10.1.tar.bz2) = 6c6c5e0826b70dc99d7fe9710728b27e
+MD5 (silc-client-0.9.12.1.tar.bz2) = 0ea94745b3036e4dcc18f6e8e54bbaa5
diff --git a/net/silc-client/files/patch-Makefile.in b/net/silc-client/files/patch-Makefile.in
index 4f4d4f1e6914..60b26a65e0aa 100644
--- a/net/silc-client/files/patch-Makefile.in
+++ b/net/silc-client/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig	Thu Dec  5 19:38:34 2002
-+++ Makefile.in	Sun Dec 29 15:27:21 2002
-@@ -231,7 +231,7 @@
+--- Makefile.in.orig	Tue Mar 18 15:40:51 2003
++++ Makefile.in	Wed Sep 24 20:17:07 2003
+@@ -233,7 +233,7 @@
  
  AUTOMAKE_OPTIONS = 1.0 no-dependencies foreign
  
@@ -9,19 +9,25 @@
  
  # Sub directories defined by "distributions" file, and can be overridden
  # with ./configure, which substitutes these variables.
-@@ -700,11 +700,9 @@
- install-dirs:
- 	-mkdir -p $(etcdir)
- 	-mkdir -p $(modulesdir)
--	-mkdir -p $(docdir)
+@@ -706,17 +706,13 @@
  
  install-dirs-client: install-dirs
  	-mkdir -p $(helpdir)
--	-mkdir -p $(mandir)/man1
+-	-mkdir -p $(mansdir)/man1
  
  install-dirs-server: install-dirs
  	-mkdir -p $(logsdir)
-@@ -738,12 +736,8 @@
+-	-mkdir -p $(mansdir)/man5
+-	-mkdir -p $(mansdir)/man8
+ 
+ doc-install:
+ 	-$(INSTALL_DATA) $(srcdir)/doc/CodingStyle $(docdir)/
+ 	-$(INSTALL_DATA) $(srcdir)/doc/FAQ $(docdir)/
+-	-$(INSTALL_DATA) $(srcdir)/doc/*.txt $(docdir)/
+ 	-$(INSTALL_DATA) $(srcdir)/COPYING $(docdir)/
+ 	-$(INSTALL_DATA) $(srcdir)/CHANGES $(docdir)/
+ 	-$(INSTALL_DATA) $(srcdir)/CREDITS $(docdir)/
+@@ -740,12 +736,8 @@
  	fi
  
  etc-install-client:
@@ -35,12 +41,3 @@
  
  etc-install-server:
  	-@if test '!' -f $(etcdir)/silcd.conf ; then \
-@@ -773,7 +767,7 @@
- 	  $(sbindir)/silcd -C $(etcdir); \
- 	fi
- 
--@SILC_DIST_CLIENT_TRUE@install-data-hook: install-dirs-client sim-install doc-install-client etc-install-client
-+@SILC_DIST_CLIENT_TRUE@install-data-hook: install-dirs-client sim-install 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
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/net/silc-client/pkg-plist b/net/silc-client/pkg-plist
index 7e723964964a..4ee77331b3af 100644
--- a/net/silc-client/pkg-plist
+++ b/net/silc-client/pkg-plist
@@ -109,10 +109,20 @@ share/silc/scripts/hello.pl
 share/silc/scripts/mail-maildir.pl
 share/silc/scripts/mail.pl
 share/silc/themes/default.theme
+%%PORTDOCS%%%%DOCSDIR%%/CodingStyle
+%%PORTDOCS%%%%DOCSDIR%%/FAQ
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/CHANGES
+%%PORTDOCS%%%%DOCSDIR%%/CREDITS
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/example_silc.conf
 @dirrm share/silc/themes
 @dirrm share/silc/scripts
 @dirrm share/silc/help
 @dirrm share/silc
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm lib/silcsim/client
 @unexec rmdir %D/lib/silcsim 2>/dev/null || true
 @unexec rmdir %D/etc/silc 2>/dev/null || true