3 files changed, 65 insertions, 3 deletions

diff --git a/textproc/libextractor/Makefile b/textproc/libextractor/Makefile
index 0f846b9bb9c3..a8e205faaad0 100644
--- a/textproc/libextractor/Makefile
+++ b/textproc/libextractor/Makefile
@@ -17,12 +17,16 @@ USE_BZIP2=	yes
 USE_GNOME=	glib20
 USE_PYTHON=	yes
 USE_LIBLTDL=	yes
+USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--disable-ltdl-install
-USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 
 MAN1=		extract.1
 MAN3=		libextractor.3
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/src/plugins/Makefile.in
+	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/src/plugins/Makefile.am
+
 .include <bsd.port.mk>
diff --git a/textproc/libextractor/files/patch-src::include::plibc.h b/textproc/libextractor/files/patch-src::include::plibc.h
new file mode 100644
index 000000000000..3cf1cc58f951
--- /dev/null
+++ b/textproc/libextractor/files/patch-src::include::plibc.h
@@ -0,0 +1,58 @@
+--- src/include/plibc.h.orig	Fri May 20 03:27:06 2005
++++ src/include/plibc.h	Wed Jul 20 11:51:53 2005
+@@ -451,20 +451,20 @@
+  #define STRERROR(i) strerror(i)

+  #define READLINK(p, b, s) readlink(p, b, s)

+  #define LSTAT(p, b) lstat(p, b)

+- #define PRINTF(f, ...) printf(f , __VA_ARGS__)

+- #define FPRINTF(fil, fmt, ...) fprintf(fil, fmt, __VA_ARGS__)

++ #define PRINTF(f, ARGS...) printf(f , ##ARGS)
++ #define FPRINTF(fil, fmt, ARGS...) fprintf(fil, fmt, ##ARGS)
+  #define VPRINTF(f, a) vprintf(f, a)

+  #define VFPRINTF(s, f, a) vfprintf(s, f, a)

+  #define VSPRINTF(d, f, a) vsprintf(d, f, a)

+  #define VSNPRINTF(str, size, fmt, a) vsnprintf(str, size, fmt, a)

+- #define _REAL_SNPRINTF(str, size, fmt, ...) snprintf(str, size, fmt, __VA_ARGS__)

+- #define SPRINTF(d, f, ...) sprintf(d, f, __VA_ARGS__)

++ #define _REAL_SNPRINTF(str, size, fmt, ARGS...) snprintf(str, size, fmt, ##ARGS)
++ #define SPRINTF(d, f, ARGS...) sprintf(d, f, ##ARGS)
+  #define VSSCANF(s, f, a) vsscanf(s, f, a)

+- #define SSCANF(s, f, ...) sscanf(s, f, __VA_ARGS__)

++ #define SSCANF(s, f, ARGS...) sscanf(s, f, ##ARGS)
+  #define VFSCANF(s, f, a) vfscanf(s, f, a)

+  #define VSCANF(f, a) vscanf(f, a)

+- #define SCANF(f, ...) scanf(f, __VA_ARGS__)

+- #define FSCANF(s, f, ...) fscanf(s, f, __VA_ARGS__)

++ #define SCANF(f, ARGS...) scanf(f, ##ARGS)
++ #define FSCANF(s, f, ARGS...) fscanf(s, f, ##ARGS)
+  #define ACCEPT(s, a, l) accept(s, a, l)

+  #define BIND(s, n, l) bind(s, n, l)

+  #define CONNECT(s, n, l) connect(s, n, l)

+@@ -515,20 +515,20 @@
+  #define STRERROR(i) _win_strerror(i)

+  #define READLINK(p, b, s) _win_readlink(p, b, s)

+  #define LSTAT(p, b) _win_lstat(p, b)

+- #define PRINTF(f, ...) _win_printf(f , __VA_ARGS__)

+- #define FPRINTF(fil, fmt, ...) _win_fprintf(fil, fmt, __VA_ARGS__)

++ #define PRINTF(f, ARGS...) _win_printf(f , ##ARGS)
++ #define FPRINTF(fil, fmt, ARGS...) _win_fprintf(fil, fmt, ##ARGS)
+  #define VPRINTF(f, a) _win_vprintf(f, a)

+  #define VFPRINTF(s, f, a) _win_vfprintf(s, f, a)

+  #define VSPRINTF(d, f, a) _win_vsprintf(d, f, a)

+  #define VSNPRINTF(str, size, fmt, a) _win_vsnprintf(str, size, fmt, a)

+- #define _REAL_SNPRINTF(str, size, fmt, ...) _win_snprintf(str, size, fmt, __VA_ARGS__)

+- #define SPRINTF(d, f, ...) _win_sprintf(d, f, __VA_ARGS__)

++ #define _REAL_SNPRINTF(str, size, fmt, ARGS...) _win_snprintf(str, size, fmt, ##ARGS)
++ #define SPRINTF(d, f, ARGS...) _win_sprintf(d, f, ##ARGS)
+  #define VSSCANF(s, f, a) _win_vsscanf(s, f, a)

+- #define SSCANF(s, f, ...) _win_sscanf(s, f, __VA_ARGS__)

++ #define SSCANF(s, f, ARGS...) _win_sscanf(s, f, ##ARGS)
+  #define VFSCANF(s, f, a) _win_vfscanf(s, f, a)

+  #define VSCANF(f, a) _win_vscanf(f, a)

+- #define SCANF(f, ...) _win_scanf(f, __VA_ARGS__)

+- #define FSCANF(s, f, ...) _win_fscanf(s, f, __VA_ARGS__)

++ #define SCANF(f, ARGS...) _win_scanf(f, ##ARGS)
++ #define FSCANF(s, f, ARGS...) _win_fscanf(s, f, ##ARGS)
+  #define ACCEPT(s, a, l) _win_accept(s, a, l)

+  #define BIND(s, n, l) _win_bind(s, n, l)

+  #define CONNECT(s, n, l) _win_connect(s, n, l)

diff --git a/textproc/libextractor/files/patch-aa b/textproc/libextractor/files/patch-src::main::Makefile.in
index d656e76a5696..ec539b8191d3 100644
--- a/textproc/libextractor/files/patch-aa
+++ b/textproc/libextractor/files/patch-src::main::Makefile.in
@@ -1,5 +1,5 @@
---- src/main/Makefile.in.orig	Sun May 22 02:43:44 2005
-+++ src/main/Makefile.in	Wed May 25 17:24:05 2005
+--- src/main/Makefile.in.orig	Sat May 21 15:43:44 2005
++++ src/main/Makefile.in	Fri Jul 15 21:04:42 2005
 @@ -703,8 +703,6 @@