head 1.6; access; symbols pkgsrc-2013Q2:1.6.0.16 pkgsrc-2013Q2-base:1.6 pkgsrc-2012Q4:1.6.0.14 pkgsrc-2012Q4-base:1.6 pkgsrc-2011Q4:1.6.0.12 pkgsrc-2011Q4-base:1.6 pkgsrc-2011Q2:1.6.0.10 pkgsrc-2011Q2-base:1.6 pkgsrc-2009Q4:1.6.0.8 pkgsrc-2009Q4-base:1.6 pkgsrc-2008Q4:1.6.0.6 pkgsrc-2008Q4-base:1.6 pkgsrc-2008Q3:1.6.0.4 pkgsrc-2008Q3-base:1.6 cube-native-xorg:1.6.0.2 cube-native-xorg-base:1.6 pkgsrc-2008Q2:1.5.0.22 pkgsrc-2008Q2-base:1.5 cwrapper:1.5.0.20 pkgsrc-2008Q1:1.5.0.18 pkgsrc-2008Q1-base:1.5 pkgsrc-2007Q4:1.5.0.16 pkgsrc-2007Q4-base:1.5 pkgsrc-2007Q3:1.5.0.14 pkgsrc-2007Q3-base:1.5 pkgsrc-2007Q2:1.5.0.12 pkgsrc-2007Q2-base:1.5 pkgsrc-2007Q1:1.5.0.10 pkgsrc-2007Q1-base:1.5 pkgsrc-2006Q4:1.5.0.8 pkgsrc-2006Q4-base:1.5 pkgsrc-2006Q3:1.5.0.6 pkgsrc-2006Q3-base:1.5 pkgsrc-2006Q2:1.5.0.4 pkgsrc-2006Q2-base:1.5 pkgsrc-2006Q1:1.5.0.2 pkgsrc-2006Q1-base:1.5 pkgsrc-2005Q4:1.4.0.14 pkgsrc-2005Q4-base:1.4 pkgsrc-2005Q3:1.4.0.12 pkgsrc-2005Q3-base:1.4 pkgsrc-2005Q2:1.4.0.10 pkgsrc-2005Q2-base:1.4 pkgsrc-2005Q1:1.4.0.8 pkgsrc-2005Q1-base:1.4 pkgsrc-2004Q4:1.4.0.6 pkgsrc-2004Q4-base:1.4 pkgsrc-2004Q3:1.4.0.4 pkgsrc-2004Q3-base:1.4 pkgsrc-2004Q2:1.4.0.2 pkgsrc-2004Q2-base:1.4 pkgsrc-2004Q1:1.3.0.4 pkgsrc-2004Q1-base:1.3 pkgsrc-2003Q4:1.3.0.2 pkgsrc-2003Q4-base:1.3 buildlink2-base:1.3 netbsd-1-3-PATCH003:1.2 netbsd-1-3-PATCH002:1.1.1.1 FreeBSD-current-1997-11-19:1.1.1.1 FREEBSD:1.1.1; locks; strict; comment @# @; 1.6 date 2008.08.08.23.41.22; author epg; state dead; branches; next 1.5; 1.5 date 2006.03.02.21.28.23; author joerg; state Exp; branches; next 1.4; 1.4 date 2004.05.04.06.18.14; author mrg; state Exp; branches; next 1.3; 1.3 date 99.03.04.09.12.41; author kim; state dead; branches; next 1.2; 1.2 date 98.08.07.11.09.43; author agc; state Exp; branches; next 1.1; 1.1 date 97.11.19.13.55.05; author agc; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 97.11.19.13.55.05; author agc; state Exp; branches; next ; desc @@ 1.6 log @- Update from 1.0.4 (Apr 2000) to 1.3 (Jun 2008) (whew!). - many bug fixes - MM_CHARSET no longer needed; now uses iconv to decode RFC2047-encoded headers and convert to current locale. - various MIME improvements - Take maintainership (ok'd by kim@@). - Replace DESCR with text from web site. - Support user-destdir. - Use --with-hash-backup instead of hacking config.h post-configure. - Drop IRIX-specific part of fmt_scan.c patch-cd, and therefore drop patch-ck and IRIX bits in Makefile. - A tmac.h conf file (wtf?) is no longer installed. - Update what's installed to share/doc/nmh. - Update PLIST for added/removed/renamed files. - Patches: - Update patch-ca and patch-cd. - Remove errno patches, upstream since XXX: patch-aa, patch-ab, patch-ad, patch-ae, patch-ag, patch-ah, patch-ai, patch-aj, patch-ak, patch-al, patch-am, patch-an patch-ao, patch-ap, patch-aq, patch-ar, patch-as, patch-at, patch-au, patch-av, patch-aw, patch-ax, patch-az, patch-ba, patch-bb, patch-bc, patch-bd, patch-be, patch-bf, patch-bg, patch-bh, patch-bi - patch-aa also had a patch for some fgetstr problem on NetBSD which no longer seems to happen. - Remove patch-cb; GCOS_HACK is referenced nowhere in nmh code (only apparently outdated docs) or in any other pkgsrc patch; HAVE_SYS_PARAM_H is already elsewhere in config.h, and sys/param.h is included in nmh.h. - Remove patch-ce (http://savannah.nongnu.org/bugs/?1393 fixed in uip/sortm.c r1.7). - Remove patch-ci (fixed in uip/show.c r1.6). - Remove patch-cj; $(etcdir)/tmac.h is gone and the folders/flists problems were fixed (differently) in 2000. - Remove patch-ck (CPPFLAGS support for the IRIX-specific part of patch-cd. @ text @$NetBSD: patch-aa,v 1.5 2006/03/02 21:28:23 joerg Exp $ --- uip/mhbuildsbr.c.orig 1999-09-12 13:50:12.000000000 +0000 +++ uip/mhbuildsbr.c @@@@ -40,8 +40,6 @@@@ #endif -extern int errno; - extern int debugsw; extern int verbosw; @@@@ -174,7 +172,7 @@@@ static int InitFTP (CT); static int openFTP (CT, char **); static int InitMail (CT); static int openMail (CT, char **); -static char *fgetstr (char *, int, FILE *); +static char *mh_fgetstr (char *, int, FILE *); static int user_content (FILE *, char *, char *, CT *); static void set_id (CT, int); static int compose_content (CT); @@@@ -374,7 +372,7 @@@@ finish_field: * read and parse the composition file * and the directives it contains. */ - while (fgetstr (buf, sizeof(buf) - 1, in)) { + while (mh_fgetstr (buf, sizeof(buf) - 1, in)) { struct part *part; CT p; @@@@ -2829,7 +2827,7 @@@@ openMail (CT ct, char **file) static char * -fgetstr (char *s, int n, FILE *stream) +mh_fgetstr (char *s, int n, FILE *stream) { char *cp, *ep; @@@@ -2931,7 +2929,7 @@@@ user_content (FILE *in, char *file, char again_descr: ct->c_descr = add (buffer + i + 1, ct->c_descr); - if (!fgetstr (buffer, sizeof(buffer) - 1, in)) + if (!mh_fgetstr (buffer, sizeof(buffer) - 1, in)) adios (NULL, "end-of-file after %s: field in plaintext", DESCR_FIELD); switch (buffer[0]) { case ' ': @@@@ -2954,7 +2952,7 @@@@ again_descr: rock_and_roll: headers = -1; pos = ftell (in); - if ((cp = fgetstr (buffer, sizeof(buffer) - 1, in)) == NULL) + if ((cp = mh_fgetstr (buffer, sizeof(buffer) - 1, in)) == NULL) break; if (buffer[0] == '#') { char *bp; @@@@ -3297,7 +3295,7 @@@@ use_forw: ct->c_ctparams = (void *) m; pp = &m->mp_parts; - while (fgetstr (buffer, sizeof(buffer) - 1, in)) { + while (mh_fgetstr (buffer, sizeof(buffer) - 1, in)) { struct part *part; CT p; @ 1.5 log @Add DragonFly support. Fix errno. @ text @d1 1 a1 1 $NetBSD$ @ 1.4 log @XXX: hack around the hack that netbsd-current tramples the XXX: users fgtstr() namespace... @ text @d3 12 a14 6 ugh. NetBSD-current (post 2.0) has a new fgetstr() that conflicts... --- uip/mhbuildsbr.c.orig 1999-09-12 23:50:12.000000000 +1000 +++ uip/mhbuildsbr.c 2004-05-04 12:45:13.000000000 +1000 @@@@ -174,7 +174,7 @@@@ d23 1 a23 1 @@@@ -374,7 +374,7 @@@@ d32 1 a32 1 @@@@ -2829,7 +2829,7 @@@@ d41 1 a41 1 @@@@ -2931,7 +2931,7 @@@@ d50 1 a50 1 @@@@ -2954,7 +2954,7 @@@@ d59 1 a59 1 @@@@ -3297,7 +3297,7 @@@@ @ 1.3 log @Upgraded to nmh-1.0 @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.2 1998/08/07 11:09:43 agc Exp $ d3 58 a60 40 diff -ur nmh-0.14-dist/acconfig.h nmh-0.14/acconfig.h --- acconfig.h-dist Wed Apr 16 21:25:42 1997 +++ acconfig.h Tue May 20 18:59:52 1997 @@@@ -1,3 +1,9 @@@@ +/* Define if you have the header file. */ +#undef HAVE_SYS_PARAM_H +#ifdef HAVE_SYS_PARAM_H +#include +#endif + /****** BEGIN USER CONFIGURATION SECTION *****/ @@@@ -37,9 +40,11 @@@@ * OpenBSD 2.x * BSD/OS 2.x */ -/* #define BIND 1 */ -/* #define BSD42 1 */ -/* #define BSD44 1 */ +#ifdef BSD4_4 +#define BIND 1 +#define BSD42 1 +#define BSD44 1 +#endif /* * SCO 4.x @@@@ -72,10 +77,14 @@@@ * other programs which may modify your maildrops. * Currently you can only use one type. */ +#if defined(BSD44) +#define FCNTL_LOCKING 1 +#else #define DOT_LOCKING 1 /* #define FCNTL_LOCKING 1 */ /* #define LOCKF_LOCKING 1 */ /* #define FLOCK_LOCKING 1 */ +#endif a61 2 /* * If you have defined DOT_LOCKING, then the default is to @ 1.2 log @Add NetBSD RCS Ids. @ text @d1 1 a1 1 $NetBSD$ @ 1.1 log @Initial revision @ text @d1 2 @ 1.1.1.1 log @Initial import of nmh-0.17 from FreeBSD ports collection into NetBSD packages collection. @ text @@