Attachment #145341 for bug #192323




# $FreeBSD$

PORTNAME=	gdb
PORTVERSION=	7.8
CATEGORIES=	devel
MASTER_SITES=	GNU



LICENSE=	GPLv3

USES=		iconv gmake libtool tar:xz
USE_CSTD=	gnu89
GNU_CONFIGURE=	yes
CONFIGURE_ENV=	CONFIGURED_M4=m4 CONFIGURED_BISON=byacc

.endif

.if ${PORT_OPTIONS:MPYTHON}
	(cd ${WRKSRC}/gdb; ${GMAKE} DESTDIR=${STAGEDIR} install-python )
	(cd ${WRKSRC}/gdb/data-directory ; \
		${GMAKE} DESTDIR=${STAGEDIR} install-python )
.endif

.if ${PORT_OPTIONS:MPYTHON}

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (gdb-7.7.1.tar.bz2) = 0dbd5260406f1b0c70fcf027c6488527fadde0cd9bb574593491fe076eb03aa5	1	SHA256 (gdb-7.8.tar.xz) = 49c4abe174f79f54e1f9e75210ffb590d9b497d5b5200b5398c0e073a4ecb875
2	SIZE (gdb-7.7.1.tar.bz2) = 24849503	2	SIZE (gdb-7.8.tar.xz) = 17664316




  if (!bms.minsym)
    name = "???";
  else
    name = MSYMBOL_PRINT_NAME (bms.minsym);

  printf_filtered ("Key %d, destructor %p <%s>\n", key, destructor, name);
  return 0;

  struct minimal_symbol *ms;
  CORE_ADDR addr;

  ms = lookup_minimal_symbol (name, NULL, NULL).minsym;
  if (ms == NULL)
    return PS_NOSYM;

  *sym_addr = ms->mginfo.value.address;
  return PS_OK;
}





--- gdb/gdb.c	Thu Feb 13 13:07:24 2003
+++ gdb/gdb.c	Wed May 17 00:24:39 2006
@@ -31,5 +32,11 @@
 #include "gdb_string.h"
 #include "interps.h"
+#include <libgen.h>
 
 int
@@ -31,6 +32,14 @@
   args.argc = argc;
   args.argv = argv;
-  args.use_windows = 0;
-  args.interpreter_p = INTERP_CONSOLE;
+  if (strncmp(basename(argv[0]), "insight", 7) == 0) {
+    args.use_windows = 1;
+    args.interpreter_p = "insight";
+  } else if (strncmp(basename(argv[0]), "gdbtui", 6) == 0) {
+    args.use_windows = 0;
+    args.interpreter_p = INTERP_TUI;
+  } else {
+    args.use_windows = 0;
+    args.interpreter_p = INTERP_CONSOLE;
+  }
   return gdb_main (&args);

Return to bug 192323

Lines 1296-1302 Link Here

(-)files/fbsd-threads.c (-3 / +3 lines)
1296	if (!bms.minsym)	1296	if (!bms.minsym)
1297	name = "???";	1297	name = "???";
1298	else	1298	else
1299	name = SYMBOL_PRINT_NAME (bms.minsym);	1299	name = MSYMBOL_PRINT_NAME (bms.minsym);
1300		1300
1301	printf_filtered ("Key %d, destructor %p <%s>\n", key, destructor, name);	1301	printf_filtered ("Key %d, destructor %p <%s>\n", key, destructor, name);
1302	return 0;	1302	return 0;
Lines 1505-1515 Link Here
1505	struct minimal_symbol *ms;	1505	struct minimal_symbol *ms;
1506	CORE_ADDR addr;	1506	CORE_ADDR addr;
1507		1507
1508	ms = lookup_minimal_symbol (name, NULL, NULL);	1508	ms = lookup_minimal_symbol (name, NULL, NULL).minsym;
1509	if (ms == NULL)	1509	if (ms == NULL)
1510	return PS_NOSYM;	1510	return PS_NOSYM;
1511		1511
1512	*sym_addr = SYMBOL_VALUE_ADDRESS (ms);	1512	*sym_addr = ms->mginfo.value.address;
1513	return PS_OK;	1513	return PS_OK;
1514	}	1514	}
1515		1515

Lines 2-8 Link Here

(-)Makefile (-4 / +4 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= gdb	4	PORTNAME= gdb
5	PORTVERSION= 7.7.1	5	PORTVERSION= 7.8
6	CATEGORIES= devel	6	CATEGORIES= devel
7	MASTER_SITES= GNU	7	MASTER_SITES= GNU
8		8
Lines 11-17 Link Here
11		11
12	LICENSE= GPLv3	12	LICENSE= GPLv3
13		13
14	USES= iconv gmake libtool tar:bzip2	14	USES= iconv gmake libtool tar:xz
15	USE_CSTD= gnu89	15	USE_CSTD= gnu89
16	GNU_CONFIGURE= yes	16	GNU_CONFIGURE= yes
17	CONFIGURE_ENV= CONFIGURED_M4=m4 CONFIGURED_BISON=byacc	17	CONFIGURE_ENV= CONFIGURED_M4=m4 CONFIGURED_BISON=byacc
Lines 101-109 Link Here
101	.endif	101	.endif
102		102
103	.if ${PORT_OPTIONS:MPYTHON}	103	.if ${PORT_OPTIONS:MPYTHON}
104	(cd ${WRKSRC}/gdb; ${MAKE_CMD} DESTDIR=${STAGEDIR} install-python )	104	(cd ${WRKSRC}/gdb; ${GMAKE} DESTDIR=${STAGEDIR} install-python )
105	(cd ${WRKSRC}/gdb/data-directory ; \	105	(cd ${WRKSRC}/gdb/data-directory ; \
106	${MAKE_CMD} DESTDIR=${STAGEDIR} install-python )	106	${GMAKE} DESTDIR=${STAGEDIR} install-python )
107	.endif	107	.endif
108		108
109	.if ${PORT_OPTIONS:MPYTHON}	109	.if ${PORT_OPTIONS:MPYTHON}

Lines 1-24 Link Here

(-)files/patch-unified (-11 / +1 lines)
1	--- gdb/gdb.c Thu Feb 13 13:07:24 2003	1	--- gdb/gdb.c Thu Feb 13 13:07:24 2003
2	+++ gdb/gdb.c Wed May 17 00:24:39 2006	2	+++ gdb/gdb.c Wed May 17 00:24:39 2006
3	@@ -23,4 +23,5 @@	3	@@ -31,5 +32,11 @@
4	#include "gdb_string.h"
5	#include "interps.h"
6	+#include <libgen.h>
7
8	int
9	@@ -31,6 +32,14 @@
10	args.argc = argc;	4	args.argc = argc;
11	args.argv = argv;	5	args.argv = argv;
12	- args.use_windows = 0;
13	- args.interpreter_p = INTERP_CONSOLE;	6	- args.interpreter_p = INTERP_CONSOLE;
14	+ if (strncmp(basename(argv[0]), "insight", 7) == 0) {	7	+ if (strncmp(basename(argv[0]), "insight", 7) == 0) {
15	+ args.use_windows = 1;
16	+ args.interpreter_p = "insight";	8	+ args.interpreter_p = "insight";
17	+ } else if (strncmp(basename(argv[0]), "gdbtui", 6) == 0) {	9	+ } else if (strncmp(basename(argv[0]), "gdbtui", 6) == 0) {
18	+ args.use_windows = 0;
19	+ args.interpreter_p = INTERP_TUI;	10	+ args.interpreter_p = INTERP_TUI;
20	+ } else {	11	+ } else {
21	+ args.use_windows = 0;
22	+ args.interpreter_p = INTERP_CONSOLE;	12	+ args.interpreter_p = INTERP_CONSOLE;
23	+ }	13	+ }
24	return gdb_main (&args);	14	return gdb_main (&args);

Lines 9-14 Link Here

(-)pkg-plist (+2 lines)
9	%%PYTHON%%%%DATADIR%%%%VER%%/python/gdb/printing.py	9	%%PYTHON%%%%DATADIR%%%%VER%%/python/gdb/printing.py
10	%%PYTHON%%%%DATADIR%%%%VER%%/python/gdb/prompt.py	10	%%PYTHON%%%%DATADIR%%%%VER%%/python/gdb/prompt.py
11	%%PYTHON%%%%DATADIR%%%%VER%%/python/gdb/types.py	11	%%PYTHON%%%%DATADIR%%%%VER%%/python/gdb/types.py
		12	%%PYTHON%%%%DATADIR%%%%VER%%/python/gdb/xmethod.py
12	%%PYTHON%%%%DATADIR%%%%VER%%/python/gdb/command/__init__.py	13	%%PYTHON%%%%DATADIR%%%%VER%%/python/gdb/command/__init__.py
13	%%PYTHON%%%%DATADIR%%%%VER%%/python/gdb/command/bound_registers.py	14	%%PYTHON%%%%DATADIR%%%%VER%%/python/gdb/command/bound_registers.py
14	%%PYTHON%%%%DATADIR%%%%VER%%/python/gdb/command/explore.py	15	%%PYTHON%%%%DATADIR%%%%VER%%/python/gdb/command/explore.py
Lines 16-21 Link Here
16	%%PYTHON%%%%DATADIR%%%%VER%%/python/gdb/command/pretty_printers.py	17	%%PYTHON%%%%DATADIR%%%%VER%%/python/gdb/command/pretty_printers.py
17	%%PYTHON%%%%DATADIR%%%%VER%%/python/gdb/command/prompt.py	18	%%PYTHON%%%%DATADIR%%%%VER%%/python/gdb/command/prompt.py
18	%%PYTHON%%%%DATADIR%%%%VER%%/python/gdb/command/type_printers.py	19	%%PYTHON%%%%DATADIR%%%%VER%%/python/gdb/command/type_printers.py
		20	%%PYTHON%%%%DATADIR%%%%VER%%/python/gdb/command/xmethods.py
19	%%PYTHON%%%%DATADIR%%%%VER%%/python/gdb/function/__init__.py	21	%%PYTHON%%%%DATADIR%%%%VER%%/python/gdb/function/__init__.py
20	%%PYTHON%%%%DATADIR%%%%VER%%/python/gdb/function/strfns.py	22	%%PYTHON%%%%DATADIR%%%%VER%%/python/gdb/function/strfns.py
21	%%PYTHON%%@dirrmtry %%DATADIR%%%%VER%%/python/gdb/function	23	%%PYTHON%%@dirrmtry %%DATADIR%%%%VER%%/python/gdb/function