update to 2.0.2:

  3 May 2005:
  - Released 2.0.2
  - Fix to co-exist more nicely with other encrypting gaim plugins.

  1 Mar 2005:
  - Initial autoconfiscation, thanks to Greg Troxel <gdt@ir.bbn.com>.

5 files changed, 9 insertions, 72 deletions

diff --git a/chat/gaim-otr/Makefile b/chat/gaim-otr/Makefile
index 717e83f8696..3e8983753ea 100644
--- a/chat/gaim-otr/Makefile
+++ b/chat/gaim-otr/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2005/05/22 20:07:42 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2005/07/27 19:18:14 gdt Exp $
 
-DISTNAME=	gaim-otr-2.0.1
+DISTNAME=	gaim-otr-2.0.2
 CATEGORIES=	chat security
 MASTER_SITES=	http://www.cypherpunks.ca/otr/
 
@@ -8,7 +8,7 @@ MAINTAINER=	nathanw@NetBSD.org
 HOMEPAGE=	http://www.cypherpunks.ca/otr/
 COMMENT=	Plugin for gaim to add OTR (Off-The-Record) encryption
 
-USE_TOOLS=	gmake
+GNU_CONFIGURE=	yes
 
 .include "../../chat/libotr/buildlink3.mk"
 .include "../../security/libgcrypt/buildlink3.mk"
diff --git a/chat/gaim-otr/PLIST b/chat/gaim-otr/PLIST
index 824ab3272bc..e06266419f5 100644
--- a/chat/gaim-otr/PLIST
+++ b/chat/gaim-otr/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/03/24 21:25:00 nathanw Exp $
-lib/gaim/gaim-otr.so
+@comment $NetBSD: PLIST,v 1.2 2005/07/27 19:18:14 gdt Exp $
+lib/gaim/gaim-otr.la
diff --git a/chat/gaim-otr/distinfo b/chat/gaim-otr/distinfo
index 554509924c9..2b70a185909 100644
--- a/chat/gaim-otr/distinfo
+++ b/chat/gaim-otr/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.2 2005/04/11 20:14:12 nathanw Exp $
+$NetBSD: distinfo,v 1.3 2005/07/27 19:18:14 gdt Exp $
 
-SHA1 (gaim-otr-2.0.1.tar.gz) = 617e6c7cf92439c0320b57551ad26b2ccea468a0
-RMD160 (gaim-otr-2.0.1.tar.gz) = 8431bb7bf214f6935dda31c0378eb061eae875ad
-Size (gaim-otr-2.0.1.tar.gz) = 34691 bytes
-SHA1 (patch-aa) = a7ed08cb06ec08aa80439dafb608fb7bffdd4f77
-SHA1 (patch-ab) = 9ef5497f294eb3be3234085fd7d43f016c27c32e
+SHA1 (gaim-otr-2.0.2.tar.gz) = 62beb8f57de91aac97c1f3883e2ec5ab40f712e3
+RMD160 (gaim-otr-2.0.2.tar.gz) = 6bbb88c96f8d31d407b1a4c67c330c4ebcd10824
+Size (gaim-otr-2.0.2.tar.gz) = 314346 bytes
diff --git a/chat/gaim-otr/patches/patch-aa b/chat/gaim-otr/patches/patch-aa
deleted file mode 100644
index c6507568c25..00000000000
--- a/chat/gaim-otr/patches/patch-aa
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2005/03/24 21:25:01 nathanw Exp $
-
---- Makefile.orig	2005-03-14 13:10:12.000000000 -0500
-+++ Makefile	2005-03-14 13:13:50.000000000 -0500
-@@ -2,7 +2,7 @@
- GAIM_OTR_VERSION = 2.0.1
- 
- # Replace this with the path to the GAIM headers
--GAIM_SOURCE ?= /usr/include/gaim
-+GAIM_SOURCE ?= ${PREFIX}/include/gaim
- 
- # If you don't have pkg-config, put the appropriate -I entry on the next line
- GTK_HDRS ?= `pkg-config --cflags glib-2.0 gtk+-2.0`
-@@ -10,10 +10,10 @@
- # The location of the libotr include files.  Note that if, for example,
- # the full path of message.h is /usr/include/libotr/message.h, you
- # should put /usr/include on the next line, not /usr/include/libotr
--LIBOTRINCDIR = /usr/include
-+LIBOTRINCDIR = ${PREFIX}/include
- 
- # The locataion of libotr.a.
--LIBOTRLIBDIR = /usr/lib
-+LIBOTRLIBDIR = ${PREFIX}/lib
- 
- # The target
- TARGET = gaim-otr.so
-@@ -30,11 +30,11 @@
- else
- FPIC = -fPIC
- LDFLAGS = -module -avoid-version
--LDLIBS = -lotr -lgcrypt
-+LDLIBS = -L${LIBOTRLIBDIR} -Wl,--rpath,${LIBOTRLIBDIR} -lotr -lgcrypt
- endif
- 
- # Install directory
--GAIMDIR = /usr/lib/gaim
-+GAIMDIR = ${PREFIX}/lib/gaim
- INSTALLDIR = $(DESTDIR)$(GAIMDIR)
- 
- CC ?= gcc
diff --git a/chat/gaim-otr/patches/patch-ab b/chat/gaim-otr/patches/patch-ab
deleted file mode 100644
index 7ea8e1e5590..00000000000
--- a/chat/gaim-otr/patches/patch-ab
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2005/04/11 20:13:47 nathanw Exp $
-
---- gtk-dialog.c.orig	2005-04-11 11:18:52.000000000 -0400
-+++ gtk-dialog.c	2005-04-11 11:19:44.000000000 -0400
-@@ -156,6 +156,7 @@
-     const char *protocol_print;
-     GtkWidget *label;
-     GtkWidget *dialog;
-+    OtrgDialogWaitHandle handle;
- 
-     p = gaim_find_prpl(protocol);
-     protocol_print = (p ? p->info->name : "Unknown");
-@@ -166,7 +167,7 @@
- 	
-     dialog = create_dialog(GAIM_NOTIFY_MSG_INFO, title, primary, secondary,
- 	    0, &label);
--    OtrgDialogWaitHandle handle = malloc(sizeof(struct s_OtrgDialogWait));
-+    handle = malloc(sizeof(struct s_OtrgDialogWait));
-     handle->dialog = dialog;
-     handle->label = label;
-