diff options
| -rw-r--r-- | news/nn/Makefile | 29 | ||||
| -rw-r--r-- | news/nn/files/s-netbsd.h (renamed from news/nn/files/s-freebsd.h) | 3 | ||||
| -rw-r--r-- | news/nn/patches/patch-aa | 42 | ||||
| -rw-r--r-- | news/nn/patches/patch-ab | 226 | ||||
| -rw-r--r-- | news/nn/patches/patch-ac | 141 | ||||
| -rw-r--r-- | news/nn/patches/patch-ad | 39 | ||||
| -rw-r--r-- | news/nn/pkg/PLIST | 54 |
7 files changed, 238 insertions, 296 deletions
diff --git a/news/nn/Makefile b/news/nn/Makefile index 1f4689aa16f..50bbd4437af 100644 --- a/news/nn/Makefile +++ b/news/nn/Makefile @@ -1,8 +1,4 @@ -# New ports collection makefile for: nn -# Version required: 6.5.0 -# Date created: 24 September 1994 -# Whom: adam -# +# $NetBSD: Makefile,v 1.2 1998/05/19 22:26:39 tron Exp $ # $FreeBSD Id: Makefile,v 1.14 1997/07/30 18:17:48 adam Exp # @@ -10,24 +6,27 @@ DISTNAME= nn-6.5.0.b3 PKGNAME= nn-6.5.0 CATEGORIES= news MASTER_SITES= ftp://uniwa.uwa.edu.au/pub/nn/old/beta/ -MAINTAINER= ports@FreeBSD.ORG + +MAINTAINER= tron@netbsd.org MAN1= nn.1 nncheck.1 nngoback.1 nngrab.1 nngrep.1 nnpost.1 \ nntidy.1 nnacct.1 nnadmin.1 nnstats.1 nnusage.1 MAN8= nnmaster.8 nnspew.8 -pre-patch: - @${CP} ${WRKSRC}/config.h-dist ${WRKSRC}/config.h +post-extract: + @${MV} ${WRKSRC}/config.h-dist ${WRKSRC}/config.h + @${SED} -e 's#@@PREFIX@@#${PREFIX}#; \ + s#@@BINOWN@@#${BINOWN}#; \ + s#@@BINGRP@@#${BINGRP}#' \ + <${FILESDIR}/s-netbsd.h >${WRKSRC}/conf/s-netbsd.h -pre-build: - @${CP} ${FILESDIR}/s-freebsd.h ${WRKSRC}/conf +post-build: + (cd ${WRKSRC}/inews; ${MAKE} all) pre-install: - ${MKDIR} ${PREFIX}/news - [ -r ${PREFIX}/news/lib/inews ] || ( cd ${WRKSRC}/inews; ${MAKE} all ) - [ -r ${PREFIX}/news/lib/inews ] || ( cd ${WRKSRC}/inews; ${MAKE} install ) + (cd ${WRKSRC}/inews; ${MAKE} install) post-install: - @${ECHO} Put your NNTP host into ${PREFIX}/etc/nntpserver file + @${ECHO} "Put your NNTP host into \"${PREFIX}/etc/nntp_server\" file." -.include <bsd.port.mk> +.include <../../mk/bsd.pkg.mk> diff --git a/news/nn/files/s-freebsd.h b/news/nn/files/s-netbsd.h index ef13d41f8a2..7b319e3588f 100644 --- a/news/nn/files/s-freebsd.h +++ b/news/nn/files/s-netbsd.h @@ -157,3 +157,6 @@ typedef struct dirent Direntry; /* POSIX */ #define HAVE_WORKING_COLLATE +#define PREFIX "@@PREFIX@@" +#define BINOWN "@@BINOWN@@" +#define BINGRP "@@BINGRP@@" diff --git a/news/nn/patches/patch-aa b/news/nn/patches/patch-aa index 0e4e90fc1c5..ad0a3937b4d 100644 --- a/news/nn/patches/patch-aa +++ b/news/nn/patches/patch-aa @@ -804,7 +804,7 @@ /* define types of library functions */ -+ #ifndef __FreeBSD__ ++ #ifndef __NetBSD__ char *getenv(), *ctime(); #ifndef MALLOC_FUNC_CHECK char *strchr(), *strrchr(); @@ -861,44 +861,6 @@ FILE * nntp_fopen_list __APROTO((char *cmd)); char * nntp_fgets __APROTO((char *buf, int size)); article_number *nntp_get_article_list __APROTO((group_header *gh)); -*** inst.sh.orig Mon Sep 13 21:42:25 1993 ---- inst.sh Sat Apr 15 04:57:51 1995 -*************** -*** 1,8 **** - - # (Large) prefix inserted above by Make - -! # BSD systems keep chown in /etc -! PATH="$PATH:/etc" - - case "$1" in - mkdir) ---- 1,8 ---- - - # (Large) prefix inserted above by Make - -! # BSD systems keep chown in /usr/sbin -! PATH="$PATH:/usr/sbin" - - case "$1" in - mkdir) -*************** -*** 55,61 **** - ;; - esac - -! set -u - - ( - if $NNTP ---- 55,61 ---- - ;; - esac - -! #set -u - - ( - if $NNTP *** kill.c.orig Mon Sep 13 21:42:28 1993 --- kill.c Sat Apr 15 04:57:52 1995 *************** @@ -1280,7 +1242,7 @@ import int silent, no_update; import int sys_nerr; -+ #ifndef __FreeBSD__ ++ #ifndef __NetBSD__ import char *sys_errlist[]; + #endif extern void nn_exitmsg(); diff --git a/news/nn/patches/patch-ab b/news/nn/patches/patch-ab index 548453924bf..3dca4919c04 100644 --- a/news/nn/patches/patch-ab +++ b/news/nn/patches/patch-ab @@ -1,229 +1,3 @@ -*** config.h.orig Sun Jun 18 16:39:25 1995 ---- config.h Sun Jun 18 16:41:44 1995 -*************** -*** 32,38 **** - #define NOV - - /* Optional */ -! #define NOV_DIRECTORY "/usr/spool/news" - - /*********************** NETWORK DEPENDENT DEFINITIONS ********************** - * ---- 32,38 ---- - #define NOV - - /* Optional */ -! #define NOV_DIRECTORY "/var/news/over.view" - - /*********************** NETWORK DEPENDENT DEFINITIONS ********************** - * -*************** -*** 69,75 **** - * Consult the file NNTP for further information on the use of NNTP. - */ - -! #undef NNTP - - /* - * Define NNTP_SERVER to the name of a file containing the name of the ---- 69,75 ---- - * Consult the file NNTP for further information on the use of NNTP. - */ - -! #define NNTP - - /* - * Define NNTP_SERVER to the name of a file containing the name of the -*************** -*** 84,90 **** - * NOTE: If you plan to use the included inews, it MUST be a full pathname - */ - -! #define NNTP_SERVER "/usr/lib/nntp_server" - - /* - * Define NNTP_POST if you want nn to reject attempts to post via ---- 84,90 ---- - * NOTE: If you plan to use the included inews, it MUST be a full pathname - */ - -! #define NNTP_SERVER "/usr/local/etc/nntpserver" - - /* - * Define NNTP_POST if you want nn to reject attempts to post via -*************** -*** 126,132 **** - * conf/s-template.h as a starting point for writing you own. - */ - -! #include "s-sys5-4.h" - - /* - * Define DEFAULT_PAGER as the initial value of the 'pager' variable. ---- 126,132 ---- - * conf/s-template.h as a starting point for writing you own. - */ - -! #include "s-freebsd.h" - - /* - * Define DEFAULT_PAGER as the initial value of the 'pager' variable. -*************** -*** 141,148 **** - * nn's :print command pipes text into this command. - */ - -! #define DEFAULT_PRINTER "lp -s" /* System V */ -! /* #define DEFAULT_PRINTER "lpr -p -JNEWS" */ /* bsd */ - - /* - * Define RESIZING to make nn understand dynamic window-resizing. ---- 141,148 ---- - * nn's :print command pipes text into this command. - */ - -! /* #define DEFAULT_PRINTER "lp -s" /* System V */ -! #define DEFAULT_PRINTER "lpr -p -JNEWS" /* bsd */ - - /* - * Define RESIZING to make nn understand dynamic window-resizing. -*************** -*** 239,245 **** - - #define BIN_DIRECTORY "/usr/local/bin" - #define LIB_DIRECTORY "/usr/local/lib/nn" -! - - /**************************** DATABASE LOCATION ************************** - * ---- 239,245 ---- - - #define BIN_DIRECTORY "/usr/local/bin" - #define LIB_DIRECTORY "/usr/local/lib/nn" -! #define TMP_DIRECTORY "/var/tmp" - - /**************************** DATABASE LOCATION ************************** - * -*************** -*** 270,276 **** - * (The file system must support long file names!!) - */ - -! #define DB_DIRECTORY "/usr/spool/nn" - - - /*************************** NEWS TRANSPORT ************************** ---- 270,276 ---- - * (The file system must support long file names!!) - */ - -! #define DB_DIRECTORY "/var/spool/nn" - - - /*************************** NEWS TRANSPORT ************************** -*************** -*** 292,301 **** - * Default: NEWS_LIB_DIR/{rm,del}group - */ - -! #define NEWS_DIRECTORY "/usr/spool/news" -! #define NEWS_LIB_DIRECTORY "/usr/lib/news" - -! /* #define INEWS_PATH "/usr/lib/news/inews" */ - - - /* ---- 292,301 ---- - * Default: NEWS_LIB_DIR/{rm,del}group - */ - -! #define NEWS_DIRECTORY "/var/news" -! #define NEWS_LIB_DIRECTORY "/usr/local/news/lib" - -! /* #define INEWS_PATH "/usr/local/news/lib/inews" */ - - - /* -*************** -*** 317,323 **** - */ - - /* #define REC_MAIL "/usr/lib/news/recmail" */ /* non-sendmail */ -! #define REC_MAIL "/usr/lib/sendmail -t" /* sendmail */ - - - /* ---- 317,323 ---- - */ - - /* #define REC_MAIL "/usr/lib/news/recmail" */ /* non-sendmail */ -! #define REC_MAIL "/usr/sbin/sendmail -t" /* sendmail */ - - - /* -*************** -*** 379,391 **** - * DAEMON_MAN - nnmaster - */ - -! #define USER_MAN_DIR "/usr/man/man1" - #define USER_MAN_SECTION "1" - -! #define SYS_MAN_DIR "/usr/man/man1" -! #define SYS_MAN_SECTION "1m" - -! #define DAEMON_MAN_DIR "/usr/man/man8" - #define DAEMON_MAN_SECTION "8" - - ---- 379,391 ---- - * DAEMON_MAN - nnmaster - */ - -! #define USER_MAN_DIR "/usr/local/man/man1" - #define USER_MAN_SECTION "1" - -! #define SYS_MAN_DIR "/usr/local/man/man1" -! #define SYS_MAN_SECTION "1" - -! #define DAEMON_MAN_DIR "/usr/local/man/man8" - #define DAEMON_MAN_SECTION "8" - - -*************** -*** 445,451 **** - * was accepted, whereas with INN, it only takes seconds. - */ - -! #define INEWS_IS_FAST /* comment out for C-News */ - - /* - * Synchronous posting: If set this will cause NN to wait until a ---- 445,451 ---- - * was accepted, whereas with INN, it only takes seconds. - */ - -! /*#define INEWS_IS_FAST /* comment out for C-News */ - - /* - * Synchronous posting: If set this will cause NN to wait until a -*************** -*** 457,463 **** - * via some sort of NNTP. - */ - -! #define SYNCHRONOUS_POSTING /* comment out for C-News */ - - /* - * PUT_TIMESTAMP_IN_SCRIPTS ---- 457,463 ---- - * via some sort of NNTP. - */ - -! /*#define SYNCHRONOUS_POSTING /* comment out for C-News */ - - /* - * PUT_TIMESTAMP_IN_SCRIPTS *** inews/conf.h.orig Thu Nov 25 12:29:01 1993 --- inews/conf.h Sat Apr 15 04:57:55 1995 *************** diff --git a/news/nn/patches/patch-ac b/news/nn/patches/patch-ac new file mode 100644 index 00000000000..5b311cfd718 --- /dev/null +++ b/news/nn/patches/patch-ac @@ -0,0 +1,141 @@ +--- config.h.orig Fri Feb 18 03:15:47 1994 ++++ config.h Wed May 20 00:04:10 1998 +@@ -32,7 +32,7 @@ + #define NOV + + /* Optional */ +-#define NOV_DIRECTORY "/usr/spool/news" ++#define NOV_DIRECTORY "/var/spool/news/over.view" + + /*********************** NETWORK DEPENDENT DEFINITIONS ********************** + * +@@ -69,7 +69,7 @@ + * Consult the file NNTP for further information on the use of NNTP. + */ + +-#undef NNTP ++#define NNTP + + /* + * Define NNTP_SERVER to the name of a file containing the name of the +@@ -84,7 +84,7 @@ + * NOTE: If you plan to use the included inews, it MUST be a full pathname + */ + +-#define NNTP_SERVER "/usr/lib/nntp_server" ++#define NNTP_SERVER PREFIX "/etc/nntp_server" + + /* + * Define NNTP_POST if you want nn to reject attempts to post via +@@ -126,7 +126,7 @@ + * conf/s-template.h as a starting point for writing you own. + */ + +-#include "s-sys5-4.h" ++#include "s-netbsd.h" + + /* + * Define DEFAULT_PAGER as the initial value of the 'pager' variable. +@@ -141,8 +141,8 @@ + * nn's :print command pipes text into this command. + */ + +-#define DEFAULT_PRINTER "lp -s" /* System V */ +-/* #define DEFAULT_PRINTER "lpr -p -JNEWS" */ /* bsd */ ++/* #define DEFAULT_PRINTER "lp -s" /* System V */ ++#define DEFAULT_PRINTER "lpr -p -JNEWS" /* bsd */ + + /* + * Define RESIZING to make nn understand dynamic window-resizing. +@@ -203,8 +203,8 @@ + * Common choices are: (news, news) and (your uid, your gid) + */ + +-#define OWNER "news" +-#define GROUP "news" ++#define OWNER BINOWN ++#define GROUP BINGRP + + + /**************************** LOCALIZATION **************************** +@@ -237,9 +237,9 @@ + * (= 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 "/lib/nn" ++#define TMP_DIRECTORY "/var/tmp" + + /**************************** DATABASE LOCATION ************************** + * +@@ -270,7 +270,7 @@ + * (The file system must support long file names!!) + */ + +-#define DB_DIRECTORY "/usr/spool/nn" ++#define DB_DIRECTORY "/var/spool/news/nn" + + + /*************************** NEWS TRANSPORT ************************** +@@ -292,10 +292,10 @@ + * Default: NEWS_LIB_DIR/{rm,del}group + */ + +-#define NEWS_DIRECTORY "/usr/spool/news" +-#define NEWS_LIB_DIRECTORY "/usr/lib/news" ++#define NEWS_DIRECTORY "/var/spool/news" ++#define NEWS_LIB_DIRECTORY PREFIX "/lib/nn" + +-/* #define INEWS_PATH "/usr/lib/news/inews" */ ++#define INEWS_PATH NEWS_LIB_DIRECTORY "/inews" + + + /* +@@ -317,7 +317,7 @@ + */ + + /* #define REC_MAIL "/usr/lib/news/recmail" */ /* non-sendmail */ +-#define REC_MAIL "/usr/lib/sendmail -t" /* sendmail */ ++#define REC_MAIL "/usr/sbin/sendmail -t" /* sendmail */ + + + /* +@@ -379,13 +379,13 @@ + * DAEMON_MAN - nnmaster + */ + +-#define USER_MAN_DIR "/usr/man/man1" ++#define USER_MAN_DIR PREFIX "/man/man1" + #define USER_MAN_SECTION "1" + +-#define SYS_MAN_DIR "/usr/man/man1" +-#define SYS_MAN_SECTION "1m" ++#define SYS_MAN_DIR PREFIX "/man/man1" ++#define SYS_MAN_SECTION "1" + +-#define DAEMON_MAN_DIR "/usr/man/man8" ++#define DAEMON_MAN_DIR PREFIX "/man/man8" + #define DAEMON_MAN_SECTION "8" + + +@@ -445,7 +445,7 @@ + * was accepted, whereas with INN, it only takes seconds. + */ + +-#define INEWS_IS_FAST /* comment out for C-News */ ++/*#define INEWS_IS_FAST /* comment out for C-News */ + + /* + * Synchronous posting: If set this will cause NN to wait until a +@@ -457,7 +457,7 @@ + * via some sort of NNTP. + */ + +-#define SYNCHRONOUS_POSTING /* comment out for C-News */ ++/*#define SYNCHRONOUS_POSTING /* comment out for C-News */ + + /* + * PUT_TIMESTAMP_IN_SCRIPTS diff --git a/news/nn/patches/patch-ad b/news/nn/patches/patch-ad new file mode 100644 index 00000000000..b1f5a77d8a0 --- /dev/null +++ b/news/nn/patches/patch-ad @@ -0,0 +1,39 @@ +--- inst.sh.orig Mon Sep 13 19:42:25 1993 ++++ inst.sh Wed May 20 00:14:13 1998 +@@ -1,8 +1,8 @@ + + # (Large) prefix inserted above by Make + +-# BSD systems keep chown in /etc +-PATH="$PATH:/etc" ++# BSD systems keep chown in /usr/sbin ++PATH="$PATH:/usr/sbin" + + case "$1" in + mkdir) +@@ -55,7 +55,7 @@ + ;; + esac + +-set -u ++#set -u + + ( + if $NNTP +@@ -365,7 +365,6 @@ + + echo + echo "Formatting online manual $MAN" +- echo ".... (continues in background) ...." + + rm -f $MAN + +@@ -380,7 +379,7 @@ + ${AWK} -f format.awk - > $MAN + + ./inst chmod 644 $MAN +- ) & ++ ) + ;; + + splitdb) diff --git a/news/nn/pkg/PLIST b/news/nn/pkg/PLIST index dc7ab911901..bdce75fe99b 100644 --- a/news/nn/pkg/PLIST +++ b/news/nn/pkg/PLIST @@ -1,5 +1,4 @@ -lib/nn -news/lib/inews +@comment $NetBSD: PLIST,v 1.2 1998/05/19 22:26:40 tron Exp $ bin/nn bin/nnusage bin/nngrab @@ -11,16 +10,41 @@ bin/nngoback bin/nngrep bin/nnpost bin/nnbatch -man/man1/nn.1.gz -man/man1/nncheck.1.gz -man/man1/nngoback.1.gz -man/man1/nngrab.1.gz -man/man1/nngrep.1.gz -man/man1/nnpost.1.gz -man/man1/nntidy.1.gz -man/man1/nnacct.1.gz -man/man1/nnadmin.1.gz -man/man1/nnstats.1.gz -man/man1/nnusage.1.gz -man/man8/nnmaster.8.gz -man/man8/nnspew.8.gz +lib/nn/aux +lib/nn/upgrade_rc +lib/nn/conf +lib/nn/inews +lib/nn/help/adm.upgrade1 +lib/nn/help/adm.upgrade2 +lib/nn/help/adm.upgrade3 +lib/nn/help/adm.upgrade4 +lib/nn/help/adm.welcome +lib/nn/help/help.attr +lib/nn/help/help.commands +lib/nn/help/help.extended +lib/nn/help/help.help +lib/nn/help/help.map +lib/nn/help/help.menu +lib/nn/help/help.more +lib/nn/help/help.read +lib/nn/help/help.set +lib/nn/help/help.show +lib/nn/help/help.sort +lib/nn/help/help.variables +lib/nn/help/Manual +man/man1/nn.1 +man/man1/nncheck.1 +man/man1/nngoback.1 +man/man1/nngrab.1 +man/man1/nngrep.1 +man/man1/nnpost.1 +man/man1/nntidy.1 +man/man1/nnacct.1 +man/man1/nnadmin.1 +man/man1/nnstats.1 +man/man1/nnusage.1 +man/man8/nnmaster.8 +man/man8/nnspew.8 +@unexec rm -f %D/etc/nntp_server +@dirrm lib/nn/help +@dirrm lib/nn |