Index: head/news/fidogate/Makefile =================================================================== --- head/news/fidogate/Makefile (revision 432990) +++ head/news/fidogate/Makefile (revision 432991) @@ -1,73 +1,75 @@ # $FreeBSD$ PORTNAME= fidogate PORTVERSION= 4.4.10 +PORTREVISION= 1 CATEGORIES= news mail MASTER_SITES= SF \ ftp://ftp.fu-berlin.de/unix/news/fidogate/ MAINTAINER= dinoex@FreeBSD.org COMMENT= Fido-Internet Gateway and Tosser +LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING + MAKE_JOBS_UNSAFE= yes USES= gmake perl5 +MAKE_ARGS= OWNER=${UID} GROUP=$$(id -g) +PLIST_SUB= FIDOGATE_USER=${FIDOGATE_RUNAS} FIXDEST= . doc doc/gatebau doc/html scripts/areas \ scripts/maintenance scripts/misc scripts/nodelist \ scripts/outbound scripts/run scripts/www src/areafix \ src/charset src/ffx src/gate src/tick src/toss src/util DOCLIST= fidogate.texi fidogate.txt gatebau94.txt kludge-rfc.doc \ msgid.doc qmail.txt texinfo.tex dirs.html index.html \ template.html fido howto misc rfc gatebau/msgid.sgml \ gatebau/msgid.tex gatebau/msgid.txt OPTIONS_DEFINE= DOCS EXAMPLES -GID!= id -g -MAKE_ARGS= OWNER=${UID} GROUP=${GID} +FIDOGATE_RUNAS?= news + .include post-patch: ${REINPLACE_CMD} -e 's| .(PREFIX)| $$(DESTDIR)$$(PREFIX)|g' \ ${FIXDEST:S,$,/Makefile,S,^,${WRKSRC}/,} pre-configure: ${TOUCH} ${WRKSRC}/doc/fidogate.info ${RM} ${WRKSRC}/doc/fidogate.info-? ${RM} ${WRKSRC}/doc/fidogate.txt ${REINPLACE_CMD} -e "s|[.]info-|.info|" ${WRKSRC}/doc/Makefile ${REINPLACE_CMD} -e "s|.{PREFIX}|${PREFIX}|g" \ -e "s|.{LOCALBASE}|${LOCALBASE}|g" \ -e "s|^CC|#CC|" ${WRKSRC}/config.make -.if defined(FIDOGATE_RUNAS) - ${REINPLACE_CMD} -e "s|OWNER.*= news|OWNER = ${FIDOGATE_RUNAS}|" \ - ${WRKSRC}/config.make -.endif .if !${PORT_OPTIONS:MDOCS} ${REINPLACE_CMD} -e "s|test doc|test|" \ -e "s|cp ANNOUNCE|#cp ANNOUNCE|" \ ${WRKSRC}/Makefile ${REINPLACE_CMD} -e "s|run www|run|" ${WRKSRC}/scripts/Makefile .endif pre-install: ${MKDIR} ${STAGEDIR}${PREFIX}/libexec/fidogate -.if ${PORT_OPTIONS:MDOCS} + +pre-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR}/html \ ${STAGEDIR}${DOCSDIR}/info \ ${STAGEDIR}${DOCSDIR}/fido \ ${STAGEDIR}${DOCSDIR}/howto \ ${STAGEDIR}${DOCSDIR}/misc \ ${STAGEDIR}${DOCSDIR}/gatebau -.endif post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} ${TAR} -C ${WRKSRC}/doc -cf - ${DOCLIST} | ${TAR} -C ${STAGEDIR}${DOCSDIR} -xf - post-install-EXAMPLES-on: ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${TAR} -C ${WRKSRC}/examples -cf - . | ${TAR} -C ${STAGEDIR}${EXAMPLESDIR} -xf - .include Index: head/news/fidogate/files/patch-Makefile =================================================================== --- head/news/fidogate/files/patch-Makefile (revision 432990) +++ head/news/fidogate/files/patch-Makefile (revision 432991) @@ -1,11 +1,11 @@ ---- Makefile.orig Sun Oct 17 13:49:26 1999 -+++ Makefile Fri Jan 21 18:04:46 2000 -@@ -9,7 +9,7 @@ +--- Makefile.orig 2003-06-08 21:01:25 UTC ++++ Makefile +@@ -9,7 +9,7 @@ TOPDIR = . include $(TOPDIR)/config.make include $(TOPDIR)/rules.make -SUBDIRS = src scripts test doc sendmail +SUBDIRS = src scripts test doc INSTALLDIRS = $(DEFAULT_V_CONFIGDIR) \ $(DEFAULT_V_LIBDIR) \ Index: head/news/fidogate/files/patch-config.make =================================================================== --- head/news/fidogate/files/patch-config.make (revision 432990) +++ head/news/fidogate/files/patch-config.make (revision 432991) @@ -1,52 +1,52 @@ ---- config.make.orig 2003-04-15 20:45:20.000000000 +0200 -+++ config.make 2009-07-05 06:31:34.000000000 +0200 +--- config.make.orig 2003-04-15 18:45:20 UTC ++++ config.make @@ -57,13 +57,13 @@ # variable parameters, can be changed at run-time, DO NOT DELETE ANYTHING!!! DEFAULT_V_CONFIGDIR = /etc/fidogate -DEFAULT_V_LIBDIR = /usr/lib/fidogate -DEFAULT_V_BINDIR = $(DEFAULT_V_LIBDIR)/bin -DEFAULT_V_LOGDIR = /var/log/fidogate +DEFAULT_V_LIBDIR = ${PREFIX}/libexec/fidogate +DEFAULT_V_BINDIR = ${PREFIX}/libexec/fidogate +DEFAULT_V_LOGDIR = /var/spool/fidogate/log DEFAULT_V_VARDIR = /var/lib/fidogate -DEFAULT_V_LOCKDIR = /var/lock/fidogate +DEFAULT_V_LOCKDIR = /var/spool/fidogate/lock DEFAULT_V_SPOOLDIR = /var/spool/fidogate -DEFAULT_V_BTBASEDIR = /var/spool/bt +DEFAULT_V_BTBASEDIR = /var/spool/fidogate/bt DEFAULT_V_INBOUND = $(DEFAULT_V_BTBASEDIR)/in DEFAULT_V_PINBOUND = $(DEFAULT_V_BTBASEDIR)/pin DEFAULT_V_UUINBOUND = $(DEFAULT_V_BTBASEDIR)/uuin -@@ -87,7 +87,7 @@ +@@ -87,7 +87,7 @@ DEFAULT_F_NEWSETCDIR = /etc/news DEFAULT_F_NEWSVARDIR = /var/lib/news # INN 1.7 #DEFAULT_F_NEWSLIBDIR = /usr/lib/news -#DEFAULT_F_NEWSSPOOLDIR = /var/spool/news +#DEFAULT_F_NEWSSPOOLDIR = /var/spool/news/articles # INN 2.2 #DEFAULT_F_NEWSLIBDIR = /usr/lib #DEFAULT_F_NEWSSPOOLDIR = /var/spool/news/articles -@@ -149,7 +149,7 @@ +@@ -149,7 +149,7 @@ DEFAULT_A_UUINBOUND = %U # The perl interpreter used by subst.pl -PERL = /usr/bin/perl +PERL = ${LOCALBASE}/bin/perl # Directory with sendmail m4 configuration files # RedHat 6.x -@@ -158,9 +158,9 @@ +@@ -158,9 +158,9 @@ PERL = /usr/bin/perl SENDMAIL_CF_DIR = /usr/share/sendmail-cf # Directories for installing documentation, not used by subst.pl -INFODIR = /usr/info -HTMLDIR = /html/fidogate -HTMLLOGDIR = /html/log +INFODIR = ${PREFIX}/share/doc/fidogate/info +HTMLDIR = ${PREFIX}/share/doc/fidogate/html +HTMLLOGDIR = ${PREFIX}/share/doc/fidogate/html # RedHat RPM related dirs RPMBASEDIR = /usr/src/redhat Index: head/news/fidogate/files/patch-dbz.c =================================================================== --- head/news/fidogate/files/patch-dbz.c (revision 432990) +++ head/news/fidogate/files/patch-dbz.c (revision 432991) @@ -1,13 +1,13 @@ ---- src/toss/dbz.c.orig Wed Oct 18 23:53:57 2000 -+++ src/toss/dbz.c Mon Jul 22 19:52:59 2002 -@@ -300,8 +300,10 @@ +--- src/toss/dbz.c.orig 2000-10-18 21:53:57 UTC ++++ src/toss/dbz.c +@@ -300,8 +300,10 @@ static int debug; /* controlled by dbz #endif /* externals used */ +#ifndef __FreeBSD__ extern char *malloc(); extern char *calloc(); +#endif extern void free(); /* ANSI C; some old implementations say int */ extern int atoi(); extern long atol(); Index: head/news/fidogate/files/patch-log.c =================================================================== --- head/news/fidogate/files/patch-log.c (revision 432990) +++ head/news/fidogate/files/patch-log.c (revision 432991) @@ -1,12 +1,12 @@ ---- src/common/log.c.orig Sun Feb 16 16:38:56 2003 -+++ src/common/log.c Sat Aug 21 11:10:09 2004 -@@ -69,8 +69,8 @@ +--- src/common/log.c.orig 2004-08-26 20:56:20 UTC ++++ src/common/log.c +@@ -69,8 +69,8 @@ static int must_openlog = TRUE; char *strerror(int errnum) { #ifndef OS2 - extern int sys_nerr; # ifndef __FreeBSD__ + extern int sys_nerr; extern char *sys_errlist[]; # endif #endif Index: head/news/fidogate/files/patch-rfc2ftn.c =================================================================== --- head/news/fidogate/files/patch-rfc2ftn.c (revision 432990) +++ head/news/fidogate/files/patch-rfc2ftn.c (revision 432991) @@ -1,11 +1,11 @@ ---- src/gate/rfc2ftn.c.orig Sun Aug 22 22:19:12 2004 -+++ src/gate/rfc2ftn.c Sat Oct 7 21:06:14 2006 -@@ -99,7 +99,7 @@ +--- src/gate/rfc2ftn.c.orig 2004-08-22 20:19:12 UTC ++++ src/gate/rfc2ftn.c +@@ -99,7 +99,7 @@ void usage (void); static char *o_flag = NULL; /* -o --out-packet-file */ static char *w_flag = NULL; /* -w --write-outbound */ static int W_flag = FALSE; /* -W --write-crash */ -static int i_flag = FALSE; /* -i --ignore-hosts */ +int i_flag = FALSE; /* -i --ignore-hosts */ static int maxmsg = 0; /* Process maxmsg messages */ Index: head/news/fidogate/pkg-plist =================================================================== --- head/news/fidogate/pkg-plist (revision 432990) +++ head/news/fidogate/pkg-plist (revision 432991) @@ -1,202 +1,202 @@ libexec/fidogate/areafix.help libexec/fidogate/areasbbssync libexec/fidogate/charset.bin libexec/fidogate/charset.map -libexec/fidogate/ffx +@(%%FIDOGATE_USER%%,news,4755) libexec/fidogate/ffx libexec/fidogate/ffxmail libexec/fidogate/ffxnews libexec/fidogate/ffxqt libexec/fidogate/ffxrmail libexec/fidogate/ftn2ftn libexec/fidogate/ftn2rfc libexec/fidogate/ftnaf -libexec/fidogate/ftnafmail +@(%%FIDOGATE_USER%%,news,4755) libexec/fidogate/ftnafmail libexec/fidogate/ftnafpkt libexec/fidogate/ftnafutil libexec/fidogate/ftnbsy libexec/fidogate/ftnconfig libexec/fidogate/ftnexpire libexec/fidogate/ftnfattach libexec/fidogate/ftnflo libexec/fidogate/ftnhatch libexec/fidogate/ftnin libexec/fidogate/ftninpost libexec/fidogate/ftninrecomb libexec/fidogate/ftnlock libexec/fidogate/ftnlog -libexec/fidogate/ftnmail +@(%%FIDOGATE_USER%%,news,4755) libexec/fidogate/ftnmail libexec/fidogate/ftnoutpkt libexec/fidogate/ftnpack libexec/fidogate/ftnroute libexec/fidogate/ftnseq libexec/fidogate/ftntick libexec/fidogate/ftntickpost libexec/fidogate/ftntoss libexec/fidogate/latest libexec/fidogate/logcheck libexec/fidogate/logdaily libexec/fidogate/logreport libexec/fidogate/logsendmail libexec/fidogate/logsendmail2 libexec/fidogate/logstat libexec/fidogate/nl-autoupd libexec/fidogate/nl-check libexec/fidogate/nl-del libexec/fidogate/nl-diff libexec/fidogate/out-freq libexec/fidogate/out-ls libexec/fidogate/out-manip libexec/fidogate/out-rm0 libexec/fidogate/out-rmbsy libexec/fidogate/outb libexec/fidogate/outb-kill libexec/fidogate/pktdebug libexec/fidogate/pktmore libexec/fidogate/rfc2ftn libexec/fidogate/runafutil libexec/fidogate/runchklock libexec/fidogate/runffx libexec/fidogate/rungate libexec/fidogate/runin libexec/fidogate/runmail libexec/fidogate/runnews libexec/fidogate/runout libexec/fidogate/runpoll libexec/fidogate/runpoll-binkd libexec/fidogate/runpoll-orodruin libexec/fidogate/runtoss libexec/fidogate/rununpack libexec/fidogate/send-ffx libexec/fidogate/send-fidogate libexec/fidogate/sumcrc %%PORTDOCS%%%%DOCSDIR%%/dirs.html %%PORTDOCS%%%%DOCSDIR%%/fido/fsc-0018.txt %%PORTDOCS%%%%DOCSDIR%%/fido/fsc-0028.txt %%PORTDOCS%%%%DOCSDIR%%/fido/fsc-0035.txt %%PORTDOCS%%%%DOCSDIR%%/fido/fsc-0039.004 %%PORTDOCS%%%%DOCSDIR%%/fido/fsc-0043.002 %%PORTDOCS%%%%DOCSDIR%%/fido/fsc-0047.001 %%PORTDOCS%%%%DOCSDIR%%/fido/fsc-0048.002 %%PORTDOCS%%%%DOCSDIR%%/fido/fsc-0054.txt %%PORTDOCS%%%%DOCSDIR%%/fido/fsc-0057.002 %%PORTDOCS%%%%DOCSDIR%%/fido/fts-0001.015 %%PORTDOCS%%%%DOCSDIR%%/fido/fts-0004.txt %%PORTDOCS%%%%DOCSDIR%%/fido/fts-0009.001 %%PORTDOCS%%%%DOCSDIR%%/fidogate.texi %%PORTDOCS%%%%DOCSDIR%%/fidogate.txt %%PORTDOCS%%%%DOCSDIR%%/gatebau/msgid.sgml %%PORTDOCS%%%%DOCSDIR%%/gatebau/msgid.tex %%PORTDOCS%%%%DOCSDIR%%/gatebau/msgid.txt %%PORTDOCS%%%%DOCSDIR%%/gatebau94.txt %%PORTDOCS%%%%DOCSDIR%%/howto/FidoNode-1.html %%PORTDOCS%%%%DOCSDIR%%/howto/FidoNode-10.html %%PORTDOCS%%%%DOCSDIR%%/howto/FidoNode-11.html %%PORTDOCS%%%%DOCSDIR%%/howto/FidoNode-12.html %%PORTDOCS%%%%DOCSDIR%%/howto/FidoNode-13.html %%PORTDOCS%%%%DOCSDIR%%/howto/FidoNode-2.html %%PORTDOCS%%%%DOCSDIR%%/howto/FidoNode-3.html %%PORTDOCS%%%%DOCSDIR%%/howto/FidoNode-4.html %%PORTDOCS%%%%DOCSDIR%%/howto/FidoNode-5.html %%PORTDOCS%%%%DOCSDIR%%/howto/FidoNode-6.html %%PORTDOCS%%%%DOCSDIR%%/howto/FidoNode-7.html %%PORTDOCS%%%%DOCSDIR%%/howto/FidoNode-8.html %%PORTDOCS%%%%DOCSDIR%%/howto/FidoNode-9.html %%PORTDOCS%%%%DOCSDIR%%/howto/FidoNode.html %%PORTDOCS%%%%DOCSDIR%%/howto/FidoNode.sgml %%PORTDOCS%%%%DOCSDIR%%/howto/Makefile %%PORTDOCS%%%%DOCSDIR%%/html/ANNOUNCE %%PORTDOCS%%%%DOCSDIR%%/html/fidogate_1.html %%PORTDOCS%%%%DOCSDIR%%/html/fidogate_2.html %%PORTDOCS%%%%DOCSDIR%%/html/fidogate_3.html %%PORTDOCS%%%%DOCSDIR%%/html/fidogate_4.html %%PORTDOCS%%%%DOCSDIR%%/html/fidogate_5.html %%PORTDOCS%%%%DOCSDIR%%/html/fidogate_6.html %%PORTDOCS%%%%DOCSDIR%%/html/fidogate_7.html %%PORTDOCS%%%%DOCSDIR%%/html/fidogate_8.html %%PORTDOCS%%%%DOCSDIR%%/html/fidogate_abt.html %%PORTDOCS%%%%DOCSDIR%%/html/fidogate_ovr.html %%PORTDOCS%%%%DOCSDIR%%/html/fidogate_toc.html %%PORTDOCS%%%%DOCSDIR%%/html/gate.cgi %%PORTDOCS%%%%DOCSDIR%%/html/msgid-1.html %%PORTDOCS%%%%DOCSDIR%%/html/msgid-2.html %%PORTDOCS%%%%DOCSDIR%%/html/msgid-3.html %%PORTDOCS%%%%DOCSDIR%%/html/msgid-4.html %%PORTDOCS%%%%DOCSDIR%%/html/msgid-5.html %%PORTDOCS%%%%DOCSDIR%%/html/msgid-6.html %%PORTDOCS%%%%DOCSDIR%%/html/msgid-7.html %%PORTDOCS%%%%DOCSDIR%%/html/msgid.html %%PORTDOCS%%%%DOCSDIR%%/index.html %%PORTDOCS%%%%DOCSDIR%%/info/fidogate.info %%PORTDOCS%%%%DOCSDIR%%/kludge-rfc.doc %%PORTDOCS%%%%DOCSDIR%%/misc/ifmail-and-fidogate.doc %%PORTDOCS%%%%DOCSDIR%%/misc/roland.doc %%PORTDOCS%%%%DOCSDIR%%/misc/smail.doc %%PORTDOCS%%%%DOCSDIR%%/misc/smail2.doc %%PORTDOCS%%%%DOCSDIR%%/misc/smail3.doc %%PORTDOCS%%%%DOCSDIR%%/misc/unpack-script.doc %%PORTDOCS%%%%DOCSDIR%%/msgid.doc %%PORTDOCS%%%%DOCSDIR%%/qmail.txt %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc-index.txt %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc1036.txt %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc1123.txt %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2045.txt %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2046.txt %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2047.txt %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2048.txt %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2049.txt %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc822.txt %%PORTDOCS%%%%DOCSDIR%%/rfc/son-of-1036.html %%PORTDOCS%%%%DOCSDIR%%/template.html %%PORTDOCS%%%%DOCSDIR%%/texinfo.tex %%PORTEXAMPLES%%%%EXAMPLESDIR%%/README %%PORTEXAMPLES%%%%EXAMPLESDIR%%/morannon/aliases %%PORTEXAMPLES%%%%EXAMPLESDIR%%/morannon/areas %%PORTEXAMPLES%%%%EXAMPLESDIR%%/morannon/bounce.down %%PORTEXAMPLES%%%%EXAMPLESDIR%%/morannon/bounce.insecure %%PORTEXAMPLES%%%%EXAMPLESDIR%%/morannon/bounce.noto %%PORTEXAMPLES%%%%EXAMPLESDIR%%/morannon/bounce.restricted %%PORTEXAMPLES%%%%EXAMPLESDIR%%/morannon/fidogate.conf %%PORTEXAMPLES%%%%EXAMPLESDIR%%/morannon/hosts %%PORTEXAMPLES%%%%EXAMPLESDIR%%/morannon/packing %%PORTEXAMPLES%%%%EXAMPLESDIR%%/morannon/passwd %%PORTEXAMPLES%%%%EXAMPLESDIR%%/morannon/routing %%PORTEXAMPLES%%%%EXAMPLESDIR%%/orodruin/README %%PORTEXAMPLES%%%%EXAMPLESDIR%%/orodruin/aliases %%PORTEXAMPLES%%%%EXAMPLESDIR%%/orodruin/areas %%PORTEXAMPLES%%%%EXAMPLESDIR%%/orodruin/areas.bbs %%PORTEXAMPLES%%%%EXAMPLESDIR%%/orodruin/fareas.bbs %%PORTEXAMPLES%%%%EXAMPLESDIR%%/orodruin/fidogate.conf %%PORTEXAMPLES%%%%EXAMPLESDIR%%/orodruin/hosts %%PORTEXAMPLES%%%%EXAMPLESDIR%%/orodruin/packing %%PORTEXAMPLES%%%%EXAMPLESDIR%%/orodruin/passwd %%PORTEXAMPLES%%%%EXAMPLESDIR%%/orodruin/routing %%PORTEXAMPLES%%%%EXAMPLESDIR%%/point/areas %%PORTEXAMPLES%%%%EXAMPLESDIR%%/point/areas.bbs %%PORTEXAMPLES%%%%EXAMPLESDIR%%/point/fidogate.conf %%PORTEXAMPLES%%%%EXAMPLESDIR%%/point/newsfeeds %%PORTEXAMPLES%%%%EXAMPLESDIR%%/point/packing %%PORTEXAMPLES%%%%EXAMPLESDIR%%/point/routing %%PORTEXAMPLES%%%%EXAMPLESDIR%%/rpm/Makefile %%PORTEXAMPLES%%%%EXAMPLESDIR%%/rpm/README %%PORTEXAMPLES%%%%EXAMPLESDIR%%/rpm/aliases %%PORTEXAMPLES%%%%EXAMPLESDIR%%/rpm/areas %%PORTEXAMPLES%%%%EXAMPLESDIR%%/rpm/areas.bbs %%PORTEXAMPLES%%%%EXAMPLESDIR%%/rpm/fareas.bbs %%PORTEXAMPLES%%%%EXAMPLESDIR%%/rpm/fidogate.conf %%PORTEXAMPLES%%%%EXAMPLESDIR%%/rpm/hosts %%PORTEXAMPLES%%%%EXAMPLESDIR%%/rpm/newsfeeds.fidogate %%PORTEXAMPLES%%%%EXAMPLESDIR%%/rpm/packing %%PORTEXAMPLES%%%%EXAMPLESDIR%%/rpm/passwd %%PORTEXAMPLES%%%%EXAMPLESDIR%%/rpm/routing %%PORTEXAMPLES%%%%EXAMPLESDIR%%/win32/README.WIN32 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/win32/aliases %%PORTEXAMPLES%%%%EXAMPLESDIR%%/win32/areas %%PORTEXAMPLES%%%%EXAMPLESDIR%%/win32/areas.bbs %%PORTEXAMPLES%%%%EXAMPLESDIR%%/win32/config.make %%PORTEXAMPLES%%%%EXAMPLESDIR%%/win32/fareas.bbs %%PORTEXAMPLES%%%%EXAMPLESDIR%%/win32/fidogate.conf %%PORTEXAMPLES%%%%EXAMPLESDIR%%/win32/hosts %%PORTEXAMPLES%%%%EXAMPLESDIR%%/win32/packing %%PORTEXAMPLES%%%%EXAMPLESDIR%%/win32/passwd %%PORTEXAMPLES%%%%EXAMPLESDIR%%/win32/routing %%PORTEXAMPLES%%%%EXAMPLESDIR%%/win32/test-win32