diff --git a/sysutils/openipmi/Makefile b/sysutils/openipmi/Makefile
index 2840cf04dca9..3f0d56562d5f 100644
--- a/sysutils/openipmi/Makefile
+++ b/sysutils/openipmi/Makefile
@@ -1,128 +1,127 @@
 # Created by: Alex Deiter <alex.deiter@gmail.com>
 # $FreeBSD$
 
 PORTNAME=	openipmi
 PORTVERSION=	2.0.19
 PORTREVISION=	4
 CATEGORIES=	sysutils
 MASTER_SITES=	SF/${PORTNAME}/OpenIPMI%202.0%20Library
 DISTNAME=	OpenIPMI-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Complex IPMI management software
 
-LIB_DEPENDS=	libexecinfo.so:${PORTSDIR}/devel/libexecinfo \
-		libpopt.so:${PORTSDIR}/devel/popt
+LIB_DEPENDS=	libpopt.so:${PORTSDIR}/devel/popt
 
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
-USES=		gmake libtool pathfix pkgconfig
+USES=		execinfo gmake libtool pathfix pkgconfig
 USE_LDCONFIG=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 OPTIONS_DEFINE=	SSL SNMP PERL PYTHON TCL TKINTER GDBM
 OPTIONS_RADIO=	GLIB
 OPTIONS_RADIO_GLIB=	GLIB12 GLIB20
 SSL_DESC=	IPMI 2.0 RMCP+ encryption and authentication
 SNMP_DESC=	SNMP trap support for the sample programs
 PERL_DESC=	Perl interface for OpenIPMI library
 PYTHON_DESC=	Python interface for OpenIPMI library
 TCL_DESC=	TCL interface for OpenIPMI library
 TKINTER_DESC=	GUI for OpenIPMI, written in Python
 GDBM_DESC=	Local SDR caching on startup
 GLIB12_DESC=	Simply OS handler for glib 1.2
 GLIB20_DESC=	Simply OS handler for glib 2.0
 
 .include <bsd.port.options.mk>
 
 .if exists(${LOCALBASE}/lib/libgdbm.so.3)
 PORT_OPTIONS+=	GDBM
 .endif
 
 .if ${PORT_OPTIONS:MSNMP}
 PORT_OPTIONS+=		SSL
 LIB_DEPENDS+=		libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp
 CONFIGURE_ARGS+=	--with-ucdsnmp=${LOCALBASE}
 .else
 CONFIGURE_ARGS+=	--with-ucdsnmp=no
 .endif
 
 .if ${PORT_OPTIONS:MSSL}
 USE_OPENSSL=		yes
 CONFIGURE_ARGS+=	--with-openssl=${OPENSSLBASE}
 .else
 CONFIGURE_ARGS+=	--with-openssl=no
 .endif
 
 .if ${PORT_OPTIONS:MTKINTER}
 USES+=			python
 WITH_PYTHON=		yes
 BUILD_DEPENDS+=		${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinter \
 			${LOCALBASE}/lib/Tix8.4.3/Tix.tcl:${PORTSDIR}/x11-toolkits/tix
 CONFIGURE_ARGS+=	--with-tkinter
 PLIST_SUB+=		TKINTER=""
 .else
 CONFIGURE_ARGS+=	--with-tkinter=no
 PLIST_SUB+=		TKINTER="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MPERL}
 WITH_SWIG=		yes
 USES+=			perl5
 CONFIGURE_ARGS+=	--with-perl
 PLIST_SUB+=		PERL=""
 .else
 CONFIGURE_ARGS+=	--with-perl=no
 PLIST_SUB+=		PERL="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MPYTHON}
 USES+=			python
 CONFIGURE_ARGS+=	--with-python --with-swig ac_cv_path_pythonprog=${PYTHON_CMD}
 BUILD_DEPENDS+=		swig:${PORTSDIR}/devel/swig13
 PLIST_SUB+=		PYTHON=""
 .else
 CONFIGURE_ARGS+=	--with-python=no --with-swig=no
 PLIST_SUB+=		PYTHON="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MTCL}
 USES+=			tcl
 CONFIGURE_ARGS+=	--with-tcl \
 			--with-tclcflags=-I${TCL_INCLUDEDIR} \
 			--with-tcllibs=-ltcl${TCL_SHLIB_VER}
 PLIST_SUB+=		TCL=""
 .else
 CONFIGURE_ARGS+=	--with-tcl=no
 PLIST_SUB+=		TCL="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MGDBM}
 LIB_DEPENDS+=		libgdbm.so:${PORTSDIR}/databases/gdbm
 .endif
 
 .if ${PORT_OPTIONS:MGLIB12}
 USE_GNOME+=		glib12
 CONFIGURE_ARGS+=	--with-glib12 --with-glibver=1.2
 PLIST_SUB+=		GLIB12=""
 .else
 CONFIGURE_ARGS+=	--with-glib12=no
 PLIST_SUB+=		GLIB12="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MGLIB20}
 USE_GNOME+=		glib20
 CONFIGURE_ARGS+=	--with-glib --with-glibver=2.0
 PLIST_SUB+=		GLIB20=""
 .else
 CONFIGURE_ARGS+=	--with-glib=no
 PLIST_SUB+=		GLIB20="@comment "
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} '/libOpenIPMIutils_la_LIBADD =/s/$$/ -lexecinfo/' \
 		${WRKSRC}/utils/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/sysutils/openipmi/pkg-plist b/sysutils/openipmi/pkg-plist
index e536179c9bdc..a5f644079781 100644
--- a/sysutils/openipmi/pkg-plist
+++ b/sysutils/openipmi/pkg-plist
@@ -1,220 +1,217 @@
 @comment common files list
 bin/ipmi_ui
 bin/ipmicmd
 bin/ipmilan
 bin/ipmish
 bin/openipmicmd
 bin/openipmish
 bin/rmcp_ping
 bin/solterm
 include/OpenIPMI/internal/ilist.h
 include/OpenIPMI/internal/ipmi_control.h
 include/OpenIPMI/internal/ipmi_domain.h
 include/OpenIPMI/internal/ipmi_entity.h
 include/OpenIPMI/internal/ipmi_event.h
 include/OpenIPMI/internal/ipmi_fru.h
 include/OpenIPMI/internal/ipmi_int.h
 include/OpenIPMI/internal/ipmi_locks.h
 include/OpenIPMI/internal/ipmi_malloc.h
 include/OpenIPMI/internal/ipmi_mc.h
 include/OpenIPMI/internal/ipmi_oem.h
 include/OpenIPMI/internal/ipmi_sel.h
 include/OpenIPMI/internal/ipmi_sensor.h
 include/OpenIPMI/internal/ipmi_utils.h
 include/OpenIPMI/internal/locked_list.h
 include/OpenIPMI/internal/md2.h
 include/OpenIPMI/internal/md5.h
 include/OpenIPMI/internal/opq.h
 include/OpenIPMI/ipmi_addr.h
 include/OpenIPMI/ipmi_auth.h
 include/OpenIPMI/ipmi_bits.h
 include/OpenIPMI/ipmi_cmdlang.h
 include/OpenIPMI/ipmi_conn.h
 include/OpenIPMI/ipmi_debug.h
 include/OpenIPMI/ipmi_err.h
 include/OpenIPMI/ipmi_fru.h
 include/OpenIPMI/ipmi_glib.h
 include/OpenIPMI/ipmi_lan.h
 include/OpenIPMI/ipmi_lanparm.h
 include/OpenIPMI/ipmi_log.h
 include/OpenIPMI/ipmi_mc.h
 include/OpenIPMI/ipmi_msgbits.h
 include/OpenIPMI/ipmi_pef.h
 include/OpenIPMI/ipmi_pet.h
 include/OpenIPMI/ipmi_picmg.h
 include/OpenIPMI/ipmi_posix.h
 include/OpenIPMI/ipmi_sdr.h
 include/OpenIPMI/ipmi_smi.h
 include/OpenIPMI/ipmi_sol.h
 include/OpenIPMI/ipmi_solparm.h
 include/OpenIPMI/ipmi_tcl.h
 include/OpenIPMI/ipmi_types.h
 include/OpenIPMI/ipmi_ui.h
 include/OpenIPMI/ipmi_user.h
 include/OpenIPMI/ipmiif.h
 include/OpenIPMI/lanserv.h
 include/OpenIPMI/mxp.h
 include/OpenIPMI/os_handler.h
 include/OpenIPMI/selector.h
 lib/libIPMIlanserv.a
 lib/libIPMIlanserv.so
 lib/libIPMIlanserv.so.0
 lib/libIPMIlanserv.so.0.0.1
 lib/libOpenIPMI.a
 lib/libOpenIPMI.so
 lib/libOpenIPMI.so.0
 lib/libOpenIPMI.so.0.0.5
 lib/libOpenIPMIcmdlang.a
 lib/libOpenIPMIcmdlang.so
 lib/libOpenIPMIcmdlang.so.0
 lib/libOpenIPMIcmdlang.so.0.0.5
 lib/libOpenIPMIposix.a
 lib/libOpenIPMIposix.so
 lib/libOpenIPMIposix.so.0
 lib/libOpenIPMIposix.so.0.0.1
 lib/libOpenIPMIpthread.a
 lib/libOpenIPMIpthread.so
 lib/libOpenIPMIpthread.so.0
 lib/libOpenIPMIpthread.so.0.0.1
 lib/libOpenIPMIui.a
 lib/libOpenIPMIui.so
 lib/libOpenIPMIui.so.1
 lib/libOpenIPMIui.so.1.0.1
 lib/libOpenIPMIutils.a
 lib/libOpenIPMIutils.so
 lib/libOpenIPMIutils.so.0
 lib/libOpenIPMIutils.so.0.0.1
 libdata/pkgconfig/OpenIPMI.pc
 libdata/pkgconfig/OpenIPMIcmdlang.pc
 libdata/pkgconfig/OpenIPMIposix.pc
 libdata/pkgconfig/OpenIPMIpthread.pc
 libdata/pkgconfig/OpenIPMIui.pc
 libdata/pkgconfig/OpenIPMIutils.pc
 man/man1/ipmi_ui.1.gz
 man/man1/openipmicmd.1.gz
 man/man1/openipmigui.1.gz
 man/man1/openipmish.1.gz
 man/man1/rmcp_ping.1.gz
 man/man1/solterm.1.gz
 man/man7/ipmi_cmdlang.7.gz
 man/man7/openipmi_conparms.7.gz
 man/man8/ipmilan.8.gz
-@dirrmtry include/OpenIPMI/internal
-@dirrmtry include/OpenIPMI
 %%GLIB12%%@comment files list for GLIB12
 %%GLIB12%%lib/libOpenIPMIglib12.a
 %%GLIB12%%lib/libOpenIPMIglib12.so
 %%GLIB12%%lib/libOpenIPMIglib12.so.0
 %%GLIB12%%lib/libOpenIPMIglib12.so.0.0.1
 %%GLIB12%%libdata/pkgconfig/OpenIPMIglib12.pc
 %%GLIB20%%@comment files list for GLIB20
 %%GLIB20%%lib/libOpenIPMIglib.a
 %%GLIB20%%lib/libOpenIPMIglib.so
 %%GLIB20%%lib/libOpenIPMIglib.so.0
 %%GLIB20%%lib/libOpenIPMIglib.so.0.0.1
 %%GLIB20%%libdata/pkgconfig/OpenIPMIglib.pc
 %%TCL%%@comment files list for TCL
 %%TCL%%lib/libOpenIPMItcl.a
 %%TCL%%lib/libOpenIPMItcl.so
 %%TCL%%lib/libOpenIPMItcl.so.0
 %%TCL%%lib/libOpenIPMItcl.so.0.0.1
 %%TCL%%libdata/pkgconfig/OpenIPMItcl.pc
 %%PERL%%@comment files list for PERL
 %%PERL%%%%SITE_ARCH%%/OpenIPMI.pm
 %%PERL%%%%SITE_ARCH%%/auto/OpenIPMI/OpenIPMI.so
 %%PYTHON%%@comment files list for PYTHON
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/OpenIPMI.py
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/OpenIPMI.pyc
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/OpenIPMI.pyo
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/_OpenIPMI.a
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/_OpenIPMI.so
 %%TKINTER%%@comment files list for TKINTER
 %%TKINTER%%bin/openipmigui
 %%TKINTER%%%%PYTHON_SITELIBDIR%%/openipmigui/__init__.py
 %%TKINTER%%%%PYTHON_SITELIBDIR%%/openipmigui/__init__.pyc
 %%TKINTER%%%%PYTHON_SITELIBDIR%%/openipmigui/__init__.pyo
 %%TKINTER%%%%PYTHON_SITELIBDIR%%/openipmigui/_conn.py
 %%TKINTER%%%%PYTHON_SITELIBDIR%%/openipmigui/_conn.pyc
 %%TKINTER%%%%PYTHON_SITELIBDIR%%/openipmigui/_conn.pyo
 %%TKINTER%%%%PYTHON_SITELIBDIR%%/openipmigui/_control.py
 %%TKINTER%%%%PYTHON_SITELIBDIR%%/openipmigui/_control.pyc
 %%TKINTER%%%%PYTHON_SITELIBDIR%%/openipmigui/_control.pyo
 %%TKINTER%%%%PYTHON_SITELIBDIR%%/openipmigui/_domain.py
 %%TKINTER%%%%PYTHON_SITELIBDIR%%/openipmigui/_domain.pyc
 %%TKINTER%%%%PYTHON_SITELIBDIR%%/openipmigui/_domain.pyo
 %%TKINTER%%%%PYTHON_SITELIBDIR%%/openipmigui/_entity.py
 %%TKINTER%%%%PYTHON_SITELIBDIR%%/openipmigui/_entity.pyc
 %%TKINTER%%%%PYTHON_SITELIBDIR%%/openipmigui/_entity.pyo
 %%TKINTER%%%%PYTHON_SITELIBDIR%%/openipmigui/_fru.py
 %%TKINTER%%%%PYTHON_SITELIBDIR%%/openipmigui/_fru.pyc
 %%TKINTER%%%%PYTHON_SITELIBDIR%%/openipmigui/_fru.pyo
 %%TKINTER%%%%PYTHON_SITELIBDIR%%/openipmigui/_mc.py
 %%TKINTER%%%%PYTHON_SITELIBDIR%%/openipmigui/_mc.pyc
 %%TKINTER%%%%PYTHON_SITELIBDIR%%/openipmigui/_mc.pyo
 %%TKINTER%%%%PYTHON_SITELIBDIR%%/openipmigui/_mc_chan.py
 %%TKINTER%%%%PYTHON_SITELIBDIR%%/openipmigui/_mc_chan.pyc
 %%TKINTER%%%%PYTHON_SITELIBDIR%%/openipmigui/_mc_chan.pyo
 %%TKINTER%%%%PYTHON_SITELIBDIR%%/openipmigui/_mc_lanparm.py
 %%TKINTER%%%%PYTHON_SITELIBDIR%%/openipmigui/_mc_lanparm.pyc
 %%TKINTER%%%%PYTHON_SITELIBDIR%%/openipmigui/_mc_lanparm.pyo
 %%TKINTER%%%%PYTHON_SITELIBDIR%%/openipmigui/_mc_pefparm.py
 %%TKINTER%%%%PYTHON_SITELIBDIR%%/openipmigui/_mc_pefparm.pyc
 %%TKINTER%%%%PYTHON_SITELIBDIR%%/openipmigui/_mc_pefparm.pyo
 %%TKINTER%%%%PYTHON_SITELIBDIR%%/openipmigui/_mc_solparm.py
 %%TKINTER%%%%PYTHON_SITELIBDIR%%/openipmigui/_mc_solparm.pyc
 %%TKINTER%%%%PYTHON_SITELIBDIR%%/openipmigui/_mc_solparm.pyo
 %%TKINTER%%%%PYTHON_SITELIBDIR%%/openipmigui/_mc_user.py
 %%TKINTER%%%%PYTHON_SITELIBDIR%%/openipmigui/_mc_user.pyc
 %%TKINTER%%%%PYTHON_SITELIBDIR%%/openipmigui/_mc_user.pyo
 %%TKINTER%%%%PYTHON_SITELIBDIR%%/openipmigui/_misc.py
 %%TKINTER%%%%PYTHON_SITELIBDIR%%/openipmigui/_misc.pyc
 %%TKINTER%%%%PYTHON_SITELIBDIR%%/openipmigui/_misc.pyo
 %%TKINTER%%%%PYTHON_SITELIBDIR%%/openipmigui/_oi_logging.py
 %%TKINTER%%%%PYTHON_SITELIBDIR%%/openipmigui/_oi_logging.pyc
 %%TKINTER%%%%PYTHON_SITELIBDIR%%/openipmigui/_oi_logging.pyo
 %%TKINTER%%%%PYTHON_SITELIBDIR%%/openipmigui/_saveprefs.py
 %%TKINTER%%%%PYTHON_SITELIBDIR%%/openipmigui/_saveprefs.pyc
 %%TKINTER%%%%PYTHON_SITELIBDIR%%/openipmigui/_saveprefs.pyo
 %%TKINTER%%%%PYTHON_SITELIBDIR%%/openipmigui/_sel.py
 %%TKINTER%%%%PYTHON_SITELIBDIR%%/openipmigui/_sel.pyc
 %%TKINTER%%%%PYTHON_SITELIBDIR%%/openipmigui/_sel.pyo
 %%TKINTER%%%%PYTHON_SITELIBDIR%%/openipmigui/_sensor.py
 %%TKINTER%%%%PYTHON_SITELIBDIR%%/openipmigui/_sensor.pyc
 %%TKINTER%%%%PYTHON_SITELIBDIR%%/openipmigui/_sensor.pyo
 %%TKINTER%%%%PYTHON_SITELIBDIR%%/openipmigui/_term.py
 %%TKINTER%%%%PYTHON_SITELIBDIR%%/openipmigui/_term.pyc
 %%TKINTER%%%%PYTHON_SITELIBDIR%%/openipmigui/_term.pyo
 %%TKINTER%%%%PYTHON_SITELIBDIR%%/openipmigui/gui.py
 %%TKINTER%%%%PYTHON_SITELIBDIR%%/openipmigui/gui.pyc
 %%TKINTER%%%%PYTHON_SITELIBDIR%%/openipmigui/gui.pyo
 %%TKINTER%%%%PYTHON_SITELIBDIR%%/openipmigui/gui_SoL.py
 %%TKINTER%%%%PYTHON_SITELIBDIR%%/openipmigui/gui_SoL.pyc
 %%TKINTER%%%%PYTHON_SITELIBDIR%%/openipmigui/gui_SoL.pyo
 %%TKINTER%%%%PYTHON_SITELIBDIR%%/openipmigui/gui_cmdwin.py
 %%TKINTER%%%%PYTHON_SITELIBDIR%%/openipmigui/gui_cmdwin.pyc
 %%TKINTER%%%%PYTHON_SITELIBDIR%%/openipmigui/gui_cmdwin.pyo
 %%TKINTER%%%%PYTHON_SITELIBDIR%%/openipmigui/gui_domainDialog.py
 %%TKINTER%%%%PYTHON_SITELIBDIR%%/openipmigui/gui_domainDialog.pyc
 %%TKINTER%%%%PYTHON_SITELIBDIR%%/openipmigui/gui_domainDialog.pyo
 %%TKINTER%%%%PYTHON_SITELIBDIR%%/openipmigui/gui_errstr.py
 %%TKINTER%%%%PYTHON_SITELIBDIR%%/openipmigui/gui_errstr.pyc
 %%TKINTER%%%%PYTHON_SITELIBDIR%%/openipmigui/gui_errstr.pyo
 %%TKINTER%%%%PYTHON_SITELIBDIR%%/openipmigui/gui_lightset.py
 %%TKINTER%%%%PYTHON_SITELIBDIR%%/openipmigui/gui_lightset.pyc
 %%TKINTER%%%%PYTHON_SITELIBDIR%%/openipmigui/gui_lightset.pyo
 %%TKINTER%%%%PYTHON_SITELIBDIR%%/openipmigui/gui_list.py
 %%TKINTER%%%%PYTHON_SITELIBDIR%%/openipmigui/gui_list.pyc
 %%TKINTER%%%%PYTHON_SITELIBDIR%%/openipmigui/gui_list.pyo
 %%TKINTER%%%%PYTHON_SITELIBDIR%%/openipmigui/gui_popup.py
 %%TKINTER%%%%PYTHON_SITELIBDIR%%/openipmigui/gui_popup.pyc
 %%TKINTER%%%%PYTHON_SITELIBDIR%%/openipmigui/gui_popup.pyo
 %%TKINTER%%%%PYTHON_SITELIBDIR%%/openipmigui/gui_setdialog.py
 %%TKINTER%%%%PYTHON_SITELIBDIR%%/openipmigui/gui_setdialog.pyc
 %%TKINTER%%%%PYTHON_SITELIBDIR%%/openipmigui/gui_setdialog.pyo
 %%TKINTER%%%%PYTHON_SITELIBDIR%%/openipmigui/gui_term.py
 %%TKINTER%%%%PYTHON_SITELIBDIR%%/openipmigui/gui_term.pyc
 %%TKINTER%%%%PYTHON_SITELIBDIR%%/openipmigui/gui_term.pyo
 %%TKINTER%%%%PYTHON_SITELIBDIR%%/openipmigui/gui_treelist.py
 %%TKINTER%%%%PYTHON_SITELIBDIR%%/openipmigui/gui_treelist.pyc
 %%TKINTER%%%%PYTHON_SITELIBDIR%%/openipmigui/gui_treelist.pyo
-%%TKINTER%%@dirrmtry %%PYTHON_SITELIBDIR%%/openipmigui