diff --git a/devel/cxxtools/Makefile b/devel/cxxtools/Makefile
index 36c9bdddd628..8ea06ecca1c2 100644
--- a/devel/cxxtools/Makefile
+++ b/devel/cxxtools/Makefile
@@ -1,61 +1,63 @@
 # Created by: Juergen Lock <nox@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	cxxtools
 PORTVERSION=	2.2.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	http://www.tntnet.org/download/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Collection of general-purpose C++ classes
 
 LICENSE=	LGPL21+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-PATCH_STRIP=	-p1
-USES=		cpe iconv libtool pathfix
+BROKEN_sparc64=	does not configure
+
+USES=		cpe iconv libtool localbase pathfix
 CPE_VENDOR=	tntnet
 USE_CSTD=	gnu89
 GNU_CONFIGURE=	yes
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} == "sparc64"
-BROKEN=		Does not configure on sparc64
-.endif
 .if ${ARCH} == "amd64"
 PLIST_SUB+=	X86_64_ONLY=""
 .else
 PLIST_SUB+=	X86_64_ONLY="@comment "
 .endif
+
 .if ${ARCH} == "i386"
 PLIST_SUB+=	I386_ONLY=""
 .else
 PLIST_SUB+=	I386_ONLY="@comment "
 .endif
+
 .if (${ARCH} == "amd64") || (${ARCH} == "i386")
 PLIST_SUB+=	X86_ONLY=""
 .else
 PLIST_SUB+=	X86_ONLY="@comment "
 .endif
+
 .if ${ARCH} == "arm" || ${ARCH} == "armv6"
 PLIST_SUB+=	ARM_ONLY=""
 .else
 PLIST_SUB+=	ARM_ONLY="@comment "
 .endif
+
 .if ${ARCH} == "mips" || ${ARCH} == "mips64"
 PLIST_SUB+=	MIPS_ONLY=""
 .else
 PLIST_SUB+=	MIPS_ONLY="@comment "
 .endif
+
 .if ${ARCH} == "powerpc" || ${ARCH} == "powerpc64"
 PLIST_SUB+=	PPC_ONLY=""
 .else
 PLIST_SUB+=	PPC_ONLY="@comment "
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/cxxtools/files/patch-clang b/devel/cxxtools/files/patch-include_cxxtools_char.h
similarity index 92%
rename from devel/cxxtools/files/patch-clang
rename to devel/cxxtools/files/patch-include_cxxtools_char.h
index 6c8f772a9d22..b08ef6fda379 100644
--- a/devel/cxxtools/files/patch-clang
+++ b/devel/cxxtools/files/patch-include_cxxtools_char.h
@@ -1,32 +1,32 @@
 Obtained from:
 
 	https://github.com/maekitalo/cxxtools/commit/645dedf575da32198ac815655e5c6e5cd5cc4461
 
---- a/include/cxxtools/char.h
-+++ b/include/cxxtools/char.h
+--- include/cxxtools/char.h.orig	2014-01-17 19:05:09 UTC
++++ include/cxxtools/char.h
 @@ -72,23 +72,8 @@ namespace cxxtools
              : _value(0)
              {}
  
 -            //! Constructs a character using the given char as base for the character value.
 -            Char(char ch)
 -            : _value(value_type(static_cast<unsigned char>(ch)))
 -            {}
 -
 -            //! Constructs a character using the given char as base for the character value.
 -            Char(unsigned char ch)
 -            : _value( value_type(ch) )
 -            {}
 -
 -            //! Constructs a character using the given char as base for the character value.
 -            Char(wchar_t ch)
 -            : _value( value_type(static_cast<uint16_t>(ch)) )
 -            {}
 -
 -            //! Constructs a character using the given unsigned 32-bit as base for the character value.
 -            explicit Char(value_type ch)
 +            //! Constructs a character using the given value as base for the character value.
 +            Char(value_type ch)
              : _value(ch)
              {}
  
diff --git a/devel/cxxtools/files/patch-src-directoryimpl.cpp b/devel/cxxtools/files/patch-src_directoryimpl.cpp
similarity index 68%
rename from devel/cxxtools/files/patch-src-directoryimpl.cpp
rename to devel/cxxtools/files/patch-src_directoryimpl.cpp
index e5bc44766199..3a97d265b008 100644
--- a/devel/cxxtools/files/patch-src-directoryimpl.cpp
+++ b/devel/cxxtools/files/patch-src_directoryimpl.cpp
@@ -1,10 +1,10 @@
---- a/src/directoryimpl.cpp
-+++ b/src/directoryimpl.cpp
+--- src/directoryimpl.cpp.orig	2013-12-26 09:33:48 UTC
++++ src/directoryimpl.cpp
 @@ -27,6 +27,7 @@
   */
  #include "directoryimpl.h"
  #include "cxxtools/systemerror.h"
 +#include <sys/param.h>
  #include <sys/stat.h>
  #include <sys/types.h>
  #include <dirent.h>
diff --git a/devel/cxxtools/files/patch-src-tcpsocketimpl.h b/devel/cxxtools/files/patch-src_tcpsocketimpl.h
similarity index 60%
rename from devel/cxxtools/files/patch-src-tcpsocketimpl.h
rename to devel/cxxtools/files/patch-src_tcpsocketimpl.h
index 30f1a0835b1f..5ea4873519f1 100644
--- a/devel/cxxtools/files/patch-src-tcpsocketimpl.h
+++ b/devel/cxxtools/files/patch-src_tcpsocketimpl.h
@@ -1,10 +1,10 @@
---- a/src/tcpsocketimpl.h
-+++ b/src/tcpsocketimpl.h
+--- src/tcpsocketimpl.h.orig	2014-01-17 19:05:09 UTC
++++ src/tcpsocketimpl.h
 @@ -36,6 +36,7 @@
  #include <string>
  #include <sys/types.h>
  #include <sys/socket.h>
 +#include <netinet/in.h>
  #include <sys/poll.h>
  #include <sys/time.h>
- #include <unistd.h>
+ #include <netinet/in.h>