Update to 0.6.8, provided by Kamil Rytarowski in wip.

cgdb-0.6.8 (11/13/2014)

  * Fix issue #40, the map commands were adding additional new lines
    to the mappings. For instance, 'imap a b' in the ~/.cgdb/cgdbrc
    file would cause a to map to 'b<cr>' instead of just 'b'.

  * Added feature from issue #29, added 'until' command to CGDB.

  * Updated autotools configuration files to satisfy warnings and
    recommendations produced by autotools when run.

  * Fix issue #49, a gcc compiler warning.

  * Fixed a hang consuming 100% CPU usage on OS X Mavericks (github #48).

  * Fixed a hang when quitting cgdb while inferior is running
    (github #1 and #5 and #46). This was believed to be fixed in the last
    release but I've finally reproduced the issue and fixed it for good.

cgdb-0.6.7 (01/14/2013)

  * Changed documentation license from GFDL to GPL (github #6).

  * Fixed a hang on MacOS when quitting cgdb while inferior is running
    (github #1 and #5).

  * Fixed a crash when pressing 'n' in source window (github #5).

  * Fixed a bug opening files (and toggling breakpoints in files) with
    special characters (e.g. space) in their names.

cgdb-0.6.6 (09/06/2011)

  * Fixed a compile error on Cygwin 1.7 (signature for path conversion
    functions changed).

  * Fixed a segfault on 64-bit systems in rline.c due to a missing
    prototype of cgdb_malloc. Thanks to Pietro Cerutti for reporting
    and diagnosing this one!

  * Fixed a bug in the file dialog. When searching for a file,
    and you hit enter to select it, CGDB would sometimes skip to
    the next file that matches and open that file instead.

  * CGDB should now build out of the box on Cygwin again.
    CGDB used to only support building against curses.h. Now
    it also supports building against ncurses/curses.h.

  * No longer set the prompt to (gdb) on startup.

4 files changed, 29 insertions, 30 deletions

diff --git a/devel/cgdb/Makefile b/devel/cgdb/Makefile
index 0b99c4b0a03..7f1819a1abe 100644
--- a/devel/cgdb/Makefile
+++ b/devel/cgdb/Makefile
@@ -1,34 +1,31 @@
-# $NetBSD: Makefile,v 1.23 2013/10/16 10:51:39 roy Exp $
+# $NetBSD: Makefile,v 1.24 2015/04/20 07:35:00 wiz Exp $
 
-DISTNAME=	cgdb-0.6.5
-PKGREVISION=	1
+DISTNAME=	cgdb-0.6.8
 CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=cgdb/}
+MASTER_SITES=	http://cgdb.me/files/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://cgdb.sourceforge.net/
 COMMENT=	Curses-based interface to the GNU Debugger (GDB)
 LICENSE=	gnu-gpl-v2
 
-MAKE_JOBS_SAFE=		no
+BUILD_DEPENDS+=	help2man-[0-9]*:../../converters/help2man
 
 GNU_CONFIGURE=	yes
 USE_TOOLS+=	gmake
+INFO_FILES=	yes
 
-MAKE_ENV+=	AM_LDFLAGS=-L${WRKSRC}/various/util/src
-
-INSTALLATION_DIRS=	bin share/doc/cgdb
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/cgdb/src/cgdb ${DESTDIR}${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/cgdb
+# As -L/usr/lib tends to be found in LDFLAGS, make sure that the library
+# of interest (the local libutil) is found first.
+MAKE_ENV+=	AM_LDFLAGS=-L${WRKSRC}/lib/util/src
 
 # rl_mark and others
 .include "../../devel/readline/buildlink3.mk"
 .include "../../mk/terminfo.buildlink3.mk"
 .include "../../mk/curses.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
 
 .if ${CURSES_TYPE} == "curses"
 CONFIGURE_ARGS+=	--with-curses
 .endif
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/devel/cgdb/PLIST b/devel/cgdb/PLIST
index 3b981f5c05d..3966034e18b 100644
--- a/devel/cgdb/PLIST
+++ b/devel/cgdb/PLIST
@@ -1,3 +1,5 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:48:37 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2015/04/20 07:35:00 wiz Exp $
 bin/cgdb
-share/doc/cgdb/README
+info/cgdb.info
+man/man1/cgdb.1
+share/cgdb/cgdb.txt
diff --git a/devel/cgdb/distinfo b/devel/cgdb/distinfo
index c60f6d6b1f1..f287f383c01 100644
--- a/devel/cgdb/distinfo
+++ b/devel/cgdb/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.6 2011/09/08 19:46:30 wiz Exp $
+$NetBSD: distinfo,v 1.7 2015/04/20 07:35:00 wiz Exp $
 
-SHA1 (cgdb-0.6.5.tar.gz) = a47892b3eee5d3520e5f99f207e8ca2bc18ecf43
-RMD160 (cgdb-0.6.5.tar.gz) = cdf3c135b6ef01227e11a8dc2962a0aa93b74d9f
-Size (cgdb-0.6.5.tar.gz) = 905620 bytes
-SHA1 (patch-aa) = b061e5eb8232157ff0af8a3f05a38642e0414c3a
+SHA1 (cgdb-0.6.8.tar.gz) = 0892ae59358fa98264269cf6fe57928314ef7942
+RMD160 (cgdb-0.6.8.tar.gz) = 6f72836a168ebe4c530187b02185f9e0aaaa23ea
+Size (cgdb-0.6.8.tar.gz) = 716988 bytes
+SHA1 (patch-aa) = f4ff0d3ca52c41fdd42f3899e56950487d4052eb
diff --git a/devel/cgdb/patches/patch-aa b/devel/cgdb/patches/patch-aa
index 72b31e01c77..bfc837fedaa 100644
--- a/devel/cgdb/patches/patch-aa
+++ b/devel/cgdb/patches/patch-aa
@@ -1,16 +1,16 @@
-$NetBSD: patch-aa,v 1.3 2011/09/08 19:46:30 wiz Exp $
+$NetBSD: patch-aa,v 1.4 2015/04/20 07:35:00 wiz Exp $
 
---- various/util/src/pseudo.c.orig	2011-04-08 15:16:26.000000000 +0200
-+++ various/util/src/pseudo.c	2011-04-08 15:17:02.000000000 +0200
-@@ -331,6 +331,7 @@
+--- lib/util/pseudo.c.orig	2014-07-23 01:45:41.000000000 +0000
++++ lib/util/pseudo.c
+@@ -325,6 +325,7 @@ int pty_open(int *masterfd, int *slavefd
  
- #ifndef HAVE_CYGWIN 
- #ifndef HAVE_LINUX /* linux does not use the streams module */
+ #ifndef HAVE_CYGWIN
+ #ifndef HAVE_LINUX              /* linux does not use the streams module */
 +#ifdef I_PUSH
- 	/*
- 	 * Push the appropriate streams modules, as described in Solaris pts(7).
- 	 * HP-UX pts(7) doesn't have ttcompat module.
-@@ -359,6 +360,7 @@
+     /*
+      * Push the appropriate streams modules, as described in Solaris pts(7).
+      * HP-UX pts(7) doesn't have ttcompat module.
+@@ -349,6 +350,7 @@ int pty_open(int *masterfd, int *slavefd
  #endif
  #endif
  #endif