summaryrefslogtreecommitdiff
path: root/comms
diff options
context:
space:
mode:
authortv <tv@pkgsrc.org>2002-07-06 20:15:51 +0000
committertv <tv@pkgsrc.org>2002-07-06 20:15:51 +0000
commitca86cc57bbafbdbf12e0140a53add2656203420c (patch)
tree334e94349ca70797973551217e9a5a1140318c1b /comms
parentea6fdba1f25d87d37378138a06bb546e4837d637 (diff)
downloadpkgsrc-ca86cc57bbafbdbf12e0140a53add2656203420c.tar.gz
* Update to 4.4.5. Minor changes; see ChangeLog. Moved to SourceForge.
* Make compile on newer gcc -Wuninitialized. * Use CONF_FILES install method.
Diffstat (limited to 'comms')
-rw-r--r--comms/fidogate/Makefile27
-rw-r--r--comms/fidogate/PLIST5
-rw-r--r--comms/fidogate/distinfo13
-rw-r--r--comms/fidogate/patches/patch-aa19
-rw-r--r--comms/fidogate/patches/patch-ab15
-rw-r--r--comms/fidogate/patches/patch-ai6
-rw-r--r--comms/fidogate/patches/patch-ar13
7 files changed, 64 insertions, 34 deletions
diff --git a/comms/fidogate/Makefile b/comms/fidogate/Makefile
index 4714bf45211..d0c8f4abf47 100644
--- a/comms/fidogate/Makefile
+++ b/comms/fidogate/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.18 2002/03/23 17:47:46 yyamano Exp $
+# $NetBSD: Makefile,v 1.19 2002/07/06 20:15:51 tv Exp $
#
-DISTNAME= fidogate-4.4.4
+DISTNAME= fidogate-4.4.5
CATEGORIES= comms
-MASTER_SITES= ftp://ftp.fido.de/pub/fidogate/
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fidogate/}
MAINTAINER= tv@netbsd.org
-HOMEPAGE= http://www.fido.de/fidogate/
+HOMEPAGE= http://www.fidogate.org/
COMMENT= FidoNet (FTN) <-> Internet mail and news gateway
USE_BUILDLINK_ONLY= yes
@@ -15,13 +15,17 @@ USE_GMAKE= yes
INFO_FILES= fidogate.info
MAKE_ENV= DEBUG="${CFLAGS} -Werror" CC="${CC} ${_STRIPFLAG_CC}"
+EGDIR= ${PREFIX}/share/examples
+CONF_FILES= ${EGDIR}/fidogate/fidogate.conf ${PKG_SYSCONFDIR}/fidogate/fidogate.conf
+
post-extract:
- @${CP} ${WRKSRC}/examples/orodruin/fidogate.conf ${WRKSRC}/
+ @${CP} ${WRKSRC}/examples/orodruin/fidogate.conf \
+ ${WRKSRC}/fidogate.conf.dist
# This ugliness is because config.make is parsed by both make(1) and
# subst.pl, which does only simplistic substitution.
do-configure:
- ${SED} -e 's,@PREFIX@,${PREFIX},g' \
+ ${SED} -e 's,@PREFIX@,${PREFIX},g' -e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},' \
${WRKSRC}/config.make >${WRKSRC}/config.make.new
${MV} -f ${WRKSRC}/config.make.new ${WRKSRC}/config.make
@@ -29,16 +33,16 @@ pre-build:
${RM} -f ${WRKSRC}/doc/fidogate.info*
cd ${WRKSRC}/doc && ${MAKEINFO} --no-split fidogate.texi && \
${TOUCH} fidogate.txt html/fidogate_toc.html
- ${PERL5} ${WRKSRC}/subst.pl -t${WRKSRC} ${WRKSRC}/fidogate.conf \
- >${WRKSRC}/fidogate.conf.dist
+ ${PERL5} ${WRKSRC}/subst.pl -t${WRKSRC} ${WRKSRC}/fidogate.conf.dist \
+ >${WRKSRC}/fidogate.conf
pre-install:
${INSTALL_DATA_DIR} \
- ${PREFIX}/etc/fidogate \
+ ${PKG_SYSCONFDIR}/fidogate \
+ ${EGDIR}/fidogate \
${PREFIX}/lib/fidogate \
${PREFIX}/lib/fidogate/bin \
${PREFIX}/share/doc/fidogate \
- ${PREFIX}/share/examples/fidogate \
${PREFIX}/share/fidogate \
${PREFIX}/share/fidogate/sendmail \
${PREFIX}/share/fidogate/sendmail/mailer
@@ -53,8 +57,9 @@ post-install:
${INSTALL_SCRIPT} ${WRKSRC}/scripts/maintenance/rc.fidogate \
${PREFIX}/etc/rc.d/fidogate
${INSTALL_DATA} ${WRKSRC}/doc/fidogate.txt ${PREFIX}/share/doc/fidogate/
- ${INSTALL_DATA} ${WRKSRC}/fidogate.conf.dist ${PREFIX}/etc/fidogate/
+ ${INSTALL_DATA} ${WRKSRC}/fidogate.conf ${EGDIR}/fidogate/
.include "../../lang/perl5/buildlink.mk"
.include "../../mk/texinfo.mk"
+.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/comms/fidogate/PLIST b/comms/fidogate/PLIST
index 970413eb064..d0bce122b71 100644
--- a/comms/fidogate/PLIST
+++ b/comms/fidogate/PLIST
@@ -1,6 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:03 seb Exp $
-etc/fidogate/fidogate.conf.dist
-@dirrm etc/fidogate
+@comment $NetBSD: PLIST,v 1.3 2002/07/06 20:15:51 tv Exp $
etc/rc.d/fidogate
@unexec ${INSTALL_INFO} --delete %D/info/fidogate.info %D/info/dir
info/fidogate.info
@@ -96,6 +94,7 @@ share/doc/fidogate/msgid-6.html
share/doc/fidogate/msgid-7.html
share/doc/fidogate/msgid.html
@dirrm share/doc/fidogate
+share/examples/fidogate/fidogate.conf
share/examples/fidogate/morannon/aliases
share/examples/fidogate/morannon/areas
share/examples/fidogate/morannon/bounce.down
diff --git a/comms/fidogate/distinfo b/comms/fidogate/distinfo
index c93908efdce..0dcf76ce6cb 100644
--- a/comms/fidogate/distinfo
+++ b/comms/fidogate/distinfo
@@ -1,16 +1,16 @@
-$NetBSD: distinfo,v 1.3 2001/10/31 14:32:30 tv Exp $
+$NetBSD: distinfo,v 1.4 2002/07/06 20:15:51 tv Exp $
-SHA1 (fidogate-4.4.4.tar.gz) = 38e3950e322aa669b51c5328e9f65456570bbcad
-Size (fidogate-4.4.4.tar.gz) = 1169106 bytes
-SHA1 (patch-aa) = 169ef1122c1d2050249c1cc79106f335b714ef8a
-SHA1 (patch-ab) = c453ad1e3955259f01cd0692cf5568d2f3fafacb
+SHA1 (fidogate-4.4.5.tar.gz) = ba69cb041d45f10f732f7d6399deeb5002f7d7ac
+Size (fidogate-4.4.5.tar.gz) = 1171414 bytes
+SHA1 (patch-aa) = 0bc06682bdddd8f7c47063bd22f7d70053c46f1a
+SHA1 (patch-ab) = 27457fff799208f3daf72eabb6a7b0b056faf945
SHA1 (patch-ac) = b93a8656afea504e00692d4a235f117dfb67df68
SHA1 (patch-ad) = 2562aca505a403e9cd5e493fcf84f9c7b15e764f
SHA1 (patch-ae) = e2cf8add74b051111626230257c01793c1c20ca9
SHA1 (patch-af) = 7fbc604c555f210aa49de2ecc1ec13d9835287f0
SHA1 (patch-ag) = 0d7babf2526a4b235bdd20ae1aead7ee4d734dd6
SHA1 (patch-ah) = d75936b400f87c87033b07a5481a004ea21d6ddd
-SHA1 (patch-ai) = 072a854f2db4ce1be46107dc49c211f28172c3d7
+SHA1 (patch-ai) = 7d3c184bc1071a6e70be67707181650468557cc5
SHA1 (patch-aj) = 0f68f94aa285a4d1ae38cfd2d62b10f96ad325a6
SHA1 (patch-ak) = 787c66a5af3220c234c8a9d89606e697eca4cf47
SHA1 (patch-al) = 7fe4d59f45bb865dcfbeef3a1f2d7c4023185eca
@@ -19,3 +19,4 @@ SHA1 (patch-an) = ec8d8faf329f40e06f865aa790e36f1b6cd81fbb
SHA1 (patch-ao) = e23fc61440465d1792fbcc51aeeb1077393c87e9
SHA1 (patch-ap) = 052d155e698fb36b87e4a28a4b1f75f701b7c956
SHA1 (patch-aq) = 23e551d1bf36e031a629d9d9e817d135886191ab
+SHA1 (patch-ar) = 0883b75e210d635f7e9f49c9b2b5d3978645953b
diff --git a/comms/fidogate/patches/patch-aa b/comms/fidogate/patches/patch-aa
index ca7b4190e4e..f058436f16e 100644
--- a/comms/fidogate/patches/patch-aa
+++ b/comms/fidogate/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.4 2001/02/22 03:00:15 tv Exp $
+$NetBSD: patch-aa,v 1.5 2002/07/06 20:15:52 tv Exp $
---- config.make.orig Tue Apr 11 08:02:25 2000
-+++ config.make Wed Feb 21 20:03:27 2001
+--- config.make.orig Mon Aug 20 01:23:53 2001
++++ config.make Sat Jul 6 15:19:41 2002
@@ -56,13 +56,13 @@
#
@@ -13,7 +13,7 @@ $NetBSD: patch-aa,v 1.4 2001/02/22 03:00:15 tv Exp $
-DEFAULT_V_VARDIR = /var/lib/fidogate
-DEFAULT_V_LOCKDIR = /var/lock/fidogate
-DEFAULT_V_SPOOLDIR = /var/spool/fidogate
-+DEFAULT_V_CONFIGDIR = @PREFIX@/etc/fidogate
++DEFAULT_V_CONFIGDIR = @PKG_SYSCONFDIR@/fidogate
+DEFAULT_V_LIBDIR = @PREFIX@/lib/fidogate
+DEFAULT_V_BINDIR = @PREFIX@/lib/fidogate/bin
+DEFAULT_V_LOGDIR = /var/log/fido
@@ -46,7 +46,7 @@ $NetBSD: patch-aa,v 1.4 2001/02/22 03:00:15 tv Exp $
# old-style config
#DEFAULT_F_CONFIG_GATE = %C/gate.conf
-@@ -146,15 +146,15 @@
+@@ -146,18 +146,15 @@
# The perl interpreter used by subst.pl
@@ -54,7 +54,10 @@ $NetBSD: patch-aa,v 1.4 2001/02/22 03:00:15 tv Exp $
+PERL = @PREFIX@/bin/perl
# Directory with sendmail m4 configuration files
--SENDMAIL_CF_DIR = /usr/lib/sendmail-cf
+-# RedHat 6.x
+-#SENDMAIL_CF_DIR = /usr/lib/sendmail-cf
+-# RedHat 7.x
+-SENDMAIL_CF_DIR = /usr/share/sendmail-cf
+SENDMAIL_CF_DIR = /usr/share/sendmail
# Directories for installing documentation, not used by subst.pl
@@ -67,7 +70,7 @@ $NetBSD: patch-aa,v 1.4 2001/02/22 03:00:15 tv Exp $
# RedHat RPM related dirs
RPMBASEDIR = /usr/src/redhat
-@@ -194,20 +194,17 @@
+@@ -197,20 +194,17 @@
# install permissions
PERM_PROG = 755
PERM_DATA = 644
@@ -90,7 +93,7 @@ $NetBSD: patch-aa,v 1.4 2001/02/22 03:00:15 tv Exp $
INCLUDE = -I$(TOPDIR) -I$(TOPDIR)/src/include
-@@ -236,10 +233,10 @@
+@@ -239,10 +233,10 @@
# MSDOS, OS2, WIN32
# EXE = .exe
EXE =
diff --git a/comms/fidogate/patches/patch-ab b/comms/fidogate/patches/patch-ab
index 5ac0e8ccfe4..c6761fa7730 100644
--- a/comms/fidogate/patches/patch-ab
+++ b/comms/fidogate/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.3 2001/02/22 03:00:15 tv Exp $
+$NetBSD: patch-ab,v 1.4 2002/07/06 20:15:52 tv Exp $
---- src/common/getopt.c.orig Wed Feb 21 17:27:48 2001
-+++ src/common/getopt.c Wed Feb 21 17:29:26 2001
+--- src/common/getopt.c.orig Wed Apr 17 14:17:39 1996
++++ src/common/getopt.c Sat Jul 6 15:28:30 2002
@@ -73,6 +73,7 @@
#include <stdlib.h>
#else /* Not GNU C library. */
@@ -10,3 +10,12 @@ $NetBSD: patch-ab,v 1.3 2001/02/22 03:00:15 tv Exp $
#endif /* GNU C library. */
/* If GETOPT_COMPAT is defined, `+' as well as `--' can introduce a
+@@ -444,7 +445,7 @@
+ int exact = 0;
+ int ambig = 0;
+ const struct option *pfound = NULL;
+- int indfound;
++ int indfound = 0;
+
+ while (*s && *s != '=')
+ s++;
diff --git a/comms/fidogate/patches/patch-ai b/comms/fidogate/patches/patch-ai
index 7c5762a7ec6..61118c0b129 100644
--- a/comms/fidogate/patches/patch-ai
+++ b/comms/fidogate/patches/patch-ai
@@ -1,7 +1,7 @@
-$NetBSD: patch-ai,v 1.5 2001/03/09 19:06:19 tv Exp $
+$NetBSD: patch-ai,v 1.6 2002/07/06 20:15:52 tv Exp $
---- fidogate.conf.orig Thu Feb 22 09:58:02 2001
-+++ fidogate.conf Thu Feb 22 09:58:13 2001
+--- fidogate.conf.dist.orig Thu Feb 22 09:58:02 2001
++++ fidogate.conf.dist Thu Feb 22 09:58:13 2001
@@ -15,30 +15,30 @@
##############################################################################
diff --git a/comms/fidogate/patches/patch-ar b/comms/fidogate/patches/patch-ar
new file mode 100644
index 00000000000..9667675a419
--- /dev/null
+++ b/comms/fidogate/patches/patch-ar
@@ -0,0 +1,13 @@
+$NetBSD: patch-ar,v 1.1 2002/07/06 20:15:52 tv Exp $
+
+--- src/charset/charset.c.orig Sat Jul 6 15:31:24 2002
++++ src/charset/charset.c Sat Jul 6 15:31:41 2002
+@@ -203,7 +203,7 @@
+ c &= 0xff;
+
+ if( qp && (c == '=' || c >= 0x80) )
+- str_printf(buf, sizeof(buf), "=%02.2X", c & 0xff);
++ str_printf(buf, sizeof(buf), "=%2.2X", c & 0xff);
+ else
+ {
+ buf[0] = c;