From e2b42e6c8d491bdb6d28908cd66601e0d5ae5d68 Mon Sep 17 00:00:00 2001 From: tron Date: Thu, 25 Nov 1999 19:46:19 +0000 Subject: Update "spegla" package to version 1.1 using patches supplied by Jens A Nilsson in private e-mail. --- net/spegla/Makefile | 24 ++++++++++++++------ net/spegla/files/md5 | 4 ++-- net/spegla/files/patch-sum | 6 ++--- net/spegla/patches/patch-aa | 31 ++++++++++++++++--------- net/spegla/patches/patch-ab | 12 ---------- net/spegla/patches/patch-ac | 11 --------- net/spegla/pkg/DESCR | 55 +++------------------------------------------ net/spegla/pkg/PLIST | 7 +++--- 8 files changed, 48 insertions(+), 102 deletions(-) delete mode 100644 net/spegla/patches/patch-ab delete mode 100644 net/spegla/patches/patch-ac diff --git a/net/spegla/Makefile b/net/spegla/Makefile index 9df0b19d1ef..e4774d4231e 100644 --- a/net/spegla/Makefile +++ b/net/spegla/Makefile @@ -1,12 +1,22 @@ -# $NetBSD: Makefile,v 1.2 1999/07/02 08:37:27 agc Exp $ -# +# $NetBSD: Makefile,v 1.3 1999/11/25 19:46:19 tron Exp $ -DISTNAME= spegla-1.04 -CATEGORIES= net -MASTER_SITES= ftp://ftp.luth.se/pub/unix/mirror/ \ - ftp://subzero.campus.luth.se/pub/spegla/ +DISTNAME= spegla-1.1 +CATEGORIES= net +MASTER_SITES= ftp://ftp.luth.se/pub/unix/mirror/ \ + ftp://subzero.campus.luth.se/pub/spegla/ + +MAINTAINER= jnilsson@ludd.luth.se -MAINTAINER= jnilsson@ludd.luth.se MANCOMPRESSED_IF_MANZ= yes +PLIST_SRC= ${WRKDIR}/PLIST + +post-install: + @${CP} ${PKGDIR}/PLIST ${PLIST_SRC} + @for OPT in ${MANINSTALL} x; do \ + case $$OPT in \ + catinstall) ${ECHO} man/cat1/spegla.0 >>${PLIST_SRC};; \ + maninstall) ${ECHO} man/man1/spegla.1 >>${PLIST_SRC};; \ + esac; \ + done .include "../../mk/bsd.pkg.mk" diff --git a/net/spegla/files/md5 b/net/spegla/files/md5 index ede4024afda..788701ab68a 100644 --- a/net/spegla/files/md5 +++ b/net/spegla/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.1.1.1 1999/02/26 11:27:19 frueauf Exp $ +$NetBSD: md5,v 1.2 1999/11/25 19:46:20 tron Exp $ -MD5 (spegla-1.04.tar.gz) = e8c45cb3950e6f7c8a1987cfc90e6665 +MD5 (spegla-1.1.tar.gz) = 96f02cc28983c7338e9606ecd31221d8 diff --git a/net/spegla/files/patch-sum b/net/spegla/files/patch-sum index dad5710407b..ae99d5fbd5b 100644 --- a/net/spegla/files/patch-sum +++ b/net/spegla/files/patch-sum @@ -1,5 +1,3 @@ -$NetBSD: patch-sum,v 1.1 1999/07/09 14:12:29 agc Exp $ +$NetBSD: patch-sum,v 1.2 1999/11/25 19:46:20 tron Exp $ -MD5 (patch-aa) = ddf8521e894cec926cee1a3928ccb748 -MD5 (patch-ab) = 3c747e21ed2c694ca91b6465c76393b5 -MD5 (patch-ac) = 4a963a65f0f692842fd88e92767aebaa +MD5 (patch-aa) = 7b3e0ed763f132d476cfe711c0065089 diff --git a/net/spegla/patches/patch-aa b/net/spegla/patches/patch-aa index 9a2b76d1fab..2346a4f29ae 100644 --- a/net/spegla/patches/patch-aa +++ b/net/spegla/patches/patch-aa @@ -1,11 +1,20 @@ -$NetBSD: patch-aa,v 1.2 1999/02/26 11:36:35 frueauf Exp $ - ---- jftp.c.orig Sun Feb 7 11:46:11 1999 -+++ jftp.c Fri Feb 26 12:29:28 1999 -@@ -30,5 +30,5 @@ - #include --#include - #include - #include -+#include - #include +$NetBSD: patch-aa,v 1.3 1999/11/25 19:46:20 tron Exp $ +--- Makefile-orig Mon Oct 25 20:10:31 1999 ++++ Makefile Thu Nov 25 19:47:56 1999 +@@ -8,7 +8,15 @@ + SRCS= jftp.c parserow.c spegla.c tgetopt.c container.c spf_util.c \ + que_syms.c e_err.c strlcpy.c + +-MAN= spegla.1 strlcpy.3 ++MAN= spegla.1 ++ ++FILES= spegla.sh spegla.conf ++FILESDIR= ${PREFIX}/share/examples/spegla ++ ++filesinstall:: ${PREFIX}/share/examples/spegla ++ ++${PREFIX}/share/examples/spegla: ++ mkdir -p ${PREFIX}/share/examples/spegla + + #WARNS= 2 + CFLAGS+= -Wall diff --git a/net/spegla/patches/patch-ab b/net/spegla/patches/patch-ab deleted file mode 100644 index fffc2829fa9..00000000000 --- a/net/spegla/patches/patch-ab +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ab,v 1.2 1999/02/26 11:36:35 frueauf Exp $ - ---- spegla.c.orig Tue Feb 9 23:37:42 1999 -+++ spegla.c Fri Feb 26 12:29:28 1999 -@@ -29,3 +29,2 @@ - --#include - #include -@@ -48,2 +47,3 @@ - -+#include - #include diff --git a/net/spegla/patches/patch-ac b/net/spegla/patches/patch-ac deleted file mode 100644 index fd365550762..00000000000 --- a/net/spegla/patches/patch-ac +++ /dev/null @@ -1,11 +0,0 @@ -$NetBSD: patch-ac,v 1.1.1.1 1999/02/26 11:27:20 frueauf Exp $ - ---- Makefile-orig Sun Feb 7 22:49:59 1999 -+++ Makefile Fri Feb 26 12:11:47 1999 -@@ -12,4 +12,6 @@ - CFLAGS+= -Wall - LDADD+= -lcompat - -+MANINSTALL= catinstall maninstall -+ - .include diff --git a/net/spegla/pkg/DESCR b/net/spegla/pkg/DESCR index 5e56d3d9a39..89245ead5d9 100644 --- a/net/spegla/pkg/DESCR +++ b/net/spegla/pkg/DESCR @@ -1,52 +1,3 @@ -Spegla is a mirror program for FTP sites. It was written because I -couldn't find any fast mirroring program for big mirrors. It makes a -complete mirror of a FTP area. - -Spegla only take one command-line parameter, the config file. These -parameters can be specified in it: - - - localdir where the mirror should go on your machine. - - - remotedir directory at the FTP server. - - - username user to log in as i.e. anonymous. - - - password password to use i.e. your email address. - - - host FTP server. - - - retries how many retries before quit. Defaults to 20. - - - retrytime how many seconds to wait before log in again after - a timeout. Defaults to 150. - - - timeout how many seconds to wait to timeout. Defaults to 150. - - - skipdir which directories to ignore remote and local, can be - several but only one per row. - - - dirlink not used for now. - - - logfile logfile, can be a file, stdout or stderr. Defaults - to stdout. - -Blank lines and text after '#' are ignored. - -This is what's in the config file I use for the FreeBSD mirror of -Walnut Creek's FreeBSD area. - -localdir = /ftp/pub/FreeBSD -remotedir = /pub/FreeBSD -username = anonymous -password = jnilsson@ludd.luth.se -host = ftp.freebsd.org -timeout = 120 -retries = 300 # busy ftp server and lots of files. - # Takes lots of hours to complete - # and don't want to quit when we are - # almost finished. -retrytime = 120 # if network goes down don't consume - # all retries to fast. -logfile = freebsd.org.log -skipdir = distfiles # don't have room for this yet. -skipdir = incoming # no need for this. +Spegla is a mirror program for FTP sites. Spegla was written +because the author couldn't find any fast mirroring program suitable +for big sites. It makes a complete mirror of a FTP area. diff --git a/net/spegla/pkg/PLIST b/net/spegla/pkg/PLIST index cf592245c69..282d908659f 100644 --- a/net/spegla/pkg/PLIST +++ b/net/spegla/pkg/PLIST @@ -1,4 +1,5 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 1999/02/26 11:27:19 frueauf Exp $ +@comment $NetBSD: PLIST,v 1.2 1999/11/25 19:46:21 tron Exp $ bin/spegla -man/cat1/spegla.0 -man/man1/spegla.1 +share/examples/spegla/spegla.sh +share/examples/spegla/spegla.conf +@dirrm share/examples/spegla -- cgit v1.2.3