diff --git a/textproc/raptor2/Makefile b/textproc/raptor2/Makefile
index 8f5297f37eb0..5b39c66d0c21 100644
--- a/textproc/raptor2/Makefile
+++ b/textproc/raptor2/Makefile
@@ -1,34 +1,34 @@
 PORTNAME=	raptor2
 PORTVERSION=	2.0.15
-PORTREVISION=	22
+PORTREVISION=	23
 CATEGORIES=	textproc
 MASTER_SITES=	http://download.librdf.org/source/ \
 		SF/librdf/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	RDF Parser Toolkit for Redland
 WWW=		https://librdf.org/raptor/
 
 # Even though GPLv3 is not explicitly mentioned in the port's LICENSE.html, one
 # of its licenses is "GPLv2 or newer", which includes GPLv3.
 LICENSE=	APACHE20 GPLv2 GPLv3 LGPL21
 LICENSE_COMB=	dual
 
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libicuuc.so:devel/icu \
 		libyajl.so:devel/yajl
 
 CONFLICTS=	raptor-1.4.1[0-9]* raptor-1.4.21
 
 USE_GNOME=	libxml2 libxslt
 USES=		gnome libtool:keepla pathfix pkgconfig
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-xml2-config=${LOCALBASE}/bin/xml2-config \
 		--with-curl-config=${LOCALBASE}/bin/curl-config \
 		--with-icu-config=${LOCALBASE}/bin/icu-config \
 		--with-www=curl
 INSTALL_TARGET=	install-strip
 
 USE_LDCONFIG=	yes
 
 .include <bsd.port.mk>
diff --git a/textproc/raptor2/files/patch-src_sort__r.h b/textproc/raptor2/files/patch-src_sort__r.h
new file mode 100644
index 000000000000..70878740f4a6
--- /dev/null
+++ b/textproc/raptor2/files/patch-src_sort__r.h
@@ -0,0 +1,34 @@
+--- src/sort_r.h.orig	2014-10-09 23:00:44 UTC
++++ src/sort_r.h
+@@ -24,10 +24,11 @@ void sort_r(void *base, size_t nel, size_t width,
+      defined OpenBSD3_1 || defined OpenBSD3_9 || defined __OpenBSD__ || \
+      defined __NetBSD__ || \
+      defined __DragonFly__ || \
+-     defined AMIGA)
++     defined AMIGA) && !defined(qsort_r)
+ #  define _SORT_R_BSD
+ #elif (defined _GNU_SOURCE || defined __gnu_hurd__ || defined __GNU__ || \
+-       defined __linux__ || defined __MINGW32__ || defined __GLIBC__)
++       defined __linux__ || defined __MINGW32__ || defined __GLIBC__) || \
++       defined(qsort_r)
+ #  define _SORT_R_LINUX
+ #elif (defined _WIN32 || defined _WIN64 || defined __WINDOWS__)
+ #  define _SORT_R_WINDOWS
+@@ -64,7 +65,7 @@ void sort_r(void *base, size_t nel, size_t width,
+   #if defined _SORT_R_BSD
+ 
+     /* BSD requires argument swap */
+-    extern void qsort_r(void *base, size_t nel, size_t width, void *thunk,
++    extern void (qsort_r)(void *base, size_t nel, size_t width, void *thunk,
+                         int (*compar)(void *_thunk, const void *_a, const void *_b));
+ 
+     struct sort_r_data
+@@ -82,7 +83,7 @@ void sort_r(void *base, size_t nel, size_t width,
+   #elif defined _SORT_R_LINUX
+ 
+     typedef int(* __compar_d_fn_t)(const void *, const void *, void *);
+-    extern void qsort_r(void *base, size_t nel, size_t width,
++    extern void (qsort_r)(void *base, size_t nel, size_t width,
+                         __compar_d_fn_t __compar, void *arg)
+       __attribute__((nonnull (1, 4)));
+