Wed Dec 12 12:35:21 2012 UTC ()
Update to 2.6.1, from diro in PR 47209.

Relevant ChangeLog entries since 2.5:

	* src/main.c, src/minicom.c: iconv: Handle the case that iconv
	  did not convert anything. Reported by Mike Crowe, Debian #659351.
	* src/ipc.c: Formatting cleanup.
	* src/main.c: ETIME -> ETIMEDOUT as ETIME is not available on BSDs
	* src/main.c: Fix invalid memory used, reported by Larry Baker
	* src/config.c, src/rwconf.c: Do not set modem init and reset string
	  anymore, define them empty. Instead, when editing those offer
	  them as a default.
	* src/minicom.h, src/main.c, src/dial.c: only update statusline
	  if there's a change (e.g. for updates times)
	* src/updown.c: Flush before forking helper program,
	  patch by Domen Puncer, thanks!
	* src/minicom.c, src/minicom.h, src/vt100.c: Add timestamps with
	  milliseconds, based on patch by Rapha�l Ass�nat, thanks!
	* src/dial.c, src/minicom.c, src/main.c: Cleanups. Print
	  basename of current device to statusline if online time is disabled.
	* configure.in, src/Makefile.am, src/main.c, src/minicom.c,
	  src/minicom.h, src/updown.c: Add lockdev support,
	  by Ludwig Nussel <ludwig.nussel@suse.de>
	* src/dial.c: add a dialdir version 6 which does not save the
	  pointer on disk and should now work on 32 and 64 bit
	  systems equally.
	* configure.in: Use AM_ICONV_LINK...
	* src/script.c: Fix a buffer overflow problem. Thanks Frederic Germain.
	* src/minicom.c: Do not use iconv-functions if iconv is not available.
	* src/config.c, src/main.c, src/vt100.c, src/vt100.h: Add transmit
	  delay for every character, based on patch by Nicolas PILLON.
	* src/config.c: Do not extend tilde to home directory for
	  non-path arguments. Debian bug #621741
	* configure.in, src/Makefile.am: Add workaround and then use
	  libiconv for linking, fixes build issue on Mac OS X.
	* src/main.c: Increase serial port open timeout, by
	  Lubomir Rintel
	* src/main.c: Set sensible errno if port open times out,
	  by Lubomir Rintel
	* src/help.c: Help fix for timestamp toggle by Mark Einon
	* src/minicom.c: Code consolidation.
	* src/minicom.c, src/minicom.h, src/vt100.c, man/minicom.1: Make
	  line timestamps three value: every line, every second, and off.
	* man/minicom.1: Wording fix.
	* src/vt100.c: Cleanups: Delete everything that was in OLD blocks.
	  Do not explicitly set global variables to 0.
	* src/vt100.c, man/minicom.1: Change timestamp style, prepend every
	  line. Add in manpage.
	* src/dial.c src/help.c src/ipc.c src/minicom.c src/minicom.h
	  src/vt100.c src/vt100.h: Addition by Mark Einon
	  <mark.einon@gmail.com> to add current date/time to each line.
	* src/file.c: Only enter directory if we have read permissions to
	  get directory listings, by Jan Görig.
	* src/file.c, src/getsdir.c: Cleanup and simplify.
	* man/runscript.1, man/minicom.1: Fixes by John Bradshaw
	* src/main.c: Avoid redraw of status line in Offline mode when
	  nothing changed.
	* src/minicom.c: Do not lose line wrap setting over terminal resizes.
	* src/main.c: Simplify status line update, also makes status
	  messages display the amount of time they are actually supposed
	  to display.


(wiz)
diff -r1.61 -r1.62 pkgsrc/comms/minicom/Makefile
diff -r1.12 -r1.13 pkgsrc/comms/minicom/PLIST
diff -r1.12 -r1.13 pkgsrc/comms/minicom/distinfo
diff -r0 -r1.1 pkgsrc/comms/minicom/options.mk
diff -r1.10 -r0 pkgsrc/comms/minicom/patches/patch-aa
diff -r1.5 -r1.6 pkgsrc/comms/minicom/patches/patch-ab
diff -r1.6 -r1.7 pkgsrc/comms/minicom/patches/patch-ac
diff -r1.6 -r1.7 pkgsrc/comms/minicom/patches/patch-ae
diff -r1.8 -r1.9 pkgsrc/comms/minicom/patches/patch-ad
diff -r1.4 -r1.5 pkgsrc/comms/minicom/patches/patch-ag
diff -r1.3 -r1.4 pkgsrc/comms/minicom/patches/patch-ah

cvs diff -r1.61 -r1.62 pkgsrc/comms/minicom/Makefile (expand / switch to unified diff)

--- pkgsrc/comms/minicom/Makefile 2012/10/03 11:24:42 1.61
+++ pkgsrc/comms/minicom/Makefile 2012/12/12 12:35:21 1.62
@@ -1,19 +1,18 @@ @@ -1,19 +1,18 @@
1# $NetBSD: Makefile,v 1.61 2012/10/03 11:24:42 asau Exp $ 1# $NetBSD: Makefile,v 1.62 2012/12/12 12:35:21 wiz Exp $
2 2
3DISTNAME= minicom-2.5 3DISTNAME= minicom-2.6.1
4PKGREVISION= 1 
5CATEGORIES= comms 4CATEGORIES= comms
6MASTER_SITES= http://alioth.debian.org/frs/download.php/3487/ 5MASTER_SITES= http://alioth.debian.org/frs/download.php/3700/
7 6
8MAINTAINER= pkgsrc-users@NetBSD.org 7MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://alioth.debian.org/projects/minicom/ 8HOMEPAGE= http://alioth.debian.org/projects/minicom/
10COMMENT= MS-DOS Telix serial communication program "workalike" 9COMMENT= MS-DOS Telix serial communication program "workalike"
11LICENSE= gnu-gpl-v2 10LICENSE= gnu-gpl-v2
12 11
13DEPENDS+= gkermit-[0-9]*:../../comms/gkermit 12DEPENDS+= gkermit-[0-9]*:../../comms/gkermit
14DEPENDS+= lrzsz-[0-9]*:../../comms/lrzsz 13DEPENDS+= lrzsz-[0-9]*:../../comms/lrzsz
15 14
16PKG_INSTALLATION_TYPES= overwrite pkgviews 15PKG_INSTALLATION_TYPES= overwrite pkgviews
17INSTALLATION_DIRS= share/examples/minicom 16INSTALLATION_DIRS= share/examples/minicom
18 17
19USE_PKGLOCALEDIR= yes 18USE_PKGLOCALEDIR= yes
@@ -31,17 +30,19 @@ PKG_USERS_VARS= UUCP_USER @@ -31,17 +30,19 @@ PKG_USERS_VARS= UUCP_USER
31 30
32SPECIAL_PERMS= ${PREFIX}/bin/minicom ${UUCP_USER} ${DIALER_GROUP} 4555 31SPECIAL_PERMS= ${PREFIX}/bin/minicom ${UUCP_USER} ${DIALER_GROUP} 4555
33OWN_DIRS_PERMS= ${PKG_SYSCONFDIR} ${UUCP_USER} ${DIALER_GROUP} 0755 32OWN_DIRS_PERMS= ${PKG_SYSCONFDIR} ${UUCP_USER} ${DIALER_GROUP} 0755
34 33
35EVAL_PREFIX+= GKERMIT_PREFIX=gkermit 34EVAL_PREFIX+= GKERMIT_PREFIX=gkermit
36EVAL_PREFIX+= LRZSZ_PREFIX=lrzsz 35EVAL_PREFIX+= LRZSZ_PREFIX=lrzsz
37 36
38SUBST_CLASSES+= minicom 37SUBST_CLASSES+= minicom
39SUBST_MESSAGE.minicom= Fixing hardcoded paths. 38SUBST_MESSAGE.minicom= Fixing hardcoded paths.
40SUBST_STAGE.minicom= post-patch 39SUBST_STAGE.minicom= post-patch
41SUBST_FILES.minicom= src/rwconf.c 40SUBST_FILES.minicom= src/rwconf.c
42SUBST_VARS.minicom= PREFIX GKERMIT_PREFIX LRZSZ_PREFIX 41SUBST_VARS.minicom= PREFIX GKERMIT_PREFIX LRZSZ_PREFIX
43 42
 43.include "options.mk"
 44
44.include "../../converters/libiconv/buildlink3.mk" 45.include "../../converters/libiconv/buildlink3.mk"
45.include "../../devel/gettext-lib/buildlink3.mk" 46.include "../../devel/gettext-lib/buildlink3.mk"
46.include "../../mk/termcap.buildlink3.mk" 47.include "../../mk/termcap.buildlink3.mk"
47.include "../../mk/bsd.pkg.mk" 48.include "../../mk/bsd.pkg.mk"

cvs diff -r1.12 -r1.13 pkgsrc/comms/minicom/PLIST (expand / switch to unified diff)

--- pkgsrc/comms/minicom/PLIST 2011/08/01 09:30:33 1.12
+++ pkgsrc/comms/minicom/PLIST 2012/12/12 12:35:21 1.13
@@ -1,27 +1,27 @@ @@ -1,27 +1,27 @@
1@comment $NetBSD: PLIST,v 1.12 2011/08/01 09:30:33 adam Exp $ 1@comment $NetBSD: PLIST,v 1.13 2012/12/12 12:35:21 wiz Exp $
2bin/ascii-xfr 2bin/ascii-xfr
3bin/minicom 3bin/minicom
4bin/runscript 4bin/runscript
5bin/xminicom 5bin/xminicom
6man/man1/ascii-xfr.1 6man/man1/ascii-xfr.1
7man/man1/minicom.1 7man/man1/minicom.1
8man/man1/runscript.1 8man/man1/runscript.1
9man/man1/xminicom.1 9man/man1/xminicom.1
10share/locale/cs/LC_MESSAGES/minicom.mo 10${PLIST.nls}share/locale/cs/LC_MESSAGES/minicom.mo
11share/locale/da/LC_MESSAGES/minicom.mo 11${PLIST.nls}share/locale/da/LC_MESSAGES/minicom.mo
12share/locale/de/LC_MESSAGES/minicom.mo 12${PLIST.nls}share/locale/de/LC_MESSAGES/minicom.mo
13share/locale/es/LC_MESSAGES/minicom.mo 13${PLIST.nls}share/locale/es/LC_MESSAGES/minicom.mo
14share/locale/fi/LC_MESSAGES/minicom.mo 14${PLIST.nls}share/locale/fi/LC_MESSAGES/minicom.mo
15share/locale/fr/LC_MESSAGES/minicom.mo 15${PLIST.nls}share/locale/fr/LC_MESSAGES/minicom.mo
16share/locale/hu/LC_MESSAGES/minicom.mo 16${PLIST.nls}share/locale/hu/LC_MESSAGES/minicom.mo
17share/locale/id/LC_MESSAGES/minicom.mo 17${PLIST.nls}share/locale/id/LC_MESSAGES/minicom.mo
18share/locale/ja/LC_MESSAGES/minicom.mo 18${PLIST.nls}share/locale/ja/LC_MESSAGES/minicom.mo
19share/locale/nb/LC_MESSAGES/minicom.mo 19${PLIST.nls}share/locale/nb/LC_MESSAGES/minicom.mo
20share/locale/pl/LC_MESSAGES/minicom.mo 20${PLIST.nls}share/locale/pl/LC_MESSAGES/minicom.mo
21share/locale/pt_BR/LC_MESSAGES/minicom.mo 21${PLIST.nls}share/locale/pt_BR/LC_MESSAGES/minicom.mo
22share/locale/ro/LC_MESSAGES/minicom.mo 22${PLIST.nls}share/locale/ro/LC_MESSAGES/minicom.mo
23share/locale/ru/LC_MESSAGES/minicom.mo 23${PLIST.nls}share/locale/ru/LC_MESSAGES/minicom.mo
24share/locale/rw/LC_MESSAGES/minicom.mo 24${PLIST.nls}share/locale/rw/LC_MESSAGES/minicom.mo
25share/locale/sv/LC_MESSAGES/minicom.mo 25${PLIST.nls}share/locale/sv/LC_MESSAGES/minicom.mo
26share/locale/vi/LC_MESSAGES/minicom.mo 26${PLIST.nls}share/locale/vi/LC_MESSAGES/minicom.mo
27share/locale/zh_TW/LC_MESSAGES/minicom.mo 27${PLIST.nls}share/locale/zh_TW/LC_MESSAGES/minicom.mo

cvs diff -r1.12 -r1.13 pkgsrc/comms/minicom/distinfo (expand / switch to unified diff)

--- pkgsrc/comms/minicom/distinfo 2011/12/05 08:10:18 1.12
+++ pkgsrc/comms/minicom/distinfo 2012/12/12 12:35:21 1.13
@@ -1,12 +1,11 @@ @@ -1,12 +1,11 @@
1$NetBSD: distinfo,v 1.12 2011/12/05 08:10:18 adam Exp $ 1$NetBSD: distinfo,v 1.13 2012/12/12 12:35:21 wiz Exp $
2 2
3SHA1 (minicom-2.5.tar.gz) = 442250314de63189b619f8744c0669445e2cdd1d 3SHA1 (minicom-2.6.1.tar.gz) = ce6b5f3dab6b4179736152e38a806029f8ad222a
4RMD160 (minicom-2.5.tar.gz) = 4131b9ef37d25cf8f77a70fc4b4de32e7896cc23 4RMD160 (minicom-2.6.1.tar.gz) = d9c7bf6d661427ff1a4007a917574e4ecd872c50
5Size (minicom-2.5.tar.gz) = 822499 bytes 5Size (minicom-2.6.1.tar.gz) = 830485 bytes
6SHA1 (patch-aa) = 1ce591eb1f9969a8dd72194d10f69a1df77c35a7 6SHA1 (patch-ab) = e87dbe616958b2b1a01a9a7dfa8cb8f8c1a6978f
7SHA1 (patch-ab) = db913d60191fd1b0830746019c6cc9c125069cfb 7SHA1 (patch-ac) = b2ffa106989ea562b8ea85bfd15e516713a37f3f
8SHA1 (patch-ac) = 6af60d8edb50f4cd10bc4b63a792cec2075ed6d5 8SHA1 (patch-ad) = a3e50ae6dcacb6ae6a177e5b6e4d3d959d960eca
9SHA1 (patch-ad) = e57999876f690689d858aa07f5c122ea79bfd2f1 9SHA1 (patch-ae) = ea2fb58212de7caaaed4c0817290ca3612212b6c
10SHA1 (patch-ae) = 1d3267fc666d857bbab05a542de6d3aa1ba53e14 10SHA1 (patch-ag) = 5f635b67e2e48d13c9df7f3ed4fdca83a1c7f7ef
11SHA1 (patch-ag) = cf6c551736feb77f7f714cb4ba8b9a787eac937d 11SHA1 (patch-ah) = ae6048f6a8e81134a459aaf21527e944c68ae07f
12SHA1 (patch-ah) = 499f2372a27ffef2b51aa5d9ac21545d1fe5c277 

File Added: pkgsrc/comms/minicom/options.mk
# $NetBSD: options.mk,v 1.1 2012/12/12 12:35:21 wiz Exp $

PKG_OPTIONS_VAR=	PKG_OPTIONS.minicom
PKG_SUPPORTED_OPTIONS=	nls
PKG_SUGGESTED_OPTIONS+=	nls

PLIST_VARS+=		nls

.include "../../mk/bsd.options.mk"

.if !empty(PKG_OPTIONS:Mnls)
CONFIGURE_ARGS+=	--enable-nls
PLIST.nls=		yes
.else
CONFIGURE_ARGS+=	--disable-nls
.endif

File Deleted: pkgsrc/comms/minicom/patches/Attic/patch-aa

cvs diff -r1.5 -r1.6 pkgsrc/comms/minicom/patches/Attic/patch-ab (expand / switch to unified diff)

--- pkgsrc/comms/minicom/patches/Attic/patch-ab 2011/08/01 09:30:33 1.5
+++ pkgsrc/comms/minicom/patches/Attic/patch-ab 2012/12/12 12:35:21 1.6
@@ -1,7 +1,9 @@ @@ -1,7 +1,9 @@
1$NetBSD: patch-ab,v 1.5 2011/08/01 09:30:33 adam Exp $ 1$NetBSD: patch-ab,v 1.6 2012/12/12 12:35:21 wiz Exp $
 2
 3Fix installed man pages.
2 4
3--- man/Makefile.am.orig 2009-12-12 15:47:47.000000000 +0000 5--- man/Makefile.am.orig 2009-12-12 15:47:47.000000000 +0000
4+++ man/Makefile.am 6+++ man/Makefile.am
5@@ -1 +1 @@ 7@@ -1 +1 @@
6-dist_man_MANS = ascii-xfr.1 minicom.1 runscript.1 xminicom.1 8-dist_man_MANS = ascii-xfr.1 minicom.1 runscript.1 xminicom.1
7+dist_man_MANS = ascii-xfr.1 minicom.1 runscript.1 9+dist_man_MANS = ascii-xfr.1 minicom.1 runscript.1

cvs diff -r1.6 -r1.7 pkgsrc/comms/minicom/patches/patch-ac (expand / switch to unified diff)

--- pkgsrc/comms/minicom/patches/patch-ac 2011/08/01 09:30:33 1.6
+++ pkgsrc/comms/minicom/patches/patch-ac 2012/12/12 12:35:21 1.7
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-ac,v 1.6 2011/08/01 09:30:33 adam Exp $ 1$NetBSD: patch-ac,v 1.7 2012/12/12 12:35:21 wiz Exp $
2 2
3--- src/updown.c.orig 2010-05-30 20:34:00.000000000 +0000 3--- src/updown.c.orig 2011-09-07 21:04:32.000000000 +0000
4+++ src/updown.c 4+++ src/updown.c
5@@ -294,7 +294,7 @@ void updown(int what, int nr) 5@@ -296,7 +296,7 @@ void updown(int what, int nr)
6 do_log("%s", cmdline); /* jl 22.06.97 */ 6 do_log("%s", cmdline); /* jl 22.06.97 */
7  7
8 if (P_PFULL(g) == 'N') { 8 if (P_PFULL(g) == 'N') {
9- win = mc_wopen(10, 7, 70, 13, BSINGLE, stdattr, mfcolor, mbcolor, 1, 0, 1); 9- win = mc_wopen(10, 7, 70, 13, BSINGLE, stdattr, mfcolor, mbcolor, 1, 0, 1);
10+ win = mc_wopen(5, 5, 74, 11, BSINGLE, stdattr, mfcolor, mbcolor, 1, 0, 1); 10+ win = mc_wopen(5, 5, 74, 11, BSINGLE, stdattr, mfcolor, mbcolor, 1, 0, 1);
11 snprintf(title, sizeof(title), _("%.30s %s - Press CTRL-C to quit"), P_PNAME(g), 11 snprintf(title, sizeof(title), _("%.30s %s - Press CTRL-C to quit"), P_PNAME(g),
12 what == 'U' ? _("upload") : _("download")); 12 what == 'U' ? _("upload") : _("download"));
13 mc_wtitle(win, TMID, title); 13 mc_wtitle(win, TMID, title);

cvs diff -r1.6 -r1.7 pkgsrc/comms/minicom/patches/patch-ae (expand / switch to unified diff)

--- pkgsrc/comms/minicom/patches/patch-ae 2011/08/01 09:30:33 1.6
+++ pkgsrc/comms/minicom/patches/patch-ae 2012/12/12 12:35:21 1.7
@@ -1,8 +1,14 @@ @@ -1,8 +1,14 @@
1$NetBSD: patch-ae,v 1.6 2011/08/01 09:30:33 adam Exp $ 1$NetBSD: patch-ae,v 1.7 2012/12/12 12:35:21 wiz Exp $
2 2
3--- src/windiv.c.orig 2003-04-22 01:56:46.000000000 +0200 3Needs sys/types.h.
4+++ src/windiv.c 2005-06-29 07:03:12.000000000 +0200 4
5@@ -22,2 +22,3 @@ 5--- src/windiv.c.orig 2009-12-12 15:47:47.000000000 +0000
 6+++ src/windiv.c
 7@@ -20,6 +20,7 @@
 8 #include <config.h>
 9 #endif
6  10
7+#include <sys/types.h> 11+#include <sys/types.h>
8 #include <dirent.h> 12 #include <dirent.h>
 13 #include <sys/stat.h>
 14 #include "port.h"

cvs diff -r1.8 -r1.9 pkgsrc/comms/minicom/patches/patch-ad (expand / switch to unified diff)

--- pkgsrc/comms/minicom/patches/patch-ad 2011/08/01 09:30:33 1.8
+++ pkgsrc/comms/minicom/patches/patch-ad 2012/12/12 12:35:21 1.9
@@ -1,16 +1,18 @@ @@ -1,16 +1,18 @@
1$NetBSD: patch-ad,v 1.8 2011/08/01 09:30:33 adam Exp $ 1$NetBSD: patch-ad,v 1.9 2012/12/12 12:35:21 wiz Exp $
2 2
3--- src/rwconf.c.orig 2011-01-16 10:01:18.000000000 +0000 3Removed hardcoded LRZSZ_PREFIX and PREFIX.
 4
 5--- src/rwconf.c.orig 2011-12-27 22:21:05.000000000 +0000
4+++ src/rwconf.c 6+++ src/rwconf.c
5@@ -76,27 +76,15 @@ struct pars mpars[] = { 7@@ -76,27 +76,15 @@ struct pars mpars[] = {
6 { "", 0, "pname10" }, 8 { "", 0, "pname10" },
7 { "", 0, "pname11" }, 9 { "", 0, "pname11" },
8 { "", 0, "pname12" }, 10 { "", 0, "pname12" },
9-#if defined(__linux__) || defined(__GNU__) 11-#if defined(__linux__) || defined(__GNU__)
10- { "/usr/bin/sz -vv -b", 0, "pprog1" }, 12- { "/usr/bin/sz -vv -b", 0, "pprog1" },
11- { "/usr/bin/sb -vv", 0, "pprog2" }, 13- { "/usr/bin/sb -vv", 0, "pprog2" },
12- { "/usr/bin/sx -vv", 0, "pprog3" }, 14- { "/usr/bin/sx -vv", 0, "pprog3" },
13- { "/usr/bin/rz -vv -b -E", 0, "pprog4" }, 15- { "/usr/bin/rz -vv -b -E", 0, "pprog4" },
14- { "/usr/bin/rb -vv", 0, "pprog5" }, 16- { "/usr/bin/rb -vv", 0, "pprog5" },
15- { "/usr/bin/rx -vv", 0, "pprog6" }, 17- { "/usr/bin/rx -vv", 0, "pprog6" },
16- { "/usr/bin/kermit -i -l %l -b %b -s", 0, "pprog7" }, 18- { "/usr/bin/kermit -i -l %l -b %b -s", 0, "pprog7" },

cvs diff -r1.4 -r1.5 pkgsrc/comms/minicom/patches/patch-ag (expand / switch to unified diff)

--- pkgsrc/comms/minicom/patches/patch-ag 2011/08/01 09:30:33 1.4
+++ pkgsrc/comms/minicom/patches/patch-ag 2012/12/12 12:35:21 1.5
@@ -1,16 +1,18 @@ @@ -1,16 +1,18 @@
1$NetBSD: patch-ag,v 1.4 2011/08/01 09:30:33 adam Exp $ 1$NetBSD: patch-ag,v 1.5 2012/12/12 12:35:21 wiz Exp $
2 2
3--- src/getsdir.c.orig 2009-12-12 15:47:47.000000000 +0000 3Use NAME_MAX, if defined, instead of MAXNAMLEN.
 4
 5--- src/getsdir.c.orig 2011-02-14 10:07:00.000000000 +0000
4+++ src/getsdir.c 6+++ src/getsdir.c
5@@ -185,7 +185,11 @@ int getsdir(const char *dirpath, const c 7@@ -232,7 +232,11 @@ int getsdir(const char *dirpath, const c
6 int l; 8 }
7  9
8 /* copy the filename */ 10 /* copy the filename */
9+#ifdef NAME_MAX 11+#ifdef NAME_MAX
10+ strncpy(datb_cur->data[datb_cur->cnt].fname, dp->d_name, NAME_MAX); 12+ strncpy((*datptr)[cnt].fname, dp->d_name, NAME_MAX);
11+#else 13+#else
12 strncpy(datb_cur->data[datb_cur->cnt].fname, dp->d_name, MAXNAMLEN); 14 strncpy((*datptr)[cnt].fname, dp->d_name, MAXNAMLEN);
13+#endif 15+#endif
14  16
15 /* get information about the directory entry */ 17 /* get information about the directory entry */
16 snprintf(fpath, sizeof(fpath), "%s/%s", dirpath, dp->d_name); 18 snprintf(fpath, sizeof(fpath), "%s/%s", dirpath, dp->d_name);

cvs diff -r1.3 -r1.4 pkgsrc/comms/minicom/patches/patch-ah (expand / switch to unified diff)

--- pkgsrc/comms/minicom/patches/patch-ah 2011/12/05 08:10:18 1.3
+++ pkgsrc/comms/minicom/patches/patch-ah 2012/12/12 12:35:21 1.4
@@ -1,17 +1,21 @@ @@ -1,17 +1,21 @@
1$NetBSD: patch-ah,v 1.3 2011/12/05 08:10:18 adam Exp $ 1$NetBSD: patch-ah,v 1.4 2012/12/12 12:35:21 wiz Exp $
 2
 3Needs limits.h and NAME_MAX defined, if it's not already.
2 4
3--- src/getsdir.h.orig 2009-12-12 15:47:47.000000000 +0000 5--- src/getsdir.h.orig 2009-12-12 15:47:47.000000000 +0000
4+++ src/getsdir.h 6+++ src/getsdir.h
5@@ -25,7 +25,12 @@ 7@@ -23,9 +23,14 @@
 8 */
 9
6 #include <dirent.h> 10 #include <dirent.h>
7+#include <limits.h> 11+#include <limits.h>
8  12
9 typedef struct dirEntry { /* structure of data item */ 13 typedef struct dirEntry { /* structure of data item */
10+#ifdef NAME_MAX 14+#ifdef NAME_MAX
11+ char fname[NAME_MAX + 1]; 15+ char fname[NAME_MAX + 1];
12+#else 16+#else
13 char fname[MAXNAMLEN + 1]; /* filename + terminating null */ 17 char fname[MAXNAMLEN + 1]; /* filename + terminating null */
14+#endif 18+#endif
15 time_t time; /* last modification date */ 19 time_t time; /* last modification date */
16 mode_t mode; /* file mode (dir? etc.) */ 20 mode_t mode; /* file mode (dir? etc.) */
17 ushort cflags; /* caller field for convenience */ 21 ushort cflags; /* caller field for convenience */