5 files changed, 28 insertions, 25 deletions

diff --git a/security/Makefile b/security/Makefile
index f468c69155c7..7c45fc082cf6 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -562,6 +562,7 @@
     SUBDIR += phpmyid
     SUBDIR += phpsecinfo
     SUBDIR += pidentd
+    SUBDIR += pidgin-otr
     SUBDIR += pinentry
     SUBDIR += pinentry-curses
     SUBDIR += pinentry-gtk
diff --git a/security/pidgin-otr/Makefile b/security/pidgin-otr/Makefile
index 8042f20a0234..c5ac3d996ae8 100644
--- a/security/pidgin-otr/Makefile
+++ b/security/pidgin-otr/Makefile
@@ -1,5 +1,5 @@
 # ex:ts=8
-# New ports collection makefile for:	Gaim-OTR
+# Ports collection Makefile for:	pidgin-otr
 # Date created:				2004-12-17
 # Whom:					Conor McDermottroe <ports@mcdermottroe.com>
 #
@@ -7,24 +7,25 @@
 #
 
 PORTNAME=	otr
-PORTVERSION=	3.0.0
-PORTREVISION=	2
+PORTVERSION=	3.0.1
 CATEGORIES=	security net
-MASTER_SITES=	http://www.cypherpunks.ca/otr/ \
-		http://www.xelerance.com/mirror/otr/
-PKGNAMEPREFIX=	gaim-
+MASTER_SITES=	http://www.cyberdyne.org/~icebrkr/files/
+PKGNAMEPREFIX=	pidgin-
 DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
 
-MAINTAINER=	ports@mcdermottroe.com
-COMMENT=	Allows deniable private conversations using GAIM
+MAINTAINER=	perlfu@gmail.com
+COMMENT=	Allows deniable private conversations using Pidgin
 
-BUILD_DEPENDS=	${LOCALBASE}/include/gaim/config.h:${PORTSDIR}/net-im/gaim
-RUN_DEPENDS=	gaim:${PORTSDIR}/net-im/gaim
+BUILD_DEPENDS=	${LOCALBASE}/bin/pidgin:${PORTSDIR}/net-im/pidgin
 LIB_DEPENDS=	otr:${PORTSDIR}/security/libotr \
-		gcrypt:${PORTSDIR}/security/libgcrypt
+		gcrypt:${PORTSDIR}/security/libgcrypt \
+		purple.0:${PORTSDIR}/net-im/libpurple
 
 USE_XLIB=	yes
 GNU_CONFIGURE=	yes
+
+CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 CONFIGURE_ARGS=	--with-libotr-prefix=${LOCALBASE}/lib \
 		--with-libotr-inc-prefix=${LOCALBASE}/include
 
diff --git a/security/pidgin-otr/distinfo b/security/pidgin-otr/distinfo
index 3822e9562ce3..00c4bc0d1cb4 100644
--- a/security/pidgin-otr/distinfo
+++ b/security/pidgin-otr/distinfo
@@ -1,3 +1,3 @@
-MD5 (gaim-otr-3.0.0.tar.gz) = e819ef065bc0758f58beae5aa6a73ab1
-SHA256 (gaim-otr-3.0.0.tar.gz) = d6887fe5054bba466d15d1436ed15982a3b8ef1dbb8e73eeb79195535f88be01
-SIZE (gaim-otr-3.0.0.tar.gz) = 326217
+MD5 (pidgin-otr-3.0.1.tar.gz) = 826975e987418d2b3b3f8561a6c25467
+SHA256 (pidgin-otr-3.0.1.tar.gz) = 38b128909395f98b53c63868351a8d18a7ec6949631aaa6d3e54f928894ed80f
+SIZE (pidgin-otr-3.0.1.tar.gz) = 571630
diff --git a/security/pidgin-otr/pkg-descr b/security/pidgin-otr/pkg-descr
index 678c8ca720d1..3c6c9a770f66 100644
--- a/security/pidgin-otr/pkg-descr
+++ b/security/pidgin-otr/pkg-descr
@@ -2,17 +2,17 @@ Off-the-Record (OTR) Messaging allows you to have private
 conversations over instant messaging by providing:
 
 * Encryption
-	No one else can read your instant messages.
+       No one else can read your instant messages.
 * Authentication
-	You are assured the correspondent is who you think it is. 
+       You are assured the correspondent is who you think it is. 
 * Deniability
-	The messages you send do not have digital signatures that
-	are checkable by a third party. Anyone can forge messages
-	after a conversation to make them look like they came from
-	you. However, during a conversation, your correspondent is
-	assured the messages he sees are authentic and unmodified. 
+       The messages you send do not have digital signatures that
+       are checkable by a third party. Anyone can forge messages
+       after a conversation to make them look like they came from
+       you. However, during a conversation, your correspondent is
+       assured the messages he sees are authentic and unmodified. 
 * Perfect forward secrecy
-	If you lose control of your private keys, no previous 
-	conversation is compromised.
+       If you lose control of your private keys, no previous 
+       conversation is compromised.
 
 WWW: http://www.cypherpunks.ca/otr/
diff --git a/security/pidgin-otr/pkg-plist b/security/pidgin-otr/pkg-plist
index 65bd369a7e27..740e1479a0a1 100644
--- a/security/pidgin-otr/pkg-plist
+++ b/security/pidgin-otr/pkg-plist
@@ -1,2 +1,3 @@
-lib/gaim/gaim-otr.so
-lib/gaim/gaim-otr.la
+lib/pidgin/pidgin-otr.la
+lib/pidgin/pidgin-otr.so
+@dirrmtry lib/pidgin