svn commit: r363286 - in head/news: atp atp/files cnews/files crashmail/files gup/files knews/files newsfetch newsfetch/files nn nn/files plor/files slnr slnr/files tin/files trn/files
Adam Weinberger
adamw at FreeBSD.org
Tue Jul 29 02:18:50 UTC 2014
Author: adamw
Date: Tue Jul 29 02:18:44 2014
New Revision: 363286
URL: http://svnweb.freebsd.org/changeset/ports/363286
QAT: https://qat.redports.org/buildarchive/r363286/
Log:
Rename news/ patch-xy patches to reflect the files they modify.
Added:
head/news/atp/files/patch-Makefile.in
- copied unchanged from r363257, head/news/atp/files/patch-aa
head/news/cnews/files/patch-quiz-substitutions
- copied unchanged from r363257, head/news/cnews/files/patch-aa
head/news/cnews/files/patch-sendmail
- copied unchanged from r363257, head/news/cnews/files/patch-ab
head/news/crashmail/files/patch-doc_example.prefs
- copied unchanged from r363257, head/news/crashmail/files/patch-aa
head/news/crashmail/files/patch-src_Makefile
- copied unchanged from r363257, head/news/crashmail/files/patch-ab
head/news/crashmail/files/patch-src_jamlib_jam.h
- copied unchanged from r363257, head/news/crashmail/files/patch-ae
head/news/crashmail/files/patch-src_oslib_linux_os_linux.h
- copied unchanged from r363257, head/news/crashmail/files/patch-ad
head/news/crashmail/files/patch-src_shared_types.h
- copied unchanged from r363257, head/news/crashmail/files/patch-ac
head/news/gup/files/patch-Makefile
- copied unchanged from r363257, head/news/gup/files/patch-aa
head/news/gup/files/patch-gup.c
- copied unchanged from r363257, head/news/gup/files/patch-ad
head/news/gup/files/patch-main.mk
- copied unchanged from r363257, head/news/gup/files/patch-ac
head/news/gup/files/patch-rfc822.h
- copied unchanged from r363257, head/news/gup/files/patch-ab
head/news/knews/files/patch-configure.h
- copied unchanged from r363257, head/news/knews/files/patch-aa
head/news/knews/files/patch-knews.tmpl
- copied unchanged from r363257, head/news/knews/files/patch-ac
head/news/knews/files/patch-src_Knews.ad
- copied unchanged from r363257, head/news/knews/files/patch-ab
head/news/newsfetch/files/patch-newsfetch.1
- copied unchanged from r363257, head/news/newsfetch/files/patch-ac
head/news/newsfetch/files/patch-newsfetch.c
- copied unchanged from r363257, head/news/newsfetch/files/patch-ab
head/news/nn/files/patch-Makefile
- copied unchanged from r363257, head/news/nn/files/patch-ag
head/news/nn/files/patch-config.h.unparsed
- copied unchanged from r363257, head/news/nn/files/patch-ae
head/news/nn/files/patch-inst.sh
- copied unchanged from r363257, head/news/nn/files/patch-ac
head/news/nn/files/patch-nntp.c
- copied unchanged from r363257, head/news/nn/files/patch-an
head/news/nn/files/patch-sort.c
- copied unchanged from r363257, head/news/nn/files/patch-ad
head/news/plor/files/patch-main.c
- copied unchanged from r363257, head/news/plor/files/patch-aa
head/news/plor/files/patch-video.c
- copied unchanged from r363257, head/news/plor/files/patch-ab
head/news/slnr/files/patch-src_Makefile
- copied unchanged from r363257, head/news/slnr/files/patch-aa
head/news/tin/files/patch-configure
- copied unchanged from r363257, head/news/tin/files/patch-ab
head/news/tin/files/patch-include_autoconf.hin
- copied unchanged from r363257, head/news/tin/files/patch-ae
head/news/trn/files/patch-Configure
- copied unchanged from r363257, head/news/trn/files/patch-ad
head/news/trn/files/patch-Makefile.SH
- copied unchanged from r363257, head/news/trn/files/patch-ac
head/news/trn/files/patch-hints_freebsd.sh
- copied unchanged from r363257, head/news/trn/files/patch-ab
head/news/trn/files/patch-nntp.c
- copied unchanged from r363257, head/news/trn/files/patch-aa
Deleted:
head/news/atp/files/patch-aa
head/news/cnews/files/patch-aa
head/news/cnews/files/patch-ab
head/news/crashmail/files/patch-aa
head/news/crashmail/files/patch-ab
head/news/crashmail/files/patch-ac
head/news/crashmail/files/patch-ad
head/news/crashmail/files/patch-ae
head/news/gup/files/patch-aa
head/news/gup/files/patch-ab
head/news/gup/files/patch-ac
head/news/gup/files/patch-ad
head/news/knews/files/patch-aa
head/news/knews/files/patch-ab
head/news/knews/files/patch-ac
head/news/newsfetch/files/patch-ab
head/news/newsfetch/files/patch-ac
head/news/nn/files/patch-ac
head/news/nn/files/patch-ad
head/news/nn/files/patch-ae
head/news/nn/files/patch-ag
head/news/nn/files/patch-an
head/news/plor/files/patch-aa
head/news/plor/files/patch-ab
head/news/slnr/files/patch-aa
head/news/tin/files/patch-ab
head/news/tin/files/patch-ae
head/news/trn/files/patch-aa
head/news/trn/files/patch-ab
head/news/trn/files/patch-ac
head/news/trn/files/patch-ad
Modified:
head/news/atp/Makefile
head/news/newsfetch/Makefile
head/news/nn/Makefile
head/news/slnr/Makefile
Modified: head/news/atp/Makefile
==============================================================================
--- head/news/atp/Makefile Tue Jul 29 01:59:16 2014 (r363285)
+++ head/news/atp/Makefile Tue Jul 29 02:18:44 2014 (r363286)
@@ -1,22 +1,22 @@
# Created by: Donald Burr <dburr at FreeBSD.org>
# $FreeBSD$
-PORTNAME= atp
-PORTVERSION= 1.50
+PORTNAME= atp
+PORTVERSION= 1.50
PORTREVISION= 1
-CATEGORIES= news
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
+CATEGORIES= news
+MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= system/bbs/mail
-DISTFILES= ${DISTNAME}-src.tar.gz
+DISTFILES= ${DISTNAME}-src.tar.gz
-MAINTAINER= ports at FreeBSD.org
+MAINTAINER= ports at FreeBSD.org
COMMENT= QWK message packet reader and composer for FreeBSD
-RUN_DEPENDS= zip:${PORTSDIR}/archivers/zip \
- unzip:${PORTSDIR}/archivers/unzip
+RUN_DEPENDS= zip:${PORTSDIR}/archivers/zip \
+ unzip:${PORTSDIR}/archivers/unzip
-USES= gmake
-GNU_CONFIGURE= YES
+USES= gmake
+GNU_CONFIGURE= yes
SUB_FILES= pkg-message
post-patch:
Copied: head/news/atp/files/patch-Makefile.in (from r363257, head/news/atp/files/patch-aa)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/news/atp/files/patch-Makefile.in Tue Jul 29 02:18:44 2014 (r363286, copy of r363257, head/news/atp/files/patch-aa)
@@ -0,0 +1,42 @@
+--- Makefile.in.old Fri May 15 16:34:21 1998
++++ Makefile.in Fri May 15 16:35:02 1998
+@@ -20,7 +20,7 @@
+ mandir = $(prefix)/man
+
+ # path where your ATP data and configuration files will reside:
+-atphome = @ATPHOME@
++atphome = $(prefix)/share/atp
+
+ # permissions and ownership
+ bin_prm = 755
+@@ -78,7 +78,7 @@
+ # phony targets (a.k.a "forced" targets)
+ clean_targ = clean distclean clobber spotless mostlyclean unconvert
+ devel_targ = callmap check depend extract lint tags
+-instl_targ = install uninstall in_cfg in_man in_wrap
++instl_targ = install uninstall in_cfg in_man
+ misc_targ = debug dvi info eline elinedb manifest
+ .PHONY : $(clean_targ) $(devel_targ) $(instl_targ) $(misc_targ)
+
+@@ -109,7 +109,7 @@
+ utils/rot13:
+ cd utils ; $(MAKE) rot13
+
+-install: in_bin in_man in_cfg in_wrap
++install: in_bin in_man in_cfg
+
+ in_cfg:
+ @echo " "
+@@ -136,12 +136,6 @@
+ $(INSTALL) -m $(bin_prm) -o $(bin_own) -g $(bin_grp) ./atp $(bindir)/atp
+ $(INSTALL) -m $(bin_prm) -o $(bin_own) -g $(bin_grp) ./utils/atpdiag $(bindir)/atpdiag
+ $(INSTALL) -m $(bin_prm) -o $(bin_own) -g $(bin_grp) ./utils/rot13 $(bindir)/rot13
+-
+-in_wrap:
+- @echo " "
+- @echo "Now it's YOUR turn, please do this:"
+- @echo "Set and export the environment variable: ATP=$(atphome)"
+- @echo "Edit your $(atphome)/atprc and then read the docs!"
+
+ in_man:
+ @echo " "
Copied: head/news/cnews/files/patch-quiz-substitutions (from r363257, head/news/cnews/files/patch-aa)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/news/cnews/files/patch-quiz-substitutions Tue Jul 29 02:18:44 2014 (r363286, copy of r363257, head/news/cnews/files/patch-aa)
@@ -0,0 +1,153 @@
+diff -urN ../pre-conf/conf/makeinc conf/makeinc
+--- ../pre-conf/conf/makeinc Thu Jan 1 01:00:00 1970
++++ conf/makeinc Mon Aug 2 20:32:23 1999
+@@ -0,0 +1,3 @@
++# makefile substitutions file
++# how to include ../include/config.make
++INCLUDE .include "../include/config.make"
+diff -urN ../pre-conf/conf/quiz.def conf/quiz.def
+--- ../pre-conf/conf/quiz.def Thu Jan 1 01:00:00 1970
++++ conf/quiz.def Mon Aug 2 20:36:19 1999
+@@ -0,0 +1,68 @@
++# These answers are interdependent; do not edit this file!
++newsuid="news"
++# These answers are interdependent; do not edit this file!
++newsgid="news"
++# These answers are interdependent; do not edit this file!
++newsarts="/var/news"
++# These answers are interdependent; do not edit this file!
++newsov="/var/news/over.view"
++# These answers are interdependent; do not edit this file!
++newsctl="/usr/local/news/lib"
++# These answers are interdependent; do not edit this file!
++newsbin="/usr/local/news/cnewsbin"
++# These answers are interdependent; do not edit this file!
++newspath="/bin:/usr/bin:/usr/local/bin"
++# These answers are interdependent; do not edit this file!
++newsumask="022"
++# These answers are interdependent; do not edit this file!
++newsconfig="/usr/local/news/cnewsbin/config"
++# These answers are interdependent; do not edit this file!
++newscrisis="newscrisis"
++# These answers are interdependent; do not edit this file!
++newsmaster="newsmaster"
++# These answers are interdependent; do not edit this file!
++addrsize="big"
++# These answers are interdependent; do not edit this file!
++fake=" fgetline.o fsync.o"
++# These answers are interdependent; do not edit this file!
++storeval=""
++# These answers are interdependent; do not edit this file!
++faststdio="no"
++# These answers are interdependent; do not edit this file!
++fakehdrs=" sys/timeb.h"
++# These answers are interdependent; do not edit this file!
++ranlib="yes"
++# These answers are interdependent; do not edit this file!
++make="make"
++# These answers are interdependent; do not edit this file!
++include="bsd"
++# These answers are interdependent; do not edit this file!
++cc=""
++# These answers are interdependent; do not edit this file!
++copts="-O"
++# These answers are interdependent; do not edit this file!
++ldopts=""
++# These answers are interdependent; do not edit this file!
++postlibs=""
++# These answers are interdependent; do not edit this file!
++uucptype="tay"
++# These answers are interdependent; do not edit this file!
++dftype="statfs"
++# These answers are interdependent; do not edit this file!
++dfdirs=""
++# These answers are interdependent; do not edit this file!
++archive="yes"
++# These answers are interdependent; do not edit this file!
++spacelow="no"
++# These answers are interdependent; do not edit this file!
++nfsgroup="no"
++# These answers are interdependent; do not edit this file!
++server="newsie"
++# These answers are interdependent; do not edit this file!
++rbin="/usr/local/news/cnewsbin/input"
++# These answers are interdependent; do not edit this file!
++bin="/usr/local/bin"
++# These answers are interdependent; do not edit this file!
++faststrchr="no"
++# These answers are interdependent; do not edit this file!
++sftype="c"
+diff -urN ../pre-conf/conf/substitutions conf/substitutions
+--- ../pre-conf/conf/substitutions Thu Jan 1 01:00:00 1970
++++ conf/substitutions Mon Aug 2 20:36:19 1999
+@@ -0,0 +1,8 @@
++# general substitutions file
++NEWSBIN /usr/local/news/cnewsbin
++NEWSCTL /usr/local/news/lib
++NEWSARTS /var/news
++NEWSOV /var/news/over.view
++NEWSPATH /bin:/usr/bin:/usr/local/bin
++NEWSUMASK 022
++NEWSCONFIG /usr/local/news/cnewsbin/config
+diff -urN ../pre-conf/include/config.make include/config.make
+--- ../pre-conf/include/config.make Thu Jan 1 01:00:00 1970
++++ include/config.make Mon Aug 2 20:36:19 1999
+@@ -0,0 +1,58 @@
++# make header file
++# pathname variables
++# =()<NEWSARTS=@<NEWSARTS>@>()=
++NEWSARTS=/var/news
++# =()<NEWSOV=@<NEWSOV>@>()=
++NEWSOV=/var/news/over.view
++# =()<NEWSBIN=@<NEWSBIN>@>()=
++NEWSBIN=/usr/local/news/cnewsbin
++# =()<NEWSCTL=@<NEWSCTL>@>()=
++NEWSCTL=/usr/local/news/lib
++# =()<NEWSCONFIG=@<NEWSCONFIG>@>()=
++NEWSCONFIG=/usr/local/news/cnewsbin/config
++
++# workaround for System V make bug
++SHELL=/bin/sh
++
++# directories where things go
++UIBIN=/usr/local/bin
++RBIN=/usr/local/news/cnewsbin/input
++
++# compilation stuff
++# LIB is for makefile dependencies, LIBS for cc invocations
++LIB=../libcnews.a
++LIBS=../libcnews.a
++CFLAGS+=$(MORECFLAGS) -I../include
++LDFLAGS=$(CFLAGS)
++LINTFLAGS=$(MORELINTFLAGS) -I../include
++
++# directories etc.
++CONF=../conf
++MAKE=make
++TO=$(CONF)/cpto
++IN=$(CONF)/cmpto $(CMPOPT)
++CF=$(CONF)/checkfile $(CMPOPT)
++MKDIR=$(CONF)/mkdirs
++MX=chmod +x
++UPDATE=$(CONF)/update.ran ../libcnews.a
++LIBCMP=$(CONF)/libcmp ../libcnews.a
++
++# misc configuration bits
++SPACEFOR=statfs
++DOSPACEFOR=dospacefor
++QUEUELEN=tay
++UID=news
++GID=news
++SIZE=big
++DBZ=libdbz
++STDIO=sysstdio
++SERVER=
++REPORTTO=newsmaster
++URGENTTO=newscrisis
++
++# things for testing
++HERE=. ../conf/rsetup ;
++
++# fake files needed
++HFAKE= sys/timeb.h
++OFAKE= fgetline.o fsync.o
Copied: head/news/cnews/files/patch-sendmail (from r363257, head/news/cnews/files/patch-ab)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/news/cnews/files/patch-sendmail Tue Jul 29 02:18:44 2014 (r363286, copy of r363257, head/news/cnews/files/patch-ab)
@@ -0,0 +1,32 @@
+*** util/report.old Thu Sep 15 13:24:57 1994
+--- util/report Fri Sep 30 16:57:05 1994
+***************
+*** 65,70 ****
+ else
+ cat $r
+ fi
+! ) | mail $args # some sites might want "/usr/lib/sendmail -t" instead
+
+ # and the trap handles the exit status
+--- 65,70 ----
+ else
+ cat $r
+ fi
+! ) | /usr/sbin/sendmail -t $args # some sites might want "mail" instead
+
+ # and the trap handles the exit status
+*** inject/makefile.ORIG Thu Dec 29 00:30:01 1994
+--- inject/makefile Thu Feb 23 11:21:46 1995
+***************
+*** 57,61 ****
+ cp $(PROGS) ../util/canonhdr regress/tmp/inject
+ $(MX) regress/regress regress/master/run
+ $(HERE) cd regress ; NEWSTZ=3660 ; export NEWSTZ ; ./regress
+!
+ # header dependencies follow
+--- 57,61 ----
+ cp $(PROGS) ../util/canonhdr regress/tmp/inject
+ $(MX) regress/regress regress/master/run
+ $(HERE) cd regress ; NEWSTZ=3660 ; export NEWSTZ ; ./regress
+!
+ # header dependencies follow
Copied: head/news/crashmail/files/patch-doc_example.prefs (from r363257, head/news/crashmail/files/patch-aa)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/news/crashmail/files/patch-doc_example.prefs Tue Jul 29 02:18:44 2014 (r363286, copy of r363257, head/news/crashmail/files/patch-aa)
@@ -0,0 +1,122 @@
+diff -ur doc/example.prefs doc/example.prefs
+--- doc/example.prefs Wed May 16 01:39:05 2001
++++ doc/example.prefs Sun Jun 24 19:49:17 2001
+@@ -32,7 +32,7 @@
+ ; In the Linux version of CrashMail, it is possible to enter "syslog" as the
+ ; filename. If you do this, everything will be logged to the syslog instead.
+
+-LOGFILE "c:\\fido\\logs\\crashmail.log"
++LOGFILE "/var/log/fido/crashmail.log"
+ LOGLEVEL 5
+
+ ; DUPEFILE <filename> <maxsize>
+@@ -49,7 +49,7 @@
+ ; KILL Dupes are killed
+ ; IGNORE No dupechecking
+
+-DUPEFILE "c:\\fido\\logs\\crashmail.dupes" 200
++DUPEFILE "/var/log/fido/crashmail.dupes" 200
+ DUPEMODE BAD
+
+ ; LOOPMODE IGNORE/LOG/LOG+BAD
+@@ -97,41 +97,41 @@
+ ; The inbound directory is the directory where CrashMail looks for .pkt files
+ ; and bundles to toss.
+
+-INBOUND "c:\\fido\\inbound"
++INBOUND "/var/spool/fido/inbound"
+
+ ; OUTBOUND <directory>
+ ;
+ ; The outbound directory is where CrashMail writes the flow files that tells
+ ; the mailer what files to send.
+
+-OUTBOUND "c:\\fido\\outbound"
++OUTBOUND "/var/spool/fido/outbound"
+
+ ; TEMPDIR <directory>
+ ;
+ ; This is the directory where CrashMail unpacks incoming bundles.
+ ;
+
+-TEMPDIR "c:\\fido\\temp"
++TEMPDIR "/var/spool/fido/temp"
+
+ ; CREATEPKTDIR <directory>
+ ;
+ ; This is the directory where CrashMail stores created .pkt files until they
+ ; are stored in the packet directory.
+
+-CREATEPKTDIR "c:\\fido\\temp"
++CREATEPKTDIR "/var/spool/fido/temp"
+
+ ; PACKETDIR <directory>
+ ;
+ ; This is the directory where CrashMail stores generated bundles.
+
+-PACKETDIR "c:\\fido\\packets"
++PACKETDIR "/var/spool/fido/packets"
+
+ ; STATSFILE <filename>
+ ;
+ ; This is the file where CrashMail stores statistics about areas and nodes.
+ ; You can display the contents of this file with CrashStats.
+
+-STATSFILE "c:\\fido\\crashmail.stats"
++STATSFILE "/var/log/fido/crashmail.stats"
+
+ ; Switches
+ ; ========
+@@ -357,8 +357,8 @@
+ ; the bundle matches the recog string, CrashMail uses that packer. ? can be
+ ; used as a wildcard and you can use $xx to specify a hexadecimal number.
+
+-PACKER "LHA" "c:\\fido\\bin\\lha a %a %f" "c:\\fido\\bin\\lha x %a" "??-lh?-"
+-PACKER "ZIP" "c:\\fido\\bin\\pkzip %a %f" "c:\\fido\\bin\\pkunzip %a" "PK"
++PACKER "LHA" "/usr/local/bin/lha a %a %f" "/usr/local/bin/lha x %a" "??-lh?-"
++PACKER "ZIP" "/usr/local/bin/zip -9j %a %f" "/usr/local/bin/unzip -jCL %a" "PK"
+
+ ; AKA
+ ; ===
+@@ -527,7 +527,7 @@
+ ;
+ ; The file that is sent when a downlink issues a %HELP command.
+
+-AREAFIXHELP "c:\\fido\\AreafixHelp.txt"
++AREAFIXHELP "/usr/local/etc/crashmail/areafix.help"
+
+ ; AREAFIXMAXLINES <max>
+ ;
+@@ -554,7 +554,7 @@
+ ; available for forward-requests. GROUP specifies the group needed to be
+ ; allowed to forward-requests areas in this list.
+
+-AREALIST 2:200/100.0 "c:\\fido\\lists\\R20Desc.lst" GROUP A FORWARD DESC
++AREALIST 2:200/100.0 "/usr/local/etc/crashmail/R20Desc.lst" GROUP A FORWARD DESC
+
+ ; Routing
+ ; =======
+@@ -692,18 +692,18 @@
+ ;
+ ; You must use one of these %-codes or the new path will not be unique.
+
+-NETMAIL "NETMAIL" 2:200/108.7 JAM "c:\\fido\\areas\\NETMAIL"
++NETMAIL "NETMAIL" 2:200/108.7 JAM "/var/spool/fido/msgbase/netmail"
+
+-AREA "BAD" 2:200/108.7 JAM "c:\\fido\\areas\\BAD"
++AREA "BAD" 2:200/108.7 JAM "/var/spool/fido/msgbase/badmail"
+
+-AREA "DEFAULT_A" 2:200/108.7 JAM "c:\\fido\\areas\\%8"
++AREA "DEFAULT_A" 2:200/108.7 JAM "/var/spool/fido/msgbase/%l"
+
+-AREA "R20_INTRESSE" 2:200/108.7 JAM "c:\\fido\\areas\\36124179"
++AREA "R20_INTRESSE" 2:200/108.7 JAM "/var/spool/fido/msgbase/r20_intresse"
+ EXPORT %2:200/100.0
+ DESCRIPTION "Intresseklubben"
+ GROUP A
+
+-AREA "R20_TRASHCAN" 2:200/108.7 JAM "c:\\fido\\areas\\3612417a"
++AREA "R20_TRASHCAN" 2:200/108.7 JAM "/var/spool/fido/msgbase/r20_trashcan"
+ EXPORT %2:200/100.0
+ DESCRIPTION "Soptunnan"
+ GROUP A
Copied: head/news/crashmail/files/patch-src_Makefile (from r363257, head/news/crashmail/files/patch-ab)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/news/crashmail/files/patch-src_Makefile Tue Jul 29 02:18:44 2014 (r363286, copy of r363257, head/news/crashmail/files/patch-ab)
@@ -0,0 +1,33 @@
+diff -ur src/Makefile src/Makefile
+--- src/Makefile Wed May 16 01:39:04 2001
++++ src/Makefile Sun Jun 24 14:01:17 2001
+@@ -10,10 +10,10 @@
+ @echo make cleanos2 ......... Remove object files under OS/2
+
+ linux :
+- make -C cmnllib -f Makefile.linux
+- make -C jamlib -f Makefile.linux
+- make -C oslib_linux
+- make -f Makefile.linux
++ ${MAKE} -C cmnllib -f Makefile.linux
++ ${MAKE} -C jamlib -f Makefile.linux
++ ${MAKE} -C oslib_linux
++ ${MAKE} -f Makefile.linux
+
+ win32 :
+ make -C cmnllib -f Makefile.win32
+@@ -28,10 +28,10 @@
+ make -f Makefile.os2
+
+ cleanlinux :
+- make -C cmnllib -f Makefile.linux clean
+- make -C jamlib -f Makefile.linux clean
+- make -C oslib_linux clean
+- make -f Makefile.linux clean
++ ${MAKE} -C cmnllib -f Makefile.linux clean
++ ${MAKE} -C jamlib -f Makefile.linux clean
++ ${MAKE} -C oslib_linux clean
++ ${MAKE} -f Makefile.linux clean
+
+ cleanwin32 :
+ make -C cmnllib -f Makefile.win32 clean
Copied: head/news/crashmail/files/patch-src_jamlib_jam.h (from r363257, head/news/crashmail/files/patch-ae)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/news/crashmail/files/patch-src_jamlib_jam.h Tue Jul 29 02:18:44 2014 (r363286, copy of r363257, head/news/crashmail/files/patch-ae)
@@ -0,0 +1,21 @@
+--- src/jamlib/jam.h.orig Mon Sep 18 02:22:08 2000
++++ src/jamlib/jam.h Tue Jan 21 18:01:07 2003
+@@ -32,13 +32,18 @@
+ #ifndef __JAM_H__
+ #define __JAM_H__
+
++#include <sys/types.h>
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <ctype.h>
+
+ #ifndef linux
++#if defined(__FreeBSD__)
++typedef u_long ulong; /* must be 32 bits wide */
++#else
+ typedef unsigned short ushort; /* must be 16 bits wide */
+ typedef unsigned long ulong; /* must be 32 bits wide */
++#endif
+ #endif
+
+ typedef unsigned char uchar; /* must be 8 bits wide */
Copied: head/news/crashmail/files/patch-src_oslib_linux_os_linux.h (from r363257, head/news/crashmail/files/patch-ad)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/news/crashmail/files/patch-src_oslib_linux_os_linux.h Tue Jul 29 02:18:44 2014 (r363286, copy of r363257, head/news/crashmail/files/patch-ad)
@@ -0,0 +1,12 @@
+diff -ur src/oslib_linux/os_linux.h src/oslib_linux/os_linux.h
+--- src/oslib_linux/os_linux.h Wed May 16 01:39:05 2001
++++ src/oslib_linux/os_linux.h Sun Jun 24 17:23:29 2001
+@@ -5,7 +5,7 @@
+ #define OS_EXIT_ERROR 10
+ #define OS_EXIT_OK 0
+
+-#define OS_PLATFORM_NAME "Linux"
++#define OS_PLATFORM_NAME "FreeBSD"
+ #define OS_PATH_CHARS "/"
+ #define OS_CURRENT_DIR "."
+
Copied: head/news/crashmail/files/patch-src_shared_types.h (from r363257, head/news/crashmail/files/patch-ac)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/news/crashmail/files/patch-src_shared_types.h Tue Jul 29 02:18:44 2014 (r363286, copy of r363257, head/news/crashmail/files/patch-ac)
@@ -0,0 +1,16 @@
+--- src/shared/types.h.orig Wed May 16 00:39:05 2001
++++ src/shared/types.h Tue Jan 21 17:59:12 2003
+@@ -2,8 +2,12 @@
+ #define SHARED_TYPES_H
+
+ #ifdef PLATFORM_LINUX
+-#define NO_TYPEDEF_ULONG
+ #define NO_TYPEDEF_USHORT
++#if defined(__FreeBSD__)
++#include <sys/types.h>
++#else
++#define NO_TYPEDEF_ULONG
++#endif
+ #endif
+
+ #ifndef NO_TYPEDEF_ULONG
Copied: head/news/gup/files/patch-Makefile (from r363257, head/news/gup/files/patch-aa)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/news/gup/files/patch-Makefile Tue Jul 29 02:18:44 2014 (r363286, copy of r363257, head/news/gup/files/patch-aa)
@@ -0,0 +1,36 @@
+--- Makefile.orig Sun Nov 22 13:15:39 1998
++++ Makefile Sun Nov 22 13:18:46 1998
+@@ -8,7 +8,7 @@
+ # a working version for your system, please mail a copy back to the
+ # author so that others may benefit from your effort.
+
+-CONFIG = vanilla
++CONFIG = freebsd
+
+ # Destination directories for the executable and man page. Note that
+ # the executable is only used in a .forward so /usr/local/bin may
+@@ -28,20 +28,20 @@
+
+ # ACTIVE_PATH is the full pathname for your news active file. This
+ # file is used to validate newgroup names.
+-ACTIVE_PATH =
++ACTIVE_PATH = /var/db/news/active
+
+
+ # NEWSGROUPS_PATH is the fill pathname for your newsgroups file. This
+ # file is used to provide descriptions for each newsgroup.
+-NEWSGROUPS_PATH =
++NEWSGROUPS_PATH = /var/db/news/newsgroups
+
+ # BACKSTOP_MAILID is used if gup cannot find a FROM: or a REPLY-TO: or
+ # a valid site command, this is where the mail goes to.
+-BACKSTOP_MAILID = news
++BACKSTOP_MAILID = usenet
+
+ # MAIL_COMMAND is the mailer that accepts a mail with rfc822 headers and
+ # body from stdin.
+-MAIL_COMMAND = "/usr/lib/sendmail -t"
++MAIL_COMMAND = "/usr/sbin/sendmail -oi -t"
+
+ # With a command like "include alt.*" the resultant list is, long.
+ # LOG_MATCH_LIMIT, defines the upper bound on the number of pattern
Copied: head/news/gup/files/patch-gup.c (from r363257, head/news/gup/files/patch-ad)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/news/gup/files/patch-gup.c Tue Jul 29 02:18:44 2014 (r363286, copy of r363257, head/news/gup/files/patch-ad)
@@ -0,0 +1,20 @@
+--- gup.c.orig Sun Oct 20 16:55:33 2002
++++ gup.c Sun Oct 20 16:55:50 2002
+@@ -37,7 +37,7 @@
+
+
+ char *progname = "gup"; /* GC */
+-FILE *log_fp = stderr;
++FILE *log_fp;
+
+ static char *usage =
+ "\n\
+@@ -165,6 +165,8 @@
+
+ int changed;
+
++ log_fp = stderr;
++
+ umask(UMASK);
+
+ parse_options(argc, argv); /* Decode our command line options */
Copied: head/news/gup/files/patch-main.mk (from r363257, head/news/gup/files/patch-ac)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/news/gup/files/patch-main.mk Tue Jul 29 02:18:44 2014 (r363286, copy of r363257, head/news/gup/files/patch-ac)
@@ -0,0 +1,11 @@
+--- main.mk.orig Mon Jun 7 23:37:43 1999
++++ main.mk Mon Jun 7 23:38:19 1999
+@@ -17,7 +17,7 @@
+ -DBACKSTOP_MAILID='"$(BACKSTOP_MAILID)"' \
+ -DLOG_MATCH_LIMIT=$(LOG_MATCH_LIMIT) -DUMASK=$(UMASK)
+
+-CFLAGS = $(P_CFLAGS) $(P_NO_FLAGS) $(P_USE_FLAGS) $(P_INCLUDES) \
++CFLAGS += $(P_CFLAGS) $(P_NO_FLAGS) $(P_USE_FLAGS) $(P_INCLUDES) \
+ $(DEFS) -DMAIL_COMMAND='"$(MAIL_COMMAND)"'
+
+ LDFLAGS = $(P_LDFLAGS) $(P_LIBS)
Copied: head/news/gup/files/patch-rfc822.h (from r363257, head/news/gup/files/patch-ab)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/news/gup/files/patch-rfc822.h Tue Jul 29 02:18:44 2014 (r363286, copy of r363257, head/news/gup/files/patch-ab)
@@ -0,0 +1,17 @@
+--- rfc822.h.orig Sun Oct 20 16:57:18 2002
++++ rfc822.h Sun Oct 20 16:57:33 2002
+@@ -243,12 +243,14 @@
+ extern char *strerror();
+
+ /* Variables and routines that Unix(tm) provides. */
++#ifndef __FreeBSD__
+ extern int errno;
+ extern int sys_nerr;
+ extern int optind;
+ extern char *sys_errlist[];
+ extern char **environ;
+ extern char *optarg;
++#endif
+
+ #ifdef HAVE_UNISTD
+ #include <unistd.h>
Copied: head/news/knews/files/patch-configure.h (from r363257, head/news/knews/files/patch-aa)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/news/knews/files/patch-configure.h Tue Jul 29 02:18:44 2014 (r363286, copy of r363257, head/news/knews/files/patch-aa)
@@ -0,0 +1,33 @@
+--- configure.h.orig Tue Dec 29 11:47:02 1998
++++ configure.h Sun Apr 16 18:48:00 2000
+@@ -14,7 +14,7 @@
+ *
+ * If you don't have sendmail, use /bin/false :-).
+ */
+-/* #define MAIL_COMMAND "/usr/sbin/sendmail -t" */
++#define MAIL_COMMAND "/usr/sbin/sendmail -t"
+ /* #define MAIL_COMMAND "/usr/lib/sendmail -t" */
+
+
+@@ -84,9 +84,9 @@
+ * libcompface.
+ */
+
+-#define HAVE_JPEG 0
+-#define HAVE_PNG 0
+-#define HAVE_COMPFACE 0
++#define HAVE_JPEG 1
++#define HAVE_PNG 1
++#define HAVE_COMPFACE 1
+
+
+
+@@ -138,7 +138,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
Copied: head/news/knews/files/patch-knews.tmpl (from r363257, head/news/knews/files/patch-ac)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/news/knews/files/patch-knews.tmpl Tue Jul 29 02:18:44 2014 (r363286, copy of r363257, head/news/knews/files/patch-ac)
@@ -0,0 +1,17 @@
+--- knews.tmpl.orig Tue Dec 29 12:14:55 1998
++++ knews.tmpl Thu Jan 7 21:30:06 1999
+@@ -74,7 +74,7 @@
+ * be changed to -lgz.
+ */
+
+-JPEG_LIB = -ljpeg
++JPEG_LIB = -L!!LOCALBASE!!/lib -ljpeg
+ PNG_LIB = -lpng -lz -lm
+ COMPFACE_LIB = -lcompface
+
+@@ -83,4 +83,4 @@
+ * 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
Copied: head/news/knews/files/patch-src_Knews.ad (from r363257, head/news/knews/files/patch-ab)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/news/knews/files/patch-src_Knews.ad Tue Jul 29 02:18:44 2014 (r363286, copy of r363257, head/news/knews/files/patch-ab)
@@ -0,0 +1,37 @@
+--- src/Knews.ad.orig Fri Jan 9 18:16:22 1998
++++ src/Knews.ad Sat Mar 14 16:59:53 1998
+@@ -35,6 +35,7 @@
+ !Knews.editCommand: xterm -e $EDITOR +%i %s
+ !Knews.editCommand: xemacs +%i %s
+ !Knews.editCommand: xterm -e vi +%i %s
++!Knews.editCommand: xterm -fn 10x20 -cr red -bg grey90 -e vi +%i %s
+ !
+ ! You might need a few stty settings for vi:
+ !
+@@ -45,12 +46,13 @@
+ ! measure, knews will not allow quotes, parentheses, white space
+ ! or ampersands in the url.
+ !
+-!Knews.urlCommand: netscape -remote 'openUrl(%s)'
++Knews.urlCommand: netscape -remote 'openUrl(%s)'
+
+
+ ! Command for printing.
+ !
+-Knews.printCommand: /bin/false
++!Knews.printCommand: /usr/bin/lpr
++Knews.printCommand: newsp | /usr/bin/lpr
+
+
+ ! Whether knews should generate a Path header.
+@@ -224,8 +226,8 @@
+ ! Some people want double clicking on a subject to go directly into thread
+ ! mode. This will do it.
+ !
+-!*threadlist.translations: #override \
+-! <Btn1Down>(2): notify() view-thread(true)
++*threadlist.translations: #override \
++ <Btn1Down>(2): notify() view-thread(true)
+
+
+ ! The initial directory of the filechooser. Make sure it exists
Modified: head/news/newsfetch/Makefile
==============================================================================
--- head/news/newsfetch/Makefile Tue Jul 29 01:59:16 2014 (r363285)
+++ head/news/newsfetch/Makefile Tue Jul 29 02:18:44 2014 (r363286)
@@ -19,10 +19,10 @@ PLIST_FILES= bin/newsfetch \
man/man1/newsfetch.1.gz
do-configure:
- cd ${WRKSRC} && ( \
- ${ECHO_CMD} "PROG= newsfetch"; \
- ${ECHO_CMD} "SRCS=" *.c; \
- ${ECHO_CMD} ".include <bsd.prog.mk>"; \
- ) > Makefile
+ (cd ${WRKSRC} && ( \
+ ${ECHO_CMD} "PROG= newsfetch"; \
+ ${ECHO_CMD} "SRCS=" *.c; \
+ ${ECHO_CMD} ".include <bsd.prog.mk>"; \
+ ) > Makefile)
.include <bsd.port.mk>
Copied: head/news/newsfetch/files/patch-newsfetch.1 (from r363257, head/news/newsfetch/files/patch-ac)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/news/newsfetch/files/patch-newsfetch.1 Tue Jul 29 02:18:44 2014 (r363286, copy of r363257, head/news/newsfetch/files/patch-ac)
@@ -0,0 +1,11 @@
+--- newsfetch.1.orig Tue Apr 14 20:04:25 1998
++++ newsfetch.1 Fri Jan 26 23:41:22 2001
+@@ -5,7 +5,7 @@
+ .SH SYNOPSIS
+ .B newsfetch
+ .BI
+-hostname
++hostname[:port]
+ [
+ .BI \-clsyvV
+ ]
Copied: head/news/newsfetch/files/patch-newsfetch.c (from r363257, head/news/newsfetch/files/patch-ab)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/news/newsfetch/files/patch-newsfetch.c Tue Jul 29 02:18:44 2014 (r363286, copy of r363257, head/news/newsfetch/files/patch-ab)
@@ -0,0 +1,44 @@
+--- newsfetch.c.orig Thu Jul 23 18:28:56 1998
++++ newsfetch.c Fri Jan 26 23:41:22 2001
+@@ -7,6 +7,7 @@
+
+
+ #include <stdio.h>
++#include <string.h>
+ #include <signal.h>
+ #include <pwd.h>
+ #include <sys/types.h>
+@@ -28,6 +29,7 @@
+ int wait_after_articles = 0, articles_fetched=0, last_than_current;
+ int wait_for_time = 0, timeout=READ_TIMEOUT, article_fetching=0;
+ int cleanup=1, max_article, news_target=0, first_article, only_list=0;
++int port = 119;
+ char group[100], pipe_command[100];
+ FILE *rcfp, *rctmpfp, *socket_fp[2];
+ char lockfile[100];
+@@ -59,6 +61,16 @@
+ getHomedir(homedir);
+ strcpy(hostname,argv[1]);
+
++ {
++ char *p;
++ int n;
++
++ if (NULL != (p = strchr(hostname, ':')) && 0 < (n = atoi(p + 1))) {
++ port = n;
++ *p = '\0';
++ }
++ }
++
+ get_commandline(argc, argv, dirname, rcfile,
+ &cleanup, &wait_after_articles, &wait_for_time,
+ &command_flag, execute_command,
+@@ -75,7 +87,7 @@
+ generateProcmailrc(homedir, rcfile, dirname, pipe_command);
+ }
+
+- socket_id=ConnectServer(hostname,119, 0);
++ socket_id=ConnectServer(hostname, port, 0);
+
+ /* two file descriptor are for portability among diff systems */
+ createFd(socket_id, socket_fp);
Modified: head/news/nn/Makefile
==============================================================================
--- head/news/nn/Makefile Tue Jul 29 01:59:16 2014 (r363285)
+++ head/news/nn/Makefile Tue Jul 29 02:18:44 2014 (r363286)
@@ -7,11 +7,11 @@ PORTREVISION= 1
CATEGORIES= news
MASTER_SITES= http://www.sourcefiles.org/Internet/News/Usenet_Clients/ \
http://www.wa.apana.org.au/~dean/sources/
-EXTRACT_SUFX= .tar.Z
MAINTAINER= johans at FreeBSD.org
COMMENT= Newsreader
+USES= tar:Z
MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS} -Iconf" LDFLAGS="${LDFLAGS} -s"
pre-patch:
Copied: head/news/nn/files/patch-Makefile (from r363257, head/news/nn/files/patch-ag)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/news/nn/files/patch-Makefile Tue Jul 29 02:18:44 2014 (r363286, copy of r363257, head/news/nn/files/patch-ag)
@@ -0,0 +1,9 @@
+--- Makefile.orig Sun Aug 20 08:48:36 2006
++++ Makefile Sun Aug 20 08:48:42 2006
+@@ -96,3 +96,6 @@
+
+ man/nn.1.D: man/nn.1
+ sh SPLITNN1
++
++install:
++ ./inst n
Copied: head/news/nn/files/patch-config.h.unparsed (from r363257, head/news/nn/files/patch-ae)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/news/nn/files/patch-config.h.unparsed Tue Jul 29 02:18:44 2014 (r363286, copy of r363257, head/news/nn/files/patch-ae)
@@ -0,0 +1,102 @@
+--- config.h.unparsed.orig Sat Sep 3 13:59:25 2005
++++ config.h.unparsed Sat Sep 3 14:02:25 2005
+@@ -45,10 +45,10 @@
+ #define DO_NOV_DIGEST
+
+ /* Optional */
+-/* #define NOV_DIRECTORY "/usr/spool/news" */
++#define NOV_DIRECTORY "/var/news/over.view"
+
+ /* Optional */
+-/* #define NOV_FILENAME ".overview" */
++#define NOV_FILENAME ".overview"
+
+
+ /********************************** NNTP *********************************
+@@ -68,7 +68,9 @@
+ * LIB_DIRECTORY defined below.
+ */
+
+-#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 DOMAIN_FILE NNTP_DOMAIN
+
+ /*
+ * Define your local domain name. If you leave this undefined, nn will
+@@ -84,7 +86,7 @@
+ * DOMAIN as defined above). If you don't want this, comment it out.
+ */
+
+-#define HIDDENNET
++/* #define HIDDENNET */
+
+
+ /***************** OPERATING SYSTEM DEPENDENT DEFINITIONS *******************
+@@ -95,7 +97,7 @@
+ * conf/s-template.h as a starting point for writing you own.
+ */
+
+-#include "s-sunos5.h"
++#include "s-freebsd.h"
+
+ /*
+ * Define DEFAULT_PAGER as the initial value of the 'pager' variable.
+@@ -122,7 +124,7 @@
+ * conf/m-template.h as a starting point for writing you own.
+ */
+
+-#include "m-sparc.h"
++#include "m-i80386.h"
+
+
+ /***************************** OWNERSHIP ***************************
+@@ -173,9 +175,9 @@
+ * (= LIB_DIRECTORY/Log if undefined).
+ */
+
+-#define BIN_DIRECTORY "/usr/local/bin"
+-#define LIB_DIRECTORY "/usr/local/lib/nn"
+-
++#define BIN_DIRECTORY "SUB_PREFIX/bin"
++#define LIB_DIRECTORY "SUB_PREFIX/lib/nn"
++#define TMP_DIRECTORY "/var/tmp"
+
+ /*************************** MAIL INTERFACE *************************
+ *
+@@ -189,7 +191,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 */
+
+ /*
+ * nn needs to know the name of your host.
+@@ -237,13 +239,13 @@
+ * DAEMON_MAN - nnmaster
+ */
+
+-#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/local/man/man1"
++#define SYS_MAN_DIR "SUB_MANPREFIX/man/man1"
+ #define SYS_MAN_SECTION "1m"
+
+-#define DAEMON_MAN_DIR "/usr/local/man/man8"
++#define DAEMON_MAN_DIR "SUB_MANPREFIX/man/man8"
+ #define DAEMON_MAN_SECTION "8"
+
+
+@@ -425,7 +427,7 @@
+ * 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 "SUB_PREFIX/news/lib"
+
+ /************************ CONFIGURATION COMPLETED ************************/
Copied: head/news/nn/files/patch-inst.sh (from r363257, head/news/nn/files/patch-ac)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/news/nn/files/patch-inst.sh Tue Jul 29 02:18:44 2014 (r363286, copy of r363257, head/news/nn/files/patch-ac)
@@ -0,0 +1,24 @@
+--- inst.sh.orig Thu Dec 6 19:52:24 2001
++++ inst.sh Thu Dec 6 19:53:23 2001
+@@ -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)
+@@ -83,8 +83,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
+
Copied: head/news/nn/files/patch-nntp.c (from r363257, head/news/nn/files/patch-an)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/news/nn/files/patch-nntp.c Tue Jul 29 02:18:44 2014 (r363286, copy of r363257, head/news/nn/files/patch-an)
@@ -0,0 +1,86 @@
+--- nntp.c.orig Tue Apr 19 16:06:51 2005
++++ nntp.c Sat Jul 7 00:30:15 2007
+@@ -76,6 +76,7 @@
+ static int connect_server(void);
+ static void debug_msg(char *prefix, char *str);
+ static void find_server(void);
++static char *find_domain(const char *domainFile);
+ static int get_server_line(char *string, int size);
+ static int get_server(char *string, int size);
+ static int get_socket(void);
+@@ -233,6 +234,50 @@
+ sys_error("Failed to find name of NNTP server!");
+ }
+
++
++/*
++ * find_domain 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.
++ */
++
++static char *
++find_domain(const char *domainFile)
++{
++ register FILE *fp;
++ register char *cp;
++ static char buf[MAXHOSTNAMELEN];
++ char *index();
++
++ if (domainFile == NULL)
++ return (NULL);
++
++ fp = fopen(domainFile, "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);
++}
++
++
+ /*
+ * get_server_line: get a line from the server.
+ *
+@@ -848,6 +893,16 @@
+
+ #else /* DOMAIN */
+
++ /*
++ * if domain is defined in DOMAIN_FILE, use it
++ */
++ cp = find_domain(DOMAIN_FILE);
++ if (cp) {
++ strncpy(domain, cp, MAXHOSTNAMELEN);
++ domain[MAXHOSTNAMELEN-1] = 0; /* ensure nul-terminated */
++ return;
++ }
++
+ domain[0] = '\0';
+
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-ports-all
mailing list