4 files changed, 3 insertions, 44 deletions

diff --git a/net-im/mcabber/Makefile b/net-im/mcabber/Makefile
index d1bd9e565ebf..3650606a08b9 100644
--- a/net-im/mcabber/Makefile
+++ b/net-im/mcabber/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mcabber
-PORTVERSION=	0.6.8
+PORTVERSION=	0.7.0
 CATEGORIES=	net
 MASTER_SITES=	http://www.lilotux.net/~mikael/mcabber/files/
 
diff --git a/net-im/mcabber/distinfo b/net-im/mcabber/distinfo
index 3082d6f37792..4e34de819146 100644
--- a/net-im/mcabber/distinfo
+++ b/net-im/mcabber/distinfo
@@ -1,2 +1,2 @@
-MD5 (mcabber-0.6.8.tar.bz2) = e0c9333ec0ab17b57b16980832989849
-SIZE (mcabber-0.6.8.tar.bz2) = 301041
+MD5 (mcabber-0.7.0.tar.bz2) = fd40c81da873bd41a360735cc61c9db4
+SIZE (mcabber-0.7.0.tar.bz2) = 310063
diff --git a/net-im/mcabber/files/patch-src_Makefile.in b/net-im/mcabber/files/patch-src_Makefile.in
deleted file mode 100644
index 63a19d8ae7b6..000000000000
--- a/net-im/mcabber/files/patch-src_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Makefile.in.orig	Wed Oct  5 19:02:57 2005
-+++ src/Makefile.in	Wed Oct  5 19:03:19 2005
-@@ -162,7 +162,7 @@
- 		  settings.c settings.h hooks.c hooks.h \
- 		  histolog.c histolog.h utils.c utils.h list.h
- 
--LDADD = -lglib-2.0 -lncurses -lpanel \
-+LDADD = $(GLIB_LIBS) -lncurses -lpanel \
- 	../libjabber/liblibjabber.a ../connwrap/libconnwrap.a
- 
- INCLUDES = $(GLIB_CFLAGS)
diff --git a/net-im/mcabber/files/patch-src_main.c b/net-im/mcabber/files/patch-src_main.c
deleted file mode 100644
index ffb60cda567d..000000000000
--- a/net-im/mcabber/files/patch-src_main.c
+++ /dev/null
@@ -1,30 +0,0 @@
---- src/main.c.orig	Wed Oct  5 19:12:04 2005
-+++ src/main.c	Wed Oct  5 19:17:36 2005
-@@ -143,7 +143,7 @@
-   char *password, *p;
-   size_t passsize = 128;
-   struct termios orig, new;
--  int nread;
-+  char* nread;
- 
-   /* Turn echoing off and fail if we can't. */
-   if (tcgetattr(fileno(stdin), &orig) != 0) return;
-@@ -152,15 +152,15 @@
-   if (tcsetattr(fileno(stdin), TCSAFLUSH, &new) != 0) return;
- 
-   /* Read the password. */
--  password = NULL;
-+  password = (char *)malloc(passsize);
-   printf("Please enter password: ");
--  nread = getline(&password, &passsize, stdin);
-+  nread = fgets(password, passsize, stdin);
- 
-   /* Restore terminal. */
-   tcsetattr(fileno(stdin), TCSAFLUSH, &orig);
-   printf("\n");
- 
--  if (nread == -1 || !password) return;
-+  if (nread == NULL || !password) return;
- 
-   for (p = (char*)password; *p; p++)
-     ;