Index: devel/Makefile
===================================================================
--- devel/Makefile
+++ devel/Makefile
@@ -1401,6 +1401,7 @@
     SUBDIR += libcrossguid
     SUBDIR += libcutl
     SUBDIR += libcwd
+    SUBDIR += libcxx-gdbpy
     SUBDIR += libdaemon
     SUBDIR += libdap
     SUBDIR += libdatrie
Index: devel/gdb/Makefile
===================================================================
--- devel/gdb/Makefile
+++ devel/gdb/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gdb
 PORTVERSION=	8.2.1
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	GNU
 
@@ -79,6 +79,9 @@
 PYTHON_CONFIGURE_ON=	--with-python=${PYTHON_CMD}
 PYTHON_CONFIGURE_OFF=	--without-python
 PYTHON_USES=		python
+.if exists(/usr/lib/libc++.so.1)
+PYTHON_RUN_DEPENDS=	${DATADIR}/auto-load/usr/lib/libc++.so.1-gdb.py:devel/libcxx-gdbpy
+.endif
 SYSTEM_ICONV_USES=	iconv
 SYSTEM_ZLIB_WITH=	system-zlib
 TUI_CONFIGURE_ENABLE=	tui
Index: devel/libcxx-gdbpy/Makefile
===================================================================
--- /dev/null
+++ devel/libcxx-gdbpy/Makefile
@@ -0,0 +1,23 @@
+# $FreeBSD$
+
+PORTNAME=	libcxx-gdbpy
+DISTVERSION=	g20190211
+CATEGORIES=	devel
+
+MAINTAINER=	jhb@FreeBSD.org
+COMMENT=	Pretty printers for libc++ classes
+
+LICENSE=	LLVM
+LICENSE_NAME=	LLVM Release License
+LICENSE_FILE=	${WRKSRC}/LICENSE.TXT
+LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	bsdjhb
+GH_PROJECT=	libcxx-gdbpy
+GH_TAGNAME=	99aae0c
+
+NO_ARCH=	yes
+NO_BUILD=	yes
+
+.include <bsd.port.mk>
Index: devel/libcxx-gdbpy/distinfo
===================================================================
--- /dev/null
+++ devel/libcxx-gdbpy/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1549917874
+SHA256 (bsdjhb-libcxx-gdbpy-g20190211-99aae0c_GH0.tar.gz) = 101425f8041489e31370ddd5938b41541b88a2e1051da70fe12d37c9186aa7eb
+SIZE (bsdjhb-libcxx-gdbpy-g20190211-99aae0c_GH0.tar.gz) = 4607
Index: devel/libcxx-gdbpy/pkg-descr
===================================================================
--- /dev/null
+++ devel/libcxx-gdbpy/pkg-descr
@@ -0,0 +1,6 @@
+This port installs python scripts that include pretty printers and xmethods
+for libc++.  GDB uses these scripts to print the value of STL objects more
+cleanly as well as permit the use of template functions and operators on
+STL objects.
+
+WWW: https://github.com/bsdjhb/libcxx-gdbpy
Index: devel/libcxx-gdbpy/pkg-plist
===================================================================
--- /dev/null
+++ devel/libcxx-gdbpy/pkg-plist
@@ -0,0 +1,4 @@
+%%DATADIR%%/libcxx/__init__.py
+%%DATADIR%%/libcxx/printers.py
+%%DATADIR%%/libcxx/xmethods.py
+share/gdb/auto-load/usr/lib/libc++.so.1-gdb.py