Index: devel/elfio/Makefile
===================================================================
--- devel/elfio/Makefile
+++ devel/elfio/Makefile
@@ -2,44 +2,29 @@
 # $FreeBSD$
 
 PORTNAME=	elfio
-PORTVERSION=	1.0.3
-PORTREVISION=	5
+PORTVERSION=	3.3
 CATEGORIES=	devel
-MASTER_SITES=	SF/${PORTNAME}/ELFIO-sources/ELFIO-${PORTVERSION}
-DISTNAME=	${PORTNAME:tu}-${PORTVERSION}
+MASTER_SITES=	SF/elfio/ELFIO-sources/ELFIO-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	C++ library for reading and generating files in the ELF binary format
+MAINTAINER=	james.wright@digital-chaos.com
+COMMENT=	Small C++ library for reading and generating ELF files
 
-LICENSE=	LGPL21+
+LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 GNU_CONFIGURE=	yes
-INSTALL_TARGET=	install-strip
-USES=		autoreconf libtool
-USE_LDCONFIG=	yes
+CONFIGURE_ARGS=	--bindir=${EXAMPLESDIR}
 
-PORTDOCS=	*
-
-OPTIONS_DEFINE=	EXAMPLES DOCS
+OPTIONS_DEFINE=	DOCS EXAMPLES
 OPTIONS_SUB=	yes
 
-post-patch:
-	@(${FIND} ${WRKSRC}/ -name Makefile.am | \
-		${XARGS} ${REINPLACE_CMD} -E -e 's,(libELFIO)\.a,\1.la,g')
-
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-.for file in AUTHORS ChangeLog README
-	${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR}
-.endfor
-.for f in elf11g.zip tutorial.docbook tutorial.pdf
-	${INSTALL_DATA} ${WRKSRC}/doc/${f} ${STAGEDIR}${DOCSDIR}
-.endfor
+	${INSTALL_MAN} ${WRKSRC}/doc/elfio.pdf ${STAGEDIR}${DOCSDIR}
 
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-	@${FIND} ${WRKSRC}/Examples/ -name "*.cpp" -exec ${INSTALL_DATA} {} \
-		${STAGEDIR}${EXAMPLESDIR}/ \;
+	@${FIND} ${WRKSRC}/examples/ -name "*.cpp" -exec ${INSTALL_DATA} {} \
+	${STAGEDIR}${EXAMPLESDIR}/ \;
 
 .include <bsd.port.mk>
Index: devel/elfio/distinfo
===================================================================
--- devel/elfio/distinfo
+++ devel/elfio/distinfo
@@ -1,2 +1,3 @@
-SHA256 (ELFIO-1.0.3.tar.gz) = e8cdd3895c4f6e5ed2422a2151e7940f9085a1c10d1f0508ed03b1c4860bcada
-SIZE (ELFIO-1.0.3.tar.gz) = 308560
+TIMESTAMP = 1554830757
+SHA256 (elfio-3.3.tar.gz) = d931d72c9c8bda130b3716fcf6671aded2127d8f3903cf34669311296c89b5c2
+SIZE (elfio-3.3.tar.gz) = 881052
Index: devel/elfio/files/patch-ELFIO_Makefile.am
===================================================================
--- devel/elfio/files/patch-ELFIO_Makefile.am
+++ devel/elfio/files/patch-ELFIO_Makefile.am
@@ -1,18 +0,0 @@
---- ELFIO/Makefile.am.orig	Sun Jun 24 12:43:57 2007
-+++ ELFIO/Makefile.am	Sun Jun 24 12:44:29 2007
-@@ -1,6 +1,6 @@
--lib_LIBRARIES = libELFIO.a
-+lib_LTLIBRARIES = libELFIO.la
- 
--libELFIO_a_SOURCES = ELFIDynamic.cpp ELFIImpl.cpp ELFINote.cpp ELFIO.cpp \
-+libELFIO_la_SOURCES = ELFIDynamic.cpp ELFIImpl.cpp ELFINote.cpp ELFIO.cpp \
-     ELFIOUtils.cpp ELFIRelocation.cpp ELFISection.cpp \
-     ELFISegment.cpp ELFIStrings.cpp ELFISymbols.cpp \
-     ELFODynamic.cpp ELFOImpl.cpp ELFONote.cpp \
-@@ -10,4 +10,4 @@
- include_HEADERS = ELFI.h ELFIO.h ELFO.h ELFTypes.h
- noinst_HEADERS  = ELFIImpl.h ELFOImpl.h ELFIOUtils.h
- 
--EXTRA_DIST = ELFIO.dsp ELFIO.dsw ELFIO.mcp
-\ No newline at end of file
-+EXTRA_DIST = ELFIO.dsp ELFIO.dsw ELFIO.mcp
Index: devel/elfio/files/patch-configure.in
===================================================================
--- devel/elfio/files/patch-configure.in
+++ devel/elfio/files/patch-configure.in
@@ -1,17 +0,0 @@
---- configure.in.orig	Sun Nov  6 09:08:06 2005
-+++ configure.in	Sun Jun 24 12:52:04 2007
-@@ -5,8 +5,13 @@
- 
- dnl Checks for programs.
- AC_PROG_CXX
--AC_PROG_RANLIB
- AC_PROG_INSTALL
-+
-+#
-+# Shared library support
-+#
-+AM_ENABLE_SHARED
-+AM_PROG_LIBTOOL
- 
- dnl Checks for libraries.
- 
Index: devel/elfio/pkg-descr
===================================================================
--- devel/elfio/pkg-descr
+++ devel/elfio/pkg-descr
@@ -1,6 +1,8 @@
-ELFIO is a C++ library for reading and generating files in the ELF binary
-format. This library is unique and not based on any other product. It is also
-platform independent. The library uses standard ANSI C++ constructions and
-runs on a wide variety of architectures.
+ELFIO is a small, header-only C++ library that provides a simple interface
+for reading and generating files in ELF binary format.
 
-WWW: https://sourceforge.net/projects/elfio/
+It is used as a standalone library - it is not dependant on any other
+product or project. Adhering to ISO C++, it compiles on a wide variety of
+architectures and compilers.
+
+WWW: http://elfio.sourceforge.net/
Index: devel/elfio/pkg-plist
===================================================================
--- devel/elfio/pkg-plist
+++ devel/elfio/pkg-plist
@@ -1,15 +1,23 @@
-bin/ELFDump
-include/ELFI.h
-include/ELFIO.h
-include/ELFO.h
-include/ELFTypes.h
-lib/libELFIO.a
-lib/libELFIO.so
-lib/libELFIO.so.0
-lib/libELFIO.so.0.0.0
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ELFDump.cpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/RelocationTable.cpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Write.cpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/WriteObj.cpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/WriteObj2.cpp
+include/elfio/elf_types.hpp
+include/elfio/elfio.hpp
+include/elfio/elfio_dump.hpp
+include/elfio/elfio_dynamic.hpp
+include/elfio/elfio_header.hpp
+include/elfio/elfio_note.hpp
+include/elfio/elfio_relocation.hpp
+include/elfio/elfio_section.hpp
+include/elfio/elfio_segment.hpp
+include/elfio/elfio_strings.hpp
+include/elfio/elfio_symbols.hpp
+include/elfio/elfio_utils.hpp
+%%PORTDOCS%%%%DOCSDIR%%/elfio.pdf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/anonymizer
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/anonymizer.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/elfdump
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/elfdump.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/write_obj
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/write_obj.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/writer
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/writer.cpp