4 files changed, 59 insertions, 0 deletions
diff --git a/net/pjsip/files/patch-Makefile b/net/pjsip/files/patch-Makefile
new file mode 100644
index 000000000000..35a0b70d20af
--- /dev/null
+++ b/net/pjsip/files/patch-Makefile
@@ -0,0 +1,26 @@
+--- Makefile.orig	2014-07-14 07:21:58 UTC
++++ Makefile
+@@ -124,7 +124,7 @@ install:
+ 	for d in pjlib pjlib-util pjnath pjmedia pjsip; do \
+ 		cp -RLf $$d/include/* $(DESTDIR)$(includedir)/; \
+ 	done
+-	mkdir -p $(DESTDIR)$(libdir)/pkgconfig
++	mkdir -p $(DESTDIR)$(prefix)/libdata/pkgconfig
+ 	sed -e "s!@PREFIX@!$(prefix)!" libpjproject.pc.in | \
+ 		sed -e "s!@INCLUDEDIR@!$(includedir)!" | \
+ 		sed -e "s!@LIBDIR@!$(libdir)!" | \
+@@ -132,11 +132,11 @@ install:
+ 		sed -e "s!@PJ_LDLIBS@!!" | \
+ 		sed -e "s!@PJ_LDXXLIBS@!$(PJ_LDXXLIBS)!" | \
+ 		sed -e "s!@PJ_INSTALL_CFLAGS@!!" | \
+-		sed -e "s!@PJ_INSTALL_CXXFLAGS@!$(PJ_INSTALL_CXXFLAGS)!" > $(DESTDIR)/$(libdir)/pkgconfig/libpjproject.pc
++		sed -e "s!@PJ_INSTALL_CXXFLAGS@!$(PJ_INSTALL_CXXFLAGS)!" > $(DESTDIR)/$(prefix)/libdata/pkgconfig/libpjproject.pc
+ 
+ uninstall:
+-	$(RM) $(DESTDIR)$(libdir)/pkgconfig/libpjproject.pc
+-	-rmdir $(DESTDIR)$(libdir)/pkgconfig 2> /dev/null
++	$(RM) $(DESTDIR)$(prefix)/libdata/pkgconfig/libpjproject.pc
++	-rmdir $(DESTDIR)$(prefix)/libdata/pkgconfig 2> /dev/null
+ 	for d in pjlib pjlib-util pjnath pjmedia pjsip; do \
+ 		for f in $$d/include/*; do \
+ 			$(RM) -r "$(DESTDIR)$(includedir)/`basename $$f`"; \
diff --git a/net/pjsip/files/patch-aconfigure b/net/pjsip/files/patch-aconfigure
new file mode 100644
index 000000000000..2301a789e330
--- /dev/null
+++ b/net/pjsip/files/patch-aconfigure
@@ -0,0 +1,11 @@
+--- aconfigure.orig	2014-08-19 02:18:07 UTC
++++ aconfigure
+@@ -6654,7 +6654,7 @@ else
+ 			FFMPEG_PREFIX=$with_ffmpeg
+ 			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Using ffmpeg prefix... $FFMPEG_PREFIX" >&5
+ $as_echo "Using ffmpeg prefix... $FFMPEG_PREFIX" >&6; }
+-			export PKG_CONFIG_PATH=$FFMPEG_PREFIX/lib/pkgconfig
++			export PKG_CONFIG_PATH=$FFMPEG_PREFIX/libdata/pkgconfig
+ 		fi
+ 
+ 		for ac_prog in pkg-config "python pkgconfig.py"
diff --git a/net/pjsip/files/patch-pjmedia_src_pjmedia_resample__libsamplerate.c b/net/pjsip/files/patch-pjmedia_src_pjmedia_resample__libsamplerate.c
new file mode 100644
index 000000000000..d62db5bfff7e
--- /dev/null
+++ b/net/pjsip/files/patch-pjmedia_src_pjmedia_resample__libsamplerate.c
@@ -0,0 +1,11 @@
+--- pjmedia/src/pjmedia/resample_libsamplerate.c.orig	2011-05-05 06:14:19 UTC
++++ pjmedia/src/pjmedia/resample_libsamplerate.c
+@@ -33,7 +33,7 @@
+ 
+ #if PJMEDIA_RESAMPLE_IMP==PJMEDIA_RESAMPLE_LIBSAMPLERATE
+ 
+-#include "../../third_party/libsamplerate/src/samplerate.h"
++#include <samplerate.h>
+ 
+ #define THIS_FILE   "resample_libsamplerate.c"
+ 
diff --git a/net/pjsip/files/patch-pkgconfig.py b/net/pjsip/files/patch-pkgconfig.py
new file mode 100644
index 000000000000..32a08e5a1bef
--- /dev/null
+++ b/net/pjsip/files/patch-pkgconfig.py
@@ -0,0 +1,11 @@
+--- pkgconfig.py.orig	2012-10-04 07:36:39 UTC
++++ pkgconfig.py
+@@ -117,7 +117,7 @@ if __name__ == "__main__":
+ 	# Fix search path
+ 	PKG_CONFIG_PATH = os.getenv("PKG_CONFIG_PATH", "").strip()
+ 	if not PKG_CONFIG_PATH:
+-		PKG_CONFIG_PATH="/usr/local/lib/pkgconfig:/usr/lib/pkgconfig"
++		PKG_CONFIG_PATH="/usr/local/libdata/pkgconfig"
+ 	PKG_CONFIG_PATH = PKG_CONFIG_PATH.replace(";", ":")
+ 
+ 	# Parse files