7 files changed, 48 insertions, 74 deletions

diff --git a/net/silc-client/Makefile b/net/silc-client/Makefile
index 37e798e01eaa..3a40b15ab1b6 100644
--- a/net/silc-client/Makefile
+++ b/net/silc-client/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	silc
-PORTVERSION=	0.6.4
+PORTVERSION=	0.6.6
 CATEGORIES=	net security
 MASTER_SITES=	http://www.silcnet.org/download/ \
 		ftp://ftp.silcnet.org/pub/silc/ \
@@ -25,22 +25,20 @@ DISTNAME=	${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
 
 MAINTAINER=	lioux@FreeBSD.org
 
+.ifndef(NOPORTDOCS)
+RUN_DEPENDS=	${LOCALBASE}/share/doc/silc/CREDITS:${.CURDIR}/../silc-doc
+.endif
+
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_GLIB=	yes
-CONFIGURE_ARGS=	--with-docdir=share/doc/${PORTNAME} \
-		--with-etcdir=${PREFIX}/etc/${PORTNAME} \
-		--with-helpdir=share/${PORTNAME}/help \
-		--with-simdir=libexec/${PORTNAME}/modules
+CONFIGURE_ARGS=	--with-etcdir=${PREFIX}/etc/${PORTNAME} \
+		--with-helpdir=${PREFIX}/share/${PORTNAME}/help
 PLIST_SUB=	INSTALL_DIR="${INSTALL_DIR}"
 PKGDEINSTALL=	${PKGINSTALL}
 
 INSTALL_DIR?=	${INSTALL} -d -o ${BINOWN} -g ${BINGRP} -m 755
 
-.ifdef(NOPORTDOCS)
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-Makefile.in-noportdocs
-.endif
-
 .ifdef(WITHOUT_OPTIMIZED_ASM)
 CONFIGURE_ARGS+=	--disable-asm
 .endif
diff --git a/net/silc-client/distinfo b/net/silc-client/distinfo
index 6c15d58be630..87283167ec76 100644
--- a/net/silc-client/distinfo
+++ b/net/silc-client/distinfo
@@ -1 +1 @@
-MD5 (silc-client-0.6.4.tar.bz2) = ff876b47b4a83e31775a8e9e25cd300f
+MD5 (silc-client-0.6.6.tar.bz2) = 60f42d1a218a8153e3bf84b2d28636c1
diff --git a/net/silc-client/files/extra-patch-Makefile.in-noportdocs b/net/silc-client/files/extra-patch-Makefile.in-noportdocs
deleted file mode 100644
index 56f87c3d8be7..000000000000
--- a/net/silc-client/files/extra-patch-Makefile.in-noportdocs
+++ /dev/null
@@ -1,34 +0,0 @@
---- Makefile.in.orig	Fri Nov  9 02:21:14 2001
-+++ Makefile.in	Fri Nov  9 02:22:13 2001
-@@ -145,9 +145,9 @@
- 
- AUTOMAKE_OPTIONS = 1.0 no-dependencies foreign
- 
--COMMONDIRS = lib irssi silc silcd doc includes
--SUBDIRS = lib irssi doc includes
--DIST_SUBDIRS = lib irssi doc includes
-+COMMONDIRS = lib irssi silc silcd includes
-+SUBDIRS = lib irssi includes
-+DIST_SUBDIRS = lib irssi includes
- 
- #
- # INCLUDE defines
-@@ -514,7 +514,6 @@
- 	-mkdir -p $(etcdir)
- 	-mkdir -p $(modulesdir)
- 	-mkdir -p $(helpdir)
--	-mkdir -p $(docdir)
- 	-mkdir -p $(logsdir)
- 
- generate-server-key:
-@@ -543,8 +542,8 @@
- 	  $(etcdir)/silc.conf; \
- 	fi
- 
--@SILC_DIST_CLIENT_TRUE@install-data-hook: install-dirs sim-install doc-install etc-install
--@SILC_DIST_CLIENT_FALSE@install-data-hook: install-dirs generate-server-key sim-install doc-install etc-install
-+@SILC_DIST_CLIENT_TRUE@install-data-hook: install-dirs sim-install etc-install
-+@SILC_DIST_CLIENT_FALSE@install-data-hook: install-dirs generate-server-key sim-install etc-install
- # 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-client/files/patch-Makefile.in b/net/silc-client/files/patch-Makefile.in
index 8ec4bb81fc63..89bac09247e3 100644
--- a/net/silc-client/files/patch-Makefile.in
+++ b/net/silc-client/files/patch-Makefile.in
@@ -1,14 +1,30 @@
 --- Makefile.in.orig	Fri Nov  2 22:58:36 2001
-+++ Makefile.in	Fri Nov  9 18:15:27 2001
-@@ -515,7 +515,6 @@
- 	-mkdir -p $(modulesdir)
++++ Makefile.in	Mon Nov 12 23:14:54 2001
+@@ -145,9 +145,9 @@
+ 
+ AUTOMAKE_OPTIONS = 1.0 no-dependencies foreign
+ 
+-COMMONDIRS = lib irssi silc silcd doc includes
+-SUBDIRS = lib irssi doc includes
+-DIST_SUBDIRS = lib irssi doc includes
++COMMONDIRS = lib irssi silc includes
++SUBDIRS = lib irssi includes
++DIST_SUBDIRS = lib irssi includes
+ 
+ #
+ # INCLUDE defines
+@@ -512,10 +512,7 @@
+ 
+ install-dirs:
+ 	-mkdir -p $(etcdir)
+-	-mkdir -p $(modulesdir)
  	-mkdir -p $(helpdir)
- 	-mkdir -p $(docdir)
+-	-mkdir -p $(docdir)
 -	-mkdir -p $(logsdir)
  
  generate-server-key:
  	-@if test '!' -f $(etcdir)/silcd.pub ; then \
-@@ -538,14 +537,9 @@
+@@ -538,18 +535,13 @@
  	$(INSTALL_DATA) $(srcdir)/TODO $(docdir)/
  
  etc-install:
@@ -17,11 +33,16 @@
 -	  $(etcdir)/silcd.conf; \
 -          chmod go= $(etcdir)/silcd.conf; \
 -	fi
--	-@if test '!' -f $(etcdir)/silc.conf ; then \
-+	-@if test '!' -f $(etcdir)/silc.conf.sample ; then \
+ 	-@if test '!' -f $(etcdir)/silc.conf ; then \
  	  $(INSTALL_DATA) $(srcdir)/doc/example_silc.conf \
 -	  $(etcdir)/silc.conf; \
 +	  $(etcdir)/silc.conf.sample; \
  	fi
  
- @SILC_DIST_CLIENT_TRUE@install-data-hook: install-dirs sim-install doc-install etc-install
+-@SILC_DIST_CLIENT_TRUE@install-data-hook: install-dirs sim-install doc-install etc-install
+-@SILC_DIST_CLIENT_FALSE@install-data-hook: install-dirs generate-server-key sim-install doc-install etc-install
++@SILC_DIST_CLIENT_TRUE@install-data-hook: install-dirs etc-install
++@SILC_DIST_CLIENT_FALSE@install-data-hook: install-dirs generate-server-key etc-install
+ # 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-client/files/patch-irssi:docs:Makefile.in b/net/silc-client/files/patch-irssi:docs:Makefile.in
new file mode 100644
index 000000000000..68cba29c7bf3
--- /dev/null
+++ b/net/silc-client/files/patch-irssi:docs:Makefile.in
@@ -0,0 +1,11 @@
+--- irssi/docs/Makefile.in.orig	Fri Nov  2 22:58:58 2001
++++ irssi/docs/Makefile.in	Mon Nov 12 23:56:17 2001
+@@ -385,7 +385,7 @@
+ 
+ info-am:
+ 
+-install-data-am: install-docDATA
++install-data-am:
+ 
+ install-exec-am:
+ 
diff --git a/net/silc-client/pkg-install b/net/silc-client/pkg-install
index 7a7c37734c54..554154b67b2e 100644
--- a/net/silc-client/pkg-install
+++ b/net/silc-client/pkg-install
@@ -35,7 +35,6 @@ POST-INSTALL)
 			${CONF_DIR}/${CONF_FILE}${SAMP_SUFX} \
 			${CONF_DIR}/${CONF_FILE}
 	fi
-	${INSTALL_DIR} ${PKG_PREFIX}/libexec/silc/modules
 	;;
 
 DEINSTALL)
@@ -47,12 +46,6 @@ DEINSTALL)
 		echo "$PKGNAME: However, if you are permanently removing this port, you should do a 'rm -f ${CONF_DIR}/${CONF_FILE}' to remove the configuration file left."
 		echo "$PKGNAME: Also, do not forget to 'rmdir ${CONF_DIR} 2>/dev/null'"
 	fi
-
-	${RMDIR} ${PKG_PREFIX}/libexec/silc/modules 2>/dev/null
-	if [ -d ${PKG_PREFIX}/libexec/silc ]
-	then
-		${RMDIR} ${PKG_PREFIX}/libexec/silc 2>/dev/null || echo "$PKGNAME: Will not remove silc modules. If permanently removing the port, 'rm -Rf ${PKG_PREFIX}/libexec/silc'"
-	fi
 	;;
 
 PRE-INSTALL|POST-DEINSTALL)
diff --git a/net/silc-client/pkg-plist b/net/silc-client/pkg-plist
index 7fbdadf83a26..5665206582ae 100644
--- a/net/silc-client/pkg-plist
+++ b/net/silc-client/pkg-plist
@@ -2,20 +2,6 @@ bin/silc
 etc/silc/config
 etc/silc/default.theme
 etc/silc/silc.conf.sample
-%%PORTDOCS%%share/doc/silc/CHANGES
-%%PORTDOCS%%share/doc/silc/COPYING
-%%PORTDOCS%%share/doc/silc/CREDITS
-%%PORTDOCS%%share/doc/silc/CodingStyle
-%%PORTDOCS%%share/doc/silc/FAQ
-%%PORTDOCS%%share/doc/silc/INSTALL
-%%PORTDOCS%%share/doc/silc/README
-%%PORTDOCS%%share/doc/silc/TODO
-%%PORTDOCS%%share/doc/silc/draft-riikonen-silc-commands-02.txt
-%%PORTDOCS%%share/doc/silc/draft-riikonen-silc-ke-auth-04.txt
-%%PORTDOCS%%share/doc/silc/draft-riikonen-silc-pp-04.txt
-%%PORTDOCS%%share/doc/silc/draft-riikonen-silc-spec-04.txt
-%%PORTDOCS%%share/doc/silc/example_silc.conf
-%%PORTDOCS%%share/doc/silc/example_silcd.conf
 share/silc/help/action
 share/silc/help/admin
 share/silc/help/alias
@@ -94,5 +80,4 @@ share/silc/help/whowas
 share/silc/help/window
 @dirrm share/silc/help
 @dirrm share/silc
-%%PORTDOCS%%@dirrm share/doc/silc
 @unexec rmdir %D/etc/silc 2>/dev/null || true