10 files changed, 14 insertions, 136 deletions

diff --git a/security/gaim-otr/Makefile b/security/gaim-otr/Makefile
index 2c2d61f28bea..995776b40f72 100644
--- a/security/gaim-otr/Makefile
+++ b/security/gaim-otr/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	otr
-PORTVERSION=	2.0.1
-PORTREVISION=	5
+PORTVERSION=	3.0.0
 CATEGORIES=	security net
 MASTER_SITES=	http://www.cypherpunks.ca/otr/ \
 		http://www.xelerance.com/mirror/otr/
@@ -24,16 +23,7 @@ LIB_DEPENDS=	otr:${PORTSDIR}/security/libotr \
 		gcrypt:${PORTSDIR}/security/libgcrypt
 
 USE_X_PREFIX=	yes
-USE_GMAKE=	yes
-USE_REINPLACE=	yes
-
-post-patch:
-	${REINPLACE_CMD} -e "s|%%LOCALBASE%%|${LOCALBASE}|g" \
-		${WRKSRC}/Makefile
-	${REINPLACE_CMD} -e "s|%%X11BASE%%|${X11BASE}|g" \
-		${WRKSRC}/Makefile
-
-do-install:
-	${INSTALL_DATA} ${WRKSRC}/gaim-otr.so ${PREFIX}/lib/gaim
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--with-libotr-prefix=${LOCALBASE}/lib --with-libotr-inc-prefix=${LOCALBASE}/include
 
 .include <bsd.port.mk>
diff --git a/security/gaim-otr/distinfo b/security/gaim-otr/distinfo
index 9d6f3697c6d8..3822e9562ce3 100644
--- a/security/gaim-otr/distinfo
+++ b/security/gaim-otr/distinfo
@@ -1,3 +1,3 @@
-MD5 (gaim-otr-2.0.1.tar.gz) = 873568dac983b7182ad3ac6545567377
-SHA256 (gaim-otr-2.0.1.tar.gz) = 990edeb937b5fd118bbe7201557d8c6541f18492e3f318af789231bb652cb08c
-SIZE (gaim-otr-2.0.1.tar.gz) = 34691
+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
diff --git a/security/gaim-otr/files/patch-Makefile b/security/gaim-otr/files/patch-Makefile
deleted file mode 100644
index ef5cde9de6af..000000000000
--- a/security/gaim-otr/files/patch-Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
---- Makefile.orig	Wed Feb 23 14:49:10 2005
-+++ Makefile	Mon Mar 21 18:31:51 2005
-@@ -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 ?= %%X11BASE%%/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 = %%LOCALBASE%%/include
- 
- # The locataion of libotr.a.
--LIBOTRLIBDIR = /usr/lib
-+LIBOTRLIBDIR = %%LOCALBASE%%/lib
- 
- # The target
- TARGET = gaim-otr.so
-@@ -29,7 +29,7 @@
-          -lgcrypt -lgpg-error
- else
- FPIC = -fPIC
--LDFLAGS = -module -avoid-version
-+LDFLAGS = -module -avoid-version -L%%LOCALBASE%%/lib
- LDLIBS = -lotr -lgcrypt
- endif
- 
diff --git a/security/gaim-otr/files/patch-gtk-dialog.c b/security/gaim-otr/files/patch-gtk-dialog.c
deleted file mode 100644
index b53d75000b7f..000000000000
--- a/security/gaim-otr/files/patch-gtk-dialog.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- gtk-dialog.c.orig	Tue Feb  8 18:31:12 2005
-+++ gtk-dialog.c	Thu Apr 21 17:31:33 2005
-@@ -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;
- 
diff --git a/security/gaim-otr/pkg-plist b/security/gaim-otr/pkg-plist
index 362781970305..65bd369a7e27 100644
--- a/security/gaim-otr/pkg-plist
+++ b/security/gaim-otr/pkg-plist
@@ -1 +1,2 @@
 lib/gaim/gaim-otr.so
+lib/gaim/gaim-otr.la
diff --git a/security/pidgin-otr/Makefile b/security/pidgin-otr/Makefile
index 2c2d61f28bea..995776b40f72 100644
--- a/security/pidgin-otr/Makefile
+++ b/security/pidgin-otr/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	otr
-PORTVERSION=	2.0.1
-PORTREVISION=	5
+PORTVERSION=	3.0.0
 CATEGORIES=	security net
 MASTER_SITES=	http://www.cypherpunks.ca/otr/ \
 		http://www.xelerance.com/mirror/otr/
@@ -24,16 +23,7 @@ LIB_DEPENDS=	otr:${PORTSDIR}/security/libotr \
 		gcrypt:${PORTSDIR}/security/libgcrypt
 
 USE_X_PREFIX=	yes
-USE_GMAKE=	yes
-USE_REINPLACE=	yes
-
-post-patch:
-	${REINPLACE_CMD} -e "s|%%LOCALBASE%%|${LOCALBASE}|g" \
-		${WRKSRC}/Makefile
-	${REINPLACE_CMD} -e "s|%%X11BASE%%|${X11BASE}|g" \
-		${WRKSRC}/Makefile
-
-do-install:
-	${INSTALL_DATA} ${WRKSRC}/gaim-otr.so ${PREFIX}/lib/gaim
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--with-libotr-prefix=${LOCALBASE}/lib --with-libotr-inc-prefix=${LOCALBASE}/include
 
 .include <bsd.port.mk>
diff --git a/security/pidgin-otr/distinfo b/security/pidgin-otr/distinfo
index 9d6f3697c6d8..3822e9562ce3 100644
--- a/security/pidgin-otr/distinfo
+++ b/security/pidgin-otr/distinfo
@@ -1,3 +1,3 @@
-MD5 (gaim-otr-2.0.1.tar.gz) = 873568dac983b7182ad3ac6545567377
-SHA256 (gaim-otr-2.0.1.tar.gz) = 990edeb937b5fd118bbe7201557d8c6541f18492e3f318af789231bb652cb08c
-SIZE (gaim-otr-2.0.1.tar.gz) = 34691
+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
diff --git a/security/pidgin-otr/files/patch-Makefile b/security/pidgin-otr/files/patch-Makefile
deleted file mode 100644
index ef5cde9de6af..000000000000
--- a/security/pidgin-otr/files/patch-Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
---- Makefile.orig	Wed Feb 23 14:49:10 2005
-+++ Makefile	Mon Mar 21 18:31:51 2005
-@@ -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 ?= %%X11BASE%%/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 = %%LOCALBASE%%/include
- 
- # The locataion of libotr.a.
--LIBOTRLIBDIR = /usr/lib
-+LIBOTRLIBDIR = %%LOCALBASE%%/lib
- 
- # The target
- TARGET = gaim-otr.so
-@@ -29,7 +29,7 @@
-          -lgcrypt -lgpg-error
- else
- FPIC = -fPIC
--LDFLAGS = -module -avoid-version
-+LDFLAGS = -module -avoid-version -L%%LOCALBASE%%/lib
- LDLIBS = -lotr -lgcrypt
- endif
- 
diff --git a/security/pidgin-otr/files/patch-gtk-dialog.c b/security/pidgin-otr/files/patch-gtk-dialog.c
deleted file mode 100644
index b53d75000b7f..000000000000
--- a/security/pidgin-otr/files/patch-gtk-dialog.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- gtk-dialog.c.orig	Tue Feb  8 18:31:12 2005
-+++ gtk-dialog.c	Thu Apr 21 17:31:33 2005
-@@ -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;
- 
diff --git a/security/pidgin-otr/pkg-plist b/security/pidgin-otr/pkg-plist
index 362781970305..65bd369a7e27 100644
--- a/security/pidgin-otr/pkg-plist
+++ b/security/pidgin-otr/pkg-plist
@@ -1 +1,2 @@
 lib/gaim/gaim-otr.so
+lib/gaim/gaim-otr.la