summaryrefslogtreecommitdiff
path: root/news
diff options
context:
space:
mode:
Diffstat (limited to 'news')
-rw-r--r--news/Makefile23
-rw-r--r--news/cg/DESCR9
-rw-r--r--news/cg/Makefile15
-rw-r--r--news/cg/PLIST3
-rw-r--r--news/cg/distinfo6
-rw-r--r--news/cg/patches/patch-aa13
-rw-r--r--news/inn/DESCR11
-rw-r--r--news/inn/MESSAGE9
-rw-r--r--news/inn/Makefile127
-rw-r--r--news/inn/Makefile.common6
-rw-r--r--news/inn/PLIST326
-rw-r--r--news/inn/buildlink3.mk19
-rw-r--r--news/inn/distinfo14
-rw-r--r--news/inn/files/innd.sh54
-rw-r--r--news/inn/patches/patch-aa23
-rw-r--r--news/inn/patches/patch-ab15
-rw-r--r--news/inn/patches/patch-ac19
-rw-r--r--news/inn/patches/patch-ad14
-rw-r--r--news/inn/patches/patch-ae17
-rw-r--r--news/inn/patches/patch-af20
-rw-r--r--news/inn/patches/patch-ag13
-rw-r--r--news/inn/patches/patch-ah29
-rw-r--r--news/inn/patches/patch-ai13
-rw-r--r--news/knews/DESCR2
-rw-r--r--news/knews/Makefile48
-rw-r--r--news/knews/PLIST4
-rw-r--r--news/knews/distinfo39
-rw-r--r--news/knews/patches/patch-aa40
-rw-r--r--news/knews/patches/patch-ab38
-rw-r--r--news/knews/patches/patch-ac30
-rw-r--r--news/knews/patches/patch-ad27
-rw-r--r--news/knews/patches/patch-ae17
-rw-r--r--news/knews/patches/patch-af27
-rw-r--r--news/knews/patches/patch-ag141
-rw-r--r--news/knews/patches/patch-ah21
-rw-r--r--news/knews/patches/patch-ai121
-rw-r--r--news/knews/patches/patch-aj18
-rw-r--r--news/knews/patches/patch-ak12
-rw-r--r--news/knews/patches/patch-al12
-rw-r--r--news/knews/patches/patch-am14
-rw-r--r--news/knews/patches/patch-an12
-rw-r--r--news/knews/patches/patch-ao14
-rw-r--r--news/knews/patches/patch-ap12
-rw-r--r--news/knews/patches/patch-aq20
-rw-r--r--news/knews/patches/patch-ar12
-rw-r--r--news/knews/patches/patch-as12
-rw-r--r--news/knews/patches/patch-at12
-rw-r--r--news/knews/patches/patch-au12
-rw-r--r--news/knews/patches/patch-av12
-rw-r--r--news/knews/patches/patch-aw12
-rw-r--r--news/knews/patches/patch-ax12
-rw-r--r--news/knews/patches/patch-ay12
-rw-r--r--news/knews/patches/patch-az12
-rw-r--r--news/knews/patches/patch-ba12
-rw-r--r--news/knews/patches/patch-bb12
-rw-r--r--news/knews/patches/patch-bc12
-rw-r--r--news/knews/patches/patch-bd139
-rw-r--r--news/knews/patches/patch-be138
-rw-r--r--news/knews/patches/patch-bf10
-rw-r--r--news/knews/patches/patch-bg68
-rw-r--r--news/knews/patches/patch-bh37
-rw-r--r--news/leafnode/DEINSTALL28
-rw-r--r--news/leafnode/DESCR8
-rw-r--r--news/leafnode/INSTALL47
-rw-r--r--news/leafnode/MESSAGE20
-rw-r--r--news/leafnode/Makefile67
-rw-r--r--news/leafnode/PLIST23
-rw-r--r--news/leafnode/distinfo6
-rw-r--r--news/leafnode/patches/patch-aa56
-rw-r--r--news/newsfetch/DESCR4
-rw-r--r--news/newsfetch/Makefile21
-rw-r--r--news/newsfetch/PLIST3
-rw-r--r--news/newsfetch/distinfo8
-rw-r--r--news/newsfetch/patches/patch-aa41
-rw-r--r--news/newsfetch/patches/patch-ab76
-rw-r--r--news/newsfetch/patches/patch-ac19
-rw-r--r--news/newsx/DESCR13
-rw-r--r--news/newsx/Makefile22
-rw-r--r--news/newsx/PLIST7
-rw-r--r--news/newsx/distinfo7
-rw-r--r--news/newsx/patches/patch-aa63
-rw-r--r--news/newsx/patches/patch-ab43
-rw-r--r--news/nget/DESCR24
-rw-r--r--news/nget/MESSAGE20
-rw-r--r--news/nget/Makefile34
-rw-r--r--news/nget/PLIST13
-rw-r--r--news/nget/distinfo5
-rw-r--r--news/nn/DESCR1
-rw-r--r--news/nn/Makefile49
-rw-r--r--news/nn/PLIST50
-rw-r--r--news/nn/distinfo35
-rw-r--r--news/nn/files/m-powerpc.h24
-rw-r--r--news/nn/files/s-netbsd.h161
-rw-r--r--news/nn/patches/patch-aa30
-rw-r--r--news/nn/patches/patch-ab22
-rw-r--r--news/nn/patches/patch-ac13
-rw-r--r--news/nn/patches/patch-ad22
-rw-r--r--news/nn/patches/patch-ae13
-rw-r--r--news/nn/patches/patch-af40
-rw-r--r--news/nn/patches/patch-ag12
-rw-r--r--news/nn/patches/patch-ah45
-rw-r--r--news/nn/patches/patch-ai106
-rw-r--r--news/nn/patches/patch-aj37
-rw-r--r--news/nn/patches/patch-ak157
-rw-r--r--news/nn/patches/patch-al26
-rw-r--r--news/nn/patches/patch-am13
-rw-r--r--news/nn/patches/patch-an13
-rw-r--r--news/nn/patches/patch-ao61
-rw-r--r--news/nn/patches/patch-ap22
-rw-r--r--news/nn/patches/patch-aq41
-rw-r--r--news/nn/patches/patch-ar49
-rw-r--r--news/nn/patches/patch-as15
-rw-r--r--news/nn/patches/patch-at38
-rw-r--r--news/nn/patches/patch-au63
-rw-r--r--news/nn/patches/patch-av28
-rw-r--r--news/nn/patches/patch-aw13
-rw-r--r--news/nn/patches/patch-ax25
-rw-r--r--news/nn/patches/patch-ay40
-rw-r--r--news/nn/patches/patch-az42
-rw-r--r--news/nn/patches/patch-ba29
-rw-r--r--news/nn/patches/patch-bb101
-rw-r--r--news/nn/patches/patch-bc43
-rw-r--r--news/nn/patches/patch-bd15
-rw-r--r--news/nntpcache/DESCR18
-rw-r--r--news/nntpcache/MESSAGE12
-rw-r--r--news/nntpcache/Makefile45
-rw-r--r--news/nntpcache/PLIST50
-rw-r--r--news/nntpcache/distinfo9
-rw-r--r--news/nntpcache/files/nntpcached.rc7
-rw-r--r--news/nntpcache/patches/patch-aa13
-rw-r--r--news/nntpcache/patches/patch-ab13
-rw-r--r--news/nntpcache/patches/patch-ac14
-rw-r--r--news/nntpcache/patches/patch-ad14
-rw-r--r--news/nntpclnt/DESCR4
-rw-r--r--news/nntpclnt/MESSAGE20
-rw-r--r--news/nntpclnt/Makefile49
-rw-r--r--news/nntpclnt/PLIST7
-rw-r--r--news/nntpclnt/distinfo9
-rw-r--r--news/nntpclnt/files/config.NetBSD.sh81
-rw-r--r--news/nntpclnt/files/config.SunOS.sh81
-rw-r--r--news/nntpclnt/patches/patch-aa23
-rw-r--r--news/nntpclnt/patches/patch-ab52
-rw-r--r--news/nntpclnt/patches/patch-ac83
-rw-r--r--news/nntpclnt/patches/patch-ad28
-rw-r--r--news/pan/DESCR8
-rw-r--r--news/pan/Makefile33
-rw-r--r--news/pan/PLIST38
-rw-r--r--news/pan/distinfo6
-rw-r--r--news/pan/patches/patch-aa13
-rw-r--r--news/slrn/DESCR4
-rw-r--r--news/slrn/Makefile31
-rw-r--r--news/slrn/PLIST62
-rw-r--r--news/slrn/distinfo7
-rw-r--r--news/slrn/patches/patch-aa15
-rw-r--r--news/slrn/patches/patch-ae13
-rw-r--r--news/suck/DESCR13
-rw-r--r--news/suck/Makefile40
-rw-r--r--news/suck/PLIST24
-rw-r--r--news/suck/distinfo6
-rw-r--r--news/suck/patches/patch-aa13
-rw-r--r--news/tin/DESCR1
-rw-r--r--news/tin/Makefile70
-rw-r--r--news/tin/PLIST19
-rw-r--r--news/tin/distinfo6
-rw-r--r--news/tin/patches/patch-aa12
-rw-r--r--news/trn/DESCR18
-rw-r--r--news/trn/Makefile85
-rw-r--r--news/trn/PLIST35
-rw-r--r--news/trn/distinfo7
-rw-r--r--news/trn/patches/patch-ac112
-rw-r--r--news/trn/patches/patch-ad18
-rw-r--r--news/xrn/DESCR15
-rw-r--r--news/xrn/Makefile26
-rw-r--r--news/xrn/PLIST9
-rw-r--r--news/xrn/distinfo7
-rw-r--r--news/xrn/patches/patch-aa31
-rw-r--r--news/xrn/patches/patch-ab15
177 files changed, 0 insertions, 5619 deletions
diff --git a/news/Makefile b/news/Makefile
deleted file mode 100644
index d263a6cd67b..00000000000
--- a/news/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-# $NetBSD: Makefile,v 1.32 2005/04/22 19:33:49 wiz Exp $
-#
-
-COMMENT= Network news
-
-SUBDIR+= cg
-SUBDIR+= inn
-SUBDIR+= knews
-SUBDIR+= leafnode
-SUBDIR+= newsfetch
-SUBDIR+= newsx
-SUBDIR+= nget
-SUBDIR+= nn
-SUBDIR+= nntpcache
-SUBDIR+= nntpclnt
-SUBDIR+= pan
-SUBDIR+= slrn
-SUBDIR+= suck
-SUBDIR+= tin
-SUBDIR+= trn
-SUBDIR+= xrn
-
-.include "../mk/bsd.pkg.subdir.mk"
diff --git a/news/cg/DESCR b/news/cg/DESCR
deleted file mode 100644
index a2f563d1d4f..00000000000
--- a/news/cg/DESCR
+++ /dev/null
@@ -1,9 +0,0 @@
-cg is a semi-automatic newsgroup binary downloader. It assembles
-parts based on subject headers and then offers them in an editor for
-the user to choose which files he really wants.
-
-It supports decoding data in the following formats:
- uuencode (both single- and multi-posting binaries)
- MIME (multipart/mixed, message/partial;
- base64, quoted printable, x-uuencode)
- yEnc
diff --git a/news/cg/Makefile b/news/cg/Makefile
deleted file mode 100644
index 41424353bd5..00000000000
--- a/news/cg/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# $NetBSD: Makefile,v 1.7 2005/04/11 21:47:03 tv Exp $
-#
-
-DISTNAME= cg-0.4
-CATEGORIES= news
-MASTER_SITES= http://ftp.giga.or.at/pub/nih/cg/
-
-MAINTAINER= wiz@NetBSD.org
-HOMEPAGE= http://ftp.giga.or.at/pub/nih/cg/
-COMMENT= Semi-automatic newsgroup binary downloader
-
-GNU_CONFIGURE= YES
-TEST_TARGET= check
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/news/cg/PLIST b/news/cg/PLIST
deleted file mode 100644
index 441f2f480e6..00000000000
--- a/news/cg/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2002/08/25 21:50:27 jlam Exp $
-bin/cg
-man/man1/cg.1
diff --git a/news/cg/distinfo b/news/cg/distinfo
deleted file mode 100644
index e94c50f1733..00000000000
--- a/news/cg/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.4 2005/11/03 16:53:34 tv Exp $
-
-SHA1 (cg-0.4.tar.gz) = 8fdb3156e3ad11fd182d2adf1d87ff799beaac60
-RMD160 (cg-0.4.tar.gz) = 9a706b5b1dc5e4e2617dec7f9f6e37b19ed634aa
-Size (cg-0.4.tar.gz) = 203503 bytes
-SHA1 (patch-aa) = c30af62f04e07b347c5a048edad19b2cca70ae98
diff --git a/news/cg/patches/patch-aa b/news/cg/patches/patch-aa
deleted file mode 100644
index be265c48ab6..00000000000
--- a/news/cg/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2005/11/03 16:53:34 tv Exp $
-
---- snprintf.c.orig 2002-05-13 12:51:22.000000000 -0400
-+++ snprintf.c
-@@ -64,7 +64,7 @@
-
- /* varargs declarations: */
-
--#if defined(HAVE_STDARG_H)
-+#if defined(HAVE_STDARG_H) || defined(__STDC__)
- # include <stdarg.h>
- # define HAVE_STDARGS /* let's hope that works everywhere (mj) */
- # define VA_LOCAL_DECL va_list ap
diff --git a/news/inn/DESCR b/news/inn/DESCR
deleted file mode 100644
index 2308d4f6c4c..00000000000
--- a/news/inn/DESCR
+++ /dev/null
@@ -1,11 +0,0 @@
-This is the public release of InterNet News (INN). This work is
-sponsored by the Internet Software Consortium.
-
-InterNetNews is a complete Usenet system. The cornerstone of the
-package is innd, an NNTP server that multiplexes all I/O. Newsreading
-is handled by a separate server, nnrpd, that is spawned for each
-client. Both innd and nnrpd have some slight variances from the
-NNTP protocol.
-
-You can set the environment variable INN_SPOOL to whatever you like
-to change the default spool directory when building this pkg.
diff --git a/news/inn/MESSAGE b/news/inn/MESSAGE
deleted file mode 100644
index aa795aa4ae6..00000000000
--- a/news/inn/MESSAGE
+++ /dev/null
@@ -1,9 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.3 2002/09/29 10:39:36 jlam Exp $
-
-The following programs have been installed suid root on your machine:
-
- ${PREFIX}/inn/bin/inndstart
- ${PREFIX}/inn/bin/startinnfeed
-
-===========================================================================
diff --git a/news/inn/Makefile b/news/inn/Makefile
deleted file mode 100644
index 4ba4b4ca473..00000000000
--- a/news/inn/Makefile
+++ /dev/null
@@ -1,127 +0,0 @@
-# $NetBSD: Makefile,v 1.72 2005/10/07 18:08:25 reed Exp $
-
-DISTNAME= inn-2.4.1
-PKGREVISION= 8
-CATEGORIES= news
-MASTER_SITES= ftp://ftp.isc.org/isc/inn/ \
- ftp://ftp.sunet.se/pub/news/nntp/inn/ \
- ftp://ftp.fu-berlin.de/unix/news/inn/
-
-MAINTAINER= tron@NetBSD.org
-HOMEPAGE= http://www.isc.org/inn.html
-COMMENT= The public release of InterNet News (INN)
-
-CONFLICTS+= nntpclnt-[0-9]*
-
-.include "Makefile.common"
-BUILD_DEFS+= USE_INET6
-BUILD_DEFS+= INN_DATA_DIR INN_USER INN_GROUP
-FILES_SUBST+= INN_DATA_DIR=${INN_DATA_DIR}
-
-USE_PKGINSTALL= YES
-GNU_CONFIGURE= YES
-GNU_CONFIGURE_PREFIX= ${INN_PREFIX}
-CONFIGURE_ARGS+= --enable-setgid-inews \
- --enable-uucp-rnews \
- --with-perl \
- --with-openssl=${SSLBASE} \
- --with-tmp-dir=${INN_DATA_DIR}/tmp \
- --with-db-dir=${INN_DATA_DIR}/db \
- --with-etc-dir=${INN_DATA_DIR}/etc \
- --with-log-dir=${INN_DATA_DIR}/log \
- --with-run-dir=${INN_DATA_DIR}/run \
- --with-spool-dir=${INN_SPOOL} \
- --with-news-user=${INN_USER} \
- --with-news-group=${INN_GROUP}
-CONFIGURE_ENV+= _PATH_PERL=${PERL5}
-CONFIGURE_ENV+= _PATH_AWK="${TOOLS_AWK}"
-CONFIGURE_ENV+= _PATH_EGREP="${TOOLS_EGREP}"
-CONFIGURE_ENV+= _PATH_SED="${TOOLS_SED}"
-CONFIGURE_ENV+= _PATH_SH="${TOOLS_SH}"
-CONFIGURE_ENV+= _PATH_SORT="${TOOLS_SORT}"
-CONFIGURE_ENV+= GZIP=${TOOLS_GZIP_CMD:Q}
-USE_TOOLS+= awk egrep gzip perl:run sed sh sort yacc
-
-PKG_USERS= ${INN_USER}:${INN_GROUP}::Internet\ News:${INN_DATA_DIR}:${SH}
-PKG_GROUPS= ${INN_GROUP}
-
-PKG_SYSCONFDIR.inn= ${INN_DATA_DIR}/etc
-EXAMPLEDIR= ${PREFIX}/share/examples/inn
-INN_DATADIRS= db etc log log/OLD run spool tmp
-INN_SPOOLDIRS= archive articles overview incoming incoming/bad \
- outgoing uniover innfeed
-
-OWN_DIRS= ${PREFIX}/etc/nntp
-OWN_DIRS_PERMS= ${INN_DATA_DIR} ${INN_USER} ${INN_GROUP} 0775
-.for DIR in ${INN_DATADIRS}
-MAKE_DIRS_PERMS+= ${INN_DATA_DIR}/${DIR} ${INN_USER} ${INN_GROUP} 0775
-.endfor
-.for DIR in ${INN_SPOOLDIRS}
-MAKE_DIRS_PERMS+= ${INN_DATA_DIR}/spool/${DIR} ${INN_USER} ${INN_GROUP} 0775
-.endfor
-
-CFILES= actsync.cfg actsync.ign buffindexed.conf \
- control.ctl cycbuff.conf distrib.pats \
- expire.ctl incoming.conf inn.conf innfeed.conf \
- innreport.conf innwatch.ctl moderators \
- motd.news news2mail.cf newsfeeds nnrpd.track \
- nntpsend.ctl ovdb.conf overview.fmt passwd.nntp \
- radius.conf readers.conf sasl.conf storage.conf
-.for FILE in ${CFILES}
-CONF_FILES_PERMS+= ${EXAMPLEDIR}/${FILE} ${PKG_SYSCONFDIR}/${FILE} \
- ${INN_USER} ${INN_GROUP} 0664
-.endfor
-
-RCD_SCRIPTS= innd
-
-.include "../../mk/bsd.prefs.mk"
-
-.if defined(USE_INET6) && ${USE_INET6} == YES
-CONFIGURE_ARGS+= --enable-ipv6
-.endif
-
-.if ${OPSYS} == "SunOS"
-CONFIGURE_ARGS+= --with-sendmail=/usr/lib/sendmail
-.else
-CONFIGURE_ARGS+= --with-sendmail=/usr/sbin/sendmail
-.endif
-
-.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
-GCC_REQD+= 2.95.3
-.endif
-
-post-patch:
- ${RM} -f ${WRKSRC}/samples/inn.conf.in.orig_dist
-
-post-build:
- for DIR in backends expire frontends innd innfeed lib nnrpd \
- storage; do \
- ${SED} -e 's#-b .OLD##' -e 's#-G#-g#' -e 's#-O#-o#' \
- ${WRKSRC}/$$DIR/Makefile \
- > ${WRKSRC}/$$DIR/Makefile.patch; \
- ${MV} ${WRKSRC}/$$DIR/Makefile.patch \
- ${WRKSRC}/$$DIR/Makefile; \
- done
-
-pre-install:
- for DIR in ${INN_DATA_DIR} ${PREFIX}/etc/nntp ${PREFIX}/inn; do \
- ${INSTALL_DATA_DIR} $$DIR; \
- done
-
-post-install:
- ${RM} -f ${PREFIX}/bin/inews
- ${LN} -s ../inn/bin/inews ${PREFIX}/bin/inews
- ${INSTALL_DATA_DIR} ${PREFIX}/include/inn
- cd ${PREFIX}/include/inn; \
- for FILE in config.h dbz.h libinn.h storage.h; do \
- ${LN} -s ${INN_PREFIX}/include/$$FILE $$FILE; \
- done
- ${INSTALL_DATA_DIR} ${EXAMPLEDIR}
- for FILE in `ls -1 ${WRKSRC}/samples/* | \
- ${EGREP} -v '(Makefile|.*\.(in|orig)$$)'`; do \
- ${INSTALL_DATA} $$FILE ${EXAMPLEDIR}; \
- done
-
-.include "../../lang/perl5/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/news/inn/Makefile.common b/news/inn/Makefile.common
deleted file mode 100644
index f0e99a5d46c..00000000000
--- a/news/inn/Makefile.common
+++ /dev/null
@@ -1,6 +0,0 @@
-# $NetBSD: Makefile.common,v 1.1 2003/07/29 16:27:26 wiz Exp $
-#
-
-INN_PREFIX?= ${PREFIX}/inn
-INN_DATA_DIR?= /var/news
-INN_SPOOL?= ${INN_DATA_DIR}/spool
diff --git a/news/inn/PLIST b/news/inn/PLIST
deleted file mode 100644
index c10b3dfc8c2..00000000000
--- a/news/inn/PLIST
+++ /dev/null
@@ -1,326 +0,0 @@
-@comment $NetBSD: PLIST,v 1.9 2005/09/22 15:38:39 tron Exp $
-bin/inews
-include/inn/config.h
-include/inn/dbz.h
-include/inn/libinn.h
-include/inn/storage.h
-inn/bin/actmerge
-inn/bin/actsync
-inn/bin/actsyncd
-inn/bin/archive
-inn/bin/auth/passwd/auth_smb
-inn/bin/auth/passwd/ckpasswd
-inn/bin/auth/passwd/radius
-inn/bin/auth/resolv/domain
-inn/bin/auth/resolv/ident
-inn/bin/batcher
-inn/bin/buffchan
-inn/bin/cnfsheadconf
-inn/bin/cnfsstat
-inn/bin/control/checkgroups.pl
-inn/bin/control/ihave.pl
-inn/bin/control/newgroup.pl
-inn/bin/control/rmgroup.pl
-inn/bin/control/sendme.pl
-inn/bin/control/sendsys.pl
-inn/bin/control/senduuname.pl
-inn/bin/control/version.pl
-inn/bin/controlbatch
-inn/bin/controlchan
-inn/bin/convdate
-inn/bin/ctlinnd
-inn/bin/cvtbatch
-inn/bin/docheckgroups
-inn/bin/expire
-inn/bin/expireover
-inn/bin/expirerm
-inn/bin/fastrm
-inn/bin/filechan
-inn/bin/filter/INN.py
-inn/bin/filter/filter.tcl
-inn/bin/filter/filter_innd.pl
-inn/bin/filter/filter_innd.py
-inn/bin/filter/filter_nnrpd.pl
-inn/bin/filter/nnrpd_auth.pl
-inn/bin/filter/nnrpd_auth.py
-inn/bin/filter/startup.tcl
-inn/bin/filter/startup_innd.pl
-inn/bin/getlist
-inn/bin/gpgverify
-inn/bin/grephistory
-inn/bin/imapfeed
-inn/bin/inews
-inn/bin/inncheck
-inn/bin/innconfval
-inn/bin/innd
-inn/bin/inndf
-inn/bin/inndstart
-inn/bin/innfeed
-inn/bin/innmail
-inn/bin/innreport
-inn/bin/innstat
-inn/bin/innupgrade
-inn/bin/innwatch
-inn/bin/innxbatch
-inn/bin/innxmit
-inn/bin/mailpost
-inn/bin/makedbz
-inn/bin/makehistory
-inn/bin/mod-active
-inn/bin/news.daily
-inn/bin/news2mail
-inn/bin/ninpaths
-inn/bin/nnrpd
-inn/bin/nntpget
-inn/bin/nntpsend
-inn/bin/ovdb_init
-inn/bin/ovdb_monitor
-inn/bin/ovdb_server
-inn/bin/ovdb_stat
-inn/bin/overchan
-inn/bin/perl-nocem
-inn/bin/pgpverify
-inn/bin/procbatch
-inn/bin/prunehistory
-inn/bin/pullnews
-inn/bin/rc.news
-inn/bin/rnews
-inn/bin/rnews.libexec/c7unbatch
-inn/bin/rnews.libexec/decode
-inn/bin/rnews.libexec/encode
-inn/bin/rnews.libexec/gunbatch
-inn/bin/scanlogs
-inn/bin/scanspool
-inn/bin/send-ihave
-inn/bin/send-nntp
-inn/bin/send-uucp
-inn/bin/sendinpaths
-inn/bin/sendxbatches
-inn/bin/shlock
-inn/bin/shrinkfile
-inn/bin/signcontrol
-inn/bin/simpleftp
-inn/bin/sm
-inn/bin/startinnfeed
-inn/bin/tally.control
-inn/bin/tdx-util
-inn/bin/writelog
-inn/doc/CONTRIBUTORS
-inn/doc/GPL
-inn/doc/HACKING
-inn/doc/INSTALL
-inn/doc/LICENSE
-inn/doc/NEWS
-inn/doc/README
-inn/doc/TODO
-inn/doc/compliance-nntp
-inn/doc/config-design
-inn/doc/config-semantics
-inn/doc/config-syntax
-inn/doc/external-auth
-inn/doc/history
-inn/doc/hook-perl
-inn/doc/hook-python
-inn/doc/hook-tcl
-inn/doc/sample-control
-inn/include/conffile.h
-inn/include/config.h
-inn/include/dbz.h
-inn/include/inn/buffer.h
-inn/include/inn/confparse.h
-inn/include/inn/defines.h
-inn/include/inn/hashtab.h
-inn/include/inn/history.h
-inn/include/inn/innconf.h
-inn/include/inn/list.h
-inn/include/inn/md5.h
-inn/include/inn/messages.h
-inn/include/inn/mmap.h
-inn/include/inn/qio.h
-inn/include/inn/sequence.h
-inn/include/inn/system.h
-inn/include/inn/timer.h
-inn/include/inn/tst.h
-inn/include/inn/vector.h
-inn/include/inn/version.h
-inn/include/inn/wire.h
-inn/include/inndcomm.h
-inn/include/libinn.h
-inn/include/nntp.h
-inn/include/ov.h
-inn/include/paths.h
-inn/include/storage.h
-inn/lib/innreport_inn.pm
-inn/lib/innshellvars
-inn/lib/innshellvars.pl
-inn/lib/innshellvars.tcl
-inn/lib/libinn.a
-inn/lib/libinnhist.a
-inn/lib/libstorage.a
-man/man1/convdate.1
-man/man1/fastrm.1
-man/man1/getlist.1
-man/man1/grephistory.1
-man/man1/inews.1
-man/man1/innconfval.1
-man/man1/innfeed.1
-man/man1/innmail.1
-man/man1/nntpget.1
-man/man1/pgpverify.1
-man/man1/rnews.1
-man/man1/shlock.1
-man/man1/shrinkfile.1
-man/man1/simpleftp.1
-man/man1/sm.1
-man/man1/startinnfeed.1
-man/man3/clientlib.3
-man/man3/dbz.3
-man/man3/inndcomm.3
-man/man3/libauth.3
-man/man3/libinn.3
-man/man3/libinnhist.3
-man/man3/libstorage.3
-man/man3/list.3
-man/man3/parsedate.3
-man/man3/qio.3
-man/man3/tst.3
-man/man3/uwildmat.3
-man/man5/active.5
-man/man5/active.times.5
-man/man5/buffindexed.conf.5
-man/man5/control.ctl.5
-man/man5/cycbuff.conf.5
-man/man5/distrib.pats.5
-man/man5/expire.ctl.5
-man/man5/history.5
-man/man5/incoming.conf.5
-man/man5/inn.conf.5
-man/man5/innfeed.conf.5
-man/man5/innwatch.ctl.5
-man/man5/moderators.5
-man/man5/motd.news.5
-man/man5/newsfeeds.5
-man/man5/newslog.5
-man/man5/nnrpd.track.5
-man/man5/nntpsend.ctl.5
-man/man5/ovdb.5
-man/man5/overview.fmt.5
-man/man5/passwd.nntp.5
-man/man5/radius.conf.5
-man/man5/readers.conf.5
-man/man5/sasl.conf.5
-man/man5/storage.conf.5
-man/man5/subscriptions.5
-man/man8/actsync.8
-man/man8/actsyncd.8
-man/man8/archive.8
-man/man8/auth_smb.8
-man/man8/batcher.8
-man/man8/buffchan.8
-man/man8/ckpasswd.8
-man/man8/cnfsheadconf.8
-man/man8/cnfsstat.8
-man/man8/controlchan.8
-man/man8/ctlinnd.8
-man/man8/cvtbatch.8
-man/man8/domain.8
-man/man8/expire.8
-man/man8/expireover.8
-man/man8/expirerm.8
-man/man8/filechan.8
-man/man8/ident.8
-man/man8/inncheck.8
-man/man8/innd.8
-man/man8/inndf.8
-man/man8/inndstart.8
-man/man8/innreport.8
-man/man8/innstat.8
-man/man8/innupgrade.8
-man/man8/innwatch.8
-man/man8/innxbatch.8
-man/man8/innxmit.8
-man/man8/mailpost.8
-man/man8/makedbz.8
-man/man8/makehistory.8
-man/man8/mod-active.8
-man/man8/news.daily.8
-man/man8/news2mail.8
-man/man8/ninpaths.8
-man/man8/nnrpd.8
-man/man8/nntpsend.8
-man/man8/ovdb_init.8
-man/man8/ovdb_monitor.8
-man/man8/ovdb_server.8
-man/man8/ovdb_stat.8
-man/man8/overchan.8
-man/man8/perl-nocem.8
-man/man8/prunehistory.8
-man/man8/pullnews.8
-man/man8/radius.8
-man/man8/rc.news.8
-man/man8/scanlogs.8
-man/man8/send-nntp.8
-man/man8/send-uucp.8
-man/man8/sendinpaths.8
-man/man8/tally.control.8
-man/man8/tdx-util.8
-man/man8/writelog.8
-share/examples/inn/INN.py
-share/examples/inn/active.minimal
-share/examples/inn/actsync.cfg
-share/examples/inn/actsync.ign
-share/examples/inn/buffindexed.conf
-share/examples/inn/control.ctl
-share/examples/inn/cycbuff.conf
-share/examples/inn/distrib.pats
-share/examples/inn/expire.ctl
-share/examples/inn/filter.tcl
-share/examples/inn/filter_innd.pl
-share/examples/inn/filter_innd.py
-share/examples/inn/filter_nnrpd.pl
-share/examples/inn/incoming.conf
-share/examples/inn/inn.conf
-share/examples/inn/innfeed.conf
-share/examples/inn/innreport.conf
-share/examples/inn/innwatch.ctl
-share/examples/inn/moderators
-share/examples/inn/motd.news
-share/examples/inn/news2mail.cf
-share/examples/inn/newsfeeds
-share/examples/inn/newsgroups.minimal
-share/examples/inn/nnrpd.py
-share/examples/inn/nnrpd.track
-share/examples/inn/nnrpd_access.pl
-share/examples/inn/nnrpd_access_wrapper.pl
-share/examples/inn/nnrpd_access_wrapper.py
-share/examples/inn/nnrpd_auth.pl
-share/examples/inn/nnrpd_auth.py
-share/examples/inn/nnrpd_auth_wrapper.pl
-share/examples/inn/nnrpd_auth_wrapper.py
-share/examples/inn/nnrpd_dynamic_wrapper.py
-share/examples/inn/nntpsend.ctl
-share/examples/inn/ovdb.conf
-share/examples/inn/overview.fmt
-share/examples/inn/passwd.nntp
-share/examples/inn/radius.conf
-share/examples/inn/readers.conf
-share/examples/inn/sasl.conf
-share/examples/inn/startup.tcl
-share/examples/inn/startup_innd.pl
-share/examples/inn/storage.conf
-share/examples/inn/subscriptions
-share/examples/rc.d/innd
-@dirrm share/examples/inn
-@dirrm inn/lib
-@dirrm inn/include/inn
-@dirrm inn/include
-@dirrm inn/doc
-@dirrm inn/bin/rnews.libexec
-@dirrm inn/bin/filter
-@dirrm inn/bin/control
-@dirrm inn/bin/auth/resolv
-@dirrm inn/bin/auth/passwd
-@dirrm inn/bin/auth
-@dirrm inn/bin
-@dirrm inn
-@dirrm include/inn
diff --git a/news/inn/buildlink3.mk b/news/inn/buildlink3.mk
deleted file mode 100644
index 522e008c1a1..00000000000
--- a/news/inn/buildlink3.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/03/16 09:48:37 cube Exp $
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-INN_BUILDLINK3_MK:= ${INN_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= inn
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ninn}
-BUILDLINK_PACKAGES+= inn
-
-.if !empty(INN_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.inn+= inn>=2.3.4
-BUILDLINK_PKGSRCDIR.inn?= ../../news/inn
-
-.endif # INN_BUILDLINK3_MK
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/news/inn/distinfo b/news/inn/distinfo
deleted file mode 100644
index e5f6e37adc8..00000000000
--- a/news/inn/distinfo
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: distinfo,v 1.13 2005/02/24 12:19:55 agc Exp $
-
-SHA1 (inn-2.4.1.tar.gz) = f36267eca56a643a37ed6c2903cd6fbb71e407f5
-RMD160 (inn-2.4.1.tar.gz) = ce3271fec204a68e7eb0648d1afa176ba1d3e601
-Size (inn-2.4.1.tar.gz) = 1849845 bytes
-SHA1 (patch-aa) = 548acc9d7b8386ed055fae772c8c26e5c6225da6
-SHA1 (patch-ab) = a681fdecf562088cfb25e8625be1380b32331af0
-SHA1 (patch-ac) = c37aa2ea182fafd01ee4a20dbcd67816217a8587
-SHA1 (patch-ad) = 1f4d4b15a478d6d35185977d8bc32a4e161665c5
-SHA1 (patch-ae) = 28c36db3fee701d7a46e656e0911356b0fa40c59
-SHA1 (patch-af) = fda097d52bd77500d287e30af8332d7e817a46a2
-SHA1 (patch-ag) = 0d513b856f1dc75e8d72294dc6e88ca52b0b9cd3
-SHA1 (patch-ah) = 0d3dbaab7fa70c96528beec8e7b3f05f74822512
-SHA1 (patch-ai) = 9d99bd095dc5cb4b9c99274c0adeaab779ca2c2d
diff --git a/news/inn/files/innd.sh b/news/inn/files/innd.sh
deleted file mode 100644
index 90494923e26..00000000000
--- a/news/inn/files/innd.sh
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: innd.sh,v 1.13 2002/09/29 10:39:36 jlam Exp $
-#
-# PROVIDE: inn
-# REQUIRE: DAEMON
-# KEYWORD: shutdown
-
-if [ -x @PREFIX@/inn/bin/rc.news -a -s @INN_DATA_DIR@/db/active ]
-then
- if [ ! -f @PREFIX@/etc/nntp/server ]
- then
- hostname >@PREFIX@/etc/nntp/server
- fi
-
- if [ ! -f @PREFIX@/etc/nntp/domainname ]
- then
- (set - X `grep ^fromhost: @PKG_SYSCONFDIR@/inn.conf`
- if [ $# -eq 3 ]
- then
- echo $3 >@PREFIX@/etc/nntp/domainname
- fi)
- fi
-
- if [ $# -eq 0 ]
- then
- echo -n ' innd'
- su news -c "@PREFIX@/inn/bin/rc.news start" >/dev/null
- exit 0
- fi
-
- case "$1" in
- start )
- echo "Starting INN."
- su news -c "@PREFIX@/inn/bin/rc.news $1" >/dev/null
- exit 0
- ;;
- stop )
- su news -c "@PREFIX@/inn/bin/rc.news $1"
- exit 0
- ;;
- restart )
- $0 stop
- sleep 5
- exec $0 start
- ;;
- * )
- echo "Usage: $0 (start|stop|restart)"
- exit 1
- ;;
- esac
-fi
-
-exit 0
diff --git a/news/inn/patches/patch-aa b/news/inn/patches/patch-aa
deleted file mode 100644
index c0763f25f0d..00000000000
--- a/news/inn/patches/patch-aa
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-aa,v 1.10 2004/07/24 23:55:27 grant Exp $
-
---- configure.orig 2004-01-08 09:47:19.000000000 +1100
-+++ configure
-@@ -5684,8 +5684,7 @@ RNEWSMODE=0500
- if test "${enable_uucp_rnews+set}" = set; then
- enableval="$enable_uucp_rnews"
- if test "x$enableval" = xyes ; then
-- RNEWSGRP=uucp
-- RNEWSMODE=04550
-+ RNEWSMODE=04555
- fi
- fi
-
-@@ -6522,7 +6521,7 @@ else
- echo "$ac_t""no" 1>&6
- fi
-
--for ac_prog in 'bison -y' byacc
-+for ac_prog in 'bison -y' byacc yacc
- do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
diff --git a/news/inn/patches/patch-ab b/news/inn/patches/patch-ab
deleted file mode 100644
index 12f79573af3..00000000000
--- a/news/inn/patches/patch-ab
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ab,v 1.6 2004/07/24 23:55:28 grant Exp $
-
---- scripts/news.daily.in.orig 2004-01-08 09:47:19.000000000 +1100
-+++ scripts/news.daily.in
-@@ -223,6 +223,10 @@ fi
-
- cd ${PATHETC}
-
-+## Unlimit
-+ulimit -d `ulimit -H -d`
-+ulimit -n `ulimit -H -n`
-+
- ## Show the status of the news system.
- ${DOSTAT} && {
- ${INNSTAT}
diff --git a/news/inn/patches/patch-ac b/news/inn/patches/patch-ac
deleted file mode 100644
index ffb1e5dd94e..00000000000
--- a/news/inn/patches/patch-ac
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ac,v 1.9 2004/07/24 23:55:28 grant Exp $
-
---- Makefile.global.in.orig 2004-01-08 09:47:19.000000000 +1100
-+++ Makefile.global.in
-@@ -225,10 +225,10 @@ PATHINBAD = $(PATHINCOMING)/bad
- PATHOVERVIEW = $(PATHSPOOL)/overview
- PATHOUTGOING = $(PATHSPOOL)/outgoing
-
--MAN1 = @mandir@/man1
--MAN3 = @mandir@/man3
--MAN5 = @mandir@/man5
--MAN8 = @mandir@/man8
-+MAN1 = $(LOCALBASE)/man/man1
-+MAN3 = $(LOCALBASE)/man/man3
-+MAN5 = $(LOCALBASE)/man/man5
-+MAN8 = $(LOCALBASE)/man/man8
-
- ## Installation settings. The file installation modes are determined by
- ## configure; inews and rnews are special and have configure flags to
diff --git a/news/inn/patches/patch-ad b/news/inn/patches/patch-ad
deleted file mode 100644
index 14ea08e44c2..00000000000
--- a/news/inn/patches/patch-ad
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ad,v 1.6 2004/07/24 23:55:28 grant Exp $
-
---- scripts/rc.news.in.orig 2004-01-08 09:47:19.000000000 +1100
-+++ scripts/rc.news.in
-@@ -76,6 +76,9 @@ Xstop)
- ;;
- esac
-
-+## Unlimit
-+ulimit -n `ulimit -H -n`
-+
- ## Pick ${INND} or ${INNDSTART}
- WHAT=${INNDSTART}
-
diff --git a/news/inn/patches/patch-ae b/news/inn/patches/patch-ae
deleted file mode 100644
index bf740030d45..00000000000
--- a/news/inn/patches/patch-ae
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ae,v 1.9 2004/07/24 23:55:28 grant Exp $
-
---- frontends/rnews.c.orig 2004-01-08 09:47:19.000000000 +1100
-+++ frontends/rnews.c
-@@ -822,10 +822,12 @@ int main(int ac, char *av[])
- message_handlers_warn(1, message_log_syslog_err);
- message_handlers_die(1, message_log_syslog_err);
-
-+#if !defined(__FreeBSD__) && !defined(__bsdi__) && !defined (__NetBSD__)
- if (setgid(getegid()) < 0)
- die("cannot setgid to %lu", (unsigned long) getegid());
- if (setuid(geteuid()) < 0)
- die("cannot setuid to %lu", (unsigned long) geteuid());
-+#endif
-
- if (!innconf_read(NULL))
- exit(1);
diff --git a/news/inn/patches/patch-af b/news/inn/patches/patch-af
deleted file mode 100644
index 6aaf017b2c3..00000000000
--- a/news/inn/patches/patch-af
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-af,v 1.8 2004/07/24 23:55:28 grant Exp $
-
---- innd/inndstart.c.orig 2004-01-08 09:47:19.000000000 +1100
-+++ innd/inndstart.c
-@@ -136,6 +136,7 @@ main(int argc, char *argv[])
- if (p && strcmp(p, "all") != 0 && strcmp(p, "any") != 0) {
- if (!inet_aton(p, &address))
- die("invalid bindaddress in inn.conf (%s)", p);
-+ addr_specified = true;
- }
- #ifdef HAVE_INET6
- address6 = in6addr_any;
-@@ -143,6 +144,7 @@ main(int argc, char *argv[])
- if (p && strcmp(p, "all") != 0 && strcmp(p, "any") != 0) {
- if (inet_pton(AF_INET6, p, &address6) < 1)
- die("invalid bindaddress6 in inn.conf (%s)", p);
-+ addr_specified = true;
- }
- #endif
-
diff --git a/news/inn/patches/patch-ag b/news/inn/patches/patch-ag
deleted file mode 100644
index 698844e520a..00000000000
--- a/news/inn/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.8 2004/07/24 23:55:28 grant Exp $
-
---- control/pgpverify.in.orig 2004-01-08 09:47:19.000000000 +1100
-+++ control/pgpverify.in
-@@ -97,7 +97,7 @@ do '@LIBDIR@/innshellvars.pl';
- # Path to pgp binary; for PGP 5.0, set the path to the pgpv binary.
- # If you have INN and the script is able to successfully include your
- # innshellvars.pl file, the value of $inn::pgp will override this.
--$pgp = '/usr/local/bin/pgp';
-+$pgp = '@_PATH_PGP@';
-
- # If you keep your keyring somewhere that is not the default used by pgp,
- # uncomment the next line and set appropriately. If you have INN and the
diff --git a/news/inn/patches/patch-ah b/news/inn/patches/patch-ah
deleted file mode 100644
index a722354778e..00000000000
--- a/news/inn/patches/patch-ah
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-ah,v 1.7 2004/07/24 23:55:28 grant Exp $
-
---- site/Makefile.orig 2004-01-08 09:47:19.000000000 +1100
-+++ site/Makefile
-@@ -68,22 +68,11 @@ REST = \
- ALL = $(MOST) $(REST)
-
- REST_INSTALLED = \
-- $D$(PATH_NEWSFEEDS) $D$(PATH_INNDHOSTS) \
-- $D$(PATH_NNRPDTRACK) $D$(PATH_NNTPPASS) \
-- $D$(PATH_CONFIG) $D$(PATH_MODERATORS) \
-- $D$(PATH_CONTROLCTL) $D$(PATH_EXPIRECTL) $D$(PATHETC)/nntpsend.ctl \
-- $D$(PATHETC)/innreport.conf \
-- $D$(PATH_CTLWATCH) $D$(PATH_DISTPATS) $D$(PATH_SCHEMA) \
-- $D$(PATH_ACTSYNC_CFG) $D$(PATH_ACTSYNC_IGN) \
-- $D$(PATH_MOTD) $D$(PATH_STORAGECONF) \
-- $D$(PATH_OVERVIEWCTL) $D$(PATH_CYCBUFFCONFIG) $D$(PATH_BUFFINDEXED) \
-- $D$(PATH_INNFEEDCTL) $D$(PATH_PERL_STARTUP_INND) \
-+ $D$(PATH_PERL_STARTUP_INND) \
- $D$(PATH_PERL_FILTER_INND) $D$(PATH_PERL_FILTER_NNRPD) \
- $D$(PATH_PYTHON_FILTER_INND) $D$(PATH_PYTHON_INN_MODULE) \
- $D$(PATH_TCL_STARTUP) $D$(PATH_TCL_FILTER) \
-- $D$(PATH_NNRPAUTH) $D$(PATHETC)/news2mail.cf $D$(PATH_READERSCONF) \
-- $D$(PATH_RADIUS_CONF) $D$(PATH_NNRPYAUTH) $D$(PATH_OVDB_CONF) \
-- $D$(PATH_SASL_CONF) $D$(PATH_SUBSCRIPTIONS)
-+ $D$(PATH_NNRPAUTH) $D$(PATH_NNRPYAUTH)
-
- ALL_INSTALLED = $(MOST_INSTALLED) $(REST_INSTALLED)
-
diff --git a/news/inn/patches/patch-ai b/news/inn/patches/patch-ai
deleted file mode 100644
index 5b07297fbcd..00000000000
--- a/news/inn/patches/patch-ai
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ai,v 1.5 2004/07/24 23:55:28 grant Exp $
-
---- include/dbz.h.orig 2004-01-08 09:47:19.000000000 +1100
-+++ include/dbz.h
-@@ -38,7 +38,7 @@ typedef struct {
- bool nonblock;
- } dbzoptions;
-
--#ifdef __GNUC__
-+#if defined(__GNUC__) && !defined(PACKED)
- #define PACKED __attribute__ ((packed))
- #else
- #if !defined(PACKED)
diff --git a/news/knews/DESCR b/news/knews/DESCR
deleted file mode 100644
index 34bd1d03068..00000000000
--- a/news/knews/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-Knews is a threaded newsreader with an X Window interface that
-uses NNTP to get news. It displays the threads in a graphical tree.
diff --git a/news/knews/Makefile b/news/knews/Makefile
deleted file mode 100644
index 6df24a0d9cf..00000000000
--- a/news/knews/Makefile
+++ /dev/null
@@ -1,48 +0,0 @@
-# $NetBSD: Makefile,v 1.45 2005/04/11 21:47:03 tv Exp $
-
-DISTNAME= knews-1.0b.1
-PKGNAME= knews-1.0
-PKGREVISION= 10
-CATEGORIES= news x11
-MASTER_SITES= http://www.matematik.su.se/~kjj/
-
-MAINTAINER= tron@NetBSD.org
-HOMEPAGE= http://www.matematik.su.se/~kjj/
-COMMENT= X11 newsreader with support for threading and MIME
-
-CONFLICTS= knews-1.0b0
-
-USE_IMAKE= YES
-
-BUILD_DEFS+= KNEWS_DOMAIN_NAME KNEWS_DOMAIN_FILE USE_INET6
-
-.include "../../mk/bsd.prefs.mk"
-
-# Set KNEWS_DOMAIN_NAME to a string appended to the "From:" header or
-# KNEWS_DOMAIN_FILE to a file from which the domain name will be read.
-post-extract:
-.if !defined(KNEWS_DOMAIN_FILE) && !defined(KNEWS_DOMAIN_NAME)
- @${ECHO_MSG} "Type \"make KNEWS_DOMAIN_NAME=xyz\" to set the domain name."
-.elif defined(KNEWS_DOMAIN_FILE)
- @${ECHO_MSG} "Reading \"From:\" domain from file \"${KNEWS_DOMAIN_FILE}\"."
-.else
- @${ECHO_MSG} "Using \"${KNEWS_DOMAIN_NAME}\" as the \"From:\" domain name."
-.endif
-
-post-patch:
-.if defined(KNEWS_DOMAIN_FILE)
- ${ECHO} >>${WRKSRC}/configure.h \
- "#define DOMAIN_FILE \"${KNEWS_DOMAIN_FILE}\""
-.elif defined(KNEWS_DOMAIN_NAME)
- ${ECHO} >>${WRKSRC}/configure.h \
- "#define DOMAIN_NAME \"${KNEWS_DOMAIN_NAME}\""
-.endif
-.if defined(USE_INET6) && ${USE_INET6} == YES
- ${ECHO} >>${WRKSRC}/configure.h "#define USE_INET6 YES"
-.endif
-
-.include "../../graphics/jpeg/buildlink3.mk"
-.include "../../graphics/png/buildlink3.mk"
-.include "../../graphics/xpm/buildlink3.mk"
-.include "../../mail/faces/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/news/knews/PLIST b/news/knews/PLIST
deleted file mode 100644
index b53400c9f3d..00000000000
--- a/news/knews/PLIST
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2003/03/03 02:56:01 jschauma Exp $
-bin/knews
-lib/X11/app-defaults/Knews
-${IMAKE_MAN_DIR}/knews.${IMAKE_MANNEWSUFFIX}
diff --git a/news/knews/distinfo b/news/knews/distinfo
deleted file mode 100644
index 54340079a2b..00000000000
--- a/news/knews/distinfo
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD: distinfo,v 1.8 2005/02/24 12:19:55 agc Exp $
-
-SHA1 (knews-1.0b.1.tar.gz) = b56046036d4c6688439e6730b8ae2a2eade922db
-RMD160 (knews-1.0b.1.tar.gz) = c29cd8401bd802852f875d3c531f2f0f8805cc43
-Size (knews-1.0b.1.tar.gz) = 392225 bytes
-SHA1 (patch-aa) = 1f68aed0378d11b959a940185963f9081c596e15
-SHA1 (patch-ab) = c91ef1a71a9bd63a64d87e59a0a441386dc3d3c0
-SHA1 (patch-ac) = 8e087270e5b0be25b161b2462b61fcdce6edea42
-SHA1 (patch-ad) = c8ccc9dcd9e4aadd209366f738f2d6eb71464d59
-SHA1 (patch-ae) = 5048f46e187abb84822702de2aab486f707ea185
-SHA1 (patch-af) = 44698e8579f2ce6779a2959803ec8c2abf45c83d
-SHA1 (patch-ag) = c40ecd5f97542e968b21b340e65552be06142b43
-SHA1 (patch-ah) = b971332d24fe400c30fb46e44be9e5317166898f
-SHA1 (patch-ai) = 58e085e2b55300889709c2cd95a9cd4d14be177d
-SHA1 (patch-aj) = e19750ae0c64cf65dd5c52cc8e1a4798a6c69c0a
-SHA1 (patch-ak) = 45aa66d4d30cb5d5bfa5ce407472ec663481faa6
-SHA1 (patch-al) = 2988f9b41d0f22b4395ee8213f94ca47032a3f23
-SHA1 (patch-am) = e8f182e5f089e04e7a8b2e8ee260c254791bbb40
-SHA1 (patch-an) = a21c78baefa94ef2e8c6aa7310890d12337fbc65
-SHA1 (patch-ao) = 377bd3cdf11fac50c622113fea840179e7823200
-SHA1 (patch-ap) = e215b15ddc87fcc57d57387beda95565077bcc6a
-SHA1 (patch-aq) = c0adbcb8c7baf8bd20275acebdf6cb9378bfff29
-SHA1 (patch-ar) = b6f2cb066d124c9fec7bafc71cb76276613527e4
-SHA1 (patch-as) = eb0a693428e57f8aec90ce3594fb7940dfff6c34
-SHA1 (patch-at) = 08a2f2bbcef800df6f8f312a002a0b65b764ba26
-SHA1 (patch-au) = 5280d94ba94a520c1458cb018d65b30fe6ebbf67
-SHA1 (patch-av) = 28231ab867fb61a881c519a9e1bc0f4e4aad4ded
-SHA1 (patch-aw) = 474de717f637c76066cc7e580b840e8ffb66020f
-SHA1 (patch-ax) = 210e3b9a3185c7cc503a47923cf54d3d62a5e0d7
-SHA1 (patch-ay) = a636d73a4d6bc930dbf66abec5e342e2f00547ed
-SHA1 (patch-az) = 1d91236b5f1dd59e54e9d8b02f31090abe70b67b
-SHA1 (patch-ba) = a46041cc02ec99379d1c7a69534ca4574a1d8b77
-SHA1 (patch-bb) = 05963335420741b8ce5658ad43cbfa83379fe289
-SHA1 (patch-bc) = 74b0c0ee543f3753886dc75ea7d32a61256eb5b5
-SHA1 (patch-bd) = bda85621f338cecd8796a42170bfa493bb0592f4
-SHA1 (patch-be) = 3cf47af64e7865f3336b0549b78e3f56bbff2252
-SHA1 (patch-bf) = 5d51af81738c227de3ec6d23bbfe33c593410614
-SHA1 (patch-bg) = 84e4daf47ca111831661448c4411da4d9c803d27
-SHA1 (patch-bh) = a07383736b99b14c2d3a993f08f8734ba29e711e
diff --git a/news/knews/patches/patch-aa b/news/knews/patches/patch-aa
deleted file mode 100644
index 5bf2c6b22e9..00000000000
--- a/news/knews/patches/patch-aa
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2001/07/25 07:17:06 tron Exp $
-
---- configure.h.orig Tue Dec 29 11:47:02 1998
-+++ configure.h Wed Jul 25 09:14:17 2001
-@@ -14,8 +14,11 @@
- *
- * If you don't have sendmail, use /bin/false :-).
- */
--/* #define MAIL_COMMAND "/usr/sbin/sendmail -t" */
--/* #define MAIL_COMMAND "/usr/lib/sendmail -t" */
-+#ifdef __sun__
-+#define MAIL_COMMAND "/usr/lib/sendmail -t"
-+#else
-+#define MAIL_COMMAND "/usr/sbin/sendmail -t"
-+#endif
-
-
-
-@@ -84,9 +87,9 @@
- * libcompface.
- */
-
--#define HAVE_JPEG 0
--#define HAVE_PNG 0
--#define HAVE_COMPFACE 0
-+#define HAVE_COMPFACE 1
-+#define HAVE_JPEG 1
-+#define HAVE_PNG 1
-
-
-
-@@ -138,7 +141,7 @@
- *
- * Knews*backgroundPixmap: ~/dir/texture.xpm
- */
--#define HAVE_XPM 0
-+#define HAVE_XPM 1
-
-
- /* If your system doesn't have the POSIX sigaction() function, defining
diff --git a/news/knews/patches/patch-ab b/news/knews/patches/patch-ab
deleted file mode 100644
index df5cde249f2..00000000000
--- a/news/knews/patches/patch-ab
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD: patch-ab,v 1.5 1999/04/23 21:47:13 tron Exp $
-
---- knews.tmpl.orig Tue Dec 29 05:14:55 1998
-+++ knews.tmpl Tue Mar 9 06:30:33 1999
-@@ -1,4 +1,4 @@
--/*
-+ /*
- * This file is included into all Imakefiles. If your default compiler
- * is not ISO/ANSI compliant, you have to fix it here. Below are a few
- * example settings for systems I have access to.
-@@ -23,11 +23,9 @@
- */
-
- /* gcc on decent systems */
--#if 0
- CC = gcc
- CCOPTIONS = -ansi -pedantic -Wall
- CDEBUGFLAGS = -O2
--#endif
-
- /* gcc on SunOS 4.1.x (and maybe other non-decent systems) */
- #if 0
-@@ -74,13 +72,13 @@
- * be changed to -lgz.
- */
-
--JPEG_LIB = -ljpeg
-+JPEG_LIB = -L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -ljpeg
- PNG_LIB = -lpng -lz -lm
- COMPFACE_LIB = -lcompface
-
-
- /*
- * If you need to add include paths for e.g. libjpeg, libpng or libzlib
- * include files, do it here.
- */
--KNEWS_INCLUDES =
-+KNEWS_INCLUDES = -I${LOCALBASE}/include
diff --git a/news/knews/patches/patch-ac b/news/knews/patches/patch-ac
deleted file mode 100644
index 59ef949390d..00000000000
--- a/news/knews/patches/patch-ac
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-ac,v 1.5 1999/07/24 12:02:33 tron Exp $
-
---- src/domain.c.orig Sun Aug 23 16:23:19 1998
-+++ src/domain.c Sat Jul 24 13:57:12 1999
-@@ -66,10 +66,25 @@
- }
- }
-
-+static void fix_mail_name(void)
-+{
-+ char *dn;
-+
-+ if (!global.mail_name) return;
-+
-+ dn = strchr(global.mail_name, '@');
-+ if (!dn) return;
-+ *dn++='\0';
-+
-+ XtFree(global.domain_name);
-+ global.domain_name = XtNewString(dn);
-+}
-+
- void fix_domain_stuff()
- {
- fix_domain_name();
- fix_user_id();
-+ fix_mail_name();
-
- if (!global.domain_name)
- fputs("knews: Couldn't determine domain name. "
diff --git a/news/knews/patches/patch-ad b/news/knews/patches/patch-ad
deleted file mode 100644
index d392ef5b8c9..00000000000
--- a/news/knews/patches/patch-ad
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-ad,v 1.6 2001/07/24 17:18:38 tron Exp $
-
---- src/Imakefile.orig Sat Nov 21 16:31:37 1998
-+++ src/Imakefile Tue Jul 24 19:13:44 2001
-@@ -5,6 +5,8 @@
- #undef MAIL_COMMAND
- #undef EDIT_COMMAND
-
-+LDPRELIBS =
-+
- XMU_LIB =
- XPM_LIB =
- REGEXP_LIB =
-@@ -16,11 +18,11 @@
- #endif
-
- #if HAVE_XMU
--XMU_LIB = -lXmu
-+XMU_LIB = $(LDPRELIB) -lXmu
- #endif
-
- #if HAVE_XPM
--XPM_LIB = -lXpm
-+XPM_LIB = -Wl,-R$(USRLIBDIR) -lXpm
- #endif
-
- #if !HAVE_JPEG
diff --git a/news/knews/patches/patch-ae b/news/knews/patches/patch-ae
deleted file mode 100644
index 9816daec744..00000000000
--- a/news/knews/patches/patch-ae
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ae,v 1.4 2000/08/01 21:59:27 tron Exp $
-
---- src/global.h.orig Sat Nov 21 15:43:56 1998
-+++ src/global.h Tue Aug 1 23:56:21 2000
-@@ -2,10 +2,12 @@
- * Copyright (C) 1995, 1996 Karl-Johan Johnsson.
- */
-
-+#ifndef __NetBSD__
- #undef _POSIX_SOURCE
- #define _POSIX_SOURCE 1
- #undef _POSIX_C_SOURCE
- #define _POSIX_C_SOURCE 2
-+#endif
-
- #define KNEWS_VERSION "1.0b.1"
-
diff --git a/news/knews/patches/patch-af b/news/knews/patches/patch-af
deleted file mode 100644
index 0aae44cb9d1..00000000000
--- a/news/knews/patches/patch-af
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-af,v 1.4 2001/02/24 22:40:40 tron Exp $
-
---- src/sysdeps.h.orig Fri Jan 9 18:16:24 1998
-+++ src/sysdeps.h Sat Feb 24 23:30:34 2001
-@@ -2,7 +2,11 @@
- * Copyright (C) 1995, 1996 Karl-Johan Johnsson.
- */
-
-+#if defined(USE_INET6)
-+typedef struct addrinfo SERV_ADDR;
-+#else
- typedef struct SERV_ADDR SERV_ADDR;
-+#endif
-
- #define NNTP_PORT 119
- #define FTP_PORT 21
-@@ -14,7 +18,9 @@
- extern void abort_callback(Widget, XtPointer, XtPointer);
-
- extern SERV_ADDR *get_host(char*, unsigned short, int);
--extern int open_socket(void);
-+extern SERV_ADDR *next_addr(SERV_ADDR *);
-+extern void free_addr(SERV_ADDR *);
-+extern int open_socket(SERV_ADDR *);
- extern int connect_socket(int, SERV_ADDR*);
- extern int open_duplex(int*);
- extern int bind_and_listen(int);
diff --git a/news/knews/patches/patch-ag b/news/knews/patches/patch-ag
deleted file mode 100644
index cc198d555b2..00000000000
--- a/news/knews/patches/patch-ag
+++ /dev/null
@@ -1,141 +0,0 @@
-$NetBSD: patch-ag,v 1.5 2001/03/10 22:05:54 tron Exp $
-
---- src/sysdeps.c.orig Tue Dec 29 11:46:52 1998
-+++ src/sysdeps.c Sat Feb 24 23:31:43 2001
-@@ -20,8 +20,8 @@
- #include <netinet/in.h>
- #include <arpa/inet.h>
-
--#include "server.h"
- #include "sysdeps.h"
-+#include "server.h"
-
- #undef PURIFY_HACK
- /*#define PURIFY_HACK*/
-@@ -96,6 +96,9 @@
- #ifdef EINPROGRESS
- err_no == EINPROGRESS ||
- #endif
-+#ifdef EALREADY
-+ err_no == EALREADY ||
-+#endif
- err_no == EAGAIN);
- }
-
-@@ -256,10 +259,12 @@
-
- /***********************************************************************/
-
-+#if !defined(USE_INET6)
- struct SERV_ADDR {
- struct in_addr addr;
- unsigned short port;
- };
-+#endif
-
- /*
- * host: either "hostname:port" or "ip.ip.ip.ip:port",
-@@ -271,6 +276,28 @@
- */
- SERV_ADDR *get_host(char *host, unsigned short def_port, int byte_swap)
- {
-+#if defined(USE_INET6)
-+ char *c, *port, buffer[6];
-+ struct addrinfo hints, *res;
-+
-+ port = 0;
-+ c = strrchr(host, ':');
-+ if (c) {
-+ *c = '\0';
-+ if (c[1] >= '0' && c[1] <= '9')
-+ port = c + 1;
-+ }
-+ if (!port) {
-+ sprintf(buffer, "%d", def_port);
-+ port = buffer;
-+ }
-+
-+ memset(&hints, '\0', sizeof(hints));
-+ hints.ai_family = AF_UNSPEC;
-+ hints.ai_socktype = SOCK_STREAM;
-+ hints.ai_protocol = 0;
-+ return getaddrinfo(host, port, &hints, &res) ? NULL : res;
-+#else
- SERV_ADDR *ret;
- struct in_addr addr;
- unsigned short port;
-@@ -332,14 +359,38 @@
- ret->port = port;
-
- return ret;
-+#endif
- }
-
--int open_socket(void)
-+SERV_ADDR *next_addr(SERV_ADDR *addr)
-+
-+{
-+#ifdef USE_INET6
-+ return addr->ai_next;
-+#else
-+ return NULL;
-+#endif
-+}
-+void free_addr(SERV_ADDR *addr)
-+
-+{
-+#ifdef USE_INET6
-+ freeaddrinfo(addr);
-+#else
-+ XtFree((char *)addr);
-+#endif
-+}
-+
-+int open_socket(SERV_ADDR *addr)
- {
- int fd, tmp;
-
- do {
-- fd = socket(PF_INET, SOCK_STREAM, 0);
-+#ifdef USE_INET6
-+ fd = socket(addr->ai_family, addr->ai_socktype, addr->ai_protocol);
-+#else
-+ fd = socket(AF_INET, SOCK_STREAM, 0);
-+#endif
- } while (fd < 0 && errno == EINTR);
-
- if (fd < 0) {
-@@ -372,8 +423,15 @@
-
- int connect_socket(int fd, SERV_ADDR *addr)
- {
-- struct sockaddr_in serv_addr;
- int tmp;
-+#ifdef USE_INET6
-+ do {
-+ tmp = connect(fd, addr->ai_addr, addr->ai_addrlen);
-+ } while (tmp < 0 && errno == EINTR);
-+
-+ return tmp;
-+#else
-+ struct sockaddr_in serv_addr;
-
- if (!addr) {
- fputs("knews: connect_socket: addr is NULL!!!\n", stderr);
-@@ -390,6 +448,7 @@
- } while (tmp < 0 && errno == EINTR);
-
- return tmp;
-+#endif
- }
-
- #if 0 /* Misc stuff for ftp routines */
-@@ -548,7 +607,7 @@
- char *get_mailhostname(void)
- {
- struct utsname un = {{0,},};
-- char *host = NULL, *domain;
-+ char *host = NULL;
-
- #ifdef PURIFY_HACK
- return NULL;
diff --git a/news/knews/patches/patch-ah b/news/knews/patches/patch-ah
deleted file mode 100644
index 8e7a7243620..00000000000
--- a/news/knews/patches/patch-ah
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ah,v 1.2 2001/02/24 22:40:40 tron Exp $
-
---- src/xutil.c.orig Fri Jan 9 18:16:20 1998
-+++ src/xutil.c Sat Feb 24 23:32:58 2001
-@@ -18,6 +18,7 @@
- #include "resource.h"
- #include "save.h"
- #include "search.h"
-+#include "sysdeps.h"
- #include "server.h"
- #include "tag.h"
- #include "thread.h"
-@@ -343,7 +344,7 @@
- qf(main_server);
-
- server_close(main_server);
-- XtFree(global.serv_addr);
-+ free_addr(global.serv_addr);
- global.serv_addr = NULL;
-
- clear_thread_context(main_thr);
diff --git a/news/knews/patches/patch-ai b/news/knews/patches/patch-ai
deleted file mode 100644
index db28d7dccf4..00000000000
--- a/news/knews/patches/patch-ai
+++ /dev/null
@@ -1,121 +0,0 @@
-$NetBSD: patch-ai,v 1.5 2001/03/12 13:23:00 tron Exp $
-
---- src/server.c.orig Fri Jan 9 18:16:22 1998
-+++ src/server.c Mon Mar 12 14:11:00 2001
-@@ -2,19 +2,21 @@
- * Copyright (C) 1995, 1996 Karl-Johan Johnsson.
- */
-
-+#include <sys/types.h>
-+#include <sys/socket.h>
-+
- #include "global.h"
- #include "child.h"
- #include "codes.h"
- #include "connect.h"
- #include "file.h"
- #include "resource.h"
-+#include "sysdeps.h"
- #include "server.h"
- #include "util.h"
- #include "widgets.h"
- #include "xutil.h"
-
--#include "sysdeps.h"
--
- struct SERVER {
- int fd;
- char *buffer;
-@@ -128,37 +130,70 @@
- * tell != 0 means tell about errors
- * tell > 1 means say what you're doing
- */
--int server_open(SERVER *server, struct SERV_ADDR *addr, int tell)
-+int server_open(SERVER *server, SERV_ADDR *addr, int tell)
- {
-- long tmp;
-+ int tmp;
-
- server_close(server);
-- server->fd = open_socket();
-- if (server->fd < 0) {
-- set_message("Error: Failed to create socket!", True);
-- return -1;
-- }
-+ while (addr) {
-+ server->fd = open_socket(addr);
-+ if (server->fd < 0) {
-+ set_message("Error: Failed to create socket!", True);
-+ return -1;
-+ }
-
-- if (tell > 1)
-- set_message("Server contacted, waiting for response...", False);
-+ if (tell > 1)
-+ set_message("Server contacted, waiting for response...", False);
-
-- tmp = connect_socket(server->fd, addr);
-+ if (connect_socket(server->fd, addr) == 0)
-+ break;
-
-- if (tmp < 0 && would_block(server->fd, errno)) {
-- if (tell == 0)
-- return 0; /* don't block */
--
-- tmp = 0;
-- do_wait(&server->fd, True, server->quit_func, server);
-- if (server->fd < 0)
-- return -1;
-+ if (would_block(server->fd, errno)) {
-+ if (tell == 0)
-+ return 0; /* don't block */
-+
-+ do_wait(&server->fd, True, server->quit_func, server);
-+ if (server->fd < 0)
-+ return -1;
-+ else {
-+#ifdef __NetBSD__
-+ socklen_t length;
-+ int error;
-+#else
-+ int length, error;
-+#endif
-+ length = sizeof(error);
-+ if (getsockopt(server->fd, SOL_SOCKET, SO_ERROR,
-+ (char *)&error, &length) == 0) {
-+ if (error == 0)
-+ break;
-+ else
-+ errno = error;
-+ }
-+ }
-+ }
-+
-+ server_close(server);
-+ addr = next_addr(addr);
-+ }
-+
-+ if (server->fd < 0) {
-+ if (tell) {
-+ char message[128];
-+ char *tmp = error_string(errno);
-+
-+ if (!tmp)
-+ tmp = "Connection failed";
-+ sprintf(message, "Error: %s!", tmp);
-+ set_message(message, True);
-+ }
-+ return -1;
- }
-
- server->buffer[0] = '\0';
-- if (tmp >= 0)
-- do {
-- tmp = read(server->fd, server->buffer, server->len);
-- } while (tmp < 0 && errno == EINTR);
-+ do {
-+ tmp = read(server->fd, server->buffer, server->len);
-+ } while (tmp < 0 && errno == EINTR);
-
- if (tmp >= 0) {
- server->buffer[tmp] = '\0';
diff --git a/news/knews/patches/patch-aj b/news/knews/patches/patch-aj
deleted file mode 100644
index 94b751be774..00000000000
--- a/news/knews/patches/patch-aj
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2001/02/23 22:19:42 tron Exp $
-
---- src/server.h.orig Fri Jan 9 18:16:20 1998
-+++ src/server.h Fri Feb 23 22:26:47 2001
-@@ -7,12 +7,11 @@
-
- typedef struct SERVER SERVER;
- typedef void (*QuitFunc)(void*);
--struct SERV_ADDR;
-
- extern SERVER *server_create(int);
- extern void server_free(SERVER*);
- extern void server_close(SERVER*);
--extern int server_open(SERVER*, struct SERV_ADDR*, int);
-+extern int server_open(SERVER*, SERV_ADDR*, int);
- extern int server_fork(SERVER*, char*, int);
- extern long server_write_raw(SERVER*, char*, long);
- extern int server_write(SERVER*, char*);
diff --git a/news/knews/patches/patch-ak b/news/knews/patches/patch-ak
deleted file mode 100644
index ca6952f587d..00000000000
--- a/news/knews/patches/patch-ak
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2001/02/23 22:19:42 tron Exp $
-
---- src/actions.c.orig Fri Jan 9 18:16:22 1998
-+++ src/actions.c Fri Feb 23 22:27:59 2001
-@@ -7,6 +7,7 @@
- #include "procs.h"
- #include "read.h"
- #include "search.h"
-+#include "sysdeps.h"
- #include "server.h"
- #include "thread.h"
- #include "util.h"
diff --git a/news/knews/patches/patch-al b/news/knews/patches/patch-al
deleted file mode 100644
index c1bf3806196..00000000000
--- a/news/knews/patches/patch-al
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-al,v 1.1 2001/02/23 22:19:42 tron Exp $
-
---- src/ahead.c.orig Wed Oct 21 18:25:44 1998
-+++ src/ahead.c Fri Feb 23 22:28:47 2001
-@@ -12,6 +12,7 @@
- #include "newsrc.h"
- #include "parse.h"
- #include "resource.h"
-+#include "sysdeps.h"
- #include "server.h"
- #include "thread.h"
- #include "util.h"
diff --git a/news/knews/patches/patch-am b/news/knews/patches/patch-am
deleted file mode 100644
index cef122bf252..00000000000
--- a/news/knews/patches/patch-am
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-am,v 1.1 2001/02/23 22:19:42 tron Exp $
-
---- src/bg.c.orig Fri Jan 9 18:16:19 1998
-+++ src/bg.c Fri Feb 23 22:29:35 2001
-@@ -6,8 +6,8 @@
- #include "bg.h"
- #include "codes.h"
- #include "resource.h"
--#include "server.h"
- #include "sysdeps.h"
-+#include "server.h"
- #include "widgets.h"
- #include "xutil.h"
- #include "../Widgets/ScrList.h"
diff --git a/news/knews/patches/patch-an b/news/knews/patches/patch-an
deleted file mode 100644
index 1b2f4277f1d..00000000000
--- a/news/knews/patches/patch-an
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-an,v 1.1 2001/02/23 22:19:42 tron Exp $
-
---- src/cache.c.orig Fri Jan 9 18:16:24 1998
-+++ src/cache.c Fri Feb 23 22:30:25 2001
-@@ -8,6 +8,7 @@
- #include "codes.h"
- #include "file.h"
- #include "resource.h"
-+#include "sysdeps.h"
- #include "server.h"
- #include "thread.h"
- #include "util.h"
diff --git a/news/knews/patches/patch-ao b/news/knews/patches/patch-ao
deleted file mode 100644
index 2ea01e14546..00000000000
--- a/news/knews/patches/patch-ao
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ao,v 1.1 2001/02/23 22:19:42 tron Exp $
-
---- src/connect.c.orig Fri Jan 9 18:16:28 1998
-+++ src/connect.c Fri Feb 23 22:31:08 2001
-@@ -13,8 +13,8 @@
- #include "newsrc.h"
- #include "resource.h"
- #include "file.h"
--#include "server.h"
- #include "sysdeps.h"
-+#include "server.h"
- #include "util.h"
- #include "widgets.h"
- #include "xutil.h"
diff --git a/news/knews/patches/patch-ap b/news/knews/patches/patch-ap
deleted file mode 100644
index 30cdd22dbae..00000000000
--- a/news/knews/patches/patch-ap
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ap,v 1.1 2001/02/23 22:19:42 tron Exp $
-
---- src/k_file.c.orig Fri Jan 9 18:16:24 1998
-+++ src/k_file.c Fri Feb 23 22:31:53 2001
-@@ -12,6 +12,7 @@
- #include "k_kill.h"
- #include "k_node.h"
- #include "resource.h"
-+#include "sysdeps.h"
- #include "server.h"
- #include "util.h"
- #include "thread.h"
diff --git a/news/knews/patches/patch-aq b/news/knews/patches/patch-aq
deleted file mode 100644
index 48814f7ef5b..00000000000
--- a/news/knews/patches/patch-aq
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-aq,v 1.1 2001/02/23 22:19:42 tron Exp $
-
---- src/main.c.orig Sat Nov 21 15:43:37 1998
-+++ src/main.c Fri Feb 23 22:33:25 2001
-@@ -21,14 +21,13 @@
- #include "read.h"
- #include "resource.h"
- #include "save.h"
-+#include "sysdeps.h"
- #include "server.h"
- #include "tag.h"
- #include "thread.h"
- #include "uudecode.h"
- #include "widgets.h"
- #include "xutil.h"
--
--#include "sysdeps.h"
-
- struct Global global = {0, };
- XtAppContext app_cont;
diff --git a/news/knews/patches/patch-ar b/news/knews/patches/patch-ar
deleted file mode 100644
index 11f2b82e59a..00000000000
--- a/news/knews/patches/patch-ar
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ar,v 1.1 2001/02/23 22:19:42 tron Exp $
-
---- src/misc.c.orig Sun Aug 23 14:07:29 1998
-+++ src/misc.c Fri Feb 23 22:33:57 2001
-@@ -16,6 +16,7 @@
- #include "resource.h"
- #include "save.h"
- #include "search.h"
-+#include "sysdeps.h"
- #include "server.h"
- #include "tag.h"
- #include "thread.h"
diff --git a/news/knews/patches/patch-as b/news/knews/patches/patch-as
deleted file mode 100644
index 5b4ea5c308f..00000000000
--- a/news/knews/patches/patch-as
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-as,v 1.1 2001/02/23 22:19:42 tron Exp $
-
---- src/newsrc.c.orig Thu Nov 19 09:55:52 1998
-+++ src/newsrc.c Fri Feb 23 22:34:40 2001
-@@ -9,6 +9,7 @@
- #include "file.h"
- #include "newsrc.h"
- #include "resource.h"
-+#include "sysdeps.h"
- #include "server.h"
- #include "util.h"
- #include "widgets.h"
diff --git a/news/knews/patches/patch-at b/news/knews/patches/patch-at
deleted file mode 100644
index 70e80382a2d..00000000000
--- a/news/knews/patches/patch-at
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-at,v 1.1 2001/02/23 22:19:42 tron Exp $
-
---- src/p_menu.c.orig Fri Jan 9 18:16:28 1998
-+++ src/p_menu.c Fri Feb 23 22:35:22 2001
-@@ -14,6 +14,7 @@
- #include "p_post.h"
- #include "p_setup.h"
- #include "resource.h"
-+#include "sysdeps.h"
- #include "server.h"
- #include "util.h"
- #include "widgets.h"
diff --git a/news/knews/patches/patch-au b/news/knews/patches/patch-au
deleted file mode 100644
index 9857afb5f24..00000000000
--- a/news/knews/patches/patch-au
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-au,v 1.1 2001/02/23 22:19:43 tron Exp $
-
---- src/p_post.c.orig Fri Jan 9 18:16:21 1998
-+++ src/p_post.c Fri Feb 23 22:36:04 2001
-@@ -16,6 +16,7 @@
- #include "p_popup.h"
- #include "p_post.h"
- #include "resource.h"
-+#include "sysdeps.h"
- #include "server.h"
- #include "thread.h"
- #include "util.h"
diff --git a/news/knews/patches/patch-av b/news/knews/patches/patch-av
deleted file mode 100644
index 9a8faf094d6..00000000000
--- a/news/knews/patches/patch-av
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-av,v 1.1 2001/02/23 22:19:43 tron Exp $
-
---- src/p_setup.c.orig Sun Aug 23 15:05:17 1998
-+++ src/p_setup.c Fri Feb 23 22:36:39 2001
-@@ -14,6 +14,7 @@
- #include "p_setup.h"
- #include "parse.h"
- #include "resource.h"
-+#include "sysdeps.h"
- #include "server.h"
- #include "util.h"
- #include "xutil.h"
diff --git a/news/knews/patches/patch-aw b/news/knews/patches/patch-aw
deleted file mode 100644
index 23c6c4cb789..00000000000
--- a/news/knews/patches/patch-aw
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aw,v 1.1 2001/02/23 22:19:43 tron Exp $
-
---- src/partial.c.orig Fri Jan 9 18:16:22 1998
-+++ src/partial.c Fri Feb 23 22:37:36 2001
-@@ -12,6 +12,7 @@
- #include "partial.h"
- #include "read.h"
- #include "resource.h"
-+#include "sysdeps.h"
- #include "server.h"
- #include "tag.h"
- #include "thread.h"
diff --git a/news/knews/patches/patch-ax b/news/knews/patches/patch-ax
deleted file mode 100644
index d762e1126f7..00000000000
--- a/news/knews/patches/patch-ax
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ax,v 1.1 2001/02/23 22:19:43 tron Exp $
-
---- src/procs.c.orig Sun Aug 23 14:48:43 1998
-+++ src/procs.c Fri Feb 23 22:38:20 2001
-@@ -15,6 +15,7 @@
- #include "resource.h"
- #include "save.h"
- #include "search.h"
-+#include "sysdeps.h"
- #include "server.h"
- #include "tag.h"
- #include "thread.h"
diff --git a/news/knews/patches/patch-ay b/news/knews/patches/patch-ay
deleted file mode 100644
index 155b0b5c98b..00000000000
--- a/news/knews/patches/patch-ay
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ay,v 1.1 2001/02/23 22:19:43 tron Exp $
-
---- src/read.c.orig Sat Nov 21 15:57:49 1998
-+++ src/read.c Fri Feb 23 22:38:56 2001
-@@ -16,6 +16,7 @@
- #include "read.h"
- #include "resource.h"
- #include "save.h"
-+#include "sysdeps.h"
- #include "server.h"
- #include "tag.h"
- #include "util.h"
diff --git a/news/knews/patches/patch-az b/news/knews/patches/patch-az
deleted file mode 100644
index 7280bab6535..00000000000
--- a/news/knews/patches/patch-az
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-az,v 1.1 2001/02/23 22:19:43 tron Exp $
-
---- src/save.c.orig Sun Aug 23 13:03:06 1998
-+++ src/save.c Fri Feb 23 22:39:36 2001
-@@ -11,6 +11,7 @@
- #include "connect.h"
- #include "file.h"
- #include "save.h"
-+#include "sysdeps.h"
- #include "server.h"
- #include "tag.h"
- #include "util.h"
diff --git a/news/knews/patches/patch-ba b/news/knews/patches/patch-ba
deleted file mode 100644
index 0a084956d85..00000000000
--- a/news/knews/patches/patch-ba
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ba,v 1.1 2001/02/23 22:19:43 tron Exp $
-
---- src/search.c.orig Fri Jan 9 18:16:22 1998
-+++ src/search.c Fri Feb 23 22:40:18 2001
-@@ -9,6 +9,7 @@
- #include "newsrc.h"
- #include "read.h"
- #include "search.h"
-+#include "sysdeps.h"
- #include "server.h"
- #include "tag.h"
- #include "thread.h"
diff --git a/news/knews/patches/patch-bb b/news/knews/patches/patch-bb
deleted file mode 100644
index 2d9cd5e9473..00000000000
--- a/news/knews/patches/patch-bb
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-bb,v 1.1 2001/02/23 22:19:43 tron Exp $
-
---- src/thread.c.orig Sun Aug 23 16:24:22 1998
-+++ src/thread.c Fri Feb 23 22:43:07 2001
-@@ -17,6 +17,7 @@
- #include "parse.h"
- #include "read.h"
- #include "resource.h"
-+#include "sysdeps.h"
- #include "server.h"
- #include "sort.h"
- #include "thread.h"
diff --git a/news/knews/patches/patch-bc b/news/knews/patches/patch-bc
deleted file mode 100644
index 8f4f82226db..00000000000
--- a/news/knews/patches/patch-bc
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-bc,v 1.1 2001/02/23 22:19:43 tron Exp $
-
---- src/uudecode.c.orig Fri Jan 9 18:16:22 1998
-+++ src/uudecode.c Fri Feb 23 22:43:53 2001
-@@ -8,6 +8,7 @@
- #include "file.h"
- #include "resource.h"
- #include "save.h"
-+#include "sysdeps.h"
- #include "server.h"
- #include "util.h"
- #include "uudecode.h"
diff --git a/news/knews/patches/patch-bd b/news/knews/patches/patch-bd
deleted file mode 100644
index d91e014c47f..00000000000
--- a/news/knews/patches/patch-bd
+++ /dev/null
@@ -1,139 +0,0 @@
-$NetBSD: patch-bd,v 1.2 2002/03/15 03:25:57 fredb Exp $
-
---- src/png.c.orig Sat Nov 21 08:55:13 1998
-+++ src/png.c
-@@ -78,8 +78,8 @@
-
- Pixmap do_png(char *data, long len, long *wp, long *hp)
- {
-- png_struct p_str;
-- png_info p_info;
-+ png_struct *p_str = NULL;
-+ png_info *p_info = NULL;
- Pixmap pixmap;
- FILE *volatile vol_fp = NULL;
- void *volatile vol_pic = NULL;
-@@ -98,7 +98,11 @@
- return None;
- }
-
-- if (setjmp(p_str.jmpbuf))
-+ if ((p_str = (png_struct *) png_create_read_struct(PNG_LIBPNG_VER_STRING,
-+ NULL, NULL, NULL)))
-+ p_info = (png_info *) png_create_info_struct(p_str);
-+
-+ if (p_str && p_info && setjmp(png_jmpbuf(p_str)))
- ArtTextAddLine(main_widgets.text, "[knews: png error.]",
- ascii_font->body_font, global.alert_pixel);
- else {
-@@ -108,58 +112,55 @@
- unsigned int per_line = 0;
- unsigned int i, j, pass;
-
-- png_read_init(&p_str);
-- png_info_init(&p_info);
--
-- png_init_io(&p_str, vol_fp);
-- png_read_info(&p_str, &p_info);
-+ png_init_io(p_str, vol_fp);
-+ png_read_info(p_str, p_info);
-
-- vol_w = w = p_info.width;
-- vol_h = h = p_info.height;
-+ vol_w = w = p_info->width;
-+ vol_h = h = p_info->height;
-
-- if (p_info.bit_depth == 16)
-- png_set_strip_16(&p_str);
-- else if (p_info.bit_depth < 8)
-- png_set_packing(&p_str);
-+ if (p_info->bit_depth == 16)
-+ png_set_strip_16(p_str);
-+ else if (p_info->bit_depth < 8)
-+ png_set_packing(p_str);
-
-- if (p_info.valid & PNG_INFO_bKGD)
-- png_set_background(&p_str, &p_info.background,
-+ if (p_info->valid & PNG_INFO_bKGD)
-+ png_set_background(p_str, &p_info->background,
- PNG_BACKGROUND_GAMMA_FILE, True, 1.0);
- else {
- static png_color_16 bg = {0, };
-- png_set_background(&p_str, &bg,
-+ png_set_background(p_str, &bg,
- PNG_BACKGROUND_GAMMA_SCREEN, False, 1.0);
- }
-
- per_line = w;
-
-- if (!(p_info.color_type & PNG_COLOR_MASK_COLOR)) { /* grey image */
-+ if (!(p_info->color_type & PNG_COLOR_MASK_COLOR)) { /* grey image */
- grey = True;
-- png_set_expand(&p_str);
-+ png_set_expand(p_str);
- } else if (!p_cmap) { /* true color visual */
-- if (p_info.color_type == PNG_COLOR_TYPE_PALETTE)
-- png_set_expand(&p_str);
-+ if (p_info->color_type == PNG_COLOR_TYPE_PALETTE)
-+ png_set_expand(p_str);
- per_line *= 3;
-- } else if (p_info.color_type & PNG_COLOR_MASK_PALETTE) {
-+ } else if (p_info->color_type & PNG_COLOR_MASK_PALETTE) {
- CMAP_ENTRY *pal;
- int i, pn;
-
-- pn = p_info.num_palette;
-+ pn = p_info->num_palette;
- pal = (CMAP_ENTRY *)XtMalloc(pn * sizeof *pal);
- for (i = 0 ; i < pn ; i++) {
-- pal[i].r = p_info.palette[i].red;
-- pal[i].g = p_info.palette[i].green;
-- pal[i].b = p_info.palette[i].blue;
-+ pal[i].r = p_info->palette[i].red;
-+ pal[i].g = p_info->palette[i].green;
-+ pal[i].b = p_info->palette[i].blue;
- }
- vol_pal = pal;
- vol_pn = pn;
- } else {
-- png_set_dither(&p_str, p_cmap, cmap_size,
-+ png_set_dither(p_str, p_cmap, cmap_size,
- cmap_size, NULL, True);
- }
-
-- pass = png_set_interlace_handling(&p_str);
-- png_start_read_image(&p_str);
-+ pass = png_set_interlace_handling(p_str);
-+ png_start_read_image(p_str);
-
- vol_pic = pic = (unsigned char *)XtMalloc(h * per_line);
-
-@@ -167,14 +168,14 @@
- for (i = 0 ; i < pass ; i++) {
- row = pic;
- for (j = 0 ; j < h ; j++) {
-- png_read_row(&p_str, NULL, row);
-+ png_read_row(p_str, NULL, row);
- if (!did)
- vol_did = did = True;
- row += per_line;
- }
- }
-
-- png_read_end(&p_str, NULL);
-+ png_read_end(p_str, NULL);
- }
-
- if (!vol_did)
-@@ -204,7 +205,10 @@
- }
- }
-
-- png_read_destroy(&p_str, &p_info, NULL);
-+ if (p_info)
-+ png_destroy_read_struct(&p_str, &p_info, NULL);
-+ else
-+ png_destroy_read_struct(&p_str, NULL, NULL);
- fclose((FILE *)vol_fp);
- XtFree((char *)vol_pic);
- XtFree((char *)vol_pal);
diff --git a/news/knews/patches/patch-be b/news/knews/patches/patch-be
deleted file mode 100644
index 6bed07ac54a..00000000000
--- a/news/knews/patches/patch-be
+++ /dev/null
@@ -1,138 +0,0 @@
-$NetBSD: patch-be,v 1.1 2001/08/15 06:09:02 fredb Exp $
-
---- src/expand.c.orig Fri Jan 9 11:16:29 1998
-+++ src/expand.c
-@@ -110,49 +110,46 @@
- return dest;
- }
-
--char *expand_path(char *file_name)
-+char *expand_save_text(char *src)
- {
-- char *path = NULL;
-+ char *dest = NULL;
- long len = 0, pos = 0;
- char ch;
-
-- if (file_name[0] == '~' && file_name[1] == '/')
-- file_name += 2;
--
-- for (ch = *file_name++ ; ch != '\0' ; ch = *file_name++) {
-+ for (ch = *src++ ; ch != '\0' ; ch = *src++) {
- if (pos + 8 > len) {
- len = pos + 256;
-- path = XtRealloc(path, len);
-+ dest = XtRealloc(dest, len);
- }
-
- if (ch != '%')
-- path[pos++] = ch;
-+ dest[pos++] = ch;
- else {
- char *p, *c = NULL;
- int cap = False;
- int slash = False;
- int clen = 0;
-
-- ch = *file_name++;
-+ ch = *src++;
- switch (ch) {
- case '%':
-- path[pos++] = '%';
-+ dest[pos++] = '%';
- continue; /* don't fall through */
- case 'a':
- case 'A':
- if (global.mode != NewsModeGroup &&
- global.mode != NewsModeThread) {
- fputs("knews: Not in a newsgroup!\n", stderr);
-- XtFree(path);
-+ XtFree(dest);
- return NULL;
- }
- if (!global.curr_art) {
- fputs("knews: No selected article!\n", stderr);
-- XtFree(path);
-+ XtFree(dest);
- return NULL;
- }
-- sprintf(path + pos, "%ld", global.curr_art->no);
-- pos += strlen(path + pos);
-+ sprintf(dest + pos, "%ld", global.curr_art->no);
-+ pos += strlen(dest + pos);
- continue;
- case 'g':
- slash = True;
-@@ -180,7 +177,7 @@
- c = global.nntp_server;
- if (!c) {
- fputs("knews: nntp_server is NULL!\n", stderr);
-- XtFree(path);
-+ XtFree(dest);
- return NULL;
- }
- p = strchr(c, ':');
-@@ -192,7 +189,7 @@
- default:
- fprintf(stderr,
- "knews: %%%c: Unknown format specifier.\n", ch);
-- XtFree(path);
-+ XtFree(dest);
- return NULL;
- }
-
-@@ -202,7 +199,7 @@
- clen = strlen(c);
- } else {
- fputs("knews: Not in a newsgroup.\n", stderr);
-- XtFree(path);
-+ XtFree(dest);
- return NULL;
- }
-
-@@ -210,7 +207,7 @@
- continue;
- if (pos + clen + 8 > len) {
- len = pos + clen + 256;
-- path = XtRealloc(path, len);
-+ dest = XtRealloc(dest, len);
- }
-
- ch = *c++;
-@@ -219,18 +216,32 @@
- if (cap && islower((unsigned char)ch))
- ch = toupper((unsigned char)ch);
-
-- path[pos++] = ch;
-+ dest[pos++] = ch;
- while (clen-- > 0) {
- ch = *c++;
-
- if (ch == '.' && slash)
- ch ='/';
-- path[pos++] = ch;
-+ dest[pos++] = ch;
- }
-- path[pos] = '\0';
-+ dest[pos] = '\0';
- }
- }
-- path[pos] = '\0';
-+ dest[pos] = '\0';
-+
-+ return dest;
-+}
-+
-+char *expand_path(char *file_name)
-+{
-+ char *path = NULL;
-+
-+ if (file_name[0] == '~' && file_name[1] == '/')
-+ file_name += 2;
-+
-+ path = expand_save_text(file_name);
-+ if (!path)
-+ return NULL;
-
- return path;
- }
diff --git a/news/knews/patches/patch-bf b/news/knews/patches/patch-bf
deleted file mode 100644
index 7b63af01e4f..00000000000
--- a/news/knews/patches/patch-bf
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: patch-bf,v 1.1 2001/08/15 06:09:02 fredb Exp $
-
---- src/expand.h.orig Fri Jan 9 11:16:29 1998
-+++ src/expand.h
-@@ -7,4 +7,5 @@
- extern char *regexp_escape_string(char*, int);
- extern char *expand_view_command(const char*, char*, char*,
- struct MimeArg*, int, int);
-+extern char *expand_save_text(char*);
- extern char *expand_path(char*);
diff --git a/news/knews/patches/patch-bg b/news/knews/patches/patch-bg
deleted file mode 100644
index 76d8a9a0e6c..00000000000
--- a/news/knews/patches/patch-bg
+++ /dev/null
@@ -1,68 +0,0 @@
-$NetBSD: patch-bg,v 1.1 2001/08/15 06:09:02 fredb Exp $
-
---- src/save.c.orig Sun Jul 8 08:31:37 2001
-+++ src/save.c
-@@ -9,6 +9,7 @@
- #include "child.h"
- #include "codes.h"
- #include "connect.h"
-+#include "expand.h"
- #include "file.h"
- #include "save.h"
- #include "sysdeps.h"
-@@ -256,6 +257,9 @@
- char *buffer;
- SERVER *server;
-
-+ sprintf(p, "%ld of %ld", i + 1, n);
-+ set_message(message, False);
-+
- server = cache_get_server(arts[i]->no, False);
- if (!server) {
- char command[32];
-@@ -276,9 +280,6 @@
- server_free(server);
- else if (!buffer)
- return -1;
--
-- sprintf(p, "%ld", i + 1);
-- set_message(message, False);
- }
-
- if (fflush(fp) < 0)
-@@ -436,7 +437,7 @@
- XtFree(cmd);
- }
-
--static void do_pipe(char *command, SaveScope scope, int what)
-+static void do_pipe(char *raw_command, SaveScope scope, int what)
- {
- FILE *file = NULL;
- char *file_name;
-@@ -445,6 +446,7 @@
- int status, fflush_status;
- char message[128];
- pid_t pid;
-+ char *command;
- char *temp;
-
- if (global.busy)
-@@ -453,11 +455,17 @@
- if (global.mode != NewsModeGroup && global.mode != NewsModeThread) {
- set_message("Not in a newsgroup!", True);
- return;
-- } else if (!command || command[0] == '\0') {
-+ } else if (!raw_command || raw_command[0] == '\0') {
- set_message("No command specified!", True);
- return;
- } else if (!(what & (SAVE_HEAD | SAVE_BODY))) {
- set_message("Nothing to pipe (neither head or body selected)!", True);
-+ return;
-+ }
-+
-+ command = expand_save_text(raw_command);
-+ if (!command) {
-+ set_message("Shell command expansion failed!", True);
- return;
- }
-
diff --git a/news/knews/patches/patch-bh b/news/knews/patches/patch-bh
deleted file mode 100644
index 61bb7d238e4..00000000000
--- a/news/knews/patches/patch-bh
+++ /dev/null
@@ -1,37 +0,0 @@
-$NetBSD: patch-bh,v 1.1 2002/03/13 21:13:17 fredb Exp $
-
---- src/Knews.ad.orig Mon Dec 28 07:48:08 1998
-+++ src/Knews.ad
-@@ -274,10 +274,10 @@
- ! 'less'-like bindings for the article text scrollbar:
- !
- *textvbar.accelerators: #override \n\
-- c <Key> p: abs-scroll(-13) \n\
-- c <Key> n: abs-scroll(13) \n\
-- c <Key> f: page-scroll(0.95) \n\
-- c <Key> b: page-scroll(-0.95)
-+ ~s c <Key> p: abs-scroll(-13) \n\
-+ ~s c <Key> n: abs-scroll(13) \n\
-+ c <Key> f: page-scroll(0.95) \n\
-+ c <Key> b: page-scroll(-0.95)
- *textvbar.stepSize: 13
-
-
-@@ -359,7 +359,7 @@
- c s <Key> k: kill-append(message-id, thread) \n\
- c <Key> j: mime-hack(image/jpeg, uue) \n\
- c <Key> g: mime-hack(image/gif, uue) \n\
-- c <Key> p: mime-hack(image/png, uue) \n\
-+ c s <Key> p: mime-hack(image/png, uue) \n\
- ~s <Key> t: tree-layout(True, 16) \n\
- s <Key> t: tree-layout(False, 6)
-
-@@ -402,7 +402,7 @@
- c s <Key> k: kill-append(message-id, thread) \n\
- c <Key> j: mime-hack(image/jpeg, uue) \n\
- c <Key> g: mime-hack(image/gif, uue) \n\
-- c <Key> p: mime-hack(image/png, uue)
-+ c s <Key> p: mime-hack(image/png, uue)
-
-
-
diff --git a/news/leafnode/DEINSTALL b/news/leafnode/DEINSTALL
deleted file mode 100644
index d2ab0860285..00000000000
--- a/news/leafnode/DEINSTALL
+++ /dev/null
@@ -1,28 +0,0 @@
-# $NetBSD: DEINSTALL,v 1.3 2004/01/11 16:45:51 cjep Exp $
-
-LEAFNODE_CONFDIR=@LEAFNODE_CONFDIR@
-LEAFNODE_SPOOL=@LEAFNODE_SPOOL@
-LEAFNODE_LOCKDIR=@LEAFNODE_LOCKDIR@
-LEAFNODE_HOME=@LEAFNODE_HOME@
-
-case "${STAGE}" in
- POST-DEINSTALL) cat <<EOF
-
-==========================================================================
-
-Note that the leafnode spool, lock and configuration directories
-
- ${LEAFNODE_SPOOL}
- ${LEAFNODE_LOCKDIR}
- ${LEAFNODE_HOME}
- and ${LEAFNODE_CONFDIR}
-
-are NOT deleted during the package deinstallation. Please remove these
-directories and all their contents manually if they are no longer needed.
-Also, don't forgot to remove any cron jobs associated with leafnode.
-
-==========================================================================
-
-EOF
- ;;
-esac
diff --git a/news/leafnode/DESCR b/news/leafnode/DESCR
deleted file mode 100644
index 33cfaf8aff0..00000000000
--- a/news/leafnode/DESCR
+++ /dev/null
@@ -1,8 +0,0 @@
-Leafnode is a USENET software package designed for small sites, with a
-few tens of readers and only a slow link to the net.
-
-Only groups that someone has been reading in the past week are fetched
-from the upstream NNTP server. When someone stops reading a group,
-fetchnews will stop reading that group a week later (this is the default
-which can be configured), and when someone starts reading a group, fetchnews
-will grab all the articles it can in that group the next time it runs.
diff --git a/news/leafnode/INSTALL b/news/leafnode/INSTALL
deleted file mode 100644
index 983fd781fd0..00000000000
--- a/news/leafnode/INSTALL
+++ /dev/null
@@ -1,47 +0,0 @@
-# $NetBSD: INSTALL,v 1.3 2004/01/11 16:45:51 cjep Exp $
-
-LEAFNODE_CONFDIR=@LEAFNODE_CONFDIR@
-LEAFNODE_SPOOL=@LEAFNODE_SPOOL@
-LEAFNODE_LOCKDIR=@LEAFNODE_LOCKDIR@
-LEAFNODE_HOME=@LEAFNODE_HOME@
-
-if [ "${STAGE}" = "POST-INSTALL" ]; then
-
- mkdir -p ${LEAFNODE_CONFDIR}
- if [ ! -f ${LEAFNODE_CONFDIR}/config ]; then
- cp ${PREFIX}/share/examples/leafnode/config.example \
- ${LEAFNODE_CONFDIR}/config
- chmod u+w ${LEAFNODE_CONFDIR}/config
- fi
-
- echo "Creating leafnode spool directories..."
-
- SPOOL_DIRS="leaf.node failed.postings interesting.groups out.going message.id"
-
- mkdir -p ${LEAFNODE_SPOOL}
- chown news:news ${LEAFNODE_SPOOL}
- chmod 2775 ${LEAFNODE_SPOOL}
-
- for D in $SPOOL_DIRS; do
- mkdir -p ${LEAFNODE_SPOOL}/$D;
- chown news:news ${LEAFNODE_SPOOL}/$D
- chmod 2775 ${LEAFNODE_SPOOL}/$D
- done
-
- mkdir -p ${LEAFNODE_LOCKDIR}
- chown news:news ${LEAFNODE_LOCKDIR}
- chmod 2775 ${LEAFNODE_LOCKDIR}
-
- # Make directories (a la quickmkdir)
- for a in 0 1 2 3 4 5 6 7 8 9; do
- for b in 0 1 2 3 4 5 6 7 8 9; do
- for c in 0 1 2 3 4 5 6 7 8 9; do
- mkdir -m 2775 -p ${LEAFNODE_SPOOL}/message.id/$a$b$c
- chown news:news ${LEAFNODE_SPOOL}/message.id/$a$b$c
- done
- done
- done
-
- mkdir -p ${LEAFNODE_HOME}
- chown news:news ${LEAFNODE_HOME}
-fi
diff --git a/news/leafnode/MESSAGE b/news/leafnode/MESSAGE
deleted file mode 100644
index 5ec4a34fcbd..00000000000
--- a/news/leafnode/MESSAGE
+++ /dev/null
@@ -1,20 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.3 2003/05/06 17:42:22 jmmv Exp $
-
-Edit ${LEAFNODE_CONFDIR}/config and make the necessary local
-changes.
-
-Leafnode needs to be run from inetd. An example configuration for
-/etc/inetd.conf is as follows:
-nntp stream tcp nowait news ${PREFIX}/sbin/leafnode leafnode
-nntp stream tcp6 nowait news ${PREFIX}/sbin/leafnode leafnode
-
-Edit the news user's crontab to run an expiry job. For example, add:
-0 4 * * * ${PREFIX}/sbin/texpire
-
-As root or news, run "fetchnews". This may take some time. Then connect
-to the leafnode server with an NNTP client. Select the groups you want
-to read in the future by reading the "default" article in them.
-Run "fetchnews" again. This run will pick up all the groups you want to
-read. You may wish to automate the running of "fetchnews".
-===========================================================================
diff --git a/news/leafnode/Makefile b/news/leafnode/Makefile
deleted file mode 100644
index 18e6663c85e..00000000000
--- a/news/leafnode/Makefile
+++ /dev/null
@@ -1,67 +0,0 @@
-# $NetBSD: Makefile,v 1.27 2005/08/23 11:48:50 rillig Exp $
-
-DISTNAME= leafnode-1.11.3.rel
-PKGNAME= ${DISTNAME:S/.rel//}
-CATEGORIES= news
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=leafnode/}
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= cjep@NetBSD.org
-HOMEPAGE= http://leafnode.sourceforge.net/
-COMMENT= NNTP server for small (dialup) sites
-
-CONFLICTS+= cyrus-imapd<2.2.10nb2
-
-WRKSRC= ${WRKDIR}/${DISTNAME}
-USE_PKGINSTALL= yes
-INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
-DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
-
-LEAFNODE_SPOOL?= /var/spool/leafnode
-LEAFNODE_LOCKDIR?= /var/spool/lock/leafnode
-LEAFNODE_CONFDIR?= ${PKG_SYSCONFDIR}/leafnode
-
-# Default data dir, login and group are the same as used by inn
-#
-BUILD_DEFS+= LEAFNODE_DATA_DIR LEAFNODE_GROUP LEAFNODE_USER
-PKG_USERS= ${LEAFNODE_USER}:${LEAFNODE_GROUP}::Internet\ News:${LEAFNODE_DATA_DIR}:${SH}
-PKG_GROUPS= ${LEAFNODE_GROUP}
-LEAFNODE_HOME?= ${INN_DATA_DIR}
-
-BUILD_DEFS+= USE_INET6
-
-FILES_SUBST+= LEAFNODE_SPOOL=${LEAFNODE_SPOOL}
-FILES_SUBST+= LEAFNODE_CONFDIR=${LEAFNODE_CONFDIR}
-FILES_SUBST+= LEAFNODE_LOCKDIR=${LEAFNODE_LOCKDIR}
-FILES_SUBST+= LEAFNODE_HOME=${LEAFNODE_HOME}
-MESSAGE_SUBST+= LEAFNODE_CONFDIR=${LEAFNODE_CONFDIR}
-
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --with-spooldir=${LEAFNODE_SPOOL}
-CONFIGURE_ARGS+= --with-lockfile=${LEAFNODE_LOCKDIR}/fetchnews.lck
-CONFIGURE_ARGS+= --sysconfdir=${LEAFNODE_CONFDIR}
-CONFIGURE_ARGS+= --with-user=${LEAFNODE_USER}
-CONFIGURE_ARGS+= --with-group=${LEAFNODE_GROUP}
-USE_TOOLS+= gmake
-
-.include "../../mk/bsd.prefs.mk"
-
-.if defined(USE_INET6) && ${USE_INET6} == YES
-CONFIGURE_ARGS+= --with-ipv6
-.else
-CONFIGURE_ARGS+= --without-ipv6
-.endif
-
-post-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/leafnode
- ${INSTALL_DATA} ${WRKSRC}/config.example \
- ${PREFIX}/share/examples/leafnode
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/leafnode
-
- ${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/README-FQDN \
- ${WRKSRC}/README-MAINTAINER \
- ${WRKSRC}/README-daemontools \
- ${WRKSRC}/README.FIRST ${PREFIX}/share/doc/leafnode
-
-.include "../../devel/pcre/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/news/leafnode/PLIST b/news/leafnode/PLIST
deleted file mode 100644
index 27ac1ba21ae..00000000000
--- a/news/leafnode/PLIST
+++ /dev/null
@@ -1,23 +0,0 @@
-@comment $NetBSD: PLIST,v 1.4 2004/01/11 16:45:51 cjep Exp $
-bin/leafnode-version
-bin/newsq
-man/man1/leafnode-version.1
-man/man1/newsq.1
-man/man8/applyfilter.8
-man/man8/checkgroups.8
-man/man8/fetchnews.8
-man/man8/leafnode.8
-man/man8/texpire.8
-sbin/applyfilter
-sbin/checkgroups
-sbin/fetchnews
-sbin/leafnode
-sbin/texpire
-share/doc/leafnode/README
-share/doc/leafnode/README-FQDN
-share/doc/leafnode/README-MAINTAINER
-share/doc/leafnode/README-daemontools
-share/doc/leafnode/README.FIRST
-share/examples/leafnode/config.example
-@dirrm share/examples/leafnode
-@dirrm share/doc/leafnode
diff --git a/news/leafnode/distinfo b/news/leafnode/distinfo
deleted file mode 100644
index 20425ac8fb6..00000000000
--- a/news/leafnode/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.15 2005/06/09 18:21:23 salo Exp $
-
-SHA1 (leafnode-1.11.3.rel.tar.bz2) = 6910f05c0fa4b1bb5a4baaa6e6fd529fef5ece22
-RMD160 (leafnode-1.11.3.rel.tar.bz2) = 786fc42b58660d8d47eccd5d610718202eb50a3c
-Size (leafnode-1.11.3.rel.tar.bz2) = 506217 bytes
-SHA1 (patch-aa) = 6820ab420cb656e61848f9eb29d4674bccb856a6
diff --git a/news/leafnode/patches/patch-aa b/news/leafnode/patches/patch-aa
deleted file mode 100644
index eb7931e44cd..00000000000
--- a/news/leafnode/patches/patch-aa
+++ /dev/null
@@ -1,56 +0,0 @@
-$NetBSD: patch-aa,v 1.6 2005/05/13 15:08:04 kim Exp $
-
---- Makefile.in.orig 2005-05-04 10:36:22.000000000 -0400
-+++ Makefile.in 2005-05-13 10:53:41.000000000 -0400
-@@ -801,14 +801,14 @@
- rm -f "$(DESTDIR)$(man8dir)/$$inst"; \
- done
- install-sysconfDATA: $(sysconf_DATA)
-- @$(NORMAL_INSTALL)
-- test -z "$(sysconfdir)" || $(mkdir_p) "$(DESTDIR)$(sysconfdir)"
-- @list='$(sysconf_DATA)'; for p in $$list; do \
-- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-- echo " $(sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconfdir)/$$f'"; \
-- $(sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f"; \
-- done
-+# @$(NORMAL_INSTALL)
-+# test -z "$(sysconfdir)" || $(mkdir_p) "$(DESTDIR)$(sysconfdir)"
-+# @list='$(sysconf_DATA)'; for p in $$list; do \
-+# if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-+# f=$(am__strip_dir) \
-+# echo " $(sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconfdir)/$$f'"; \
-+# $(sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f"; \
-+# done
-
- uninstall-sysconfDATA:
- @$(NORMAL_UNINSTALL)
-@@ -1349,17 +1349,17 @@
- rpmbuild -ba leafnode.spec || rpm -ba leafnode.spec
-
- install-data-hook: amiroot
-- set -e ; for i in . leaf.node failed.postings interesting.groups \
-- out.going message.id temp.files ; do \
-- mkdir -p $(DESTDIR)$(SPOOLDIR)/$$i ; \
-- if ./amiroot ; then \
-- chown @NEWS_USER@:@NEWS_GROUP@ $(DESTDIR)$(SPOOLDIR)/$$i ; \
-- chmod 2775 $(DESTDIR)$(SPOOLDIR)/$$i ; fi ; \
-- done
-- d="`dirname $(DESTDIR)@LOCKFILE@`" ; mkdir -p "$${d}" && \
-- if ./amiroot ; then \
-- chown @NEWS_USER@:@NEWS_GROUP@ "$${d}" ; \
-- chmod 2775 "$${d}" ; fi
-+# set -e ; for i in . leaf.node failed.postings interesting.groups \
-+# out.going message.id temp.files ; do \
-+# mkdir -p $(DESTDIR)$(SPOOLDIR)/$$i ; \
-+# if ./amiroot ; then \
-+# chown @NEWS_USER@:@NEWS_GROUP@ $(DESTDIR)$(SPOOLDIR)/$$i ; \
-+# chmod 2775 $(DESTDIR)$(SPOOLDIR)/$$i ; fi ; \
-+# done
-+# d="`dirname $(DESTDIR)@LOCKFILE@`" ; mkdir -p "$${d}" && \
-+# if ./amiroot ; then \
-+# chown @NEWS_USER@:@NEWS_GROUP@ "$${d}" ; \
-+# chmod 2775 "$${d}" ; fi
-
- uninstall-local:
- rm -rf $(DESTDIR)$(SPOOLDIR) $(DESTDIR)@LOCKFILE@
diff --git a/news/newsfetch/DESCR b/news/newsfetch/DESCR
deleted file mode 100644
index 0ddf8063aa1..00000000000
--- a/news/newsfetch/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-NEWSFETCH downloads network news into mail-format files.
-It can also pass the fetched news articles to programs like
-procmail to process them further into different folders,
-forward or deliver them.
diff --git a/news/newsfetch/Makefile b/news/newsfetch/Makefile
deleted file mode 100644
index fd152589837..00000000000
--- a/news/newsfetch/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# $NetBSD: Makefile,v 1.7 2004/03/29 17:31:54 tv Exp $
-#
-
-DISTNAME= newsfetch-1.3
-PKGREVISION= 1
-CATEGORIES= news
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-
-MAINTAINER= jrf@diverge.org
-HOMEPAGE= # doesn't work anymore - http://www.diverge.org/jrf/
-COMMENT= Downloads newsgroup messages in mail file format
-
-WRKSRC= ${WRKDIR}/newsfetch
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "SunOS"
-LDFLAGS+= -lsocket -lnsl -lresolv
-.endif
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/news/newsfetch/PLIST b/news/newsfetch/PLIST
deleted file mode 100644
index 32e9e057cda..00000000000
--- a/news/newsfetch/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 21:03:45 zuntum Exp $
-bin/newsfetch
-man/man1/newsfetch.1
diff --git a/news/newsfetch/distinfo b/news/newsfetch/distinfo
deleted file mode 100644
index 5b5cd7c79d3..00000000000
--- a/news/newsfetch/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.5 2005/02/24 12:19:55 agc Exp $
-
-SHA1 (newsfetch-1.3.tar.gz) = e497eecffa15d62b1cde6921734dd6e1cb9d933c
-RMD160 (newsfetch-1.3.tar.gz) = dfe2878e6bb0e5c5c249c3e4d7a3489adac17d97
-Size (newsfetch-1.3.tar.gz) = 12159 bytes
-SHA1 (patch-aa) = 1311f2d0b7a8cdb4e07ba8b6dba491d9878e20df
-SHA1 (patch-ab) = 2d30938b62011db3afa2c0e06043b43bbb5cf0b2
-SHA1 (patch-ac) = 2241ba0950d3ee5f4c0c253cf4870cb4e070fe11
diff --git a/news/newsfetch/patches/patch-aa b/news/newsfetch/patches/patch-aa
deleted file mode 100644
index 4fda96faa56..00000000000
--- a/news/newsfetch/patches/patch-aa
+++ /dev/null
@@ -1,41 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2003/09/22 21:12:19 wiz Exp $
-
---- Makefile.orig Mon Nov 13 02:01:49 2000
-+++ Makefile Mon Sep 22 19:38:52 2003
-@@ -1,9 +1,9 @@
- # Makefile for newsfetch program
--CC = gcc
--BINDIR = /usr/local/bin
--MANDIR = /usr/local/man/man1
-+#CC = gcc
-+BINDIR = ${PREFIX}/bin
-+MANDIR = ${PREFIX}/man/man1
-
--CFLAGS= -O2 # inline opt
-+#CFLAGS= -O2 # inline opt
-
- # uncomment this for strict checking
- #CFLAGS = -O2 -Wall -pedantic -Wstrict-prototypes -fno-strength-reduce
-@@ -15,8 +15,7 @@
- objs = newsfetch.o nntp.o net.o opt.o util.o getopt.o
-
- newsfetch: $(objs)
-- $(CC) -o newsfetch $(objs)
-- strip newsfetch
-+ $(CC) -o newsfetch $(objs) $(LDFLAGS)
-
- .c.o:
- $(CC) -c $(CFLAGS) $<
-@@ -25,10 +24,8 @@
- rm -f *.o newsfetch
-
- install:
--# cp newsfetch $(BINDIR)/newsfetch
--# cp newsfetch.1 $(MANDIR)/newsfetch.1
-- cp newsfetch /usr/local/bin
-- cp newsfetch.1 /usr/local/man/man1
-+ ${BSD_INSTALL_PROGRAM} newsfetch $(BINDIR)/newsfetch
-+ ${BSD_INSTALL_MAN} newsfetch.1 $(MANDIR)/newsfetch.1
-
- uninstall:
- rm -f $(BINDIR)/newsfetch
diff --git a/news/newsfetch/patches/patch-ab b/news/newsfetch/patches/patch-ab
deleted file mode 100644
index 81096b2b71b..00000000000
--- a/news/newsfetch/patches/patch-ab
+++ /dev/null
@@ -1,76 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2004/03/29 17:31:55 tv Exp $
-
---- nntp.c.orig Mon Nov 3 08:34:59 2003
-+++ nntp.c
-@@ -51,7 +51,7 @@ void read_nntp_data()
- int set_reader_mode()
- {
- read_nntp_data();
-- fprintf(socket_fp[0], "MODE READER\n");
-+ fprintf(socket_fp[0], "MODE READER\r\n");
- read_nntp_data();
- return (get_error(command_buf));
- }
-@@ -191,7 +191,7 @@ int check_group()
- int first_art, last_art, total_art, tmp;
-
- fprintf(stderr, "%s: ", group);
--fprintf(socket_fp[0], "GROUP %s\n", group);
-+fprintf(socket_fp[0], "GROUP %s\r\n", group);
- read_nntp_data();
-
- #ifdef DEBUG
-@@ -220,7 +220,7 @@ read_nntp_data();
- first_article = last_art - max_article + 1;
- }
-
-- fprintf(socket_fp[0], "STAT %d\n", first_article);
-+ fprintf(socket_fp[0], "STAT %d\r\n", first_article);
- read_nntp_data();
-
- while (!get_error_noprint(command_buf)) {
-@@ -238,7 +238,7 @@ read_nntp_data();
- return (0);
- }
-
-- fprintf(socket_fp[0], "STAT %d\n", first_article);
-+ fprintf(socket_fp[0], "STAT %d\r\n", first_article);
- read_nntp_data();
- }
-
-@@ -302,7 +302,7 @@ int check_header = 1;
- fprintf(stderr, " %c", 0xd);
- }
-
-- fprintf(socket_fp[0], "ARTICLE\n");
-+ fprintf(socket_fp[0], "ARTICLE\r\n");
- read_nntp_data();
-
- if (!get_error(command_buf))
-@@ -325,7 +325,7 @@ int check_header = 1;
- /*
- * Make it little fast
- */
-- fprintf(socket_fp[0], "NEXT\n");
-+ fprintf(socket_fp[0], "NEXT\r\n");
- article_fetching = 1;
-
- #ifndef NO_STATUS_METER
-@@ -391,7 +391,7 @@ void get_group_list()
- char groupname[100];
-
- fprintf(stderr, "\nList of NewsGroups:\n");
-- fprintf(socket_fp[0], "LIST\n");
-+ fprintf(socket_fp[0], "LIST\r\n");
- read_nntp_data();
-
- if (!get_error_strmsg(command_buf))
-@@ -411,7 +411,7 @@ void get_group_list()
-
- void send_quit()
- {
-- fprintf(socket_fp[0], "QUIT\n");
-+ fprintf(socket_fp[0], "QUIT\r\n");
- read_nntp_data();
- }
-
diff --git a/news/newsfetch/patches/patch-ac b/news/newsfetch/patches/patch-ac
deleted file mode 100644
index 37f6380aa8a..00000000000
--- a/news/newsfetch/patches/patch-ac
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2004/03/29 17:31:55 tv Exp $
-
---- net.c.orig Mon Nov 3 08:47:33 2003
-+++ net.c
-@@ -104,12 +104,12 @@ int connect_server(char *server_name, in
- void create_fd(int socketid, FILE ** sfp)
- {
-
-- if ((sfp[0] = fdopen(socketid, "w")) == NULL) {
-+ if ((sfp[0] = fdopen(socketid, "wb")) == NULL) {
- perror("fdopen");
- close(socketid);
- exit_now(1);
- }
-- if ((sfp[1] = fdopen(socketid, "r")) == NULL) {
-+ if ((sfp[1] = fdopen(socketid, "rb")) == NULL) {
- perror("fdopen");
- close(socketid);
- exit_now(1);
diff --git a/news/newsx/DESCR b/news/newsx/DESCR
deleted file mode 100644
index 88990e94666..00000000000
--- a/news/newsx/DESCR
+++ /dev/null
@@ -1,13 +0,0 @@
-Newsx is an NNTP client for Unix. It will connect to a remote NNTP server and
-post outgoing articles batched by the news system, as well as fetch incoming
-articles.
-
-It provides the NNTP capabilities required for small local news spools on
-installations with NNTP access only through limited ISP accounts. It works well
-via a dialup SLIP/PPP connection.
-
-Newsx is also well suited for large spools with normal feeds, being used for
-pulling newsgroups from specific NNTP servers that are not distributed in the
-usual manner. Since newsx obeys the normal news spool configuration file and
-requires little or no specific configuration, the administrative burden should
-be minimized.
diff --git a/news/newsx/Makefile b/news/newsx/Makefile
deleted file mode 100644
index c884ac448df..00000000000
--- a/news/newsx/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD: Makefile,v 1.3 2005/04/11 21:47:03 tv Exp $
-#
-
-DISTNAME= newsx-1.6
-PKGREVISION= 1
-CATEGORIES= news
-MASTER_SITES= ftp://ftp.kvaleberg.com/pub/
-
-MAINTAINER= cube@NetBSD.org
-HOMEPAGE= http://www.kvaleberg.com/newsx.html
-COMMENT= NNTP news exchange program
-
-GNU_CONFIGURE= YES
-
-.include "../../news/inn/Makefile.common"
-CONFIGURE_ARGS+= --with-newshome=${INN_PREFIX}/lib
-CONFIGURE_ARGS+= --with-rnews=${INN_PREFIX}/bin/rnews
-CONFIGURE_ARGS+= --with-inews=${INN_PREFIX}/bin/inews
-CONFIGURE_ARGS+= --with-history-mode=indexed
-
-.include "../../news/inn/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/news/newsx/PLIST b/news/newsx/PLIST
deleted file mode 100644
index 3e20ee1c1db..00000000000
--- a/news/newsx/PLIST
+++ /dev/null
@@ -1,7 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/12/31 13:28:36 cube Exp $
-bin/newsx
-bin/newsq
-man/man1/newsq.1
-man/man5/newsx.conf.5
-man/man5/in.hosts.5
-man/man8/newsx.8
diff --git a/news/newsx/distinfo b/news/newsx/distinfo
deleted file mode 100644
index 4afe8420cc1..00000000000
--- a/news/newsx/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 12:19:55 agc Exp $
-
-SHA1 (newsx-1.6.tar.gz) = e128e89ba161ceb4ab6d652d8c132ae3a33fbb20
-RMD160 (newsx-1.6.tar.gz) = e9d1785ad94510055ffcd5d3d15aeafbc16c4f46
-Size (newsx-1.6.tar.gz) = 302821 bytes
-SHA1 (patch-aa) = b0996217c88e250ed38900ad1f706d16b9900550
-SHA1 (patch-ab) = d3ca5f2231f14b27ff4ee375c1b19b5c158b71be
diff --git a/news/newsx/patches/patch-aa b/news/newsx/patches/patch-aa
deleted file mode 100644
index c5b0ed18398..00000000000
--- a/news/newsx/patches/patch-aa
+++ /dev/null
@@ -1,63 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2004/03/16 09:48:37 cube Exp $
-
---- configure.orig 2004-01-11 18:31:22.000000000 +0100
-+++ configure
-@@ -861,6 +861,8 @@ Optional Packages:
- --without-history do not perform history database lookup
- --with-history=FILE use FILE as history database
- \
-+ --with-history-mode={indexed|tagged} set history hash mode
-+\
- --with-errlog=LOG_XX do syslog in category LOG_XX
- \
- --with-inhosts=DIR use DIR as in.hosts directory
-@@ -1743,6 +1745,12 @@ _ACEOF
-
- fi
-
-+# Check whether --with-history-mode or --without-history-mode was given.
-+if test "${with_history_mode+set}" = set; then
-+ withval="$with_history_mode"
-+
-+fi;
-+
- # Check whether --with-errlog or --without-errlog was given.
- if test "${with_errlog+set}" = set; then
- withval="$with_errlog"
-@@ -1964,6 +1972,28 @@ echo $ECHO_N "checking history... $ECHO_
- HISTORY="$with_history"
- fi
- fi
-+ if test x$with_history_mode != x; then
-+ case x$with_history_mode in
-+ xindexed )
-+ echo "$as_me:$LINENO: result: $HISTORY" >&5
-+echo "${ECHO_T}$HISTORY" >&6
-+ ;;
-+ xtagged )
-+ echo "$as_me:$LINENO: result: $HISTORY" >&5
-+echo "${ECHO_T}$HISTORY" >&6
-+
-+cat >>confdefs.h <<_ACEOF
-+#define DO_TAGGED_HASH 1
-+_ACEOF
-+
-+ ;;
-+ * )
-+ echo "$as_me:$LINENO: result: ERROR: unknown hash mode $with_history_mode" >&5
-+echo "${ECHO_T}ERROR: unknown hash mode $with_history_mode" >&6
-+ exit 1
-+ ;;
-+ esac
-+ else
- if test -f $HISTORY; then
- if test -f $HISTORY.index; then
- echo "$as_me:$LINENO: result: $HISTORY" >&5
-@@ -1999,6 +2029,7 @@ echo "${ECHO_T}Try running makehistory f
- echo "${ECHO_T}ERROR: cannot find database $HISTORY" >&6
- exit 1
- fi
-+ fi
- fi
-
- echo "$as_me:$LINENO: checking locks" >&5
diff --git a/news/newsx/patches/patch-ab b/news/newsx/patches/patch-ab
deleted file mode 100644
index 228bf0c1b70..00000000000
--- a/news/newsx/patches/patch-ab
+++ /dev/null
@@ -1,43 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2004/03/16 09:48:37 cube Exp $
-
---- configure.ac.orig 2003-05-18 12:57:24.000000000 +0200
-+++ configure.ac
-@@ -278,6 +278,8 @@ AC_ARG_WITH(history, \
- if test x$with_history != xno; then
- AC_DEFINE_UNQUOTED(WITH_HISTORY, 1, [perform history database lookup])
- fi
-+AC_ARG_WITH(history-mode, \
-+ [--with-history-mode={indexed|tagged} set history hash mode])
- AC_ARG_WITH(errlog, \
- [--with-errlog=LOG_XX do syslog in category LOG_XX],[
- if test x$with_errlog = xno; then
-@@ -433,6 +435,21 @@ else
- HISTORY="$with_history"
- fi
- fi
-+ if test x$with_history_mode != x; then
-+ case x$with_history_mode in
-+ xindexed )
-+ AC_MSG_RESULT($HISTORY, indexed hash)
-+ ;;
-+ xtagged )
-+ AC_MSG_RESULT($HISTORY, tagged hash)
-+ AC_DEFINE_UNQUOTED(DO_TAGGED_HASH, 1, [for INN 2.x and dbz v.6])
-+ ;;
-+ * )
-+ AC_MSG_RESULT(ERROR: unknown hash mode $with_history_mode)
-+ exit 1
-+ ;;
-+ esac
-+ else
- if test -f $HISTORY; then
- if test -f $HISTORY.index; then
- AC_MSG_RESULT($HISTORY, indexed hash)
-@@ -453,6 +470,7 @@ else
- AC_MSG_RESULT(ERROR: cannot find database $HISTORY)
- exit 1
- fi
-+ fi
- fi
-
- dnl AC_MSG_CHECKING(error log)
diff --git a/news/nget/DESCR b/news/nget/DESCR
deleted file mode 100644
index 6e02eb58125..00000000000
--- a/news/nget/DESCR
+++ /dev/null
@@ -1,24 +0,0 @@
-nget is a command line nntp file grabber.
-It automatically pieces together multipart postings for easy
-retrieval, even substituting parts from multiple servers and
-newsgroups. Handles disconnects gracefully, resuming after the
-last part succesfully downloaded.
-
-features:
- * Automatic multi-part post joining
- * Automatic binary decoding (using uulib)
- * Caches header data for quick access
- * Full multi-server support, transparently joining parts
- from different servers
- * Full multi-group support, transparently joining parts from
- multiple newsgroups
- * Automatic retries on network errors
- * Resumes after the last part successfully downloaded
- * Dupe file detection to avoid unneeded downloads
- * Select what to retrieve based upon a regular expresson (-r),
- or even a more complex expression (-R) based upon any of the
- file's subject, author, lines, bytes, # of parts we have,
- # of parts req, date, age, messageid, and references.
- * Search for newsgroups based on their names and/or descriptions
- * Automatic handling of PAR and PAR2 files retrieves only as many
- recovery files as necessary to repair any missing/damaged files.
diff --git a/news/nget/MESSAGE b/news/nget/MESSAGE
deleted file mode 100644
index da3e23c315a..00000000000
--- a/news/nget/MESSAGE
+++ /dev/null
@@ -1,20 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.1.1.1 2004/08/23 21:14:32 recht Exp $
-
-Quickstart to nget:
-1) Before the first use, nget must be configured.
-1.a) Make nget directory:
- mkdir $HOME/.nget5
-
-1.b) Copy example .ngetrc:
- cp ${EGDIR}/dot.ngetrc $HOME/.nget5/.ngetrc
-
-1.c) Add your newsservers:
- vi $HOME/.nget5/.ngetrc
- (Remember to chmod 600 your .ngetrc if you are using password auth.)
-
-2) See manpage and nget --help output. The manpage thoroughly describes
- all command line and configuration options, and has an examples
- section.
-
-===========================================================================
diff --git a/news/nget/Makefile b/news/nget/Makefile
deleted file mode 100644
index 6464c266d30..00000000000
--- a/news/nget/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# $NetBSD: Makefile,v 1.6 2005/05/22 20:08:26 jlam Exp $
-#
-
-DISTNAME= nget-0.27.1
-CATEGORIES= news
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=nget/}
-
-MAINTAINER= joel@carnat.net
-HOMEPAGE= http://nget.sourceforge.net/
-COMMENT= Command line nntp file grabber
-
-USE_PKGLOCALEDIR= yes
-GNU_CONFIGURE= yes
-USE_TOOLS+= gmake
-USE_LANGUAGES= c c++
-
-CONFIGURE_ARGS+= --with-pcre
-CONFIGURE_ARGS+= --with-popt
-
-EGDIR= ${PREFIX}/share/examples/nget
-MESSAGE_SUBST+= EGDIR=${EGDIR}
-
-INSTALLATION_DIRS= share/nget share/examples/nget
-
-post-install:
- for f in COPYING Changelog FAQ README TODO; do \
- ${INSTALL_DATA} ${WRKSRC}/$${f} ${PREFIX}/share/nget; done
- ${INSTALL_DATA} ${WRKSRC}/.ngetrc ${EGDIR}/dot.ngetrc
-
-.include "../../converters/uulib/buildlink3.mk"
-.include "../../devel/pcre/buildlink3.mk"
-.include "../../devel/popt/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/news/nget/PLIST b/news/nget/PLIST
deleted file mode 100644
index a96c995882b..00000000000
--- a/news/nget/PLIST
+++ /dev/null
@@ -1,13 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/08/23 21:14:32 recht Exp $
-bin/nget
-bin/ngetlite
-man/man1/nget.1
-man/man1/ngetlite.1
-share/examples/nget/dot.ngetrc
-share/nget/COPYING
-share/nget/Changelog
-share/nget/FAQ
-share/nget/README
-share/nget/TODO
-@dirrm share/nget
-@dirrm share/examples/nget
diff --git a/news/nget/distinfo b/news/nget/distinfo
deleted file mode 100644
index f3f94d1cef3..00000000000
--- a/news/nget/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.3 2005/04/26 00:44:09 reed Exp $
-
-SHA1 (nget-0.27.1.tar.gz) = 80e348dcb65fcb26cbe037598e676f4770cd7ad1
-RMD160 (nget-0.27.1.tar.gz) = b90e3d6e2a33e630144a090f68f9bdd818f5e1bd
-Size (nget-0.27.1.tar.gz) = 490164 bytes
diff --git a/news/nn/DESCR b/news/nn/DESCR
deleted file mode 100644
index f1d5b464e57..00000000000
--- a/news/nn/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-No News is good news. This version of nn has NNTP and NOV support.
diff --git a/news/nn/Makefile b/news/nn/Makefile
deleted file mode 100644
index a0dabaf0d08..00000000000
--- a/news/nn/Makefile
+++ /dev/null
@@ -1,49 +0,0 @@
-# $NetBSD: Makefile,v 1.25 2005/04/11 11:05:47 schwarz Exp $
-
-DISTNAME= nn-6.6.5
-CATEGORIES= news
-MASTER_SITES= ftp://ftp.nndev.org/pub/nn-6.6/ \
- ftp://ftp.nndev.org/pub/nn-6.6/old/
-EXTRACT_SUFX= .tar.Z
-
-MAINTAINER= tech-pkg@NetBSD.org
-COMMENT= NN newsreader
-
-PKG_SYSCONFSUBDIR= nntp
-
-BUILD_DEFS+= USE_INN
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "SunOS"
-SFILE= s-sunos5.h
-.elif ${OPSYS} == "Linux"
-SFILE= s-linux.h
-.else
-SFILE= s-netbsd.h
-.endif
-
-.if ${LOWER_ARCH} == "i386"
-MFILE= m-i80386.h
-.elif ${LOWER_ARCH} == "mipseb"
-MFILE= m-mipsel.h
-.else
-MFILE= m-${LOWER_ARCH}.h
-.endif
-
-MAKE_ENV+= CC="${CC}"
-
-post-patch:
- @${SED} -e ' \
- s#@PREFIX@#${PREFIX}#; \
- s#@PKG_SYSCONFDIR@#${PKG_SYSCONFDIR}#; \
- s#@BINOWN@#${BINOWN}#; \
- s#@BINGRP@#${BINGRP}#; \
- s#@MFILE@#${MFILE}#; \
- s#@SFILE@#${SFILE}#' \
- <${WRKSRC}/config.h-dist >${WRKSRC}/config.h
- @${CP} ${FILESDIR}/s-netbsd.h ${WRKSRC}/conf/s-netbsd.h
- @${CP} ${FILESDIR}/m-powerpc.h ${WRKSRC}/conf/m-powerpc.h
- @${CP} ${WRKSRC}/conf/m-m680x0.h ${WRKSRC}/conf/m-m68k.h
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/news/nn/PLIST b/news/nn/PLIST
deleted file mode 100644
index 3369cbae534..00000000000
--- a/news/nn/PLIST
+++ /dev/null
@@ -1,50 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2002/07/08 02:21:18 kim Exp $
-bin/nn
-bin/nnadmin
-bin/nnbatch
-bin/nncheck
-bin/nngoback
-bin/nngrab
-bin/nngrep
-bin/nnpost
-bin/nnstats
-bin/nntidy
-bin/nnusage
-bin/nnview
-man/man1/nn.1
-man/man1/nnacct.1
-man/man1/nnadmin.1
-man/man1/nncheck.1
-man/man1/nngoback.1
-man/man1/nngrab.1
-man/man1/nngrep.1
-man/man1/nnpost.1
-man/man1/nnstats.1
-man/man1/nntidy.1
-man/man1/nnusage.1
-man/man1/nnview.1
-man/man8/nnmaster.8
-man/man8/nnspew.8
-share/nn/aux
-share/nn/conf
-share/nn/help/Manual
-share/nn/help/adm.upgrade1
-share/nn/help/adm.upgrade2
-share/nn/help/adm.upgrade3
-share/nn/help/adm.upgrade4
-share/nn/help/adm.welcome
-share/nn/help/help.attr
-share/nn/help/help.commands
-share/nn/help/help.extended
-share/nn/help/help.help
-share/nn/help/help.map
-share/nn/help/help.menu
-share/nn/help/help.more
-share/nn/help/help.read
-share/nn/help/help.set
-share/nn/help/help.show
-share/nn/help/help.sort
-share/nn/help/help.variables
-share/nn/upgrade_rc
-@dirrm share/nn/help
-@dirrm share/nn
diff --git a/news/nn/distinfo b/news/nn/distinfo
deleted file mode 100644
index bb87f6fce61..00000000000
--- a/news/nn/distinfo
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: distinfo,v 1.9 2005/06/17 15:36:32 hira Exp $
-
-SHA1 (nn-6.6.5.tar.Z) = 7f96de47dd96862fc9eb9b29a251964a01b63b1b
-RMD160 (nn-6.6.5.tar.Z) = 460592974b953ba0d6cb5a7234e6e4d688051090
-Size (nn-6.6.5.tar.Z) = 826135 bytes
-SHA1 (patch-aa) = cf8d85f3ba9f677836f962b814a1ba21e7218faf
-SHA1 (patch-ab) = 262d50b08031187e2fc99bf49f547fbcf21a2f39
-SHA1 (patch-ac) = 0388486772d5c8f57438a70b8d3bcfe55be5473d
-SHA1 (patch-ad) = 30f6a683b9d6f6b347822589b72baf8c00ac5c2d
-SHA1 (patch-ae) = de6c5331482f0f2165dd79bdbf57fff1703b5780
-SHA1 (patch-af) = 2287796a2c6e7aaddd5e8b766309d3fa706982d1
-SHA1 (patch-ag) = 7d5055a2ae040a5588634f7ac1a2136cce325dc7
-SHA1 (patch-ah) = 25a7d447f425e177a1c0c0628bc7432defb449fe
-SHA1 (patch-ai) = 0aa2908e2f735ed7f2930960e9ec317c383acfed
-SHA1 (patch-aj) = fac8d9a74a0f4d4cc2226511607c50e38fd8af7e
-SHA1 (patch-ak) = 45790b88eee03fa755b227c05d53664c41d3688f
-SHA1 (patch-al) = 86ef5d494eaf07b024640d3d1d2ae36fcff0cb87
-SHA1 (patch-am) = bf8d96a52fb9a4113827a20ccc00ffaced566b8b
-SHA1 (patch-an) = 772ee53b349e0e4b0f70efa5a86682a38e42893c
-SHA1 (patch-ao) = 1eaa536567c78d9a346848a6f5c73d722ef52253
-SHA1 (patch-ap) = 5f6377ae6dea06e5e20c2e003b44c2f05afc22b4
-SHA1 (patch-aq) = d93d9612b4048242316182326954ffc95f338e07
-SHA1 (patch-ar) = f584b683c3218146507a4fc71369cad58fa43de0
-SHA1 (patch-as) = 1f8688cdf80a9059744a4469461e16647fc9a66f
-SHA1 (patch-at) = f9556163a2272d913e3a122ca57e75e681193454
-SHA1 (patch-au) = 387b997c502439d5e679668c4c243eb286c42a31
-SHA1 (patch-av) = 9caf765e5714953470512a07cbe6c4efd4b08e45
-SHA1 (patch-aw) = 3335bfd42044331fba85ff7369898df82f7672ae
-SHA1 (patch-ax) = 07350a8ee3fc58404b8607773fc6091b1b1b58ba
-SHA1 (patch-ay) = ab12b19222a22424effb13c72124ae8037e610f1
-SHA1 (patch-az) = 9a6ad8f19a641ca33107366bf2d92d66ea475110
-SHA1 (patch-ba) = bbc9cbec0d191be082b1f211d146916e07100d43
-SHA1 (patch-bb) = af094b78b3f2fc0cdb77dea834d74a35fbb170a4
-SHA1 (patch-bc) = 981b2abf745d41f82e1dd4b77981457a5f19591c
-SHA1 (patch-bd) = ed29e33c446dc62296d0079e51c6089bb4706a95
diff --git a/news/nn/files/m-powerpc.h b/news/nn/files/m-powerpc.h
deleted file mode 100644
index 34edc5b7695..00000000000
--- a/news/nn/files/m-powerpc.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/************** Machine (and compiler) dependent definitions. **************
- *
- * Define appropriate types for the following ranges of integer
- * variables. These are processor & compiler dependent, but the
- * distributed definitions will probably work on most systems.
- */
-
-
-
-/* MACHINE TYPE DEFINED TYPE VALUE RANGE */
-
-typedef unsigned char int8; /* 0 .. 255 */
-typedef short int16; /* -10,000 .. 10,000 */
-typedef long int32; /* -100,000 .. 100,000 */
-typedef unsigned long uint32; /* 0 .. 2^31-1 */
-
-
-
-/*
- * Define NETWORK_BYTE_ORDER if the machine's longs are
- * already in network byte order.
- */
-
-#define NETWORK_BYTE_ORDER
diff --git a/news/nn/files/s-netbsd.h b/news/nn/files/s-netbsd.h
deleted file mode 100644
index 0938ffe83e8..00000000000
--- a/news/nn/files/s-netbsd.h
+++ /dev/null
@@ -1,161 +0,0 @@
-/* $NetBSD: s-netbsd.h,v 1.3 1999/09/20 21:43:34 kim Exp $ */
-
-/*
- * This version is for FreeBSD 2.1
- * Done by "Andrey A. Chernov" <ache@astral.msk.su>
- */
-
-
-/*
- * Include header files containing the following definitions:
- *
- * off_t, time_t, struct stat
- */
-
-#include <sys/types.h>
-#include <sys/stat.h> /* for S_IFREG */
-#include <fcntl.h> /* for O_RDONLY */
-#include <paths.h> /* for _PATH_SENDMAIL */
-
-#define HAVE_STDLIB_H
-#define HAVE_STRING_H
-#define HAVE_UNISTD_H
-#define HAVE_FCNTL_H
-
-#define HAVE_TERMIOS
-
-/*
- * Define if your system has system V like ioctls
- */
-
-#undef HAVE_TERMIO /* */
-
-/*
- * Define to use terminfo database.
- * Otherwise, termcap is used
- */
-
-#undef USE_TERMINFO /* */
-
-/*
- * Specify the library (or libraries) containing the termcap/terminfo
- * routines.
- *
- * Notice: nn only uses the low-level terminal access routines
- * (i.e. it does not use curses).
- */
-
-#define TERMLIB -ltermcap
-
-/*
- * Define HAVE_STRCHR if strchr() and strrchr() are available
- */
-
-#define HAVE_STRCHR /* */
-
-/*
- * Define if a signal handler has type void (see signal.h)
- */
-
-#define SIGNAL_HANDLERS_ARE_VOID /* */
-
-/*
- * Define HAVE_UALARM if your system has a 4.3 BSD like ualarm() call.
- * Else define MICRO_ALARM(n) to timeout in n/10 seconds if possible.
- * Don't define either if system only has the standard alarm() call.
- */
-
-#define HAVE_UALARM /* */
-
-
-/*
- * Define if your system has BSD like job control (SIGTSTP works)
- */
-
-#define HAVE_JOBCONTROL /* */
-
-
-/*
- * Define if your system has a 4.3BSD like syslog library.
- */
-
-#define HAVE_SYSLOG
-
-/*
- * Define if your system provides the "directory(3X)" access routines
- *
- * If true, include the header file(s) required by the package below
- * (remember that <sys/types.h> or equivalent is included above)
- * Also typedef Direntry to the proper struct type.
- */
-
-#define HAVE_DIRECTORY /* */
-
-#include <dirent.h> /* POSIX */
-
-typedef struct dirent Direntry; /* POSIX */
-
-/*
- * Define if your system has a mkdir() library routine
- */
-
-#define HAVE_MKDIR /* */
-
-/*
- * Pick one:
- * Define HAVE_GETHOSTNAME if you have a BSD like gethostname routine.
- * Define HAVE_UNAME if a system V compatible uname() is available.
- * Define HOSTNAME_FILE "...." to a file containing the hostname.
- * Define HOSTNAME_WHOAMI if sysname is defined in <whoami.h>.
- *
- * As a final resort, define HOSTNAME to the name of your system
- * (in config.h).
- */
-
-#define HAVE_GETHOSTNAME /* BSD systems */
-
-/*
- * Define HAVE_MULTIGROUP if system has simultaneous multiple group
- * membership capability (BSD style).
- * Also define NGROUPS or include the proper .h file if NGROUPS is
- * not defined in <sys/param.h>.
- * Also define GIDSET_TYPE to the type of the elements in the array
- * initialized by getgroups() if different from "int" (many systems
- * have a gid_t, but very few use it for getgroups()).
- */
-
-#define HAVE_MULTIGROUP /* BSD */
-#define GIDSET_TYPE gid_t
-
-/*
- * Define DETATCH_TERMINAL to be a command sequence which
- * will detatch a process from the control terminal
- * Also include system files needed to perform this HERE.
- * If not possible, just define it (empty)
- */
-
-#define DETATCH_TERMINAL setsid();
-
-/*
- * Specify where the Bourne Shell is.
- */
-
-#define SHELL "/bin/sh"
-
-/*
- * Specify the default mailer to be invoked by nnmail
- */
-
-#define MAILX "/usr/bin/mail" /* */
-
-/*
- * Define the maximum length of any pathname that may occur
- */
-
-#define FILENAME 256
-
-#define RESIZING
-
-#define HAVE_8BIT_CTYPE
-
-#define HAVE_WORKING_COLLATE
diff --git a/news/nn/patches/patch-aa b/news/nn/patches/patch-aa
deleted file mode 100644
index 792b8b565f9..00000000000
--- a/news/nn/patches/patch-aa
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-aa,v 1.9 2005/04/11 11:18:06 schwarz Exp $
-
---- Makefile.orig Fri Feb 8 05:14:41 2002
-+++ Makefile Sat Apr 9 00:48:08 2005
-@@ -18,16 +18,16 @@
- #
- # Use /lib/cpp or /usr/ccs/lib/cpp for CPP on Solaris or SVR4 machines.
-
--CC = cc
-+#CC = cc
-
- CPP = $(CC) -E
- #CPP = /lib/cpp
- #CPP = /usr/bin/cpp -no-cpp-precomp # for MacOS X
-
--CFLAGS = -O # -g -Wall -ansi -pedantic
-+#CFLAGS = -O # -g -Wall -ansi -pedantic
- #CFLAGS = -O # -w0 -g3 # for DEC
-
--MAKE = make
-+#MAKE = make
-
-
- SHELL = /bin/sh
-@@ -97,3 +97,5 @@
- man/nn.1.D: man/nn.1
- sh SPLITNN1
-
-+install:
-+ ./inst n
diff --git a/news/nn/patches/patch-ab b/news/nn/patches/patch-ab
deleted file mode 100644
index 9fd919a6741..00000000000
--- a/news/nn/patches/patch-ab
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ab,v 1.5 1999/08/22 22:55:46 kim Exp $
-
---- account.c.orig Fri Jul 3 17:02:18 1998
-+++ account.c Sun Aug 22 18:20:40 1999
-@@ -25,7 +25,7 @@
- extern int errno;
-
- struct account {
-- off_t ac_offset; /* offset in acct file */
-+ long ac_offset; /* offset in acct file */
- int ac_found; /* present in acct file */
-
- char ac_user[24]; /* user name */
-@@ -204,7 +204,7 @@
- if (ac->ac_found)
- fseek(acctf, ac->ac_offset, 0);
- else
-- fseek(acctf, (off_t)0, 2);
-+ fseek(acctf, (long)0, 2);
-
- fprintf(acctf, OUTPUT_FMT,
- ac->ac_user, ac->ac_total, ac->ac_last,
diff --git a/news/nn/patches/patch-ac b/news/nn/patches/patch-ac
deleted file mode 100644
index a9bc2880241..00000000000
--- a/news/nn/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.5 1999/07/26 21:19:24 tron Exp $
-
---- active.c.orig Sun Aug 15 08:59:33 1993
-+++ active.c Mon Jul 26 23:11:38 1999
-@@ -116,7 +116,7 @@
- continue;
- } else {
- gh->master_flag |= M_ALIASED | M_IGNORE_A;
-- gh->data_write_offset = (off_t)gh1->group_num;
-+ gh->data_write_offset = (long)gh1->group_num;
- }
- must_update = 1;
- break;
diff --git a/news/nn/patches/patch-ad b/news/nn/patches/patch-ad
deleted file mode 100644
index c155635c82e..00000000000
--- a/news/nn/patches/patch-ad
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ad,v 1.3 1999/07/26 21:19:26 tron Exp $
-
---- admin.c.orig Mon Sep 13 19:42:00 1993
-+++ admin.c Mon Jul 26 23:11:38 1999
-@@ -290,7 +290,7 @@
- group_header *gh;
- {
- FILE *data, *ix;
-- off_t data_offset, next_offset;
-+ long data_offset, next_offset;
- cross_post_number cross_post;
- article_number cur_article;
- int n, err_type;
-@@ -453,7 +453,7 @@
- group_header *gh;
- {
- FILE *data, *ix;
-- off_t offset;
-+ long offset;
- cross_post_number cross_post;
- article_number first_article;
- int n;
diff --git a/news/nn/patches/patch-ae b/news/nn/patches/patch-ae
deleted file mode 100644
index a5d460e1246..00000000000
--- a/news/nn/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.5 2005/04/11 11:18:06 schwarz Exp $
-
---- conf/s-linux.h.orig Sat Apr 9 00:52:08 2005
-+++ conf/s-linux.h Sat Apr 9 00:52:34 2005
-@@ -247,7 +247,7 @@
- * Define standard compiler flags here:
- */
-
--#define COMPILER_FLAGS -O2
-+/* #define COMPILER_FLAGS -O2 */
-
- /*
- * Define standard loader flags here:
diff --git a/news/nn/patches/patch-af b/news/nn/patches/patch-af
deleted file mode 100644
index 8e3af950a41..00000000000
--- a/news/nn/patches/patch-af
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-af,v 1.5 2002/07/08 02:21:19 kim Exp $
-
---- articles.c.orig Wed Oct 3 03:01:08 2001
-+++ articles.c Sun Jul 7 21:33:09 2002
-@@ -264,7 +264,7 @@
- int dbstatus;
- #else /* NOV */
- FILE *data;
-- off_t data_offset, data_size;
-+ long data_offset, data_size;
- #endif /* NOV */
- cross_post_number cross_post;
- attr_type leave_attr;
-@@ -286,7 +286,7 @@
- data = open_data_file(gh, 'd', OPEN_READ);
- if (data == NULL) return -10;
-
-- if ((data_offset = get_data_offset(gh, first_article)) == (off_t)(-1))
-+ if ((data_offset = get_data_offset(gh, first_article)) == (long)(-1))
- return -11;
- #endif /* NOV */
-
-@@ -355,7 +355,7 @@
- }
- data_offset += data_size;
- #endif /* NOV */
-- if (db_hdr.dh_lpos == (off_t)0)
-+ if (db_hdr.dh_lpos == (long)0)
- continue; /* article not accessible */
-
- if (db_hdr.dh_number > gh->last_db_article
-@@ -421,7 +421,7 @@
- }
-
- ah->hpos = db_hdr.dh_hpos;
-- ah->fpos = ah->hpos + (off_t)(db_hdr.dh_fpos);
-+ ah->fpos = ah->hpos + (long)(db_hdr.dh_fpos);
- ah->lpos = db_hdr.dh_lpos;
-
- ah->attr = test_article(ah);
diff --git a/news/nn/patches/patch-ag b/news/nn/patches/patch-ag
deleted file mode 100644
index 127e8388c80..00000000000
--- a/news/nn/patches/patch-ag
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ag,v 1.2 2002/07/08 02:21:19 kim Exp $
-
---- chset.c.orig Wed Feb 13 14:31:39 2002
-+++ chset.c Sun Jul 7 21:36:12 2002
-@@ -19,6 +19,7 @@
- "iso-8859-8", 8,
- "iso-8859-9", 8,
- "iso-8859-15", 8,
-+ "koi8-r", 8,
- "unknown", 0,
- NULL, 0,
- };
diff --git a/news/nn/patches/patch-ah b/news/nn/patches/patch-ah
deleted file mode 100644
index 77b987eb33f..00000000000
--- a/news/nn/patches/patch-ah
+++ /dev/null
@@ -1,45 +0,0 @@
-$NetBSD: patch-ah,v 1.2 1999/08/22 22:55:46 kim Exp $
-
---- collect.c.orig Wed Aug 14 23:08:39 1996
-+++ collect.c Sun Aug 22 18:21:47 1999
-@@ -45,7 +45,7 @@
- article_number last;
- register FILE *arc;
- register int c;
-- off_t start;
-+ long start;
- static char *arc_header = "Archived-Last: ";
- /* Header format: Archived-Last: 88888888 group.name */
- /* Fixed constants length == 15 and offset == 24 are used below */
-@@ -83,9 +83,9 @@
-
- fseek(arc, start, 0);
- fprintf(arc, "%s%8ld %s\n", arc_header, (long)num, gh->group_name);
-- fseek(arc, (off_t)0, 2);
-+ fseek(arc, (long)0, 2);
-
-- fseek(f, (off_t)0, 0);
-+ fseek(f, (long)0, 0);
- while ((c = getc(f)) != EOF) putc(c, arc);
- putc(NL, arc);
- fclose(arc);
-@@ -177,8 +177,8 @@
- /* get article header */
-
- art_hdr.a_number = art_num;
-- art_hdr.hpos = (off_t)0;
-- art_hdr.lpos = (off_t)0;
-+ art_hdr.hpos = (long)0;
-+ art_hdr.lpos = (long)0;
- art_hdr.flag = 0;
-
- mode = FILL_NEWS_HEADER | FILL_OFFSETS | SKIP_HEADER;
-@@ -391,7 +391,7 @@
- }
- #endif
- #ifndef RENUMBER_DANGER
-- if (temp == 0 && gh->data_write_offset == (off_t)0) {
-+ if (temp == 0 && gh->data_write_offset == (long)0) {
- gh->first_db_article = gh->last_db_article + 1;
- continue;
- }
diff --git a/news/nn/patches/patch-ai b/news/nn/patches/patch-ai
deleted file mode 100644
index 87cef9fc506..00000000000
--- a/news/nn/patches/patch-ai
+++ /dev/null
@@ -1,106 +0,0 @@
-$NetBSD: patch-ai,v 1.7 2005/04/11 11:05:47 schwarz Exp $
-
---- config.h-dist.orig Thu Feb 6 18:06:02 2003
-+++ config.h-dist Fri Apr 8 22:20:37 2005
-@@ -11,6 +11,9 @@
- * (c) Copyright 1990, Kim F. Storm. All rights reserved.
- */
-
-+#define PREFIX "@PREFIX@"
-+#define PKG_SYSCONFDIR "@PKG_SYSCONFDIR@"
-+
- #include <stdio.h>
- #include <ctype.h>
-
-@@ -66,7 +69,7 @@
- * ascii files. (Thank you Geoff!)
- */
-
--/* #define NETWORK_DATABASE */
-+#define NETWORK_DATABASE
-
-
- /********************************** NNTP *********************************
-@@ -100,7 +103,7 @@
- * LIB_DIRECTORY defined below.
- */
-
--#define NNTP_SERVER "/usr/local/lib/nntp_server"
-+#define NNTP_SERVER PKG_SYSCONFDIR "/server"
-
- /*
- * Define NNTP_PATH_HOSTNAME to force a specific hostname into the
-@@ -138,7 +141,7 @@
- * conf/s-template.h as a starting point for writing you own.
- */
-
--#include "s-sunos5.h"
-+#include "@SFILE@"
-
-
- /********************** MACHINE DEPENDENT DEFINITIONS **********************
-@@ -149,7 +152,7 @@
- * conf/m-template.h as a starting point for writing you own.
- */
-
--#include "m-sparc.h"
-+#include "@MFILE@"
-
-
- /**************************** LOCALIZATION ****************************
-@@ -182,8 +185,12 @@
- * (= LIB_DIRECTORY/Log if undefined).
- */
-
--#define BIN_DIRECTORY "/usr/local/bin"
--#define LIB_DIRECTORY "/usr/local/lib/nn"
-+#define BIN_DIRECTORY PREFIX "/bin"
-+#define LIB_DIRECTORY PREFIX "/share/nn"
-+#ifndef _PATH_VARTMP
-+# define _PATH_VARTMP "/var/tmp"
-+#endif
-+#define TMP_DIRECTORY _PATH_VARTMP
-
-
- /*************************** NEWS TRANSPORT **************************
-@@ -258,7 +265,10 @@
- */
-
- /* #define REC_MAIL "/usr/lib/news/recmail" */ /* non-sendmail */
--#define REC_MAIL "/usr/lib/sendmail -t" /* sendmail */
-+#ifndef _PATH_SENDMAIL
-+# define _PATH_SENDMAIL "/usr/lib/sendmail"
-+#endif
-+#define REC_MAIL _PATH_SENDMAIL " -t" /* sendmail */
-
-
- /*
-@@ -307,13 +317,13 @@
- * DAEMON_MAN - nnmaster
- */
-
--#define USER_MAN_DIR "/usr/local/man/man1"
-+#define USER_MAN_DIR PREFIX "/man/man1"
- #define USER_MAN_SECTION "1"
-
--#define SYS_MAN_DIR "/usr/local/man/man1"
--#define SYS_MAN_SECTION "1m"
-+#define SYS_MAN_DIR PREFIX "/man/man1"
-+#define SYS_MAN_SECTION "1"
-
--#define DAEMON_MAN_DIR "/usr/local/man/man8"
-+#define DAEMON_MAN_DIR PREFIX "/man/man8"
- #define DAEMON_MAN_SECTION "8"
-
-
-@@ -383,8 +393,8 @@
- * Common choices are: (news, news) and (your uid, your gid)
- */
-
--#define OWNER "news"
--#define GROUP "news"
-+#define OWNER "@BINOWN@"
-+#define GROUP "@BINGRP@"
-
- /*
- * Default folder directory
diff --git a/news/nn/patches/patch-aj b/news/nn/patches/patch-aj
deleted file mode 100644
index b73b06daea1..00000000000
--- a/news/nn/patches/patch-aj
+++ /dev/null
@@ -1,37 +0,0 @@
-$NetBSD: patch-aj,v 1.2 1999/08/22 22:55:46 kim Exp $
-
---- data.h.orig Tue Jun 23 10:57:44 1998
-+++ data.h Sun Aug 22 18:22:16 1999
-@@ -29,7 +29,7 @@
- char db_lock[DB_LOCK_MESSAGE];
- time_t db_created; /* when database was last built */
- time_t last_scan; /* age of active file at last scan */
-- off_t last_size; /* size of active file at last scan */
-+ long last_size; /* size of active file at last scan */
- group_number number_of_groups;
- int32 free_groups;
- } master_header;
-@@ -68,8 +68,8 @@
- article_number first_a_article; /* min article in active */
- article_number last_a_article; /* max article in active */
-
-- off_t index_write_offset;
-- off_t data_write_offset;
-+ long index_write_offset;
-+ long data_write_offset;
-
- time_t creation_time; /* when group was created */
-
-@@ -145,9 +145,9 @@
- group_header *a_group; /* if merged article menu */
-
- /* indexes to header line text */
-- off_t hpos; /* first byte of header */
-- off_t fpos; /* first byte in article text */
-- off_t lpos; /* last pos of article */
-+ long hpos; /* first byte of header */
-+ long fpos; /* first byte in article text */
-+ long lpos; /* last pos of article */
-
- time_stamp t_stamp; /* encoded time_stamp */
- time_stamp root_t_stamp; /* subject's time_stamp */
diff --git a/news/nn/patches/patch-ak b/news/nn/patches/patch-ak
deleted file mode 100644
index 0be866ec8e4..00000000000
--- a/news/nn/patches/patch-ak
+++ /dev/null
@@ -1,157 +0,0 @@
-$NetBSD: patch-ak,v 1.3 2002/07/08 02:21:20 kim Exp $
-
---- db.c.orig Thu Jan 31 23:10:27 2002
-+++ db.c Sun Jul 7 21:33:09 2002
-@@ -1103,7 +1103,7 @@
-
- if (!db_sequential)
- fseek(master_file,
-- (off_t)(MASTER_FIELDS * sizeof(net_long) + DB_LOCK_MESSAGE +
-+ (long)(MASTER_FIELDS * sizeof(net_long) + DB_LOCK_MESSAGE +
- GROUP_FIELDS * sizeof(net_long) * gh->group_num), 0);
-
- if (fread((char *)buf, sizeof(net_long), GROUP_FIELDS, master_file) != GROUP_FIELDS)
-@@ -1123,7 +1123,7 @@
- #else
- if (!db_sequential)
- fseek(master_file,
-- (off_t)(sizeof(master_header) + SAVED_GROUP_HEADER_SIZE(*gh) * gh->group_num), 0);
-+ (long)(sizeof(master_header) + SAVED_GROUP_HEADER_SIZE(*gh) * gh->group_num), 0);
-
- if (fread((char *)gh, SAVED_GROUP_HEADER_SIZE(*gh), 1, master_file) != 1)
- goto err;
-@@ -1145,7 +1145,7 @@
-
- if (!db_sequential)
- fseek(master_file,
-- (off_t)(MASTER_FIELDS * sizeof(net_long) + DB_LOCK_MESSAGE +
-+ (long)(MASTER_FIELDS * sizeof(net_long) + DB_LOCK_MESSAGE +
- GROUP_FIELDS * sizeof(net_long) * gh->group_num), 0);
-
- buf[0] = gh->first_db_article;
-@@ -1163,7 +1163,7 @@
- goto err;
- #else /* NETWORK_DATABASE */
- if (!db_sequential)
-- fseek(master_file, (off_t)(sizeof(master_header) + SAVED_GROUP_HEADER_SIZE(*gh) * gh->group_num), 0);
-+ fseek(master_file, (long)(sizeof(master_header) + SAVED_GROUP_HEADER_SIZE(*gh) * gh->group_num), 0);
-
-
- if (fwrite((char *)gh, SAVED_GROUP_HEADER_SIZE(*gh), 1, master_file) != 1)
-@@ -1348,10 +1348,10 @@
-
-
- #ifndef NOV
--off_t db_read_art(f)
-+long db_read_art(f)
- FILE *f;
- {
-- off_t bytes;
-+ long bytes;
-
- #ifdef NETWORK_DATABASE
- net_long buf[ARTICLE_FIELDS];
-@@ -1556,7 +1556,7 @@
- * fill in db_hdr and db_data from the overview data for the next
- * article in this group. does weirdo nn encodings of header fields.
- */
--off_t
-+long
- db_read_art(f)
- FILE *f;
- {
-@@ -1764,32 +1764,32 @@
- }
-
-
--off_t get_index_offset(gh, art_num)
-+long get_index_offset(gh, art_num)
- group_header *gh;
- article_number art_num;
- {
- #ifdef NETWORK_DATABASE
-- return (off_t)((art_num - gh->first_db_article) * sizeof(net_long));
-+ return (long)((art_num - gh->first_db_article) * sizeof(net_long));
- #else /* NETWORK_DATABASE */
-- return (off_t)((art_num - gh->first_db_article) * sizeof(off_t));
-+ return (long)((art_num - gh->first_db_article) * sizeof(long));
- #endif /* NETWORK_DATABASE */
- }
-
--off_t get_data_offset(gh, art_num)
-+long get_data_offset(gh, art_num)
- group_header *gh;
- article_number art_num;
- {
- FILE *index;
-- off_t data_offset;
-+ long data_offset;
-
-- if (gh->first_db_article == art_num) return (off_t)0;
-+ if (gh->first_db_article == art_num) return (long)0;
-
- index = open_data_file(gh, 'x', OPEN_READ);
-- if (index == NULL) return (off_t)(-1);
-+ if (index == NULL) return (long)(-1);
-
- fseek(index, get_index_offset(gh, art_num), 0);
- if (!db_read_offset(index, &data_offset))
-- data_offset = (off_t)(-1);
-+ data_offset = (long)(-1);
-
- fclose(index);
-
-@@ -1800,7 +1800,7 @@
- int
- db_read_offset(f, offset)
- FILE *f;
--off_t *offset;
-+long *offset;
- {
- #ifdef NETWORK_DATABASE
- net_long temp;
-@@ -1813,7 +1813,7 @@
- *offset = temp;
- #else /* NETWORK_DATABASE */
-
-- if (fread((char *)offset, sizeof(off_t), 1, f) != 1) return 0;
-+ if (fread((char *)offset, sizeof(long), 1, f) != 1) return 0;
- #endif /* NETWORK_DATABASE */
- return 1;
- }
-@@ -1821,7 +1821,7 @@
- int
- db_write_offset(f, offset)
- FILE *f;
--off_t *offset;
-+long *offset;
- {
- #ifdef NETWORK_DATABASE
- net_long temp;
-@@ -1835,7 +1835,7 @@
-
- #else /* NETWORK_DATABASE */
-
-- if (fwrite((char *)offset, sizeof(off_t), 1, f) != 1) return 0;
-+ if (fwrite((char *)offset, sizeof(long), 1, f) != 1) return 0;
- #endif /* NETWORK_DATABASE */
- return 1;
- }
-@@ -1859,7 +1859,7 @@
- int
- db_read_offset(f, offset)
- FILE *f;
--off_t *offset;
-+long *offset;
- {
- nn_exitmsg(50, "STUB ROUTINE CALLED: db_read_offset\n");
- return -1;
-@@ -1883,7 +1883,7 @@
- return NULL;
- }
-
--off_t
-+long
- get_index_offset(gh, art_num)
- group_header *gh;
- article_number art_num;
diff --git a/news/nn/patches/patch-al b/news/nn/patches/patch-al
deleted file mode 100644
index 8210fe60c88..00000000000
--- a/news/nn/patches/patch-al
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-al,v 1.1 1999/07/26 21:19:28 tron Exp $
-
---- db.h.orig Sun Aug 15 08:59:46 1993
-+++ db.h Mon Jul 26 23:11:38 1999
-@@ -71,8 +71,8 @@
-
- time_stamp dh_date; /* encoded Date: filed (not a time_t value!!) */
-
-- off_t dh_hpos; /* absolute offset for first byte of header */
-- off_t dh_lpos; /* absolute offset for last byte of article */
-+ long dh_hpos; /* absolute offset for first byte of header */
-+ long dh_lpos; /* absolute offset for last byte of article */
- int16 dh_fpos; /* relative offset for first byte in article text */
-
- int16 dh_lines;
-@@ -104,8 +104,8 @@
-
- /* data access */
-
--off_t db_read_art();
--off_t get_index_offset(), get_data_offset();
-+long db_read_art();
-+long get_index_offset(), get_data_offset();
-
- extern data_header db_hdr;
- extern data_dynamic_data db_data;
diff --git a/news/nn/patches/patch-am b/news/nn/patches/patch-am
deleted file mode 100644
index 401f8d87a1f..00000000000
--- a/news/nn/patches/patch-am
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-am,v 1.2 2002/07/08 02:21:20 kim Exp $
-
---- decode.c.orig Thu Jan 31 23:28:20 2002
-+++ decode.c Sun Jul 7 21:33:09 2002
-@@ -357,7 +357,7 @@
- mode_t mode;
- int onedone, len, lead_check = 0;
- char buf[LINELEN], part[2], *line;
-- off_t real_size, start_offset;
-+ long real_size, start_offset;
- long expect_size;
-
- onedone = 0;
diff --git a/news/nn/patches/patch-an b/news/nn/patches/patch-an
deleted file mode 100644
index 964da29b4e3..00000000000
--- a/news/nn/patches/patch-an
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-an,v 1.1 1999/07/26 21:19:29 tron Exp $
-
---- digest.c.orig Sun Aug 15 08:59:50 1993
-+++ digest.c Mon Jul 26 23:11:38 1999
-@@ -267,7 +267,7 @@
- skip_digest_body(f)
- register FILE *f;
- {
-- off_t backup_p[BACKUP_LINES];
-+ long backup_p[BACKUP_LINES];
- int line_type[BACKUP_LINES];
- register int backup_index, backup_count;
- int more_header_lines, end_or_asterisks, blanks;
diff --git a/news/nn/patches/patch-ao b/news/nn/patches/patch-ao
deleted file mode 100644
index e5fe4e18688..00000000000
--- a/news/nn/patches/patch-ao
+++ /dev/null
@@ -1,61 +0,0 @@
-$NetBSD: patch-ao,v 1.2 1999/08/22 22:55:46 kim Exp $
-
---- expire.c.orig Wed Aug 14 23:16:10 1996
-+++ expire.c Sun Aug 22 18:05:19 1999
-@@ -95,7 +95,7 @@
- register group_header *gh;
- {
- FILE *old, *data, *ix;
-- off_t old_max_offset;
-+ long old_max_offset;
- register article_number *list;
- article_number old_last_article;
- long count;
-@@ -148,9 +148,9 @@
- old_last_article = gh->last_db_article;
- gh->last_db_article = 0;
-
-- gh->index_write_offset = (off_t)0;
-+ gh->index_write_offset = (long)0;
- old_max_offset = gh->data_write_offset;
-- gh->data_write_offset = (off_t)0;
-+ gh->data_write_offset = (long)0;
-
- gh->master_flag &= ~M_EXPIRE;
- gh->master_flag |= M_BLOCKED;
-@@ -268,7 +268,7 @@
- {
- FILE *old_x, *old_d;
- FILE *new;
-- off_t index_offset, data_offset, new_offset;
-+ long index_offset, data_offset, new_offset;
- long count, expire_count;
- char *err_message;
-
-@@ -333,7 +333,7 @@
- * calculate the number of entries to copy
- */
-
-- count = gh->index_write_offset / sizeof(off_t);
-+ count = gh->index_write_offset / sizeof(long);
-
- /*
- * data offset is the offset into the old data file for the
-@@ -342,7 +342,7 @@
- * offset 'index_offset'.
- */
-
-- data_offset = (off_t)0;
-+ data_offset = (long)0;
-
- /*
- * read 'count' entries from the old index file starting from
-@@ -356,7 +356,7 @@
- if (!db_read_offset(old_x, &new_offset))
- expire_error("INDEX: too short");
-
-- if (data_offset == (off_t)0) data_offset = new_offset;
-+ if (data_offset == (long)0) data_offset = new_offset;
-
- new_offset -= data_offset;
- if (!db_write_offset(new, &new_offset))
diff --git a/news/nn/patches/patch-ap b/news/nn/patches/patch-ap
deleted file mode 100644
index 5d953312fd1..00000000000
--- a/news/nn/patches/patch-ap
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ap,v 1.3 2002/07/08 02:21:20 kim Exp $
-
---- global.h.orig Sun Feb 3 22:53:13 2002
-+++ global.h Sun Jul 7 21:33:09 2002
-@@ -374,12 +374,12 @@
- void db_read_group __APROTO((group_header *gh));
- #endif
- void db_write_group __APROTO((group_header *gh));
--off_t db_read_art __APROTO((FILE *f));
-+long db_read_art __APROTO((FILE *f));
- int db_write_art __APROTO((FILE *f));
--off_t get_index_offset __APROTO((group_header *gh, article_number art_num));
--off_t get_data_offset __APROTO((group_header *gh, article_number art_num));
--int db_read_offset __APROTO((FILE *f, off_t *offset));
--int db_write_offset __APROTO((FILE *f, off_t *offset));
-+long get_index_offset __APROTO((group_header *gh, article_number art_num));
-+long get_data_offset __APROTO((group_header *gh, article_number art_num));
-+int db_read_offset __APROTO((FILE *f, long *offset));
-+int db_write_offset __APROTO((FILE *f, long *offset));
-
- /* decode.c */
-
diff --git a/news/nn/patches/patch-aq b/news/nn/patches/patch-aq
deleted file mode 100644
index 7b41e3f807b..00000000000
--- a/news/nn/patches/patch-aq
+++ /dev/null
@@ -1,41 +0,0 @@
-$NetBSD: patch-aq,v 1.3 2002/07/08 02:21:20 kim Exp $
-
---- inst.sh.orig Thu Oct 4 01:33:06 2001
-+++ inst.sh Sun Jul 7 21:33:10 2002
-@@ -1,8 +1,8 @@
-
- # (Large) prefix inserted above by Make
-
--# BSD systems keep chown in /etc
--PATH="$PATH:/etc"
-+# BSD systems keep chown in different places
-+PATH="$PATH:/usr/bin:/usr/sbin:/etc"
-
- case "$1" in
- mkdir)
-@@ -55,7 +55,7 @@
- ;;
- esac
-
--set -u
-+#set -u
-
- (
- if $NNTP
-@@ -363,7 +363,6 @@
-
- echo
- echo "Formatting online manual $MAN"
-- echo ".... (continues in background) ...."
-
- rm -f $MAN
-
-@@ -378,7 +377,7 @@
- ${AWK} -f format.awk - > $MAN
-
- ./inst chmod 644 $MAN
-- ) &
-+ )
- ;;
-
- splitdb)
diff --git a/news/nn/patches/patch-ar b/news/nn/patches/patch-ar
deleted file mode 100644
index 16ad0c29619..00000000000
--- a/news/nn/patches/patch-ar
+++ /dev/null
@@ -1,49 +0,0 @@
-$NetBSD: patch-ar,v 1.2 2002/07/08 02:21:20 kim Exp $
-
---- kill.c.orig Mon Jun 17 23:58:08 2002
-+++ kill.c Sun Jul 7 21:33:10 2002
-@@ -424,7 +424,7 @@
- typedef struct {
- long ckh_magic;
- time_t ckh_db_check;
-- off_t ckh_pattern_offset;
-+ long ckh_pattern_offset;
- long ckh_pattern_size;
- long ckh_entries;
- long ckh_regexp_size;
-@@ -579,7 +579,7 @@
- comp_kill_header header;
- comp_kill_entry entry;
- time_t now, age;
-- off_t cur_line_start;
-+ long cur_line_start;
- char line[512];
- register char *cp, *np;
- register int c;
-@@ -605,7 +605,7 @@
-
- tprintf("\nCompiling kill file\n");
-
-- fseek(compf, (off_t)sizeof(header), 0);
-+ fseek(compf, (long)sizeof(header), 0);
-
- now = cur_time();
-
-@@ -850,7 +850,7 @@
-
- if (header.ckh_pattern_size > 0) {
- kill_patterns = newstr(header.ckh_pattern_size);
-- fseek(killf, (off_t)(header.ckh_entries * sizeof(entry)), 1);
-+ fseek(killf, (long)(header.ckh_entries * sizeof(entry)), 1);
- if (fread(kill_patterns, sizeof(char), (int)header.ckh_pattern_size, killf)
- != header.ckh_pattern_size) goto err;
- } else
-@@ -862,7 +862,7 @@
-
- tb = group_regexp_table;
-
-- fseek(killf, (off_t)sizeof(header), 0);
-+ fseek(killf, (long)sizeof(header), 0);
- for (n = header.ckh_entries, kl = kill_tab; --n >= 0; kl++) {
- if (fread((char *)&entry, sizeof(entry), 1, killf) != 1) goto err;
- if (header.ckh_pattern_size <= entry.ck_pattern_index ||
diff --git a/news/nn/patches/patch-as b/news/nn/patches/patch-as
deleted file mode 100644
index 4692307a7fc..00000000000
--- a/news/nn/patches/patch-as
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-as,v 1.1 1999/07/26 21:19:31 tron Exp $
-
---- master.c.orig Sat Oct 2 12:33:50 1993
-+++ master.c Mon Jul 26 23:11:38 1999
-@@ -193,8 +193,8 @@
- gh->first_db_article = 0;
- gh->last_db_article = 0;
-
-- gh->data_write_offset = (off_t)0;
-- gh->index_write_offset = (off_t)0;
-+ gh->data_write_offset = (long)0;
-+ gh->index_write_offset = (long)0;
-
- if (init_group(gh)) {
- (void)open_data_file(gh, 'd', -1);
diff --git a/news/nn/patches/patch-at b/news/nn/patches/patch-at
deleted file mode 100644
index 8cbb550cc05..00000000000
--- a/news/nn/patches/patch-at
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD: patch-at,v 1.2 1999/08/22 22:55:46 kim Exp $
-
---- more.c.orig Wed Jul 15 14:18:32 1998
-+++ more.c Sun Aug 22 18:11:22 1999
-@@ -358,8 +358,8 @@
- register FILE *art;
- int more_cmd, eof, skip_spaces, has_space, window_lines;
- int form_feed, last_ff_line, ignore_nl = 0;
-- off_t lineposbuf[LINEMAX];
-- off_t *linepos = lineposbuf;
-+ long lineposbuf[LINEMAX];
-+ long *linepos = lineposbuf;
- int linemax = LINEMAX;
- char linebuf[200], skip_char;
- int skip_wrap;
-@@ -368,7 +368,7 @@
- struct digest_header digest_save;
- int linenum, maxline, topline, print_lines, lno1;
- int scroll_lines, scroll_from;
-- off_t scroll_offset;
-+ long scroll_offset;
- int underline_line, fake_underline;
- int match_lines, match_redraw, match_topline = 0, match_botline;
- int goto_line, prev_goto, stop_line, extra_lines;
-@@ -655,11 +655,11 @@
- if (linenum == linemax) {
- linemax += 500;
- if (linepos == lineposbuf) {
-- linepos = newobj(off_t, linemax);
-+ linepos = newobj(long, linemax);
- for (linenum = 0; linenum < LINEMAX; linenum++)
- linepos[linenum] = lineposbuf[linenum];
- } else
-- linepos = resizeobj(linepos, off_t, linemax);
-+ linepos = resizeobj(linepos, long, linemax);
- }
-
- if (goto_line == linenum) {
diff --git a/news/nn/patches/patch-au b/news/nn/patches/patch-au
deleted file mode 100644
index 807cd80f5cc..00000000000
--- a/news/nn/patches/patch-au
+++ /dev/null
@@ -1,63 +0,0 @@
-$NetBSD: patch-au,v 1.2 1999/08/22 22:55:46 kim Exp $
-
---- news.c.orig Fri Jul 3 14:58:51 1998
-+++ news.c Sun Aug 22 18:13:43 1999
-@@ -23,7 +23,7 @@
- {
- register char *bp, *cp, **fptr;
- int siz, all, date_only;
-- off_t pos;
-+ long pos;
-
- pos = ftell(f);
-
-@@ -238,11 +238,11 @@
- FILE *f;
- struct stat statb;
- #ifndef DONT_COUNT_LINES
-- off_t digest_artlen;
-+ long digest_artlen;
- #endif /* DONT_COUNT_LINES */
- #ifdef NNTP
- int lazy = 0;
-- off_t fpos;
-+ long fpos;
- FILE *nntp_get_article();
- #endif /* NNTP */
-
-@@ -275,9 +275,9 @@
- /* necessary because empty files wreak havoc */
- if (fstat(fileno(f), &statb) < 0 ||
- #ifdef NOV
-- (art->lpos = statb.st_size, statb.st_size <= (off_t)0)) {
-+ (art->lpos = (long)statb.st_size, statb.st_size <= (off_t)0)) {
- #else
-- statb.st_size < art->lpos || statb.st_size <= (off_t)0) {
-+ (long)statb.st_size < art->lpos || statb.st_size <= (off_t)0) {
- #endif /* NOV */
- fclose(f);
- return who_am_i == I_AM_MASTER ? (FILE *)1 : NULL;
-@@ -363,12 +363,12 @@
- }
-
- if (modes & FILL_OFFSETS) {
-- fseek(f, (off_t)0, 2);
-+ fseek(f, (long)0, 2);
- news.ng_lpos = ftell(f);
- }
- #ifdef NNTP
- else if (use_nntp && (art->flag & (A_DIGEST | A_FOLDER)) == 0) {
-- fseek(f, (off_t)0, 2);
-+ fseek(f, (long)0, 2);
- art->lpos = ftell(f);
- }
- #endif
-@@ -391,7 +391,7 @@
- }
- #ifdef NNTP
- else if (use_nntp && (art->flag & (A_DIGEST | A_FOLDER)) == 0) {
-- fseek(f, (off_t)0, 2);
-+ fseek(f, (long)0, 2);
- art->lpos = ftell(f);
- }
- #endif
diff --git a/news/nn/patches/patch-av b/news/nn/patches/patch-av
deleted file mode 100644
index c1d66b82e3e..00000000000
--- a/news/nn/patches/patch-av
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-av,v 1.1 1999/07/26 21:19:32 tron Exp $
-
---- news.h.orig Tue Aug 31 23:06:07 1993
-+++ news.h Mon Jul 26 23:11:38 1999
-@@ -13,8 +13,8 @@
- # define N_DIGEST 1 /* article is part of a digest*/
- # define N_MODERATED 2 /* group is moderated */
-
-- off_t ng_fpos; /* position of article text */
-- off_t ng_lpos; /* last text offset */
-+ long ng_fpos; /* position of article text */
-+ long ng_lpos; /* last text offset */
- /* header lines: */
- char *ng_from; /* from */
- char *ng_name; /* senders name */
-@@ -51,9 +51,9 @@
- */
-
- struct digest_header {
-- off_t dg_hpos; /* position of article header */
-- off_t dg_fpos; /* position of article text */
-- off_t dg_lpos; /* last text position */
-+ long dg_hpos; /* position of article header */
-+ long dg_fpos; /* position of article text */
-+ long dg_lpos; /* last text position */
- /* header lines: */
- char *dg_date; /* date */
- char *dg_from; /* from */
diff --git a/news/nn/patches/patch-aw b/news/nn/patches/patch-aw
deleted file mode 100644
index 653933b703a..00000000000
--- a/news/nn/patches/patch-aw
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aw,v 1.2 2002/07/08 02:21:20 kim Exp $
-
---- newsrc.c.orig Sun Jun 16 00:22:19 2002
-+++ newsrc.c Sun Jul 7 21:33:10 2002
-@@ -378,7 +378,7 @@
-
- rc = open_file(newsrc_file, OPEN_READ);
- if (rc != NULL) {
-- fseek(rc, (off_t)0, 2);
-+ fseek(rc, (long)0, 2);
- if (ftell(rc))
- rewind(rc);
- else {
diff --git a/news/nn/patches/patch-ax b/news/nn/patches/patch-ax
deleted file mode 100644
index cafeafec22d..00000000000
--- a/news/nn/patches/patch-ax
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-ax,v 1.5 2005/04/11 11:05:47 schwarz Exp $
-
---- nntp.c.orig Sat Jan 25 07:10:39 2003
-+++ nntp.c Fri Apr 8 22:23:05 2005
-@@ -832,7 +832,11 @@
- server_real_name = hp->h_name;
- else
- nn_exitmsg(1, "NNTPSERVER is invalid");
-+#if 0
- use_nntp = (strcmp(host_name, server_real_name) != 0);
-+#else
-+ use_nntp = 1;
-+#endif
-
- if (use_nntp) {
- freeobj(news_active);
-@@ -1159,7 +1163,7 @@
-
- case OK_BODY:
- tmp = open_file(cptr->file_name, OPEN_APPEND|MUST_EXIST);
-- fseek(tmp, (off_t)0, 2);
-+ fseek(tmp, (long)0, 2);
- if (copy_text(tmp) < 0)
- return NULL;
- if (fclose(tmp) == EOF) goto err;
diff --git a/news/nn/patches/patch-ay b/news/nn/patches/patch-ay
deleted file mode 100644
index 02971512b4c..00000000000
--- a/news/nn/patches/patch-ay
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-ay,v 1.2 2002/07/08 02:21:20 kim Exp $
-
---- save.c.orig Thu Jul 12 01:18:34 2001
-+++ save.c Sun Jul 7 21:39:15 2002
-@@ -521,7 +521,7 @@
- return 0;
- }
- current_folder_type = -1;
-- if (ftell(save_file) != (off_t)0) {
-+ if (ftell(save_file) != (long)0) {
- if (mode != NO_HEADER) set_folder_type(save_name);
- save_mode &= ~FILE_IS_NEW;
- }
-@@ -538,7 +538,7 @@
- mailbox_format(save_file, 1);
-
- if (mode == FULL_HEADER || mode == HEADER_ONLY) {
-- off_t cnt = ah->fpos - ah->hpos;
-+ long cnt = ah->fpos - ah->hpos;
- while (--cnt >= 0) {
- if ((c = getc(art)) == EOF) break;
- putc(c, save_file);
-@@ -656,7 +656,7 @@
- char *dir, *file;
- {
- register int c;
-- off_t endpos;
-+ long endpos;
- FILE *h;
-
- if (dir != (char *)NULL && file[0] != '/')
-@@ -665,7 +665,7 @@
- msg("Cannot open %s", file);
- return;
- }
-- fseek(h, (off_t)0, 2);
-+ fseek(h, (long)0, 2);
- if (ftell(h) > 0)
- set_folder_type(file);
- else
diff --git a/news/nn/patches/patch-az b/news/nn/patches/patch-az
deleted file mode 100644
index 1212eb55682..00000000000
--- a/news/nn/patches/patch-az
+++ /dev/null
@@ -1,42 +0,0 @@
-$NetBSD: patch-az,v 1.1 1999/07/26 21:19:33 tron Exp $
-
---- sort.c.orig Tue Aug 31 23:06:25 1993
-+++ sort.c Mon Jul 26 23:11:39 1999
-@@ -43,6 +43,29 @@
- * before MATCH_?? (t, a, b) is used.
- */
-
-+#ifdef HAVE_WORKING_COLLATE
-+
-+#ifdef HAVE_8BIT_CTYPE
-+#define MATCH_DROP(table, c) !isprint(c)
-+#else
-+#define MATCH_DROP(table, c) ( c & 0200 || !isprint(c) )
-+#endif
-+#define MATCH_EQ(table, a, b) ( a == b || table(a, b) == 0 )
-+#define MATCH_LS_EQ(table, a, b) ( a == b || table(a, b) <= 0 )
-+#define MATCH_LS(table, a, b) ( table(a, b) < 0 )
-+#define MATCH_CMP(table, a, b) table(a, b)
-+
-+static int match_subject(a, b)
-+char a, b;
-+{
-+ static char aa[2], bb[2];
-+
-+ aa[0] = a; bb[0] = b;
-+ return strcoll(aa, bb);
-+}
-+
-+#else
-+
- #define MATCH_DROP(table, c) ( c & 0200 || table[c] == 0 )
- #define MATCH_EQ(table, a, b) ( a == b || table[a] == table[b] )
- #define MATCH_LS_EQ(table, a, b) ( a <= b || table[a] <= table[b] )
-@@ -77,6 +100,7 @@
- 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 00, 00
- };
-
-+#endif /* HAVE_WORKING_COLLATE */
-
- static int
- order_subj_date(ah1, ah2)
diff --git a/news/nn/patches/patch-ba b/news/nn/patches/patch-ba
deleted file mode 100644
index d2a4b56894c..00000000000
--- a/news/nn/patches/patch-ba
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-ba,v 1.3 2002/07/08 02:21:20 kim Exp $
-
---- term.c.orig Sun Jun 16 01:54:33 2002
-+++ term.c Sun Jul 7 21:33:10 2002
-@@ -42,9 +42,9 @@
- # include <termio.h>
- # endif /* USE_TERMCAP */
- #else
--#ifndef __FreeBSD__
-+#ifndef HAVE_TERMIOS_H
- # include <sgtty.h>
--#endif /* __FreeBSD__ */
-+#endif /* HAVE_TERMIOS_H */
- #endif
-
- #ifdef SYSV_RESIZING
-@@ -401,6 +401,12 @@
- #endif /* FAKE_INTERRUPT */
-
- static unsigned sp_table[] = {
-+#ifdef B115200
-+ B115200, 11520,
-+#endif
-+#ifdef B57600
-+ B57600, 5760,
-+#endif
- B9600, 960,
- #ifdef B19200
- B19200, 1920,
diff --git a/news/nn/patches/patch-bb b/news/nn/patches/patch-bb
deleted file mode 100644
index b7c574556a1..00000000000
--- a/news/nn/patches/patch-bb
+++ /dev/null
@@ -1,101 +0,0 @@
-$NetBSD: patch-bb,v 1.1 2000/10/11 01:26:33 dmcmahill Exp $
-
-add machine config file for mipsel machines
-
---- /dev/null Tue Oct 10 21:01:06 2000
-+++ conf/m-mipsel.h Tue Oct 10 21:21:12 2000
-@@ -0,0 +1,94 @@
-+
-+/************** Machine (and compiler) dependent definitions. **************
-+ *
-+ * Define appropriate types for the following ranges of integer
-+ * variables. These are processor & compiler dependent, but the
-+ * distributed definitions will probably work on most systems.
-+ */
-+
-+
-+
-+/* MACHINE TYPE DEFINED TYPE VALUE RANGE */
-+
-+typedef unsigned char int8; /* 0 .. 255 */
-+typedef short int16; /* -10,000 .. 10,000 */
-+typedef int int32; /* -100,000 .. 100,000 */
-+typedef unsigned int uint32; /* 0 .. 2^31-1 */
-+
-+
-+/*
-+ * Define NO_VARARGS if the varargs feature is not available.
-+ *
-+ * Also define NO_VARARGS if the vprintf/vsprintf routines are not
-+ * available (however, this will only by safe on some machines, like
-+ * the VAX).
-+ *
-+ * Defining NO_VARARGS in the m- file should only be done for
-+ * architectures which does not support it in general, or where
-+ * a majority of the systems available on that architecture
-+ * doesn't have it. Otherwise, it should be defined in the
-+ * s- file, because this is primarily OS dependent.
-+ *
-+ * NO_VARARGS can be overruled by defining HAVE_VARARGS in the s-
-+ * file.
-+ */
-+
-+/* #define NO_VARARGS /* unless HAVE_VARARGS */
-+
-+/*
-+ * Define STRCSPN if the strcspn() function is not available.
-+ */
-+
-+/* #define STRCSPN /* */
-+
-+/*
-+ * Define NO_SIGINTERRUPT on BSD based systems which don't have
-+ * a siginterrupt() function, but provides an SV_INTERRUPT flag
-+ * in <signal.h>.
-+ */
-+
-+/* #define NO_SIGINTERRUPT /* */
-+
-+
-+#ifdef NETWORK_DATABASE
-+
-+/*
-+ * Define NETWORK_BYTE_ORDER if the machine's int32's are
-+ * already in network byte order, i.e. m68k based.
-+ */
-+#include <sys/types.h>
-+#include <machine/endian.h>
-+
-+#if BYTE_ORDER == BIG_ENDIAN
-+#define NETWORK_BYTE_ORDER /* */
-+#endif
-+
-+/*
-+ * OTHERWISE provide the functions/macros ntohl/htonl to
-+ * convert longs from and to network byte order
-+ */
-+
-+#ifndef NETWORK_BYTE_ORDER
-+
-+/*
-+ * Include appropriate files or define macroes or functions (include them
-+ * in data.c) to convert longs and shorts to and from network byte order.
-+ */
-+
-+/*
-+ * This will work on most BSD based systems...
-+ */
-+
-+#include <netinet/in.h>
-+
-+/*
-+ * Otherwise, define something appropriate below
-+ */
-+
-+/* NetBSD has these in <netinet/in.h>
-+/*#define htonl(l) ... *//* host long to network long */
-+/*#define ntohl(l) ... *//* network long to host long */
-+
-+#endif /* not NETWORK BYTE ORDER */
-+
-+#endif /* NETWORK DATABASE */
diff --git a/news/nn/patches/patch-bc b/news/nn/patches/patch-bc
deleted file mode 100644
index 2efceb1e95f..00000000000
--- a/news/nn/patches/patch-bc
+++ /dev/null
@@ -1,43 +0,0 @@
-$NetBSD: patch-bc,v 1.1 2000/10/12 19:17:03 kim Exp $
-
-add machine config file for arm32 machines
-
---- /dev/null Thu Oct 12 14:46:24 2000
-+++ conf/m-arm.h Thu Oct 12 15:05:05 2000
-@@ -0,0 +1,36 @@
-+/************** Machine (and compiler) dependent definitions. **************
-+ *
-+ * For arm32
-+ *
-+ */
-+
-+/* MACHINE TYPE DEFINED TYPE VALUE RANGE */
-+
-+typedef unsigned char int8; /* 0 .. 255 */
-+typedef short int16; /* -10,000 .. 10,000 */
-+typedef int int32; /* -100,000 .. 100,000 */
-+typedef unsigned int uint32; /* 0 .. 2^31-1 */
-+
-+#ifdef NETWORK_DATABASE
-+
-+/*
-+ * Define NETWORK_BYTE_ORDER if the machine's int32's are
-+ * already in network byte order, i.e. m68k based.
-+ */
-+#include <sys/types.h>
-+#include <machine/endian.h>
-+
-+#if BYTE_ORDER == BIG_ENDIAN
-+#define NETWORK_BYTE_ORDER /* */
-+#endif
-+
-+/*
-+ * OTHERWISE provide the functions/macros ntohl/htonl to
-+ * convert longs from and to network byte order
-+ */
-+
-+#ifndef NETWORK_BYTE_ORDER
-+#include <netinet/in.h>
-+#endif
-+
-+#endif /* NETWORK_DATABASE */
diff --git a/news/nn/patches/patch-bd b/news/nn/patches/patch-bd
deleted file mode 100644
index fc7dfe6391e..00000000000
--- a/news/nn/patches/patch-bd
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-bd,v 1.2 2005/06/17 15:36:32 hira Exp $
-
---- nntp.c.old 2004-07-18 15:16:03.000000000 -0400
-+++ nntp.c 2004-07-18 15:16:07.000000000 -0400
-@@ -837,7 +837,9 @@
- if (nntp_local_server) return;
-
- find_server();
-- strncpy(host_name, (gethostbyname(host_name))->h_name, sizeof host_name);
-+
-+ if ((hp = gethostbyname(host_name)) != NULL)
-+ strncpy(host_name, hp->h_name, sizeof host_name);
-
- if ((hp = gethostbyname(nntp_server)) != NULL)
- server_real_name = hp->h_name;
diff --git a/news/nntpcache/DESCR b/news/nntpcache/DESCR
deleted file mode 100644
index be9cb9788ef..00000000000
--- a/news/nntpcache/DESCR
+++ /dev/null
@@ -1,18 +0,0 @@
-NNTPCache is Squid for news (plus lots more).
-
-NNTPCache can take reader loads off major news-servers. Besides its
-super efficient execution, a single or multi-layer concentric ring of
-NNTPCaches can be arranged about one or more central news-servers on a
-DNS round-robin basis. Such a wall of NNTPCaches provides drop-in
-scalability, redundancy, authentication & security for even the
-largest news-server heart. NNTPCache can transparently stitch multiple
-split news-servers (e.g, one news-server carrying alt.binaries.*,
-another carrying alt.*, and another carrying everything else) back
-together, allowing news-server administrators to spread their news
-feeds over multiple machines, or to out-source selected components.
-
-NNTPCache minimizes the effects of news-server down time, by continuing
-to provide cached news-data in the face of news-server fall-over.
-
-NNTPCache natively supports a variety of AUTHINFO methods, including
-/etc/passwd, generic unix pipes, LDAP and radius.
diff --git a/news/nntpcache/MESSAGE b/news/nntpcache/MESSAGE
deleted file mode 100644
index 5766184459d..00000000000
--- a/news/nntpcache/MESSAGE
+++ /dev/null
@@ -1,12 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.2 2002/09/24 12:30:29 wiz Exp $
-
-You may want to customize
-
- ${PREFIX}/etc/nntpcache/nntpcache.access
- ${PREFIX}/etc/nntpcache/nntpcache.config
- ${PREFIX}/etc/nntpcache/nntpcache.servers
-
-to fit your personal needs.
-
-===========================================================================
diff --git a/news/nntpcache/Makefile b/news/nntpcache/Makefile
deleted file mode 100644
index 6c609383123..00000000000
--- a/news/nntpcache/Makefile
+++ /dev/null
@@ -1,45 +0,0 @@
-# $NetBSD: Makefile,v 1.23 2005/05/22 20:08:26 jlam Exp $
-
-DISTNAME= nntpcache-3.0.1
-CATEGORIES= news
-MASTER_SITES= ftp://ftp.cs.tu-berlin.de/pub/net/news/nntpcache/ \
- ftp://ftp.netlab.is.tsukuba.ac.jp/pub/network/news/nntpcache/
-
-MAINTAINER= tech-pkg@NetBSD.org
-HOMEPAGE= http://www.iq.org/~proff/nntpcache.org/
-COMMENT= NNTP multi-server caching daemon
-
-LICENSE= fee-based-commercial-use
-
-# enable pgp signed nocem support?
-NNTP_USE_PGP?= no
-
-.if defined(USE_OPENLDAP) && !empty(USE_OPENLDAP:M[Yy][Ee][Ss])
-DEPENDS+= openldap-[0-9]*:../../databases/openldap
-.endif
-
-.if ${NNTP_USE_PGP} == yes
-DEPENDS+= pgp-2.*:../../security/pgp2
-.endif
-
-BUILD_DEFS+= USE_OPENLDAP NNTP_USE_PGP
-
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --localstatedir=${VARBASE}/spool
-CONFIGURE_ENV+= INSTALL_SCRIPT="${INSTALL_SCRIPT}"
-USE_TOOLS+= gmake
-
-INSTALL_TARGET= SUBDIRS="cf src filters http doc pgp contrib/newshound contrib/perlnewshound innreport scripts unixauth" \
- install
-
-post-configure:
- @${SED} -e "s:%%PREFIX%%:${PREFIX}:g" \
- ${FILESDIR}/nntpcached.rc > ${WRKSRC}/nntpcached.sh
-
-post-install:
- ${INSTALL_SCRIPT} ${WRKSRC}/nntpcached.sh ${PREFIX}/etc/rc.d/nntpcached
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/nntpcache
- cd ${WRKSRC} && ${INSTALL_DATA} README INSTALL FAQ FAQ.html LICENSING \
- README.INN README.pam ChangeLog ${PREFIX}/share/doc/nntpcache/
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/news/nntpcache/PLIST b/news/nntpcache/PLIST
deleted file mode 100644
index 05e64bbbf7a..00000000000
--- a/news/nntpcache/PLIST
+++ /dev/null
@@ -1,50 +0,0 @@
-@comment $NetBSD: PLIST,v 1.9 2002/12/09 16:01:36 tron Exp $
-etc/nntpcache/VERSION
-etc/nntpcache/innreport.conf-dist
-etc/nntpcache/innreport.pl
-etc/nntpcache/innreport.pm
-etc/nntpcache/newshound.conf-dist
-etc/nntpcache/nntpcache.access-dist
-etc/nntpcache/nntpcache.access
-etc/nntpcache/nntpcache.config-dist
-etc/nntpcache/nntpcache.config
-etc/nntpcache/nntpcache.servers-dist
-etc/nntpcache/nntpcache.servers
-etc/nntpcache/pubring.asc-dist
-etc/nntpcache/pubring.asc
-etc/nntpcache/pubring.pgp-dist
-etc/nntpcache/pubring.pgp
-etc/nntpcache/spam.filter
-etc/nntpcache/http/index.html
-etc/nntpcache/http/moose.gif
-etc/nntpcache/http/nntpcache.jpg
-@exec ${MKDIR} %D/etc/nntpcache/http/innreport/pics
-@exec ${CHOWN} -R news:news %D/etc/nntpcache
-@exec ${CHMOD} 700 %D/etc/nntpcache
-@unexec ${RMDIR} -p %D/etc/nntpcache/http/innreport/pics 2>/dev/null || ${TRUE}
-etc/rc.d/nntpcached
-sbin/innreport.sh
-sbin/newshound
-sbin/newshound.pl
-sbin/nntpcached
-libexec/unixauth
-libexec/nntpcached.debug
-libexec/nntpcache-gdb.sh
-libexec/nntpcache.gdb
-man/man8/newshound.8
-man/man8/nntpcached.8
-@unexec ${RMDIR} %D/etc/nntpcache 2>/dev/null || ${TRUE}
-@exec ${MKDIR} /var/spool/nntpcache
-@exec cp %D/etc/nntpcache/VERSION /var/spool/nntpcache/VERSION
-@exec ${CHOWN} -R news:news /var/spool/nntpcache
-@exec ${CHMOD} 700 /var/spool/nntpcache
-@unexec ${RM} -rf /var/spool/nntpcache
-share/doc/nntpcache/ChangeLog
-share/doc/nntpcache/FAQ
-share/doc/nntpcache/FAQ.html
-share/doc/nntpcache/INSTALL
-share/doc/nntpcache/LICENSING
-share/doc/nntpcache/README
-share/doc/nntpcache/README.INN
-share/doc/nntpcache/README.pam
-@dirrm share/doc/nntpcache
diff --git a/news/nntpcache/distinfo b/news/nntpcache/distinfo
deleted file mode 100644
index e09731ee5ea..00000000000
--- a/news/nntpcache/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: distinfo,v 1.5 2005/03/07 12:04:41 tv Exp $
-
-SHA1 (nntpcache-3.0.1.tar.gz) = 68ced9471a1e2a2dd7d1bf37477690a5b80bcf7d
-RMD160 (nntpcache-3.0.1.tar.gz) = 3ca0fc079532bae0eb4c6f903286d604e266a985
-Size (nntpcache-3.0.1.tar.gz) = 1085258 bytes
-SHA1 (patch-aa) = f397f4fe5ec2b1eec62981fba9b9a9922b14ef76
-SHA1 (patch-ab) = 4789544bba3f246713b1f8f74c0450811516edf9
-SHA1 (patch-ac) = aab64da73cce565642aeb4eb3024e57f388c5a19
-SHA1 (patch-ad) = 060112715712bcdbcd052cd9d7557a558518c305
diff --git a/news/nntpcache/files/nntpcached.rc b/news/nntpcache/files/nntpcached.rc
deleted file mode 100644
index eaa2ef8d23b..00000000000
--- a/news/nntpcache/files/nntpcached.rc
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: nntpcached.rc,v 1.2 2002/09/23 15:32:56 grant Exp $
-#
-
-PATH=%%PREFIX%%/sbin:/bin:/usr/bin
-[ -x %%PREFIX%%/sbin/nntpcached ] && nntpcached && echo -n ' nntpcached'
diff --git a/news/nntpcache/patches/patch-aa b/news/nntpcache/patches/patch-aa
deleted file mode 100644
index d6b2554fc9b..00000000000
--- a/news/nntpcache/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.6 2005/03/07 12:04:41 tv Exp $
-
---- configure.in.orig 2002-04-05 11:53:09.000000000 -0500
-+++ configure.in
-@@ -206,7 +206,7 @@ AC_CHECK_LIB(crypt, crypt)
- AC_CHECK_LIB(wrap, request_init)
- dnl aix
- AC_CHECK_LIB(flock, bsd)
--AC_CHECK_FUNCS(getdtablesize usleep utime waitpid wait3 chroot strdup vsnprintf daemon setenv putenv mmap getpagesize setproctitle snprintf strerror setpriority getspnam statfs statvfs strcasecmp)
-+AC_CHECK_FUNCS(getdtablesize usleep utime waitpid wait3 chroot strdup vsnprintf daemon setenv putenv mmap getpagesize setproctitle snprintf strerror setpriority getspnam statfs statvfs strcasecmp sync)
-
- AC_MSG_CHECKING(for passwd authinfo support)
- AC_ARG_WITH(authinfo-passwd,
diff --git a/news/nntpcache/patches/patch-ab b/news/nntpcache/patches/patch-ab
deleted file mode 100644
index bd41d7b29cc..00000000000
--- a/news/nntpcache/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2005/03/07 12:04:41 tv Exp $
-
---- configure.orig 2002-04-05 13:26:27.000000000 -0500
-+++ configure
-@@ -7795,7 +7795,7 @@ EOF
-
- fi
-
--for ac_func in getdtablesize usleep utime waitpid wait3 chroot strdup vsnprintf daemon setenv putenv mmap getpagesize setproctitle snprintf strerror setpriority getspnam statfs statvfs strcasecmp
-+for ac_func in getdtablesize usleep utime waitpid wait3 chroot strdup vsnprintf daemon setenv putenv mmap getpagesize setproctitle snprintf strerror setpriority getspnam statfs statvfs strcasecmp sync
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
- echo "$as_me:7801: checking for $ac_func" >&5
diff --git a/news/nntpcache/patches/patch-ac b/news/nntpcache/patches/patch-ac
deleted file mode 100644
index 9619454e0f8..00000000000
--- a/news/nntpcache/patches/patch-ac
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2005/03/07 12:04:41 tv Exp $
-
---- config.h.in.orig 2002-04-05 10:22:45.000000000 -0500
-+++ config.h.in
-@@ -164,6 +164,9 @@
- /* Define if you have the <string.h> header file. */
- #undef HAVE_STRING_H
-
-+/* Define if you have the `sync' function. */
-+#undef HAVE_SYNC
-+
- /* Define if you have the <syslog.h> header file. */
- #undef HAVE_SYSLOG_H
-
diff --git a/news/nntpcache/patches/patch-ad b/news/nntpcache/patches/patch-ad
deleted file mode 100644
index f2d6cca87be..00000000000
--- a/news/nntpcache/patches/patch-ad
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2005/03/07 12:04:41 tv Exp $
-
---- src/nntpcache.c.orig 2002-04-05 13:29:58.000000000 -0500
-+++ src/nntpcache.c
-@@ -404,7 +404,9 @@ EXPORT void ncExit (int code)
- if (Stats)
- saveStats (con->statsFile);
- unlink (PidFile);
-+#ifdef HAVE_SYNC
- sync ();
-+#endif
- } else
- {
- if (Task->ti_state == nc_client)
diff --git a/news/nntpclnt/DESCR b/news/nntpclnt/DESCR
deleted file mode 100644
index adc36c1a131..00000000000
--- a/news/nntpclnt/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-`nntpclnt' is the reference implementation of the NNTP client routines.
-Included in this package is the commonly-used `inews' posting program and
-a library useful to link to programs that simplifies NNTP implementation
-throughout a system.
diff --git a/news/nntpclnt/MESSAGE b/news/nntpclnt/MESSAGE
deleted file mode 100644
index 80b04d6b79f..00000000000
--- a/news/nntpclnt/MESSAGE
+++ /dev/null
@@ -1,20 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.2 2002/09/24 12:30:29 wiz Exp $
-
-NOTE: THIS PACKAGE IS UNUSABLE WITHOUT SETTING UP THE FOLLOWING FILES:
-
-${PREFIX}/etc/nntp/domainname:
- The domain name that should go after @ on NNTP posts by default
-
-${PREFIX}/etc/nntp/server:
- The hostname or IP address of your NNTP server (this can be omitted
- if you set NNTPSERVER in your environment)
-
-Optionally,
-
-${PREFIX}/etc/nntp/server.auth:
- "hostname user password" format authentication information for the
- NNTP server, if it requires authentication. This file should only
- be readable by group "news".
-
-===========================================================================
diff --git a/news/nntpclnt/Makefile b/news/nntpclnt/Makefile
deleted file mode 100644
index 0fbdffdd2b2..00000000000
--- a/news/nntpclnt/Makefile
+++ /dev/null
@@ -1,49 +0,0 @@
-# $NetBSD: Makefile,v 1.24 2005/06/17 03:50:29 jlam Exp $
-
-DISTNAME= nntpclnt-1.6.1
-PKGREVISION= 5
-CATEGORIES= news
-MASTER_SITES= ftp://ftp.uu.net/networking/news/nntp/
-
-MAINTAINER= tech-pkg@NetBSD.org
-COMMENT= NNTP client library and inews client posting program
-
-CONFLICTS+= inn-[0-9]*
-
-LICENSE= nntpclnt-license
-RESTRICTED= "Do not sell, rent, trade, market, or use for monetary profit"
-NO_SRC_ON_CDROM=${RESTRICTED}
-NO_BIN_ON_CDROM=${RESTRICTED}
-
-BUILD_TARGET= inews
-PKG_GROUPS= news
-USE_PKGINSTALL= yes
-PKG_SYSCONFSUBDIR= nntp
-
-PLIST_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
-
-.include "../../mk/bsd.prefs.mk"
-
-CONFIG_SH= ${FILESDIR}/config.${OPSYS}.sh
-ONLY_FOR_PLATFORM= NetBSD-*-* SunOS-*-*
-
-INSTALLATION_DIRS= bin include lib man/man3
-
-do-configure:
- ${SED} -e s,@PREFIX@,${PREFIX}, -e s,@PKGSYSCONFDIR@,${PKG_SYSCONFDIR}, \
- ${CONFIG_SH} >${WRKSRC}/config.sh
- @cd ${WRKSRC} && ${SH} Makefile.SH && ${SH} config.h.SH
-
-post-build:
- cd ${WRKSRC} && \
- ${AR} clq libnntpclnt.a nntpclnt.o && ${RANLIB} libnntpclnt.a
-
-do-install:
- ${INSTALL_PROGRAM} -g ${PKG_GROUPS} -m 2555 ${WRKSRC}/inews \
- ${PREFIX}/bin
- ${INSTALL_DATA} ${WRKSRC}/nntp.h ${PREFIX}/include/
- ${INSTALL_DATA} ${WRKSRC}/libnntpclnt.a ${PREFIX}/lib/
- ${INSTALL_DATA} ${WRKSRC}/nntpclnt.3 ${PREFIX}/man/man3/
- ${INSTALL_DATA_DIR} ${PKG_SYSCONFDIR}
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/news/nntpclnt/PLIST b/news/nntpclnt/PLIST
deleted file mode 100644
index 0f7b2b21c23..00000000000
--- a/news/nntpclnt/PLIST
+++ /dev/null
@@ -1,7 +0,0 @@
-@comment $NetBSD: PLIST,v 1.4 2004/04/07 13:56:43 cube Exp $
-bin/inews
-include/nntp.h
-lib/libnntpclnt.a
-man/man3/nntpclnt.3
-@exec ${MKDIR} ${PKG_SYSCONFDIR} 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} ${PKG_SYSCONFDIR} 2>/dev/null || ${TRUE}
diff --git a/news/nntpclnt/distinfo b/news/nntpclnt/distinfo
deleted file mode 100644
index 2bf89b3201c..00000000000
--- a/news/nntpclnt/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: distinfo,v 1.7 2005/04/01 03:32:07 kim Exp $
-
-SHA1 (nntpclnt-1.6.1.tar.gz) = df24e9083185680d85bdc016e9e4ba54f4071f80
-RMD160 (nntpclnt-1.6.1.tar.gz) = b3d8ec94d74cc1a0f88264756b89c91fabde0750
-Size (nntpclnt-1.6.1.tar.gz) = 34369 bytes
-SHA1 (patch-aa) = e4c947e9acdd6f814437409e475b819588c444fa
-SHA1 (patch-ab) = 594f068acbc6794cc4e22c77d3474ea7673a4f87
-SHA1 (patch-ac) = ed067e2f2c6c22e32ca388dc6f990aa720d762aa
-SHA1 (patch-ad) = 1b648dcaba5625326e17ecdce90622a02e207f17
diff --git a/news/nntpclnt/files/config.NetBSD.sh b/news/nntpclnt/files/config.NetBSD.sh
deleted file mode 100644
index fdf65c6beb2..00000000000
--- a/news/nntpclnt/files/config.NetBSD.sh
+++ /dev/null
@@ -1,81 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: config.NetBSD.sh,v 1.4 2004/04/07 13:56:43 cube Exp $
-#
-# config.sh
-# This file was produced by running the Configure script
-# (and manually bashed on by tv@netbsd.org)
-
-n='-n'
-c=''
-libc='/usr/lib/libc.a'
-eunicefix=':'
-eunice='undef'
-cpp='/usr/bin/cpp'
-shsharp='true'
-startsh='#!/bin/sh'
-spitshell='cat'
-test='test'
-expr='expr'
-sed='sed'
-echo='echo'
-cat='cat'
-rm='rm'
-cp='cp'
-tr='tr'
-mkdir='mkdir'
-inews='inews'
-grep='grep'
-chmod='chmod'
-awk='awk'
-egrep='/usr/bin/egrep'
-nidump='/bin/cat'
-ypmatch='/bin/cat'
-jobslib=''
-contains='grep'
-lib='@PREFIX@/etc'
-libexp='@PREFIX@/etc'
-nametype='bsd'
-cc='cc'
-iandd=''
-include=''
-socketlib=''
-posix=''
-nonetdb='undef'
-internet=''
-filexp=''
-dotdir='define'
-strncasecmp='define'
-strcasecmp='define'
-seteuid='define'
-sitename=''
-hostfile='@PKGSYSCONFDIR@/domainname'
-domain=''
-isadmin='undef'
-newsadmin='root'
-novoid='undef'
-mansrc='@PREFIX@/man/man1'
-manext='1'
-rootid='0'
-strchr='define'
-memcpy='define'
-sunos4='undef'
-solaris='undef'
-portable='define'
-passnam='define'
-berknam='define'
-usgnam='undef'
-whoami='undef'
-getpwent='define'
-gethostname='undef'
-douname='undef'
-phostname='undef'
-hostcmd=''
-serverfile='@PKGSYSCONFDIR@/server'
-auth='define'
-authsimple='define'
-authold='define'
-passfile='@PKGSYSCONFDIR@/server.auth'
-decnet='undef'
-datakit='undef'
-CONFIG=true
diff --git a/news/nntpclnt/files/config.SunOS.sh b/news/nntpclnt/files/config.SunOS.sh
deleted file mode 100644
index 7c045547d45..00000000000
--- a/news/nntpclnt/files/config.SunOS.sh
+++ /dev/null
@@ -1,81 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: config.SunOS.sh,v 1.3 2004/04/07 13:56:43 cube Exp $
-#
-# config.sh
-# This file was produced by running the Configure script.
-# (and manually bashed on by kim@netbsd.org)
-
-n=''
-c='\c'
-libc='/usr/lib/libc.a'
-eunicefix=':'
-eunice='undef'
-cpp='gcc -pipe -E'
-shsharp='true'
-startsh='#!/bin/sh'
-spitshell='cat'
-test='test'
-expr='expr'
-sed='sed'
-echo='echo'
-cat='cat'
-rm='rm'
-cp='cp'
-tr='tr'
-mkdir='mkdir'
-inews='inews'
-grep='grep'
-chmod='chmod'
-awk='awk'
-egrep='/usr/bin/egrep'
-nidump='/bin/cat'
-ypmatch='/bin/cat'
-jobslib=''
-contains='grep'
-lib='@PREFIX@/etc'
-libexp='@PREFIX@/etc'
-nametype='bsd'
-cc='gcc -pipe'
-iandd=''
-include='-DUSG'
-socketlib='-lsocket -lnsl'
-posix=''
-nonetdb='undef'
-internet=''
-filexp=''
-dotdir='define'
-strncasecmp='define'
-strcasecmp='define'
-seteuid='define'
-sitename=''
-hostfile='@PKGSYSCONFDIR@/domainname'
-domain=''
-isadmin='undef'
-newsadmin='root'
-novoid='undef'
-mansrc='@PREFIX@/man/man1'
-manext='1'
-rootid='0'
-strchr='define'
-memcpy='define'
-sunos4='undef'
-solaris='define'
-portable='define'
-passnam='define'
-berknam='define'
-usgnam='undef'
-whoami='undef'
-getpwent='define'
-gethostname='undef'
-douname='undef'
-phostname='undef'
-hostcmd=''
-serverfile='@PKGSYSCONFDIR@/etc/nntp/server'
-auth='define'
-authsimple='define'
-authold='define'
-passfile='@PKGSYSCONFDIR@/etc/nntp/server.auth'
-decnet='undef'
-datakit='undef'
-CONFIG=true
diff --git a/news/nntpclnt/patches/patch-aa b/news/nntpclnt/patches/patch-aa
deleted file mode 100644
index 7a936cd8d01..00000000000
--- a/news/nntpclnt/patches/patch-aa
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2005/04/01 03:32:07 kim Exp $
-
---- uname.c.orig 1994-08-11 17:37:53.000000000 -0400
-+++ uname.c 2005-03-31 22:30:11.000000000 -0500
-@@ -16,4 +16,5 @@
-
- #include <stdio.h>
-+#include <strings.h>
- #include "config.h"
-
-@@ -67,5 +68,5 @@
- {
- FILE * uucpf;
-- char * hostname;
-+ char * p;
- if ((uucpf = fopen(HOSTFILE,"r")) == NULL) {
- fprintf(stderr,"Couldn't open %s to determine hostname. Contact your system administrator.\n",
-@@ -74,5 +75,4 @@
- } else {
- fgets(uptr, 256, uucpf);
-- fclose(tmpfp);
- }
- p = index(uptr, '\n');
diff --git a/news/nntpclnt/patches/patch-ab b/news/nntpclnt/patches/patch-ab
deleted file mode 100644
index bd9ea5af936..00000000000
--- a/news/nntpclnt/patches/patch-ab
+++ /dev/null
@@ -1,52 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2005/04/01 03:28:36 kim Exp $
-
---- nntpclnt.c.orig 1994-08-11 17:37:51.000000000 -0400
-+++ nntpclnt.c 2005-03-31 22:25:28.000000000 -0500
-@@ -24,6 +24,11 @@
- * Include configuration parameters only if we're made in the nntp tree.
- */
-
-+#if defined(USG) || defined(MSDOS)
-+#include <string.h>
-+#else
-+#include <strings.h>
-+#endif
- #ifdef NNTPSRC
- #include "config.h"
- #endif /* NNTPSRC */
-@@ -64,11 +69,6 @@
- #define net_read(a,b,c,d,e) soread(a,b,c)
- #define net_write(a,b,c,d) sowrite(a,b,c)
- #endif
--#if defined(USG) || defined(MSDOS)
--#include <string.h>
--#else
--#include <strings.h>
--#endif
- #include "nntpclnt.h"
- #ifdef NONETDB
- # define IPPORT_NNTP ((unsigned short) 119)
-@@ -199,7 +199,7 @@
- server_init(machine)
- char *machine;
- {
-- int sockt_rd, sockt_wr;
-+ int sockt_rd, sockt_wr, result[2];
- char line[256];
- char *index();
- #if defined(DECNET) || defined(SGI4DDN)
-@@ -248,7 +248,13 @@
- /* Now get the server's signon message */
-
- (void) get_server(line, sizeof(line));
-- return (atoi(line));
-+ result[0] = atoi(line);
-+
-+ put_server("MODE READER");
-+ (void) get_server(line, sizeof(line));
-+ result[1] = atoi(line);
-+
-+ return ((result[1] != ERR_COMMAND) ? result[1] : result[0]);
- }
-
- #ifdef DATAKIT
diff --git a/news/nntpclnt/patches/patch-ac b/news/nntpclnt/patches/patch-ac
deleted file mode 100644
index a3b72fddf92..00000000000
--- a/news/nntpclnt/patches/patch-ac
+++ /dev/null
@@ -1,83 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2004/04/08 12:32:55 cube Exp $
-
---- postauth.c.orig 1994-08-11 23:37:52.000000000 +0200
-+++ postauth.c
-@@ -31,7 +31,7 @@ char *response;
- {
- char authtype[NNTP_STRLEN];
- int i, rcode;
-- if((i = sscanf(response,"%d %s", rcode, authtype)) != 2)
-+ if((i = sscanf(response,"%d %511s", &rcode, authtype)) != 2) /* 511 == NNTP_STRLEN-1 */
- return(-1);
- #ifdef AUTHSIMPLE
- if (!strcasecmp(authtype,"SIMPLE"))
-@@ -54,7 +54,7 @@ int
- authsimple(host)
- char * host;
- {
-- char remote[256], user[16], pass[16];
-+ char remote[256], user[256], pass[256];
- char buf[BUFSIZ];
- int i;
-
-@@ -69,7 +69,7 @@ char * host;
- if (buf[0] == '#')
- continue;
-
-- i = sscanf(buf,"%s %s %s", remote, user, pass);
-+ i = sscanf(buf,"%255s %255s %255s", remote, user, pass);
- /* malformed entry? */
- if (i != 3)
- {
-@@ -87,14 +87,14 @@ char * host;
- return(-1);
- }
-
-- sprintf(buf,"authinfo simple");
-+ snprintf(buf,BUFSIZ,"authinfo simple");
- if (converse(buf, sizeof(buf)) != CONT_AUTH)
- {
- fprintf(stderr,"%s\n", buf);
- return(-1);
- }
-
-- sprintf(buf,"%s %s", user,pass);
-+ snprintf(buf,BUFSIZ,"%s %s", user,pass);
- if (converse(buf, sizeof(buf)) != OK_AUTH)
- {
- fprintf(stderr,"%s\n", buf);
-@@ -110,7 +110,7 @@ extern FILE *passfile;
- authold(host)
- char *host;
- {
-- char remote[64], user[16], pass[16];
-+ char remote[256], user[256], pass[256];
- char buf[1024];
- int i;
-
-@@ -124,7 +124,7 @@ char *host;
- {
- if (buf[0] == '#')
- continue;
-- i = sscanf(buf,"%s %s %s", remote, user, pass);
-+ i = sscanf(buf,"%255s %255s %255s", remote, user, pass);
- /* malformed entry? */
- if (i != 3)
- {
-@@ -141,14 +141,14 @@ char *host;
- return(-1);
- }
-
-- sprintf(buf,"authinfo user %s", user);
-+ snprintf(buf,sizeof(buf),"authinfo user %s", user);
- if (converse(buf, sizeof(buf)) != CONT_OLDAUTHD)
- {
- fprintf(stderr,"%s\n", buf);
- return(-1);
- }
-
-- sprintf(buf,"authinfo pass %s", pass);
-+ snprintf(buf,sizeof(buf),"authinfo pass %s", pass);
- if (converse(buf, sizeof(buf)) != OK_OLDAUTH)
- {
- fprintf(stderr,"%s\n", buf);
diff --git a/news/nntpclnt/patches/patch-ad b/news/nntpclnt/patches/patch-ad
deleted file mode 100644
index 67072be4600..00000000000
--- a/news/nntpclnt/patches/patch-ad
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2005/04/01 03:28:36 kim Exp $
-
---- inews.c.orig 1994-08-11 17:37:50.000000000 -0400
-+++ inews.c 2005-03-31 22:22:59.000000000 -0500
-@@ -17,6 +17,11 @@
-
- #include <stdio.h>
- #include <ctype.h>
-+#ifdef USG
-+#include <string.h>
-+#else /* not USG */
-+#include <strings.h>
-+#endif /* not USG */
- #include "config.h"
- #include "nntp.h"
- #include "nntpclnt.h"
-@@ -27,11 +32,6 @@
- extern struct passwd *getpwnam();
- #endif
- #endif
--#ifdef USG
--#include <string.h>
--#else /* not USG */
--#include <strings.h>
--#endif /* not USG */
- /* for gen_frompath() */
- #define FROM 1
- #define PATH 2
diff --git a/news/pan/DESCR b/news/pan/DESCR
deleted file mode 100644
index c9bf10c8029..00000000000
--- a/news/pan/DESCR
+++ /dev/null
@@ -1,8 +0,0 @@
- Pan is a Newsreader for Gnome whose goal is to be easy to use and
-functional enough for beginners and advanced users alike. It has the
-basic features of threading, reading, filtering, posting, and offline
-reading, and also has a number of features for power users and
-alt.binaries fans.
-
- It's the only Unix newsreader to get a perfect score on the Good
-Net-Keeping Seal of Approval evalutions.
diff --git a/news/pan/Makefile b/news/pan/Makefile
deleted file mode 100644
index eef7ee43a7c..00000000000
--- a/news/pan/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-# $NetBSD: Makefile,v 1.43 2005/08/10 20:56:22 jlam Exp $
-#
-
-DISTNAME= pan-0.14.2
-PKGREVISION= 6
-CATEGORIES= news
-MASTER_SITES= http://pan.rebelbase.com/download/releases/${DISTNAME:C/pan-//}/SOURCE/
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= rh@NetBSD.org
-HOMEPAGE= http://pan.rebelbase.com/
-COMMENT= Newsreader for GTK2
-
-BUILD_USES_MSGFMT= YES
-
-USE_TOOLS+= perl pkg-config
-USE_DIRS+= gnome2-1.5
-USE_PKGLOCALEDIR= YES
-GNU_CONFIGURE= YES
-
-.include "../../mk/bsd.prefs.mk"
-.if (${OPSYS} != "Darwin" && ${OPSYS} != "SunOS" && ${OPSYS} != "Linux")
-LIBS+= -lcompat
-.endif
-
-.include "../../converters/libiconv/buildlink3.mk"
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../net/gnet/buildlink3.mk"
-.include "../../textproc/gtkspell/buildlink3.mk"
-.include "../../textproc/libxml2/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/news/pan/PLIST b/news/pan/PLIST
deleted file mode 100644
index bb7db1b09d7..00000000000
--- a/news/pan/PLIST
+++ /dev/null
@@ -1,38 +0,0 @@
-@comment $NetBSD: PLIST,v 1.7 2003/08/31 00:10:28 chris Exp $
-bin/pan
-share/gnome/apps/Internet/pan.desktop
-${PKGLOCALEDIR}/locale/am/LC_MESSAGES/pan.mo
-${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/pan.mo
-${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/pan.mo
-${PKGLOCALEDIR}/locale/da/LC_MESSAGES/pan.mo
-${PKGLOCALEDIR}/locale/de/LC_MESSAGES/pan.mo
-${PKGLOCALEDIR}/locale/el/LC_MESSAGES/pan.mo
-${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/pan.mo
-${PKGLOCALEDIR}/locale/es/LC_MESSAGES/pan.mo
-${PKGLOCALEDIR}/locale/et/LC_MESSAGES/pan.mo
-${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/pan.mo
-${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/pan.mo
-${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/pan.mo
-${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/pan.mo
-${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/pan.mo
-${PKGLOCALEDIR}/locale/it/LC_MESSAGES/pan.mo
-${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/pan.mo
-${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/pan.mo
-${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/pan.mo
-${PKGLOCALEDIR}/locale/lv/LC_MESSAGES/pan.mo
-${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/pan.mo
-${PKGLOCALEDIR}/locale/no/LC_MESSAGES/pan.mo
-${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/pan.mo
-${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/pan.mo
-${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/pan.mo
-${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/pan.mo
-${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/pan.mo
-${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/pan.mo
-${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/pan.mo
-${PKGLOCALEDIR}/locale/sr@Latn/LC_MESSAGES/pan.mo
-${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/pan.mo
-${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/pan.mo
-${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/pan.mo
-${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/pan.mo
-${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/pan.mo
-share/pixmaps/pan.png
diff --git a/news/pan/distinfo b/news/pan/distinfo
deleted file mode 100644
index e5cca905550..00000000000
--- a/news/pan/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.15 2005/02/24 12:19:55 agc Exp $
-
-SHA1 (pan-0.14.2.tar.bz2) = 39c0128906d389524e24d55691e017cf509516a0
-RMD160 (pan-0.14.2.tar.bz2) = 0dff24b1d83b6fabfb9cc38a7dea5f9e99513009
-Size (pan-0.14.2.tar.bz2) = 1834784 bytes
-SHA1 (patch-aa) = bfa992f0ad8f2dfcfd1bb9c848ff774bc5cec2b6
diff --git a/news/pan/patches/patch-aa b/news/pan/patches/patch-aa
deleted file mode 100644
index 8b420c7a58e..00000000000
--- a/news/pan/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.10 2003/11/14 14:48:26 fredb Exp $
-
---- pan/Makefile.in.orig 2003-08-31 11:47:44.000000000 -0500
-+++ pan/Makefile.in
-@@ -299,7 +299,7 @@ $(top_builddir)/gmime/libgmime.a
- pan_LDFLAGS =
- CFLAGS = @CFLAGS@
- COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--CCLD = $(CC)
-+CCLD = $(CXX)
- LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
- HEADERS = $(noinst_HEADERS)
-
diff --git a/news/slrn/DESCR b/news/slrn/DESCR
deleted file mode 100644
index be32cad40d4..00000000000
--- a/news/slrn/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-Slrn is a terminal based newsreader by John E. Davis <davis@space.mit.edu>.
-It supports threads and is highly customizable through S-Lang functions.
-
-In this package, there is only support for NNTP, not for local spool.
diff --git a/news/slrn/Makefile b/news/slrn/Makefile
deleted file mode 100644
index 45f7d55dd85..00000000000
--- a/news/slrn/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# $NetBSD: Makefile,v 1.36 2005/09/27 22:37:25 mjl Exp $
-
-DISTNAME= slrn-0.9.8.1
-CATEGORIES= news
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=slrn/}
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= tech-pkg@NetBSD.org
-HOMEPAGE= http://slrn.sourceforge.net/
-COMMENT= Highly customizable threaded newsreader
-
-USE_PKGLOCALEDIR= yes
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --disable-inews --with-slrnpull --enable-spool \
- --enable-grouplens --with-libdir=${PREFIX}/lib/slrn \
- --enable-mid-cache \
- --with-localedir=${PREFIX}/${PKGLOCALEDIR}/locale
-
-.include "../../mk/bsd.prefs.mk"
-
-# the next is a workaround, as 1.3.2 install doesn't like -c and -d
-# together
-.if ${OPSYS} == "NetBSD" && ${OS_VERSION} == "1.3.2"
-CONFIGURE_ENV+= INSTALL=/usr/bin/install
-.endif
-
-LDFLAGS.Linux+= -ldl
-
-.include "../../devel/libslang/buildlink3.mk"
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/news/slrn/PLIST b/news/slrn/PLIST
deleted file mode 100644
index fd6ac3ad783..00000000000
--- a/news/slrn/PLIST
+++ /dev/null
@@ -1,62 +0,0 @@
-@comment $NetBSD: PLIST,v 1.6 2004/11/19 13:35:43 adam Exp $
-bin/slrn
-bin/slrnpull
-man/man1/slrn.1
-man/man1/slrnpull.1
-share/doc/slrn/COPYING
-share/doc/slrn/COPYRIGHT
-share/doc/slrn/FAQ
-share/doc/slrn/FIRST_STEPS
-share/doc/slrn/README
-share/doc/slrn/README.GroupLens
-share/doc/slrn/README.SSL
-share/doc/slrn/README.macros
-share/doc/slrn/README.multiuser
-share/doc/slrn/THANKS
-share/doc/slrn/changes.txt
-share/doc/slrn/help.txt
-share/doc/slrn/manual.txt
-share/doc/slrn/score.sl
-share/doc/slrn/score.txt
-share/doc/slrn/slrn-doc.html
-share/doc/slrn/slrn.rc
-share/doc/slrn/slrnfuns.txt
-share/doc/slrn/slrnpull/README
-share/doc/slrn/slrnpull/README.offline
-share/doc/slrn/slrnpull/SETUP
-share/doc/slrn/slrnpull/score
-share/doc/slrn/slrnpull/setgid.txt
-share/doc/slrn/slrnpull/slrn.rc
-share/doc/slrn/slrnpull/slrnpull.conf
-share/doc/slrn/slrnpull/slrnpull.sh
-${PKGLOCALEDIR}/locale/be/LC_MESSAGES/slrn.mo
-${PKGLOCALEDIR}/locale/da/LC_MESSAGES/slrn.mo
-${PKGLOCALEDIR}/locale/de/LC_MESSAGES/slrn.mo
-${PKGLOCALEDIR}/locale/es/LC_MESSAGES/slrn.mo
-${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/slrn.mo
-${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/slrn.mo
-${PKGLOCALEDIR}/locale/it/LC_MESSAGES/slrn.mo
-${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/slrn.mo
-${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/slrn.mo
-${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/slrn.mo
-${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/slrn.mo
-${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/slrn.mo
-${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/slrn.mo
-share/slrn/macros/color.sl
-share/slrn/macros/gsort.sl
-share/slrn/macros/ispell.sl
-share/slrn/macros/latin2.sl
-share/slrn/macros/multipart.sl
-share/slrn/macros/nn.sl
-share/slrn/macros/posthook.sl
-share/slrn/macros/search.sl
-share/slrn/macros/tin-art.sl
-share/slrn/macros/tin-group.sl
-share/slrn/macros/ttyprint.sl
-share/slrn/macros/util.sl
-share/slrn/macros/varset.sl
-share/slrn/macros/xcomment.sl
-@dirrm share/doc/slrn/slrnpull
-@dirrm share/doc/slrn
-@dirrm share/slrn/macros
-@dirrm share/slrn
diff --git a/news/slrn/distinfo b/news/slrn/distinfo
deleted file mode 100644
index a839ab46f80..00000000000
--- a/news/slrn/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.11 2005/02/24 12:19:55 agc Exp $
-
-SHA1 (slrn-0.9.8.1.tar.bz2) = d8c3755403c9bb19b83123614cda05f94731027f
-RMD160 (slrn-0.9.8.1.tar.bz2) = 67f49dd88a8c9d4bbcf5646a1cfa9a998a3c4cbe
-Size (slrn-0.9.8.1.tar.bz2) = 1034332 bytes
-SHA1 (patch-aa) = 55b5bd4ce24365060b33d899473a128ba23d5656
-SHA1 (patch-ae) = 97fea500b602a68050fa6608e6ee4b328607bd96
diff --git a/news/slrn/patches/patch-aa b/news/slrn/patches/patch-aa
deleted file mode 100644
index 49a47cdfdce..00000000000
--- a/news/slrn/patches/patch-aa
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aa,v 1.9 2004/11/19 13:35:44 adam Exp $
-
---- configure.orig 2004-11-19 14:26:18.000000000 +0000
-+++ configure
-@@ -6501,9 +6501,7 @@ else
-
-
- opt_library_dirs="\
-- /usr/local/lib \
-- /usr/lib \
-- /usr/pkg/lib"
-+ $ev_libdir"
-
- if test "x$ac_optlib_home" != xno && test "x$ac_optlib_home" != xyes ; then
- opt_library_dirs="$ac_optlib_home $ac_optlib_home/lib $opt_library_dirs"
diff --git a/news/slrn/patches/patch-ae b/news/slrn/patches/patch-ae
deleted file mode 100644
index 4eb62c0f465..00000000000
--- a/news/slrn/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2004/11/19 13:35:44 adam Exp $
-
---- po/Makefile.in.in.orig 2002-11-01 12:33:26.000000000 +0000
-+++ po/Makefile.in.in
-@@ -21,7 +21,7 @@ VPATH = @srcdir@
- prefix = @prefix@
- exec_prefix = @exec_prefix@
- datadir = @datadir@
--localedir = $(datadir)/locale
-+localedir = @LOCALEDIR@
- gettextsrcdir = $(datadir)/gettext/po
-
- INSTALL = @INSTALL@
diff --git a/news/suck/DESCR b/news/suck/DESCR
deleted file mode 100644
index b900c58772c..00000000000
--- a/news/suck/DESCR
+++ /dev/null
@@ -1,13 +0,0 @@
-The primary use for suck is to feed a local INN or CNEWS server, without
-the remote NNTP feeding you articles. It is designed for a small, partial
-news feed. It is NOT designed to feed 10,000 groups and 3 Gigs of articles
-a day.
-
-This package contains software for copying news from an NNTP server to your
-local machine, and copying replies back up to an NNTP server.
-
-The suck/rpost combination allows you to run your own INN/CNEWS site,
-controlling where you get your news, and where you post outgoing articles.
-Suck/rpost use only standard NNTP commands that are used by your favorite
-news reader (tin, xvnews, strn) such as POST and ARTICLE. If you can use tin
-or xvnews against a NNTP site, than you can use Suck/Rpost.
diff --git a/news/suck/Makefile b/news/suck/Makefile
deleted file mode 100644
index 4b93d83d662..00000000000
--- a/news/suck/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
-# $NetBSD: Makefile,v 1.21 2005/10/15 21:23:00 tonio Exp $
-#
-
-DISTNAME= suck-4.3.2
-PKGREVISION= 3
-CATEGORIES= news
-MASTER_SITES= http://home.comcast.net/~bobyetman/ \
- ${MASTER_SITE_SUNSITE:=system/news/transport/} \
- ftp://tsx-11.mit.edu/pub/linux/sources/sbin/
-
-MAINTAINER= drankin@bohemians.lexington.ky.us
-HOMEPAGE= http://home.comcast.net/~bobyetman/
-COMMENT= Feed a local news server without a dedicated newsfeed
-
-GNU_CONFIGURE= yes
-
-.include "../../mk/bsd.prefs.mk"
-
-# Include SOCKS firewall support
-.if defined(USE_SOCKS) && (${USE_SOCKS} == 4 || ${USE_SOCKS} == 5)
-.if ${USE_SOCKS} == 4
-.include "../../net/socks4/buildlink3.mk"
-.else
-.include "../../net/socks5/buildlink3.mk"
-.endif
-.endif
-
-post-patch:
- ${SED} -e 's|%%%HISTORY%%%|${PREFIX}/etc/news/history|g' \
- ${WRKSRC}/Makefile.in >${WRKSRC}/Makefile.tmp
- @${MV} ${WRKSRC}/Makefile.tmp ${WRKSRC}/Makefile.in
-
-post-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/suck
- ${CP} ${WRKSRC}/sample/* ${PREFIX}/share/examples/suck
- ${CHMOD} 644 ${PREFIX}/share/examples/suck/*
-
-#.include "../../databases/gdbm/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/news/suck/PLIST b/news/suck/PLIST
deleted file mode 100644
index ca2495161d0..00000000000
--- a/news/suck/PLIST
+++ /dev/null
@@ -1,24 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2003/02/21 13:46:44 wiz Exp $
-bin/suck
-bin/rpost
-bin/testhost
-bin/lmove
-man/man1/rpost.1
-man/man1/suck.1
-man/man1/testhost.1
-man/man1/lmove.1
-share/examples/suck/get.news.inn
-share/examples/suck/get.news.generic
-share/examples/suck/killprg_child.c
-share/examples/suck/killxover_child.c
-share/examples/suck/perl_kill.pl
-share/examples/suck/perl_xover.pl
-share/examples/suck/post_filter.pl
-share/examples/suck/put.news
-share/examples/suck/put.news.pl
-share/examples/suck/put.news.sm
-share/examples/suck/put.news.sm.pl
-share/examples/suck/suckkillfile.sample
-share/examples/suck/sucknewsrc.sample
-share/examples/suck/suckothermsgs.sample
-@dirrm share/examples/suck
diff --git a/news/suck/distinfo b/news/suck/distinfo
deleted file mode 100644
index 0ed68a89bfa..00000000000
--- a/news/suck/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.5 2005/02/24 12:19:55 agc Exp $
-
-SHA1 (suck-4.3.2.tar.gz) = 8c48889e407473ab565a3d8ba5cda969862d216a
-RMD160 (suck-4.3.2.tar.gz) = bbe952cc1dc8c76fad6651b3530cb87daeb6bb1a
-Size (suck-4.3.2.tar.gz) = 187560 bytes
-SHA1 (patch-aa) = 970ffa385a2b2b3f95944ba9a4321452bb247319
diff --git a/news/suck/patches/patch-aa b/news/suck/patches/patch-aa
deleted file mode 100644
index 4f19749ae2c..00000000000
--- a/news/suck/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.4 1999/10/21 16:17:05 agc Exp $
-
---- Makefile.in.orig Sun Jul 25 15:09:33 1999
-+++ Makefile.in Tue Sep 21 10:00:34 1999
-@@ -167,7 +167,7 @@
-
- install_bin: suck rpost testhost lmove
- - mkdir -p $(bindir)
-- - strip -s suck rpost testhost lmove
-+ - strip suck rpost testhost lmove
- $(INSTALL_PROGRAM) suck $(bindir)/suck
- $(INSTALL_PROGRAM) rpost $(bindir)/rpost
- $(INSTALL_PROGRAM) testhost $(bindir)/testhost
diff --git a/news/tin/DESCR b/news/tin/DESCR
deleted file mode 100644
index a99b0fa1231..00000000000
--- a/news/tin/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-TIN: Easy to use threaded newsreader with NOV/NNTP support.
diff --git a/news/tin/Makefile b/news/tin/Makefile
deleted file mode 100644
index 01f3eafa00d..00000000000
--- a/news/tin/Makefile
+++ /dev/null
@@ -1,70 +0,0 @@
-# $NetBSD: Makefile,v 1.22 2005/04/11 21:47:03 tv Exp $
-#
-
-DISTNAME= tin-1.6.2
-PKGREVISION= 1
-CATEGORIES= news
-MASTER_SITES= ftp://ftp.tin.org/pub/news/clients/tin/current/ \
- ftp://ftp.cs.tu-berlin.de/pub/net/news/tin/current/ \
- ftp://mirror.aarnet.edu.au/pub/tin/current/ \
- ftp://gd.tuwien.ac.at/infosys/newsreaders/tin/current/ \
- ftp://ftp.funet.fi/pub/unix/news/tin-unoff/ \
- ftp://ftp.nuxi.com/pub/tin/current/ \
- ftp://uiarchive.uiuc.edu/pub/packages/news/client/tin/unoff/
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= tech-pkg@NetBSD.org
-HOMEPAGE= http://www.tin.org/
-COMMENT= TIN newsreader (termcap based)
-
-LICENSE= no-profit
-RESTRICTED= "Profit from use, sale, trade, or reproduction disallowed"
-
-GNU_CONFIGURE= yes
-USE_PKGLOCALEDIR=yes
-
-.include "../../mk/bsd.prefs.mk"
-
-.if defined(TIN_USE_INN_SPOOL) && ${TIN_USE_INN_SPOOL} == YES
-INN_DATA_DIR?= /var/news
-.endif
-
-# Curses support too buggy to activate
-# --enable-curses \
-# --with-ncurses \
-#
-CONFIGURE_ARGS+= --with-nntp-default-server=news \
- --with-mime-default-charset=ISO-8859-1 \
- --enable-forgery \
- --enable-break-long-lines \
- --with-ispell=${PREFIX}/bin/ispell \
- --with-metamail=${PREFIX}/bin/metamail \
- --disable-mime-strict-charset \
- --with-defaults-dir=${PREFIX}/etc \
- --enable-mh-mail-handling \
- --with-coffee
-.if defined(TIN_USE_INN_SPOOL) && ${TIN_USE_INN_SPOOL} == YES
-CONFIGURE_ARGS+= --with-inews-dir=${PREFIX}/inn/bin \
- --with-libdir=${INN_DATA_DIR}/db \
- --with-spooldir=${INN_DATA_DIR}/spool/articles \
- --with-nov-dir=${INN_DATA_DIR}/spool/overview
-.else
-CONFIGURE_ARGS+= --enable-nntp-only
-.endif
-
-BUILD_TARGET= build
-
-post-patch:
- @${MV} ${WRKSRC}/doc/tin.1 ${WRKSRC}/doc/tin.1.dist
- @${SED} -e 's:/etc/nntpserver:${PREFIX}/etc/nntp/server:' \
- <${WRKSRC}/doc/tin.1.dist >${WRKSRC}/doc/tin.1
-
-post-configure:
- ${ECHO} '#define NNTP_SERVER_FILE "${PREFIX}/etc/nntp/server"' >>${WRKSRC}/include/autoconf.h
- ${ECHO} '#define SMTP_SERVER_FILE "${PREFIX}/etc/smtpserver"' >>${WRKSRC}/include/autoconf.h
-
-post-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/tin
- ${INSTALL_DATA} ${WRKSRC}/doc/WHATSNEW ${PREFIX}/share/doc/tin
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/news/tin/PLIST b/news/tin/PLIST
deleted file mode 100644
index ee8ed5d13e1..00000000000
--- a/news/tin/PLIST
+++ /dev/null
@@ -1,19 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2004/12/16 11:52:42 dillo Exp $
-bin/metamutt
-bin/opt-case.pl
-bin/rtin
-bin/tin
-bin/url_handler.sh
-bin/w2r.pl
-man/man1/opt-case.pl.1
-man/man1/rtin.1
-man/man1/tin.1
-man/man1/w2r.pl.1
-man/man5/mmdf.5
-man/man5/tin.5
-share/doc/tin/WHATSNEW
-${PKGLOCALEDIR}/locale/de/LC_MESSAGES/tin.mo
-${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/tin.mo
-${PKGLOCALEDIR}/locale/et/LC_MESSAGES/tin.mo
-${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/tin.mo
-@dirrm share/doc/tin
diff --git a/news/tin/distinfo b/news/tin/distinfo
deleted file mode 100644
index bc43034ff48..00000000000
--- a/news/tin/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.9 2005/02/24 12:19:56 agc Exp $
-
-SHA1 (tin-1.6.2.tar.bz2) = 9ab37d0b2712c074e60d99d0cf5bb3a774be75db
-RMD160 (tin-1.6.2.tar.bz2) = 28a91ebe0c6064f76e0d81494ee3b8a28c15a4ab
-Size (tin-1.6.2.tar.bz2) = 1186877 bytes
-SHA1 (patch-aa) = 0551171473f2f7ba26ec703d4844f73ca20b2040
diff --git a/news/tin/patches/patch-aa b/news/tin/patches/patch-aa
deleted file mode 100644
index 325335007e1..00000000000
--- a/news/tin/patches/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2003/12/16 00:11:48 dillo Exp $
-
---- src/Makefile.in.orig Thu Jul 24 16:18:45 2003
-+++ src/Makefile.in
-@@ -326,7 +326,6 @@ install_manpage: $(DESTDIR)$(INS_MANUAL_
- @$(INSTALL) -m 444 $(DOCDIR)/tin.1 $(DESTDIR)$(INS_MANUAL_DIR)$(INS_MANUAL_EXT)/$(PROJECT).$(INS_MANUAL_EXT)
- @( $(CD) $(DESTDIR)$(INS_MANUAL_DIR)$(INS_MANUAL_EXT) && $(RM) -f r$(PROJECT).$(INS_MANUAL_EXT) && $(LN) $(PROJECT).$(INS_MANUAL_EXT) r$(PROJECT).$(INS_MANUAL_EXT) )
- @$(INSTALL) -m 444 $(DOCDIR)/tin.5 $(DESTDIR)$(INS_MANUAL_DIR)5/$(PROJECT).5
-- @-if test ! -f $(DESTDIR)$(INS_MANUAL_DIR)5/mbox.5 ; then $(INSTALL) -m 444 $(DOCDIR)/mbox.5 $(DESTDIR)$(INS_MANUAL_DIR)5/mbox.5 ; else $(ECHO) " ... skipping $(DESTDIR)$(INS_MANUAL_DIR)5/mbox.5 - file already exists" ; fi
- @-if test ! -f $(DESTDIR)$(INS_MANUAL_DIR)5/mmdf.5 ; then $(INSTALL) -m 444 $(DOCDIR)/mmdf.5 $(DESTDIR)$(INS_MANUAL_DIR)5/mmdf.5 ; else $(ECHO) " ... skipping $(DESTDIR)$(INS_MANUAL_DIR)5/mmdf.5 - file already exists" ; fi
-
- uninstall_manpage:
diff --git a/news/trn/DESCR b/news/trn/DESCR
deleted file mode 100644
index 9215a006230..00000000000
--- a/news/trn/DESCR
+++ /dev/null
@@ -1,18 +0,0 @@
-Trn is Threaded RN -- a newsreader that uses an article's references to
-order the discussions in a very natural, reply-ordered sequence called
-threads. Having the replies associated with their parent articles not
-only makes following the discussion easier, but also makes it easy to back-
-track and (re-)read a specific discussion from the beginning. Trn also
-has a visual representation of the current thread in the upper right corner
-of the header, which will give you a feel for how the discussion is going
-and how the current article is related to the last one you read.
-
-In addition, a thread selector makes it easy to browse through a large
-group looking for interesting articles. You can even browse through the
-articles you've already read and select the one(s) you wish to read again.
-Other nice features include the extract commands for the source and binary
-groups, thread-oriented kill directives, a better newgroup finding strategy,
-and lots more.
-
-Trn includes a program named "rn", which is backwards-compatible and
-starts up trn in "non-threaded" mode.
diff --git a/news/trn/Makefile b/news/trn/Makefile
deleted file mode 100644
index 3049bb7824c..00000000000
--- a/news/trn/Makefile
+++ /dev/null
@@ -1,85 +0,0 @@
-# $NetBSD: Makefile,v 1.23 2005/09/28 20:52:25 rillig Exp $
-
-DISTNAME= trn-4.0-test76
-PKGNAME= trn-4.76
-PKGREVISION= 3
-CATEGORIES= news
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=trn/} \
- ftp://trn.sourceforge.net/pub/trn/
-
-MAINTAINER= tech-pkg@NetBSD.org
-HOMEPAGE= http://trn.sourceforge.net/
-COMMENT= Threaded version of rn, the classic news reader
-
-LICENSE= trn-license
-
-PKG_SYSCONFSUBDIR= nntp
-
-.include "../../mk/bsd.prefs.mk"
-
-.if defined(USE_INN) && ${USE_INN} == YES
-DEPENDS= inn>=2.2:../../news/inn
-.else
-DEPENDS= nntpclnt>=1.6.1:../../news/nntpclnt
-.endif
-
-# TRN_HOSTBITS determines the number of "name segments" (x.y.z.com), counting
-# from right to left, that TRN will match to allow cancels, with 0 requiring
-# a perfect match. For example, with TRN_HOSTBITS=3, x.y.z.com will match
-# foo.y.z.com for the purposes of allowing cancels.
-TRN_HOSTBITS?= 0
-
-HAS_CONFIGURE= yes
-CONFIGURE_SCRIPT= ./Configure
-CONFIGURE_ENV= PREFIX=${PREFIX}
-USE_TOOLS+= awk basename cat cp diff echo egrep expr grep mkdir mv
-USE_TOOLS+= perl:run rm sed tail tr
-CONFIGURE_ENV+= TOOLS_AWK="${TOOLS_AWK}"
-CONFIGURE_ENV+= TOOLS_BASENAME="${TOOLS_BASENAME}"
-CONFIGURE_ENV+= TOOLS_CAT="${TOOLS_CAT}"
-CONFIGURE_ENV+= TOOLS_CP="${TOOLS_CP}"
-CONFIGURE_ENV+= TOOLS_DIFF="${TOOLS_DIFF}"
-CONFIGURE_ENV+= TOOLS_ECHO="${TOOLS_ECHO}"
-CONFIGURE_ENV+= TOOLS_EGREP="${TOOLS_EGREP}"
-CONFIGURE_ENV+= TOOLS_EXPR="${TOOLS_EXPR}"
-CONFIGURE_ENV+= TOOLS_GREP="${TOOLS_GREP}"
-CONFIGURE_ENV+= TOOLS_MKDIR="${TOOLS_MKDIR}"
-CONFIGURE_ENV+= TOOLS_MV="${TOOLS_MV}"
-CONFIGURE_ENV+= TOOLS_RM="${TOOLS_RM}"
-CONFIGURE_ENV+= TOOLS_SED="${TOOLS_SED}"
-CONFIGURE_ENV+= TOOLS_TAIL="${TOOLS_TAIL}"
-CONFIGURE_ENV+= TOOLS_TR="${TOOLS_TR}"
-CONFIGURE_ARGS= -d -e -D bin=${PREFIX}/bin \
- -D binexp=${PREFIX}/bin \
- -D phost=${PKG_SYSCONFDIR}'/domainname' \
- -D filexp=${PREFIX}'/share/trn/filexp' \
- -D hostbits=${TRN_HOSTBITS} \
- -D installbin=${PREFIX}'/bin' \
- -D installmansrc=${PREFIX}'/man/man1' \
- -D installprivlib=${PREFIX}'/share/trn' \
- -D libpth=${PREFIX}'/lib /usr/lib' \
- -D mansrc=${PREFIX}'/man/man1' \
- -D mansrcexp=${PREFIX}'/man/man1' \
- -D mimecap=${PREFIX}'/etc/mimecap' \
- -D orgname=${PKG_SYSCONFDIR}'/organization' \
- -D perl=${PERL5} \
- -D perlpath=${PERL5} \
- -D prefix=${PREFIX} \
- -D prefixexp=${PREFIX} \
- -D privlib=${PREFIX}'/share/trn' \
- -D privlibexp=${PREFIX}'/share/trn' \
- -D servername=${PKG_SYSCONFDIR}'/server' \
- -D d_nntp \
- -U d_local \
- -D libs=' ' \
- -D usevfork=false \
- -D inews=${PREFIX}'/bin/inews' \
- -D useinews=${PREFIX}'/bin/inews'
-
-post-install:
- @${RM} -f ${PREFIX}/bin/rn ${PREFIX}/man/man1/rn.1 \
- ${PREFIX}/man/man1/rn.1.gz
- @${LN} -s trn ${PREFIX}/bin/rn
- @${LN} -s trn.1 ${PREFIX}/man/man1/rn.1
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/news/trn/PLIST b/news/trn/PLIST
deleted file mode 100644
index 502897eb1c6..00000000000
--- a/news/trn/PLIST
+++ /dev/null
@@ -1,35 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 21:03:53 zuntum Exp $
-bin/Pnews
-bin/Rnmail
-bin/nntplist
-bin/rn
-bin/trn
-bin/trn-artchk
-share/trn/INIT
-share/trn/Pnews.header
-share/trn/Speller
-share/trn/filexp
-share/trn/makedir
-share/trn/mbox.saver
-share/trn/newsnews
-share/trn/norm.saver
-share/trn/access.def
-share/trn/HelpFiles/changelog
-share/trn/HelpFiles/config/environment
-share/trn/HelpFiles/config/index
-share/trn/HelpFiles/config/macros
-share/trn/HelpFiles/config/options
-share/trn/HelpFiles/hints
-share/trn/HelpFiles/quickstart
-share/trn/HelpFiles/top
-share/trn/HelpFiles/samples/access
-share/trn/HelpFiles/samples/index
-share/trn/HelpFiles/samples/trnrc
-@dirrm share/trn/HelpFiles/config
-@dirrm share/trn/HelpFiles/samples
-@dirrm share/trn/HelpFiles
-@dirrm share/trn
-man/man1/Pnews.1
-man/man1/Rnmail.1
-man/man1/rn.1
-man/man1/trn.1
diff --git a/news/trn/distinfo b/news/trn/distinfo
deleted file mode 100644
index 7e331bac0bc..00000000000
--- a/news/trn/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.6 2005/07/08 20:42:35 kristerw Exp $
-
-SHA1 (trn-4.0-test76.tar.gz) = 4741d506d4c2d62a8dbaa5d4fd62cce656abcf3b
-RMD160 (trn-4.0-test76.tar.gz) = f60478f8808b9c0d46a22ac924821cf2edd1fe87
-Size (trn-4.0-test76.tar.gz) = 565528 bytes
-SHA1 (patch-ac) = d33198c3d39059496ae81c0491297974caf5a073
-SHA1 (patch-ad) = 78c18d634cb0861754e1d555a0e514299136ecbc
diff --git a/news/trn/patches/patch-ac b/news/trn/patches/patch-ac
deleted file mode 100644
index e1cf44def75..00000000000
--- a/news/trn/patches/patch-ac
+++ /dev/null
@@ -1,112 +0,0 @@
-$NetBSD: patch-ac,v 1.4 2005/07/08 20:42:35 kristerw Exp $
-
---- Configure.orig 2001-02-22 20:17:39.000000000 +0100
-+++ Configure 2005-07-08 22:38:46.000000000 +0200
-@@ -2540,7 +2540,7 @@
- esac
- ;;
- *) case "$d_inews" in
-- '') dflt="$prefix/bin";;
-+ '') dflt=none;;
- "$define")
- set dflt installinews bin
- eval $prefixit
-@@ -6223,14 +6223,14 @@
- acttimes='$acttimes'
- aphostcmd='$aphostcmd'
- archobjs='$archobjs'
--awk='$awk'
--basename='$basename'
-+awk='$TOOLS_AWK'
-+basename='$TOOLS_BASENAME'
- bash='$bash'
- bin='$bin'
- binexp='$binexp'
- byacc='$byacc'
- c='$c'
--cat='$cat'
-+cat='$TOOLS_CAT'
- cc='$cc'
- ccflags='$ccflags'
- cf_by='$cf_by'
-@@ -6240,7 +6240,7 @@
- comm='$comm'
- contains='$contains'
- contdist='$contdist'
--cp='$cp'
-+cp='$TOOLS_CP'
- cpp='$cpp'
- cppflags='$cppflags'
- cpplast='$cpplast'
-@@ -6305,21 +6305,21 @@
- d_xthread='$d_xthread'
- date='$date'
- defeditor='$defeditor'
--diff='$diff'
-+diff='$TOOLS_DIFF'
- direntrytype='$direntrytype'
--echo='$echo'
-+echo='$TOOLS_ECHO'
- ed='$ed'
--egrep='$egrep'
-+egrep='$TOOLS_EGREP'
- eunicefix='$eunicefix'
- exe_ext='$exe_ext'
--expr='$expr'
-+expr='$TOOLS_EXPR'
- extrainews='$extrainews'
- filexp='$filexp'
- find='$find'
- firstmakefile='$firstmakefile'
- gccversion='$gccversion'
- glibpth='$glibpth'
--grep='$grep'
-+grep='$TOOLS_GREP'
- groupdesc='$groupdesc'
- hint='$hint'
- hostbits='$hostbits'
-@@ -6376,10 +6376,10 @@
- mimecap='$mimecap'
- mips='$mips'
- mips_type='$mips_type'
--mkdir='$mkdir'
-+mkdir='$TOOLS_MKDIR'
- more='$more'
- multistatedist='$multistatedist'
--mv='$mv'
-+mv='$TOOLS_MV'
- myactive='$myactive'
- myuname='$myuname'
- n='$n'
-@@ -6417,11 +6417,11 @@
- prefshell='$prefshell'
- privlib='$privlib'
- privlibexp='$privlibexp'
--rm='$rm'
-+rm='$TOOLS_RM'
- rmail='$rmail'
- rootid='$rootid'
- runnm='$runnm'
--sed='$sed'
-+sed='$TOOLS_SED'
- sendmail='$sendmail'
- servername='$servername'
- sharpbang='$sharpbang'
-@@ -6442,7 +6442,7 @@
- strn='$strn'
- subscriptions='$subscriptions'
- sysman='$sysman'
--tail='$tail'
-+tail='$TOOLS_TAIL'
- tee='$tee'
- termlib='$termlib'
- test='$test'
-@@ -6450,7 +6450,7 @@
- tk='$tk'
- tkinc='$tkinc'
- tklibs='$tklibs'
--tr='$tr'
-+tr='$TOOLS_TR'
- trn_init='$trn_init'
- trn_select='$trn_select'
- trnl='$trnl'
diff --git a/news/trn/patches/patch-ad b/news/trn/patches/patch-ad
deleted file mode 100644
index 0ed9c7b145b..00000000000
--- a/news/trn/patches/patch-ad
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2000/03/18 19:51:33 wiz Exp $
-
---- Pnews.SH.orig Sun Jan 17 20:01:22 1999
-+++ Pnews.SH Sat Mar 18 13:47:13 2000
-@@ -911,7 +911,12 @@
- esac
-
- case $orgname in
--/*) orgname=`$cat $orgname` ;;
-+/*) if $test -r $orgname; then
-+ orgname=`$cat $orgname`
-+ else
-+ orgname=""
-+ fi
-+ ;;
- esac
-
- $sed -e '/^Reply-To: $/d' > $tmpart <<EOHeader
diff --git a/news/xrn/DESCR b/news/xrn/DESCR
deleted file mode 100644
index 6890d33d4e0..00000000000
--- a/news/xrn/DESCR
+++ /dev/null
@@ -1,15 +0,0 @@
- XRN is a Usenet News reader for the X window system. It requires an
-NNTP server to talk to (i.e., it cannot read news from local disk
-files), and the NNTP server must support the XHDR command (most
-servers nowadays do; if yours doesn't, XRN will complain when you try
-to run it).
-
- XRN is currently maintained by Jonathan Kamens. Bug reports or
-comments about it should be sent to bug-xrn@kamens.brookline.ma.us.
-Please do *not* write to that address with basic questions about
-compiling the program; if you are unfamiliar with compiling X
-applications and the instructions below are not sufficient, you should
-seek help at your site.
-
- Versions of XRN prior to 7.00 were maintained by Ellen Santovich and
-Rick Spickelmier.
diff --git a/news/xrn/Makefile b/news/xrn/Makefile
deleted file mode 100644
index 0c611ae435e..00000000000
--- a/news/xrn/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-# $NetBSD: Makefile,v 1.11 2005/06/17 04:49:47 jlam Exp $
-#
-
-DISTNAME= 9.01
-PKGNAME= xrn-9.01
-PKGREVISION= 1
-CATEGORIES= news x11
-MASTER_SITES= ftp://sipb.mit.edu/pub/xrn/
-EXTRACT_SUFX= .tgz
-
-MAINTAINER= tech-pkg@NetBSD.org
-HOMEPAGE= http://www.mit.edu/people/jik/software/xrn.html
-COMMENT= Usenet News reader for the X window system
-
-WRKSRC= ${WRKDIR}
-DIST_SUBDIR= xrn
-
-USE_IMAKE= yes
-
-pre-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xrn
- for f in COMMON-PROBLMS COPYRIGHT CREDITS ChangeLog; do \
- ${INSTALL_DATA} ${WRKSRC}/$$f ${PREFIX}/share/doc/xrn; \
- done
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/news/xrn/PLIST b/news/xrn/PLIST
deleted file mode 100644
index 039e09b2997..00000000000
--- a/news/xrn/PLIST
+++ /dev/null
@@ -1,9 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2003/03/03 02:56:01 jschauma Exp $
-bin/xrn
-lib/X11/app-defaults/XRn
-${IMAKE_MAN_DIR}/xrn.${IMAKE_MANNEWSUFFIX}
-share/doc/xrn/COMMON-PROBLMS
-share/doc/xrn/COPYRIGHT
-share/doc/xrn/CREDITS
-share/doc/xrn/ChangeLog
-@dirrm share/doc/xrn
diff --git a/news/xrn/distinfo b/news/xrn/distinfo
deleted file mode 100644
index 43df06ee5d2..00000000000
--- a/news/xrn/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 12:19:56 agc Exp $
-
-SHA1 (xrn/9.01.tgz) = a560d07629efaa907ae01527192dd474e11555ad
-RMD160 (xrn/9.01.tgz) = c98d26e17fd8c511d9272378a54943ef9a453d3a
-Size (xrn/9.01.tgz) = 357098 bytes
-SHA1 (patch-aa) = 5560da41c2ef1d077fcc696f954bca7528d577af
-SHA1 (patch-ab) = 8e44803fcbffc0985a68479bf8f177793c1d857f
diff --git a/news/xrn/patches/patch-aa b/news/xrn/patches/patch-aa
deleted file mode 100644
index d813364833b..00000000000
--- a/news/xrn/patches/patch-aa
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-aa,v 1.1 1998/08/29 21:54:50 frueauf Exp $
-
---- config.h-orig Mon Mar 23 04:21:34 1998
-+++ config.h Sat Aug 29 23:02:04 1998
-@@ -34,6 +34,8 @@
- * config.h: configurable defaults
- */
-
-+#define CONFIG_H_IS_OK
-+
- #ifdef OV_CAMBRIDGE
- #define CONFIG_H_IS_OK
- #endif
-@@ -442,7 +444,7 @@
- #endif /* ! PRINTCOMMAND */
-
- #ifndef SENDMAIL
--#define SENDMAIL "/usr/lib/sendmail -oi -t"
-+#define SENDMAIL "/usr/sbin/sendmail -oi -t"
- #endif
- /* The command to use to verify that an E-mail address is valid. it
- should exit with status 0 if the address is valid. It shouldn't
-@@ -451,7 +453,7 @@
- If you don't want XRN to ever attempt to verify sender addresses in
- postings and messages, don't define this. */
- #ifndef SENDMAIL_VERIFY
--#define SENDMAIL_VERIFY "/usr/lib/sendmail -bv >/dev/null"
-+#define SENDMAIL_VERIFY "/usr/sbin/sendmail -bv >/dev/null"
- #endif
-
- #define SAVEMODE "normal,headers,onedir"
diff --git a/news/xrn/patches/patch-ab b/news/xrn/patches/patch-ab
deleted file mode 100644
index a4d4fdb756e..00000000000
--- a/news/xrn/patches/patch-ab
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ab,v 1.1 1999/07/23 15:48:16 frueauf Exp $
-
---- Imakefile-orig Thu Jan 29 04:06:12 1998
-+++ Imakefile Wed Jul 21 19:44:31 1999
-@@ -158,6 +158,10 @@
- # endif
- #endif
-
-+#if defined(NetBSDArchitecture)
-+XRN_DEFINES = -Dunix
-+#endif
-+
- /*
- * You probably don't need to change anything in this block.
- */