Date: Thu, 18 Jan 2007 12:46:26 +0600 (OMST) From: "Evgueni V. Gavrilov" <aquatique+ports@rusunix.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: krion@FreeBSD.org Subject: ports/108075: update net/silc-client to 1.0.3 Message-ID: <20070118064627.003C045484@rusunix.org> Resent-Message-ID: <200701180710.l0I7AQZJ093709@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 108075 >Category: ports >Synopsis: update net/silc-client to 1.0.3 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Thu Jan 18 07:10:26 GMT 2007 >Closed-Date: >Last-Modified: >Originator: Evgueni V. Gavrilov >Release: FreeBSD 6.2-RELEASE i386 >Organization: rusunix.org >Environment: System: FreeBSD rusunix.org 6.2-RELEASE FreeBSD 6.2-RELEASE #0: Wed Jan 17 12:21:19 OMST 2007 aquatique@rusunix.org:/big4/obj/usr/src/sys/AQUATIQUE i386 >Description: update net/silc-client to 1.0.3 >How-To-Repeat: patch < >Fix: --- silc.client.patch begins here --- diff -ruN silc-client.OLD/Makefile silc-client/Makefile --- silc-client.OLD/Makefile Thu Jan 18 10:45:02 2007 +++ silc-client/Makefile Thu Jan 18 12:20:07 2007 @@ -6,8 +6,8 @@ # PORTNAME= silc -PORTVERSION= 1.0.1 -PORTREVISION= 4 +PORTVERSION= 1.0.3 +PORTREVISION= 5 CATEGORIES= net ipv6 security MASTER_SITES= http://www.silcnet.org/download/%SUBDIR%/ \ http://ftp.silcnet.org/%SUBDIR%/ \ @@ -44,8 +44,6 @@ PLIST_SUB= INSTALL_DIR="${INSTALL_DIR}" PKGDEINSTALL= ${PKGINSTALL} -MAN1= silc.1 - INSTALL_DIR?= ${INSTALL} -d -o ${BINOWN} -g ${BINGRP} -m 755 .ifndef(WITH_PTHREADS) @@ -75,14 +73,12 @@ @${PERL} -pi -e 's/-O2//' ${WRKSRC}/${CONFIGURE_SCRIPT} .endif # install neither documentation nor silc server, we have ports for those - @${PERL} -pi -e 's/-D_THREAD_SAFE//; \ - s/^(SILC_DIST_SUBDIRS.+?)doc/\1/' \ - ${WRKSRC}/${CONFIGURE_SCRIPT} - @${PERL} -pi -e 's/example_silcd.conf \\\n//' ${WRKSRC}/doc/Makefile.in + @${PERL} -pi -e 's/-D_THREAD_SAFE//' ${WRKSRC}/${CONFIGURE_SCRIPT} + @${PERL} -pi -e 's/docdir/DOCDIR/' ${WRKSRC}/doc/Makefile.in @${PERL} -pi -e 's/^(install-data-am:) install-docDATA$$/\1/' \ - ${WRKSRC}/irssi/docs/Makefile.in + ${WRKSRC}/apps/irssi/docs/Makefile.in @${PERL} -pi -e 's/^(install-data-am:) install-moduleLTLIBRARIES$$/\1/' \ - ${WRKSRC}/irssi/src/perl/Makefile.in + ${WRKSRC}/apps/irssi/src/perl/Makefile.in @${PERL} -pi -e 's/--libtool-enable-shared//' \ ${WRKSRC}/lib/silccrypt/Makefile.in diff -ruN silc-client.OLD/distinfo silc-client/distinfo --- silc-client.OLD/distinfo Thu Jan 18 10:45:02 2007 +++ silc-client/distinfo Thu Jan 18 10:45:46 2007 @@ -1,3 +1,3 @@ -MD5 (silc-client-1.0.1.tar.bz2) = 9bdb66cb5dc970596d2f3c782fcc0a9f -SHA256 (silc-client-1.0.1.tar.bz2) = 2b3a50516b168c45be283ef95c19f2dac182c967e93ccff9123bc7ad1d91ee11 -SIZE (silc-client-1.0.1.tar.bz2) = 1404404 +MD5 (silc-client-1.0.3.tar.bz2) = 6727a65fe71b90b018086afe8fc84cf9 +SHA256 (silc-client-1.0.3.tar.bz2) = ee4b39b1122ac47f678edb874288412d208f57ccad9e81b1086126276d6a5440 +SIZE (silc-client-1.0.3.tar.bz2) = 1424405 diff -ruN silc-client.OLD/files/patch-Makefile.in silc-client/files/patch-Makefile.in --- silc-client.OLD/files/patch-Makefile.in Thu Jan 18 10:45:02 2007 +++ silc-client/files/patch-Makefile.in Thu Jan 1 06:00:00 1970 @@ -1,79 +0,0 @@ ---- Makefile.in.orig Wed Jan 14 19:28:32 2004 -+++ Makefile.in Wed Jan 14 20:07:01 2004 -@@ -283,7 +283,7 @@ - target_os = @target_os@ - target_vendor = @target_vendor@ - AUTOMAKE_OPTIONS = 1.0 no-dependencies foreign --COMMONDIRS = lib irssi silc silcd doc includes -+COMMONDIRS = lib irssi silc includes - - # Sub directories defined by "distributions" file, and can be overridden - # with ./configure, which substitutes these variables. -@@ -316,7 +316,6 @@ - # Installing of SILC into the system - # - etcdir = $(DESTDIR)$(silc_etcdir) --modulesdir = $(DESTDIR)$(silc_modulesdir) - helpdir = $(DESTDIR)$(silc_helpdir) - docdir = $(DESTDIR)$(silc_docdir) - logsdir = $(DESTDIR)$(silc_logsdir) -@@ -759,22 +758,17 @@ - - install-dirs: - -mkdir -p $(etcdir) -- -mkdir -p $(modulesdir) - -mkdir -p $(docdir) - - install-dirs-client: install-dirs - -mkdir -p $(helpdir) -- -mkdir -p $(mandir)/man1 - - install-dirs-server: install-dirs - -mkdir -p $(logsdir) -- -mkdir -p $(mandir)/man5 -- -mkdir -p $(mandir)/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)/ -@@ -798,12 +792,8 @@ - fi - - etc-install-client: -- -@if test '!' -d $(srcdir)/irssi ; then \ -- if test '!' -f $(etcdir)/silc.conf ; then \ - $(INSTALL_DATA) $(srcdir)/irssi/silc.conf \ -- $(etcdir)/silc.conf; \ -- fi; \ -- fi -+ $(etcdir)/silc.conf.sample - - etc-install-server: - -@if test '!' -f $(etcdir)/silcd.conf ; then \ -@@ -814,9 +804,6 @@ - chmod go= $(etcdir)/silcd.conf; \ - fi - --sim-install: -- -$(INSTALL_DATA) $(srcdir)/lib/silcsim/*.so $(modulesdir)/ -- - toolkit-install: - -mkdir -p $(docdir)/toolkit/ - -$(INSTALL_DATA) $(srcdir)/doc/toolkit/* $(docdir)/toolkit -@@ -833,9 +820,9 @@ - $(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_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 --@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_TRUE@install-data-hook: install-dirs-client doc-install-client etc-install-client -+@SILC_DIST_CLIENT_FALSE@@SILC_DIST_TOOLKIT_TRUE@install-data-hook: install-dirs-client install-dirs-server doc-install-client doc-install-server toolkit-install examples-install etc-install-client etc-install-server -+@SILC_DIST_CLIENT_FALSE@@SILC_DIST_TOOLKIT_FALSE@install-data-hook: install-dirs-server 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. - # Otherwise a system limit (for SysV at least) may be exceeded. - .NOEXPORT: diff -ruN silc-client.OLD/files/patch-doc-Makefile.in silc-client/files/patch-doc-Makefile.in --- silc-client.OLD/files/patch-doc-Makefile.in Thu Jan 1 06:00:00 1970 +++ silc-client/files/patch-doc-Makefile.in Thu Jan 18 12:15:36 2007 @@ -0,0 +1,25 @@ +--- doc/Makefile.in.orig Thu Jan 18 12:14:15 2007 ++++ doc/Makefile.in Thu Jan 18 12:14:46 2007 +@@ -402,22 +402,9 @@ + + + all: +- touch draft-riikonen-silc-spec-08.txt +- touch draft-riikonen-silc-pp-09.txt +- touch draft-riikonen-silc-ke-auth-08.txt +- touch draft-riikonen-silc-commands-06.txt +- touch draft-riikonen-silc-flags-payloads-04.txt +- touch draft-riikonen-presence-attrs-03.txt + + dist-hook: + $(SILC_TOP_SRCDIR)/scripts/manpages.pl +- rm draft-riikonen*.txt +- touch draft-riikonen-silc-spec-08.txt +- touch draft-riikonen-silc-pp-09.txt +- touch draft-riikonen-silc-ke-auth-08.txt +- touch draft-riikonen-silc-commands-06.txt +- touch draft-riikonen-silc-flags-payloads-04.txt +- touch draft-riikonen-presence-attrs-03.txt + + doc-install: + -mkdir -p $(DOCDIR) diff -ruN silc-client.OLD/files/patch-irssi::src::core::network.c silc-client/files/patch-irssi::src::core::network.c --- silc-client.OLD/files/patch-irssi::src::core::network.c Thu Jan 18 10:45:02 2007 +++ silc-client/files/patch-irssi::src::core::network.c Thu Jan 18 11:01:47 2007 @@ -1,5 +1,5 @@ ---- irssi/src/core/network.c.orig Sun Jan 25 10:11:14 2004 -+++ irssi/src/core/network.c Sun Jan 25 10:11:29 2004 +--- apps/irssi/src/core/network.c.orig Sun Jan 25 10:11:14 2004 ++++ apps/irssi/src/core/network.c Sun Jan 25 10:11:29 2004 @@ -611,7 +611,7 @@ int net_hosterror_notfound(int error) { diff -ruN silc-client.OLD/files/patch-lib-Makefile.in silc-client/files/patch-lib-Makefile.in --- silc-client.OLD/files/patch-lib-Makefile.in Thu Jan 18 10:45:02 2007 +++ silc-client/files/patch-lib-Makefile.in Thu Jan 1 06:00:00 1970 @@ -1,19 +0,0 @@ ---- lib/Makefile.in.orig Thu Nov 27 16:07:17 2003 -+++ lib/Makefile.in Fri Nov 28 15:56:07 2003 -@@ -551,15 +551,8 @@ - -rm -rf libsilcclient.a - - @SILC_DIST_TOOLKIT_TRUE@install-exec-hook: --@SILC_DIST_TOOLKIT_TRUE@ -mkdir -p $(DESTDIR)$(libdir) --@SILC_DIST_TOOLKIT_TRUE@ -$(LIBTOOL) $(INSTALL) libsilc.la $(DESTDIR)$(libdir)/ --@SILC_DIST_TOOLKIT_TRUE@ -$(LIBTOOL) $(INSTALL) libsilcclient.la $(DESTDIR)$(libdir)/ -+ - @SILC_DIST_TOOLKIT_FALSE@install-exec-hook: --@SILC_DIST_TOOLKIT_FALSE@ -mkdir -p $(libdir) --@SILC_DIST_TOOLKIT_FALSE@ -$(LIBTOOL) $(INSTALL) libsilc.la $(DESTDIR)$(libdir)/ --@SILC_DIST_TOOLKIT_FALSE@ -rm -rf $(DESTDIR)$(libdir)/libsilc.a --@SILC_DIST_CLIENT_TRUE@@SILC_DIST_TOOLKIT_FALSE@ -$(LIBTOOL) $(INSTALL) libsilcclient.la $(DESTDIR)$(libdir)/ --@SILC_DIST_CLIENT_TRUE@@SILC_DIST_TOOLKIT_FALSE@ -rm -rf $(DESTDIR)$(libdir)/libsilcclient.a - - # WIN32 DLL generation - @SILC_DIST_WIN32DLL_TRUE@silc.dll: libsilc.a diff -ruN silc-client.OLD/pkg-install silc-client/pkg-install --- silc-client.OLD/pkg-install Thu Jan 18 10:45:02 2007 +++ silc-client/pkg-install Thu Jan 18 12:11:22 2007 @@ -9,6 +9,8 @@ ACTION=$2 CONF_DIR=${PKG_PREFIX}/etc/silc +DOC_DIR=${PKG_PREFIX}/share/doc/silc +#/example_silc.conf CONF_FILE=silc.conf CONF_OWN=root @@ -32,7 +34,7 @@ echo "$PKGNAME: Will not overwrite existing ${CONF_DIR}/${CONF_FILE} configuration file." else ${INSTALL} -c -o ${CONF_OWN} -g ${CONF_GRP} -m ${CONF_MODE} \ - ${CONF_DIR}/${CONF_FILE}${SAMP_SUFX} \ + ${DOC_DIR}/example_silc.conf \ ${CONF_DIR}/${CONF_FILE} fi ;; diff -ruN silc-client.OLD/pkg-plist silc-client/pkg-plist --- silc-client.OLD/pkg-plist Thu Jan 18 10:45:02 2007 +++ silc-client/pkg-plist Thu Jan 18 12:25:03 2007 @@ -1,5 +1,4 @@ bin/silc -etc/silc/silc.conf.sample share/silc/help/action share/silc/help/admin share/silc/help/alias @@ -97,8 +96,6 @@ share/silc/scripts/mail-maildir.pl share/silc/scripts/mail.pl share/silc/scripts/silc-mime.pl -%%PORTDOCS%%%%DOCSDIR%%/CodingStyle -%%PORTDOCS%%%%DOCSDIR%%/FAQ %%PORTDOCS%%%%DOCSDIR%%/COPYING %%PORTDOCS%%%%DOCSDIR%%/CHANGES %%PORTDOCS%%%%DOCSDIR%%/CREDITS --- silc.client.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20070118064627.003C045484>