mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-19 19:59:43 +00:00
Code Issues Releases Activity

Update to version 6.5.5.

Browse Source 
PR:		16437
Submitted by:	maintainer
This commit is contained in:
Steve Price 2000-01-29 21:57:14 +00:00
parent 6ffcd801bf
commit 53f454c3aa
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=25278
15 changed files with 349 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
news/nn/Makefile
View File

@ -1,39 +1,30 @@
# New ports collection makefile for: nn
# Version required: 6.5.3
# Version required: 6.5.5
# Date created: 24 September 1994
# Whom: adam
#
# $FreeBSD$
#
DISTNAME= nn-6.5.3
DISTNAME= nn-6.5.5
CATEGORIES= news
MASTER_SITES= ftp://ftp.visi.com/users/mtpins/ \
ftp://maroon.webmaster.com/pub/nn/
MASTER_SITES= ftp://ftp.visi.com/users/mtpins/
EXTRACT_SUFX= .tar.Z
MAINTAINER= ports@FreeBSD.org
MAINTAINER= jooji@webnology.com
IS_INTERACTIVE= yes
NO_PACKAGE= posting depends on inews utility, which has poster\'s domain compiled in
MAINTAINER= jooji@nickelkid.com
MAN1= nn.1 nncheck.1 nngoback.1 nngrab.1 nngrep.1 nnpost.1 \
nntidy.1 nnview.1 nnacct.1m nnadmin.1m nnstats.1m nnusage.1m
MAN8= nnmaster.8 nnspew.8
pre-patch:
@${CP} ${WRKSRC}/config.h-dist ${WRKSRC}/config.h
@${CP} ${WRKSRC}/config.h-dist ${WRKSRC}/config.h.unparsed
pre-build:
@${CP} ${FILESDIR}/s-freebsd.h ${WRKSRC}/conf
pre-install:
@${MKDIR} ${PREFIX}/news
[ ! -f ${WRKDIR}/.install_inews ] || (cd ${WRKSRC}/inews; ${MAKE} all)
[ ! -f ${WRKDIR}/.install_inews ] || (cd ${WRKSRC}/inews; ${MAKE} install)
@${CAT} ${WRKSRC}/config.h.unparsed | ${SED} -e "s#SUB_PREFIX#${PREFIX}#" \
| ${SED} -e "s#SUB_MANPREFIX#${MANPREFIX}#" > ${WRKSRC}/config.h
post-install:
@${CP} ${WRKDIR}/nntp_server ${PREFIX}/etc/nntp_server
@PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${DISTNAME} POST-INSTALL
.include <bsd.port.mk>

2
news/nn/distinfo
View File

@ -1 +1 @@
MD5 (nn-6.5.3.tar.Z) = 20d983d62b2f89deda855485405099ed
MD5 (nn-6.5.5.tar.Z) = f347700f2c916d66071dae04c1981952

6
news/nn/files/patch-ab
View File

@ -1,10 +1,10 @@
--- chset.c.orig Fri Apr 28 22:34:04 1995
+++ chset.c Fri Apr 16 01:30:09 1999
--- chset.c.orig Tue Jan 25 09:33:52 2000
+++ chset.c Tue Jan 25 09:34:51 2000
@@ -18,6 +18,7 @@
"iso-8859-7", 8,
"iso-8859-8", 8,
"iso-8859-9", 8,
+ "koi8-r", 8,
+ "koi8-r", 8,
"unknown", 0,
NULL, 0,
};

36
news/nn/files/patch-ac
View File

@ -1,5 +1,5 @@
--- inst.sh.orig Fri Apr 28 22:34:49 1995
+++ inst.sh Fri Apr 16 01:30:09 1999
--- inst.sh.orig Thu Jan 27 02:36:07 2000
+++ inst.sh Thu Jan 27 02:29:51 2000
@@ -1,8 +1,8 @@
# (Large) prefix inserted above by Make
@ -20,3 +20,35 @@
(
if $NNTP
@@ -89,8 +89,8 @@
if [ -s ErrorCheck ]
then
cat ErrorCheck
- echo "Hit return to continue"
- read X
+# echo "Hit return to continue"
+# read X
fi
rm -f ErrorCheck
@@ -188,7 +188,7 @@
OPT=master
;;
n)
- OPT="bin aux help online man"
+ OPT="bin aux help online man inews"
;;
2|c)
OPT=bin
@@ -357,6 +357,11 @@
fi
done
;;
+
+inews)
+ cd inews/ && make install || exit 1
+ ;;
+
online)
./inst mkdir $HELP 755 || exit 1

83
news/nn/files/patch-ae
View File

@ -1,28 +1,29 @@
--- config.h.orig Fri Apr 16 01:30:09 1999
+++ config.h Fri Apr 16 01:30:09 1999
--- config.h.unparsed.orig Wed Jan 26 23:16:25 2000
+++ config.h.unparsed Thu Jan 27 01:23:30 2000
@@ -51,10 +51,10 @@
#define DO_NOV_DIGEST /* */
#define DO_NOV_DIGEST
/* Optional */
-/* #define NOV_DIRECTORY "/usr/spool/news" /* */
+#define NOV_DIRECTORY "/var/news/over.view" /* */
-/* #define NOV_DIRECTORY "/usr/spool/news" */
+#define NOV_DIRECTORY "/var/news/over.view"
/* Optional */
-/* #define NOV_FILENAME ".overview" /* */
+#define NOV_FILENAME ".overview" /* */
-/* #define NOV_FILENAME ".overview" */
+#define NOV_FILENAME ".overview"
/*********************** NETWORK DEPENDENT DEFINITIONS **********************
@@ -107,7 +107,7 @@
@@ -107,7 +107,8 @@
* 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 "/usr/local/etc/nntp_server" /* */
-#define NNTP_SERVER "/usr/local/lib/nntp_server"
+#define NNTP_SERVER "SUB_PREFIX/etc/nntp_server"
+#define NNTP_DOMAIN "SUB_PREFIX/etc/nntp_domain"
/*
* Define NNTP_POST if you want nn to reject attempts to post via
@@ -149,7 +149,7 @@
@@ -149,7 +150,7 @@
* conf/s-template.h as a starting point for writing you own.
*/
@ -31,7 +32,7 @@
/*
* Define DEFAULT_PAGER as the initial value of the 'pager' variable.
@@ -210,7 +210,7 @@
@@ -210,7 +211,7 @@
* conf/m-template.h as a starting point for writing you own.
*/
@ -40,76 +41,82 @@
/***************************** OWNERSHIP ***************************
@@ -263,7 +263,7 @@
@@ -261,9 +262,9 @@
* (= LIB_DIRECTORY/Log if undefined).
*/
#define BIN_DIRECTORY "/usr/local/bin"
#define LIB_DIRECTORY "/usr/local/lib/nn"
-#define BIN_DIRECTORY "/usr/local/bin"
-#define LIB_DIRECTORY "/usr/local/lib/nn"
-
+#define TMP_DIRECTORY "/var/tmp"
+#define BIN_DIRECTORY "SUB_PREFIX/bin"
+#define LIB_DIRECTORY "SUB_PREFIX/lib/nn"
+#define TMP_DIRECTORY "/var/tmp"
/**************************** DATABASE LOCATION **************************
*
@@ -294,7 +294,7 @@
@@ -294,7 +295,7 @@
* (The file system must support long file names!!)
*/
-/* #define DB_DIRECTORY "/usr/spool/nn" /* */
+#define DB_DIRECTORY "/var/spool/nn" /* */
-/* #define DB_DIRECTORY "/usr/spool/nn" */
+#define DB_DIRECTORY "/var/spool/nn"
/*************************** NEWS TRANSPORT **************************
@@ -316,8 +316,8 @@
@@ -316,9 +317,9 @@
* Default: NEWS_LIB_DIR/{rm,del}group
*/
-/* #define NEWS_DIRECTORY "/usr/spool/news" /* */
-/* #define NEWS_LIB_DIRECTORY "/usr/lib/news" /* */
+#define NEWS_DIRECTORY "/var/news" /* */
+#define NEWS_LIB_DIRECTORY "/usr/local/news/lib" /* */
/* #define INEWS_PATH "/usr/lib/news/inews" /* */
-/* #define NEWS_DIRECTORY "/usr/spool/news" */
-/* #define NEWS_LIB_DIRECTORY "/usr/lib/news" */
-/* #define INEWS_PATH "/usr/lib/news/inews" */
+#define NEWS_DIRECTORY "/var/news"
+#define NEWS_LIB_DIRECTORY "SUB_PREFIX/news/lib"
+#define INEWS_PATH "SUB_PREFIX/bin/nn-inews"
@@ -341,7 +341,7 @@
/*
@@ -341,7 +342,7 @@
*/
/* #define REC_MAIL "/usr/lib/news/recmail" /* non-sendmail */
/* #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 */
/*
@@ -403,13 +403,13 @@
@@ -403,13 +404,13 @@
* DAEMON_MAN - nnmaster
*/
-#define USER_MAN_DIR "/usr/man/man1"
+#define USER_MAN_DIR "/usr/local/man/man1"
-#define USER_MAN_DIR "/usr/local/man/man1"
+#define USER_MAN_DIR "SUB_MANPREFIX/man/man1"
#define USER_MAN_SECTION "1"
-#define SYS_MAN_DIR "/usr/man/man1"
+#define SYS_MAN_DIR "/usr/local/man/man1"
-#define SYS_MAN_DIR "/usr/local/man/man1"
+#define SYS_MAN_DIR "SUB_MANPREFIX/man/man1"
#define SYS_MAN_SECTION "1m"
-#define DAEMON_MAN_DIR "/usr/man/man8"
+#define DAEMON_MAN_DIR "/usr/local/man/man8"
-#define DAEMON_MAN_DIR "/usr/local/man/man8"
+#define DAEMON_MAN_DIR "SUB_MANPREFIX/man/man8"
#define DAEMON_MAN_SECTION "8"
@@ -469,7 +469,7 @@
@@ -469,7 +470,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 */
+/* #define INEWS_IS_FAST /* comment out for C-News */
/*
* Synchronous posting: If set this will cause NN to wait until a
@@ -481,7 +481,7 @@
@@ -481,7 +482,7 @@
* via some sort of NNTP.
*/
-#define SYNCHRONOUS_POSTING /* comment out for C-News */
+/*#define SYNCHRONOUS_POSTING /* comment out for C-News */
+/* #define SYNCHRONOUS_POSTING /* comment out for C-News */
/*
* PUT_TIMESTAMP_IN_SCRIPTS

27
news/nn/files/patch-ag
View File

@ -1,16 +1,12 @@
--- Makefile.orig Mon Aug 19 17:28:12 1996
+++ Makefile Fri Apr 16 01:28:02 1999
@@ -19,15 +19,15 @@
# Use /lib/cpp or /usr/ccs/lib/cpp for CPP on Solaris or SVR4 machines.
--- Makefile.orig Sat Jun 5 00:07:14 1999
+++ Makefile Thu Jan 27 01:56:38 2000
@@ -21,13 +21,13 @@
CC = cc
-#CPP = $(CC) -E
-CPP = /lib/cpp
CPP = $(CC) -E
#CPP = /lib/cpp
-#CFLAGS = -O2 # -g # -I/usr/local/lib/malloc-debug -DMALLOC_FUNC_CHECK
-CFLAGS = -O
+CPP = $(CC) -E
+#CPP = /lib/cpp
+CFLAGS += -O2 # -g # -I/usr/local/lib/malloc-debug -DMALLOC_FUNC_CHECK
+CFLAGS = -O2 # -g # -I/usr/local/lib/malloc-debug -DMALLOC_FUNC_CHECK
+#CFLAGS = -O
#-Wall -Wcomment \
#-Wtraditional -Wshadow \
@ -21,7 +17,16 @@
MAKE = make
@@ -97,3 +97,5 @@
@@ -36,6 +36,8 @@
all: ymakefile
$(MAKE) $(MFLAGS) -f ymakefile all
+inews: ymakefile
+ $(MAKE) $(MFLAGS) -f ymakefile inews
touch: ymakefile
$(MAKE) -f ymakefile -t all
@@ -97,3 +99,5 @@
man/nn.1.D: man/nn.1
sh SPLITNN1

21
news/nn/files/patch-ai
View File

@ -1,13 +1,8 @@
*** inews/version.c Sun Jan 24 23:44:03 1999
--- inews/version.c.new Sun Jan 24 23:44:36 1999
***************
*** 2,5 ****
* Provide the version number of this release.
*/
! char nntp_version[] = "1.5.8 (11 March 90)";
--- 2,5 ----
* Provide the version number of this release.
*/
! char nntp_version[] = "1.5.8.MINI (MINI-INEWS)";
--- inews/version.c.orig Sat Apr 29 01:34:47 1995
+++ inews/version.c Fri Jan 28 15:53:13 2000
@@ -2,4 +2,4 @@
* Provide the version number of this release.
*/
-char nntp_version[] = "1.5.8 (11 March 90)";
+char nntp_version[] = "1.5.8.MINI (MINI-INEWS)";

27
news/nn/files/patch-aj Normal file
View File

@ -0,0 +1,27 @@
--- xmakefile.orig Wed Jan 26 12:30:07 2000
+++ xmakefile Wed Jan 26 12:47:18 2000
@@ -103,12 +103,15 @@
MAIL = nnmail.o reroute.o hostname.o global.o options.o
-all: $(BIN_PROG) $(LIB_PROG) $(MASTER_PROG) inst
+all: $(BIN_PROG) $(LIB_PROG) $(MASTER_PROG) inst inews
client: $(BIN_PROG) $(LIB_PROG) inst
master: $(MASTER_PROG) inst
+inews::
+ @cd inews && $(MAKE) all
+
nn: PARALLEL $(NN) $(NOVOBJ)
@echo linking nn
@$(CC) -o nn $(CFLAGS) $(NN) $(NOVOBJ) $(LDFLAGS) TERMLIB NNTP_EXTRA_LIB
@@ -195,6 +198,7 @@
rm -f $(BIN_PROG) $(LIB_PROG) $(MASTER_PROG) cvt-help usercheck
rm -f prefix mkprefix inst
rm -f man/nn.1 man/nn.1~
+ cd inews && $(MAKE) clean
*
* dependencies

27
news/nn/files/patch-ak Normal file
View File

@ -0,0 +1,27 @@
--- inews/conf.h.orig Sat Apr 29 01:34:46 1995
+++ inews/conf.h Fri Jan 28 15:04:03 2000
@@ -30,6 +30,7 @@
#define NNINEWSCONF_H
#include "config.h"
+#include <sys/param.h>
#ifndef NNTP
/* WHY DO YOU WANT TO MAKE MINI-INEWS WHEN YOU DONT USE NNTP */
@@ -59,7 +60,7 @@
* DOMAIN as defined above). If you don't want this, comment it out.
*/
-#define HIDDENNET
+/* #define HIDDENNET */
/*
* There are a number of ways that inews will try to figure out the
@@ -92,6 +93,7 @@
*/
#define SERVER_FILE NNTP_SERVER
+#define DOMAIN_FILE NNTP_DOMAIN
/*
* Reverse engineering (nn got this the other way around)....

39
news/nn/files/patch-al Normal file
View File

@ -0,0 +1,39 @@
--- inews/inews.c.orig Tue Jan 25 13:42:08 2000
+++ inews/inews.c Wed Jan 26 11:16:19 2000
@@ -32,7 +32,7 @@
extern FILE *ser_wr_fp;
-char host_name[256];
+char host_name[MAXHOSTNAMELEN];
main(argc, argv)
int argc;
@@ -248,6 +248,8 @@
char *cp;
struct passwd *passwd;
char *index(), *getenv();
+ char *getdomainbyfile();
+ char *domain;
passwd = getpwuid(getuid());
@@ -279,9 +281,15 @@
DOMAIN);
#endif /* HIDDENNET */
#else
- fprintf(ser_wr_fp, "From: %s@%s (",
- passwd->pw_name,
- host_name);
+ domain = getdomainbyfile(DOMAIN_FILE);
+ if (domain == NULL)
+ fprintf(ser_wr_fp, "From: %s@%s (",
+ passwd->pw_name,
+ host_name);
+ else
+ fprintf(ser_wr_fp, "From: %s@%s (",
+ passwd->pw_name,
+ domain);
#endif
for (cp = full_name; *cp != '\0'; ++cp)

10
news/nn/files/patch-am Normal file
View File

@ -0,0 +1,10 @@
--- inews/clientlib.h.orig Wed Jan 26 10:50:26 2000
+++ inews/clientlib.h Wed Jan 26 10:50:44 2000
@@ -5,6 +5,7 @@
*/
extern char *getserverbyfile();
+extern char *getdomainbyfile();
extern int server_init();
extern void put_server();
extern int get_server();

69
news/nn/files/patch-an Normal file
View File

@ -0,0 +1,69 @@
--- inews/clientlib.c.orig Wed Jan 26 10:17:34 2000
+++ inews/clientlib.c Wed Jan 26 10:37:27 2000
@@ -76,7 +76,7 @@
{
register FILE *fp;
register char *cp;
- static char buf[256];
+ static char buf[MAXHOSTNAMELEN];
char *index();
char *getenv();
char *strcpy();
@@ -107,6 +107,48 @@
return (NULL); /* No entry */
}
+/*
+ * getdomainbyfile Get the domain name for posting from a named file.
+ * Handle blank lines and comments.
+ *
+ * Parameters: "file" is the name of the file to read.
+ *
+ * Returns: Pointer to static data area containing the
+ * first non-blank/comment line in the file.
+ * NULL on error (or lack of entry in file).
+ *
+ * Side effects: None.
+ */
+
+char *
+getdomainbyfile(file)
+char *file;
+{
+ register FILE *fp;
+ register char *cp;
+ static char buf[MAXHOSTNAMELEN];
+ char *index();
+
+ if (file == NULL)
+ return (NULL);
+
+ fp = fopen(file, "r");
+ if (fp == NULL)
+ return (NULL);
+
+ while (fgets(buf, sizeof (buf), fp) != NULL) {
+ if (*buf == '\n' || *buf == '#')
+ continue;
+ cp = index(buf, '\n');
+ if (cp)
+ *cp = '\0';
+ (void) fclose(fp);
+ return (buf);
+ }
+
+ (void) fclose(fp);
+ return (NULL);
+}
/*
* server_init Get a connection to the remote news server.
@@ -211,7 +253,7 @@
static struct hostent def;
static struct in_addr defaddr;
static char *alist[1];
- static char namebuf[ 256 ];
+ static char namebuf[MAXHOSTNAMELEN];
defaddr.s_addr = inet_addr( machine );
if( defaddr.s_addr != -1 ) {
strcpy( namebuf, machine );

2
news/nn/pkg-descr
View File

@ -1,4 +1,4 @@
No News is good news. This version of nn has NOV support.
- Jasper O'Malley
jooji@webnology.com
jooji@nickelkid.com

60
news/nn/pkg-install Normal file
View File

@ -0,0 +1,60 @@
#!/bin/sh
if [ "x$2" != "xPOST-INSTALL" ]; then
exit
fi
cat << xxENDxx
*******************************************************************
You have just installed the $1 package
Please set your NNTP server address or hostname in the file:
xxENDxx
echo "${PKG_PREFIX}/etc/nntp_server"
echo ""
cat << xxENDxx
If desired, please set your domain name for From: addresses when
posting in the file (default is to use your hostname):
xxENDxx
echo "${PKG_PREFIX}/etc/nntp_domain"
echo ""
cat << xxENDxx
*******************************************************************
xxENDxx
if [ ! -f ${PKG_PREFIX}/etc/nntp_server ]; then
cat << xxENDxx > ${PKG_PREFIX}/etc/nntp_server
# nntp_server: Configuration file for NN newsreader
#
# Set your NNTP server address or hostname in this file.
#
# If this file is left blank, NN will use the server set in the
# NNTP_SERVER environment variable.
#
# news.myisp.com
xxENDxx
fi
if [ ! -f ${PKG_PREFIX}/etc/nntp_domain ]; then
cat << xxENDxx > ${PKG_PREFIX}/etc/nntp_domain
# nntp_domain: Configuration file for NN newsreader
#
# Set the default domain name portion of user e-mail addresses as you
# would like them to appear in the From: line of articles posted
# with NN.
#
# For example, setting the name to foobar.com in this file will cause
# the From: line for joeuser to look like something like this:
#
# From: joeuser@foobar.com (Joe User)
#
# If this file is left blank, NN will use the hostname of this
# computer as the From: domain name.
xxENDxx
fi

2
news/nn/pkg-plist
View File

@ -10,6 +10,7 @@ bin/nnstats
bin/nntidy
bin/nnusage
bin/nnview
bin/nn-inews
lib/nn/aux
lib/nn/conf
lib/nn/help/Manual
@ -33,4 +34,3 @@ lib/nn/help/help.variables
lib/nn/upgrade_rc
@dirrm lib/nn/help
@dirrm lib/nn
@unexec echo "Be sure to remove %D/news/lib/inews if you no longer need it."