4 files changed, 31 insertions, 14 deletions
diff --git a/irc/irssi-otr/files/patch-CMakeLists.txt b/irc/irssi-otr/files/patch-CMakeLists.txt
deleted file mode 100644
index 3c86739e4073..000000000000
--- a/irc/irssi-otr/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- CMakeLists.txt.orig
-+++ CMakeLists.txt
-@@ -231,7 +231,7 @@
- 
- IF(HAVE_IRSSI)
-   ADD_LIBRARY(irssiotr SHARED irssi_otr.c otr_util.c otr_ops.c otr_key.c ${PROJECT_BINARY_DIR}/otr-formats.c)
--  TARGET_LINK_LIBRARIES(irssiotr ${GLIB_LIBRARIES} ${LIBOTR_LIBRARIES})
-+  TARGET_LINK_LIBRARIES(irssiotr ${GLIB_LDFLAGS} ${LIBOTR_LIBRARIES})
-   SET_TARGET_PROPERTIES(irssiotr PROPERTIES 
-     COMPILE_FLAGS -DTARGET_IRSSI
-     OUTPUT_NAME "otr"
diff --git a/irc/irssi-otr/files/patch-configure.ac b/irc/irssi-otr/files/patch-configure.ac
new file mode 100644
index 000000000000..930afb2c3014
--- /dev/null
+++ b/irc/irssi-otr/files/patch-configure.ac
@@ -0,0 +1,11 @@
+--- configure.ac.orig	2014-02-12 18:50:45.000000000 -0600
++++ configure.ac	2014-07-21 17:07:58.763319403 -0500
+@@ -71,7 +71,7 @@
+ 
+ # Hardcoded here since irssi only searches in $HOME/.irssi/modules or this path
+ # which is unfortunate...
+-IRSSI_MODULE_DIR="/usr/lib/irssi/modules"
++IRSSI_MODULE_DIR="/usr/local/lib/irssi/modules"
+ AC_SUBST(IRSSI_MODULE_DIR)
+ 
+ AC_CONFIG_FILES([
diff --git a/irc/irssi-otr/files/patch-help_Makefile.am b/irc/irssi-otr/files/patch-help_Makefile.am
new file mode 100644
index 000000000000..90a786460f7a
--- /dev/null
+++ b/irc/irssi-otr/files/patch-help_Makefile.am
@@ -0,0 +1,10 @@
+--- help/Makefile.am.orig	2014-02-12 18:50:45.000000000 -0600
++++ help/Makefile.am	2014-07-21 17:08:26.543319563 -0500
+@@ -1,6 +1,6 @@
+ # The day Irssi will be able to check in $(prefix), this will change. Until
+ # then, it's hardcoded.
+-helpdir = /usr/share/irssi/help
++helpdir = /usr/local/share/irssi/help
+ help_DATA = otr
+ 
+ EXTRA_DIST = otr
diff --git a/irc/irssi-otr/files/patch-src_Makefile.am b/irc/irssi-otr/files/patch-src_Makefile.am
new file mode 100644
index 000000000000..d2f14f17284e
--- /dev/null
+++ b/irc/irssi-otr/files/patch-src_Makefile.am
@@ -0,0 +1,10 @@
+--- src/Makefile.am.orig	2014-02-12 18:50:45.000000000 -0600
++++ src/Makefile.am	2014-07-21 16:43:34.653319339 -0500
+@@ -1,6 +1,6 @@
+ AM_CFLAGS = $(LIBOTR_CFLAGS) $(LIBGCRYPT_CFLAGS) $(PACKAGE_FLAGS)
+ 
+-IRSSI_DIST=/usr/include/irssi
++IRSSI_DIST=/usr/local/include/irssi
+ IRSSI_INCLUDE = -I$(IRSSI_DIST) \
+ 				-I$(IRSSI_DIST)/src \
+ 				-I$(IRSSI_DIST)/src/fe-common/core \