From aquatique@rusunix.org  Tue Jun 24 03:34:57 2003
Return-Path: <aquatique@rusunix.org>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 1E68137B401
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 24 Jun 2003 03:34:57 -0700 (PDT)
Received: from rusunix.org (rusunix.org [195.162.58.254])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 6557D43F85
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 24 Jun 2003 03:34:54 -0700 (PDT)
	(envelope-from aquatique@rusunix.org)
Received: by rusunix.org (CommuniGay Pro, from userid 1111)
	id 5F63D1CD683; Tue, 24 Jun 2003 17:34:51 +0700 (OMSST)
Message-Id: <20030624103451.5F63D1CD683@rusunix.org>
Date: Tue, 24 Jun 2003 17:34:51 +0700 (OMSST)
From: Evgueni V.Gavrilov <aquatique@rusunix.org>
Reply-To: <aquatique@rusunix.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: update net/silc-client to current version
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         53672
>Category:       ports
>Synopsis:       update net/silc-client to current version
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    krion
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jun 24 03:40:16 PDT 2003
>Closed-Date:    Wed Sep 24 11:04:06 PDT 2003
>Last-Modified:  Wed Sep 24 11:04:06 PDT 2003
>Originator:     
>Release:        FreeBSD 4.8-RELEASE i386
>Organization:
rusunix.org
>Environment:
System: FreeBSD rusunix.org 4.8-RELEASE FreeBSD 4.8-RELEASE #0: Fri Jun 13 18:32:49 OMSST 2003 aquatique@rusunix.org:/usr/obj/usr/src/sys/NEWMONSTER i386

>Description:
	update net/silc-client to current version (issued 3 months ago)
>How-To-Repeat:
	patch ...
>Fix:

diff -ruN silc-client.OLD/Makefile silc-client/Makefile
--- silc-client.OLD/Makefile	Tue Jun 24 17:29:30 2003
+++ silc-client/Makefile	Tue Jun 24 17:11:32 2003
@@ -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%/ \
@@ -27,15 +27,12 @@
 MAINTAINER=	lioux@FreeBSD.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
diff -ruN silc-client.OLD/distinfo silc-client/distinfo
--- silc-client.OLD/distinfo	Tue Jun 24 17:29:30 2003
+++ silc-client/distinfo	Tue Jun 24 17:05:53 2003
@@ -1 +1 @@
-MD5 (silc-client-0.9.10.1.tar.bz2) = 6c6c5e0826b70dc99d7fe9710728b27e
+MD5 (silc-client-0.9.12.1.tar.bz2) = 0ea94745b3036e4dcc18f6e8e54bbaa5
diff -ruN silc-client.OLD/files/patch-Makefile.in silc-client/files/patch-Makefile.in
--- silc-client.OLD/files/patch-Makefile.in	Tue Jun 24 17:29:30 2003
+++ silc-client/files/patch-Makefile.in	Tue Jun 24 17:07:43 2003
@@ -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	Tue Jun 24 17:07:26 2003
+@@ -233,7 +233,7 @@
  
  AUTOMAKE_OPTIONS = 1.0 no-dependencies foreign
  
@@ -9,7 +9,7 @@
  
  # Sub directories defined by "distributions" file, and can be overridden
  # with ./configure, which substitutes these variables.
-@@ -700,11 +700,9 @@
+@@ -702,16 +702,12 @@
  install-dirs:
  	-mkdir -p $(etcdir)
  	-mkdir -p $(modulesdir)
@@ -17,11 +17,16 @@
  
  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)/
+@@ -740,12 +736,8 @@
  	fi
  
  etc-install-client:
@@ -35,7 +40,7 @@
  
  etc-install-server:
  	-@if test '!' -f $(etcdir)/silcd.conf ; then \
-@@ -773,7 +767,7 @@
+@@ -775,7 +767,7 @@
  	  $(sbindir)/silcd -C $(etcdir); \
  	fi
  
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->lioux 
Responsible-Changed-By: osa 
Responsible-Changed-When: Tue Jun 24 04:05:27 PDT 2003 
Responsible-Changed-Why:  
Over to maintainer. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=53672 
Responsible-Changed-From-To: lioux->freebsd-ports-bugs 
Responsible-Changed-By: lioux 
Responsible-Changed-When: Sun Sep 7 19:07:54 PDT 2003 
Responsible-Changed-Why:  
No longer maintain this port 

http://www.freebsd.org/cgi/query-pr.cgi?pr=53672 
Responsible-Changed-From-To: freebsd-ports-bugs->krion  
Responsible-Changed-By: krion 
Responsible-Changed-When: Thu Sep 18 00:26:21 PDT 2003 
Responsible-Changed-Why:  
I'll handle this. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=53672 

From: "Evgueni V. Gavrilov" <aquatique@rusunix.org>
To: freebsd-gnats-submit@FreeBSD.org
Cc:  
Subject: Re: ports/53672: update net/silc-client to current version
Date: Thu, 18 Sep 2003 14:52:21 +0700

 This is a multi-part message in MIME format.
 --------------070200050306040806000603
 Content-Type: text/plain; charset=us-ascii; format=flowed
 Content-Transfer-Encoding: 7bit
 
 please apply this patch after original PR's patch
 
 
 --------------070200050306040806000603
 Content-Type: text/plain;
  name="silc-client.2.patch"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline;
  filename="silc-client.2.patch"
 
 diff -ruN silc-client.OLD/Makefile silc-client/Makefile
 --- silc-client.OLD/Makefile	Thu Sep 18 14:45:30 2003
 +++ silc-client/Makefile	Thu Sep 18 14:45:59 2003
 @@ -24,7 +24,7 @@
  PKGNAMESUFFIX=	-client
  DISTNAME=	${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
  
 -MAINTAINER=	ports@FreeBSD.org
 +MAINTAINER=	aquatique@rusunix.org
  COMMENT=	Secure Internet Live Conferencing (SILC) network client
  
  USE_BZIP2=	yes
 
 --------------070200050306040806000603--
 

From: "Evgueni V. Gavrilov" <aquatique@rusunix.org>
To: freebsd-gnats-submit@FreeBSD.org
Cc:  
Subject: Re: ports/53672
Date: Wed, 24 Sep 2003 19:53:29 +0700

 Please apply this patch in order to install docs with silc-client.
 Port net/silc-docs looks absolete since it installs the same files from silc-server tarball.
 
 diff -ruN silc-client.OLD/files/patch-Makefile.in silc-client/files/patch-Makefile.in
 --- silc-client.OLD/files/patch-Makefile.in	Wed Sep 24 19:25:07 2003
 +++ silc-client/files/patch-Makefile.in	Wed Sep 24 19:46:42 2003
 @@ -40,12 +40,3 @@
   
   etc-install-server:
   	-@if test '!' -f $(etcdir)/silcd.conf ; then \
 -@@ -775,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.
 
 -- 
 http://aquatique.rusunix.org

From: "Evgueni V. Gavrilov" <aquatique@rusunix.org>
To: freebsd-gnats-submit@FreeBSD.org
Cc:  
Subject: Re: ports/53672
Date: Wed, 24 Sep 2003 20:24:17 +0700

 Chase switch to docs from client tarball (update plist)
 
 diff -ruN silc-client.orig/Makefile silc-client/Makefile
 --- silc-client.orig/Makefile	Wed Sep 24 20:03:26 2003
 +++ silc-client/Makefile	Wed Sep 24 20:12:40 2003
 @@ -35,7 +35,8 @@
  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 -ruN silc-client.orig/files/patch-Makefile.in silc-client/files/patch-Makefile.in
 --- silc-client.orig/files/patch-Makefile.in	Wed Sep 24 20:03:26 2003
 +++ silc-client/files/patch-Makefile.in	Wed Sep 24 20:17:19 2003
 @@ -1,5 +1,5 @@
  --- Makefile.in.orig	Tue Mar 18 15:40:51 2003
 -+++ Makefile.in	Tue Jun 24 17:07:26 2003
 ++++ Makefile.in	Wed Sep 24 20:17:07 2003
  @@ -233,7 +233,7 @@
   
   AUTOMAKE_OPTIONS = 1.0 no-dependencies foreign
 @@ -9,11 +9,7 @@
   
   # Sub directories defined by "distributions" file, and can be overridden
   # with ./configure, which substitutes these variables.
 -@@ -702,16 +702,12 @@
 - install-dirs:
 - 	-mkdir -p $(etcdir)
 - 	-mkdir -p $(modulesdir)
 --	-mkdir -p $(docdir)
 +@@ -706,17 +706,13 @@
   
   install-dirs-client: install-dirs
   	-mkdir -p $(helpdir)
 @@ -26,6 +22,11 @@
   
   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
   
 diff -ruN silc-client.orig/pkg-plist silc-client/pkg-plist
 --- silc-client.orig/pkg-plist	Wed Sep 24 20:03:26 2003
 +++ silc-client/pkg-plist	Wed Sep 24 20:22:56 2003
 @@ -109,10 +109,20 @@
  share/silc/scripts/mail-maildir.pl
  share/silc/scripts/mail.pl
  share/silc/themes/default.theme
 +share/doc/silc/CodingStyle
 +share/doc/silc/FAQ
 +share/doc/silc/COPYING
 +share/doc/silc/CHANGES
 +share/doc/silc/CREDITS
 +share/doc/silc/INSTALL
 +share/doc/silc/TODO
 +share/doc/silc/README
 +share/doc/silc/example_silc.conf
  @dirrm share/silc/themes
  @dirrm share/silc/scripts
  @dirrm share/silc/help
  @dirrm share/silc
 +@dirrm share/doc/silc
  @dirrm lib/silcsim/client
  @unexec rmdir %D/lib/silcsim 2>/dev/null || true
  @unexec rmdir %D/etc/silc 2>/dev/null || true
 
 -- 
 http://aquatique.rusunix.org
State-Changed-From-To: open->closed 
State-Changed-By: krion 
State-Changed-When: Wed Sep 24 11:04:00 PDT 2003 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=53672 
>Unformatted:
