- Update to 0.7.8

4 files changed, 107 insertions, 21 deletions

diff --git a/net-im/mcabber/Makefile b/net-im/mcabber/Makefile
index 4c4ad71fae5a..044f7920fd83 100644
--- a/net-im/mcabber/Makefile
+++ b/net-im/mcabber/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mcabber
-PORTVERSION=	0.7.6
+PORTVERSION=	0.7.8
 CATEGORIES=	net-im
 MASTER_SITES=	http://www.lilotux.net/~mikael/mcabber/files/ \
 		http://bsd1.csme.ru/myports/ \
@@ -18,6 +18,7 @@ COMMENT=	Small Jabber console client
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS+=--mandir=${MANPREFIX}/man
 USE_OPENSSL=	yes
 USE_ICONV=	yes
 USE_GETTEXT=	yes
@@ -27,8 +28,10 @@ USE_GETOPT_LONG=	yes
 LDFLAGS+=	-lcrypto
 
 MAN1=		mcabber.1
-PLIST_FILES=	bin/mcabber %%EXAMPLESDIR%%/mcabberrc
-PLIST_DIRS=	%%EXAMPLESDIR%%
+
+post-patch:
+	${REINPLACE_CMD} -e 's#$$"$${datadir}"#"$${datadir}"#' \
+		${WRKSRC}/configure
 
 post-install:
 	@${MKDIR} ${EXAMPLESDIR}
diff --git a/net-im/mcabber/distinfo b/net-im/mcabber/distinfo
index a3d4e8acd80f..633e863a87db 100644
--- a/net-im/mcabber/distinfo
+++ b/net-im/mcabber/distinfo
@@ -1,3 +1,3 @@
-MD5 (mcabber-0.7.6.tar.bz2) = 0456968da2a50eb127fce2a1ee5d5902
-SHA256 (mcabber-0.7.6.tar.bz2) = 03cc90cfce72a0d77fd9f6a83ef413cb27eb7421ff6c6042bf8fe5cbaf6d62de
-SIZE (mcabber-0.7.6.tar.bz2) = 332528
+MD5 (mcabber-0.7.8.tar.bz2) = 0357b941092db41b51edce517630ad38
+SHA256 (mcabber-0.7.8.tar.bz2) = c13599b76e42dff743a83b388234deef2fdc36080df328b3db57a4a0aa3949c4
+SIZE (mcabber-0.7.8.tar.bz2) = 358411
diff --git a/net-im/mcabber/files/patch-src__hbuf.c b/net-im/mcabber/files/patch-src__hbuf.c
index dc81ae8b4dbb..755ebf541774 100644
--- a/net-im/mcabber/files/patch-src__hbuf.c
+++ b/net-im/mcabber/files/patch-src__hbuf.c
@@ -1,25 +1,16 @@
---- ./src/hbuf.c.orig	Fri Apr 14 19:19:10 2006
-+++ ./src/hbuf.c	Sat May  6 20:05:46 2006
-@@ -252,6 +252,9 @@
+--- ./src/hbuf.c.orig	Thu Jun 22 10:30:34 2006
++++ ./src/hbuf.c	Thu Jun 22 10:31:06 2006
+@@ -253,6 +253,7 @@
    hbuf_block *blk;
    guchar last_persist_prefixflags = 0;
    GList *last_persist;  // last persistent flags
 +  int maxlen;
-+  hbb_line **array;
-+  hbb_line **array_elt;
+   hbb_line **array, **array_elt;
  
    // To be able to correctly highlight multi-line messages,
-   // we need to look at the last non-null prefix, which should be the first
-@@ -266,12 +269,11 @@
-     last_persist = g_list_previous(last_persist);
-   }
+@@ -273,7 +274,6 @@
  
--  hbb_line **array = g_new0(hbb_line*, n);
--  hbb_line **array_elt = array;
-+  array = g_new0(hbb_line*, n);
-+  array_elt = array;
- 
-   for (i=0 ; i < n ; i++) {
+   for (i = 0 ; i < n ; i++) {
      if (hbuf) {
 -      int maxlen;
        blk = (hbuf_block*)(hbuf->data);
diff --git a/net-im/mcabber/pkg-plist b/net-im/mcabber/pkg-plist
new file mode 100644
index 000000000000..a2870bef3263
--- /dev/null
+++ b/net-im/mcabber/pkg-plist
@@ -0,0 +1,92 @@
+bin/mcabber
+%%EXAMPLESDIR%%/mcabberrc
+%%DATADIR%%/help/en/hlp.txt
+%%DATADIR%%/help/en/hlp_add.txt
+%%DATADIR%%/help/en/hlp_alias.txt
+%%DATADIR%%/help/en/hlp_authorization.txt
+%%DATADIR%%/help/en/hlp_bind.txt
+%%DATADIR%%/help/en/hlp_buffer.txt
+%%DATADIR%%/help/en/hlp_clear.txt
+%%DATADIR%%/help/en/hlp_connect.txt
+%%DATADIR%%/help/en/hlp_del.txt
+%%DATADIR%%/help/en/hlp_disconnect.txt
+%%DATADIR%%/help/en/hlp_event.txt
+%%DATADIR%%/help/en/hlp_group.txt
+%%DATADIR%%/help/en/hlp_help.txt
+%%DATADIR%%/help/en/hlp_info.txt
+%%DATADIR%%/help/en/hlp_move.txt
+%%DATADIR%%/help/en/hlp_msay.txt
+%%DATADIR%%/help/en/hlp_quit.txt
+%%DATADIR%%/help/en/hlp_rawxml.txt
+%%DATADIR%%/help/en/hlp_rename.txt
+%%DATADIR%%/help/en/hlp_request.txt
+%%DATADIR%%/help/en/hlp_room.txt
+%%DATADIR%%/help/en/hlp_roster.txt
+%%DATADIR%%/help/en/hlp_say.txt
+%%DATADIR%%/help/en/hlp_say_to.txt
+%%DATADIR%%/help/en/hlp_set.txt
+%%DATADIR%%/help/en/hlp_status.txt
+%%DATADIR%%/help/en/hlp_status_to.txt
+%%DATADIR%%/help/en/hlp_version.txt
+%%DATADIR%%/help/fr/hlp.txt
+%%DATADIR%%/help/fr/hlp_add.txt
+%%DATADIR%%/help/fr/hlp_alias.txt
+%%DATADIR%%/help/fr/hlp_authorization.txt
+%%DATADIR%%/help/fr/hlp_bind.txt
+%%DATADIR%%/help/fr/hlp_buffer.txt
+%%DATADIR%%/help/fr/hlp_clear.txt
+%%DATADIR%%/help/fr/hlp_connect.txt
+%%DATADIR%%/help/fr/hlp_del.txt
+%%DATADIR%%/help/fr/hlp_disconnect.txt
+%%DATADIR%%/help/fr/hlp_event.txt
+%%DATADIR%%/help/fr/hlp_group.txt
+%%DATADIR%%/help/fr/hlp_help.txt
+%%DATADIR%%/help/fr/hlp_info.txt
+%%DATADIR%%/help/fr/hlp_move.txt
+%%DATADIR%%/help/fr/hlp_msay.txt
+%%DATADIR%%/help/fr/hlp_quit.txt
+%%DATADIR%%/help/fr/hlp_rawxml.txt
+%%DATADIR%%/help/fr/hlp_rename.txt
+%%DATADIR%%/help/fr/hlp_request.txt
+%%DATADIR%%/help/fr/hlp_room.txt
+%%DATADIR%%/help/fr/hlp_roster.txt
+%%DATADIR%%/help/fr/hlp_say.txt
+%%DATADIR%%/help/fr/hlp_say_to.txt
+%%DATADIR%%/help/fr/hlp_set.txt
+%%DATADIR%%/help/fr/hlp_status.txt
+%%DATADIR%%/help/fr/hlp_status_to.txt
+%%DATADIR%%/help/fr/hlp_version.txt
+%%DATADIR%%/help/pl/hlp.txt
+%%DATADIR%%/help/pl/hlp_add.txt
+%%DATADIR%%/help/pl/hlp_alias.txt
+%%DATADIR%%/help/pl/hlp_authorization.txt
+%%DATADIR%%/help/pl/hlp_bind.txt
+%%DATADIR%%/help/pl/hlp_buffer.txt
+%%DATADIR%%/help/pl/hlp_clear.txt
+%%DATADIR%%/help/pl/hlp_connect.txt
+%%DATADIR%%/help/pl/hlp_del.txt
+%%DATADIR%%/help/pl/hlp_disconnect.txt
+%%DATADIR%%/help/pl/hlp_event.txt
+%%DATADIR%%/help/pl/hlp_group.txt
+%%DATADIR%%/help/pl/hlp_help.txt
+%%DATADIR%%/help/pl/hlp_info.txt
+%%DATADIR%%/help/pl/hlp_move.txt
+%%DATADIR%%/help/pl/hlp_msay.txt
+%%DATADIR%%/help/pl/hlp_quit.txt
+%%DATADIR%%/help/pl/hlp_rawxml.txt
+%%DATADIR%%/help/pl/hlp_rename.txt
+%%DATADIR%%/help/pl/hlp_request.txt
+%%DATADIR%%/help/pl/hlp_room.txt
+%%DATADIR%%/help/pl/hlp_roster.txt
+%%DATADIR%%/help/pl/hlp_say.txt
+%%DATADIR%%/help/pl/hlp_say_to.txt
+%%DATADIR%%/help/pl/hlp_set.txt
+%%DATADIR%%/help/pl/hlp_status.txt
+%%DATADIR%%/help/pl/hlp_status_to.txt
+%%DATADIR%%/help/pl/hlp_version.txt
+@dirrm %%EXAMPLESDIR%%
+@dirrm %%DATADIR%%/help/en
+@dirrm %%DATADIR%%/help/fr
+@dirrm %%DATADIR%%/help/pl
+@dirrm %%DATADIR%%/help
+@dirrm %%DATADIR%%