- Update to 1.0.0

- Depend on security/libotr, instead of security/libotr3
- Fix WWW link in pkg-descr

PR:		192026
Submitted by:	Lawrence Chen <beastie at tardisi.com>

7 files changed, 53 insertions, 28 deletions

diff --git a/irc/irssi-otr/Makefile b/irc/irssi-otr/Makefile
index b4f51725fc32..e1109b63f018 100644
--- a/irc/irssi-otr/Makefile
+++ b/irc/irssi-otr/Makefile
@@ -2,30 +2,38 @@
 # $FreeBSD$
 
 PORTNAME=	irssi-otr
-PORTVERSION=	0.3
-PORTREVISION=	9
+PORTVERSION=	1.0.0
 CATEGORIES=	irc
-MASTER_SITES=	ftp://download.tuxfamily.org/${MASTER_SITE_SUBDIR}/
-MASTER_SITE_SUBDIR=	irssiotr
+MASTER_SITES=	GH
 
 MAINTAINER=	ashish@FreeBSD.org
 COMMENT=	Plugin for irssi for Off-the-Record (OTR) messaging
 
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
 BUILD_DEPENDS=	${LOCALBASE}/include/irssi/src/common.h:${PORTSDIR}/irc/irssi \
 		${LOCALBASE}/bin/libgcrypt-config:${PORTSDIR}/security/libgcrypt
-LIB_DEPENDS=	libotr.so.2:${PORTSDIR}/security/libotr3 \
+LIB_DEPENDS=	libotr.so:${PORTSDIR}/security/libotr \
 		libgcrypt.so:${PORTSDIR}/security/libgcrypt
 RUN_DEPENDS=	irssi:${PORTSDIR}/irc/irssi
 
-LICENSE=	GPLv2
-LICENSE_FILE=	${WRKSRC}/LICENSE
-
-USES=		cmake pkgconfig
+USES=		pkgconfig
 USE_LDCONFIG=	yes
 USE_GNOME=	glib20
+USE_GITHUB=	yes
+GH_ACCOUNT=	cryptodotis
+GH_PROJECT=	${PORTNAME}
+GH_COMMIT=	f4ecd19
+GH_TAGNAME=	v${PORTVERSION}
+
+USE_AUTOTOOLS=	autoconf aclocal libtoolize automake
+ACLOCAL_ARGS=	-I config
+AUTOMAKE_ARGS=	--add-missing --no-force
+
+CONFIGURE_ARGS=	--prefix=${LOCALBASE} --with-libotr-inc-prefix=${LOCALBASE}/include
 
 PLIST_FILES=	lib/irssi/modules/libotr.so \
-		%%DOCSDIR%%/LICENSE %%DOCSDIR%%/README
-PLIST_DIRS=	%%DOCSDIR%%
+		share/irssi/help/otr
 
 .include <bsd.port.mk>
diff --git a/irc/irssi-otr/distinfo b/irc/irssi-otr/distinfo
index 34075ea86837..ef4f29a80a4b 100644
--- a/irc/irssi-otr/distinfo
+++ b/irc/irssi-otr/distinfo
@@ -1,2 +1,2 @@
-SHA256 (irssi-otr-0.3.tar.gz) = 816cb13794c0efa33ee1618a4e926b3f1c3587c675ad3cc44b4f8de3b1b2c60e
-SIZE (irssi-otr-0.3.tar.gz) = 33514
+SHA256 (irssi-otr-1.0.0.tar.gz) = e9ab8f170b83b7bfb6d693e39fdbe59e4b98749253ec30988e41e9dc4fb21cd7
+SIZE (irssi-otr-1.0.0.tar.gz) = 39494
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 \
diff --git a/irc/irssi-otr/pkg-descr b/irc/irssi-otr/pkg-descr
index 02578e8a1e90..82097d1903d4 100644
--- a/irc/irssi-otr/pkg-descr
+++ b/irc/irssi-otr/pkg-descr
@@ -1,4 +1,4 @@
 irssi-otr provides Off-the-Record Messaging (OTR) support for
 the irssi Internet Relay Chat (IRC) client.
 
-WWW:	http://irssi-otr.tuxfamily.org/
+WWW: https://github.com/cryptodotis/irssi-otr