Adjust to latest irssi-otr as of this moment.

[Olaf Seibert <rhialto%falu.nl@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Olaf Seibert <rhialto%falu.nl@localhost>
Pushed By:	rhialto
Date:		Tue Jul 5 20:36:25 2016 +0200
Changeset:	4b73ce78b65004005f6c372884cda42e714bc602

Modified Files:
	irssi-otr/Makefile
	irssi-otr/distinfo
	irssi-otr/patches/patch-src_Makefile.am
Removed Files:
	irssi-otr/patches/patch-help_Makefile.am

Log Message:
Adjust to latest irssi-otr as of this moment.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=4b73ce78b65004005f6c372884cda42e714bc602

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 irssi-otr/Makefile                       |  5 ++++-
 irssi-otr/distinfo                       |  3 +--
 irssi-otr/patches/patch-help_Makefile.am | 14 --------------
 irssi-otr/patches/patch-src_Makefile.am  |  6 +++---
 4 files changed, 8 insertions(+), 20 deletions(-)

diffs:
diff --git a/irssi-otr/Makefile b/irssi-otr/Makefile
index 66c88cf..bff6016 100644
--- a/irssi-otr/Makefile
+++ b/irssi-otr/Makefile
@@ -1,6 +1,7 @@
 # $NetBSD: Makefile,v 1.1 2015/08/02 09:44:46 rhialto Exp $
 
 DISTNAME=		irssi-otr-1.01
+PKGREVISION=		1
 CATEGORIES=		chat
 
 MAINTAINER=		rhialto%falu.nl@localhost
@@ -12,7 +13,9 @@ GIT_REPOSITORIES=	github
 GIT_REPO.github= 	git://github.com/cryptodotis/irssi-otr.git
 GIT_MODULE.github=	irssi-otr
 # v1.01 is not tagged; use a version slightly after that.
-GIT_REVISION.github=	4ad3b7b6c85be0154ab3694fe9831796db20c4fe
+#GIT_REVISION.github=	4ad3b7b6c85be0154ab3694fe9831796db20c4fe
+# libotr >= 4.1.0 in configure.ac and spec file; Jan 12, 2015
+GIT_REVISION.github=	f75eb260c168b708873f2770d95b9a1b66144edd
 
 WRKSRC=			${WRKDIR}/${PKGBASE}
 
diff --git a/irssi-otr/distinfo b/irssi-otr/distinfo
index 1e53f3a..9162353 100644
--- a/irssi-otr/distinfo
+++ b/irssi-otr/distinfo
@@ -1,4 +1,3 @@
 $NetBSD: distinfo,v 1.1 2015/08/02 09:44:46 rhialto Exp $
 
-SHA1 (patch-help_Makefile.am) = 32543c010031494a589dadde06e0ed7f164428eb
-SHA1 (patch-src_Makefile.am) = 087f7cef16b5c492c8c5b4c75ea94f3ce558e711
+SHA1 (patch-src_Makefile.am) = 3ed334ddbe173de52c4e07cca8d34735d71d2204
diff --git a/irssi-otr/patches/patch-help_Makefile.am b/irssi-otr/patches/patch-help_Makefile.am
deleted file mode 100644
index 18b66c6..0000000
--- a/irssi-otr/patches/patch-help_Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-help_Makefile.am,v 1.1 2015/08/02 09:44:46 rhialto Exp $
-
-Our irssi installs in $(prefix).
-
---- help/Makefile.am.orig	2015-07-19 16:12:13.000000000 +0000
-+++ help/Makefile.am
-@@ -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 = $(prefix)/share/irssi/help
- help_DATA = otr
- 
- EXTRA_DIST = otr
diff --git a/irssi-otr/patches/patch-src_Makefile.am b/irssi-otr/patches/patch-src_Makefile.am
index 28a47d1..67cbc38 100644
--- a/irssi-otr/patches/patch-src_Makefile.am
+++ b/irssi-otr/patches/patch-src_Makefile.am
@@ -1,13 +1,13 @@
-$NetBSD: patch-src_Makefile.am,v 1.1 2015/08/02 09:44:46 rhialto Exp $
+$NetBSD$
 
 Our irssi installs in $(prefix).
 
---- src/Makefile.am.orig	2015-07-19 16:12:13.000000000 +0000
+--- src/Makefile.am.orig	2016-07-05 16:40:14.000000000 +0000
 +++ src/Makefile.am
 @@ -1,6 +1,6 @@
  AM_CFLAGS = $(LIBOTR_CFLAGS) $(LIBGCRYPT_CFLAGS) $(PACKAGE_FLAGS)
  
--IRSSI_DIST=/usr/include/irssi
+-IRSSI_DIST=$(oldincludedir)/irssi
 +IRSSI_DIST=$(prefix)/include/irssi
  IRSSI_INCLUDE = -I$(IRSSI_DIST) \
  				-I$(IRSSI_DIST)/src \