aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsat <sat@FreeBSD.org>2006-08-14 14:22:02 +0800
committersat <sat@FreeBSD.org>2006-08-14 14:22:02 +0800
commite6465687420cfc54246ebb12f0fe00e9c25e052e (patch)
tree32656748ff2e521dc5966280c74b2de130d5c56d
parent97eff0d8cf42156dc47770313e4f7950dc864fcc (diff)
downloadfreebsd-ports-gnome-e6465687420cfc54246ebb12f0fe00e9c25e052e.tar.gz
freebsd-ports-gnome-e6465687420cfc54246ebb12f0fe00e9c25e052e.tar.zst
freebsd-ports-gnome-e6465687420cfc54246ebb12f0fe00e9c25e052e.zip
- Update to 0.8.0
- Complete UTF-8 support - Work around the no-stream-header bug [1] PR: ports/101335 [1] Submitted by: thompsa [1]
-rw-r--r--net-im/mcabber/Makefile19
-rw-r--r--net-im/mcabber/distinfo6
-rw-r--r--net-im/mcabber/files/patch-libjabber__jconn.c12
-rw-r--r--net-im/mcabber/files/patch-src__hbuf.c8
-rw-r--r--net-im/mcabber/pkg-plist8
5 files changed, 40 insertions, 13 deletions
diff --git a/net-im/mcabber/Makefile b/net-im/mcabber/Makefile
index 2e07da5197e4..81cc44786eab 100644
--- a/net-im/mcabber/Makefile
+++ b/net-im/mcabber/Makefile
@@ -6,32 +6,39 @@
#
PORTNAME= mcabber
-PORTVERSION= 0.7.8
+PORTVERSION= 0.8.0
CATEGORIES= net-im
MASTER_SITES= http://www.lilotux.net/~mikael/mcabber/files/ CSME
MAINTAINER= infofarmer@FreeBSD.org
COMMENT= Small Jabber console client
+LIB_DEPENDS= ncursesw.5:${PORTSDIR}/devel/ncurses
+
USE_BZIP2= yes
GNU_CONFIGURE= yes
-CONFIGURE_ARGS+=--mandir=${MANPREFIX}/man
+CONFIGURE_ARGS+=--mandir=${MANPREFIX}/man --with-ssl
+CONFIGURE_ENV+= CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}"
USE_OPENSSL= yes
USE_ICONV= yes
USE_GETTEXT= yes
USE_GNOME= glib20
USE_GETOPT_LONG= yes
-
-LDFLAGS+= -lcrypto
+CFLAGS+= -I${LOCALBASE}/include
+CPPFLAGS= ${CFLAGS}
+LDFLAGS+= -lcrypto -L${LOCALBASE}/lib
MAN1= mcabber.1
post-patch:
- ${REINPLACE_CMD} -e 's#$$"$${datadir}"#"$${datadir}"#' \
- ${WRKSRC}/configure
+ @${REINPLACE_CMD} -e 's#$$"$${datadir}"#"$${datadir}"#' \
+ -e 's/waddnwstr/mvwaddnwstr/g' -e 's!ncursesw/!ncurses/!g' ${WRKSRC}/configure
+ @${REINPLACE_CMD} -e 's/NCURSESW/NCURSES/' ${WRKSRC}/src/screen.h ${WRKSRC}/src/utf8.h
+ @${REINPLACE_CMD} -e 's!ncursesw/!ncurses/!g' ${WRKSRC}/src/screen.h
post-install:
@${MKDIR} ${EXAMPLESDIR}
+ @${CP} -R ${WRKSRC}/contrib ${DATADIR}/
${INSTALL_DATA} ${WRKSRC}/mcabberrc.example ${EXAMPLESDIR}/mcabberrc
.include <bsd.port.mk>
diff --git a/net-im/mcabber/distinfo b/net-im/mcabber/distinfo
index 633e863a87db..4774b520b7e9 100644
--- a/net-im/mcabber/distinfo
+++ b/net-im/mcabber/distinfo
@@ -1,3 +1,3 @@
-MD5 (mcabber-0.7.8.tar.bz2) = 0357b941092db41b51edce517630ad38
-SHA256 (mcabber-0.7.8.tar.bz2) = c13599b76e42dff743a83b388234deef2fdc36080df328b3db57a4a0aa3949c4
-SIZE (mcabber-0.7.8.tar.bz2) = 358411
+MD5 (mcabber-0.8.0.tar.bz2) = 31addfc6f22d1c84ab7e84bdbfb103fb
+SHA256 (mcabber-0.8.0.tar.bz2) = b54934dadc15e83bb7ad8b9c59230b8f5be19cc75550bb605a4011a0d7d2c4a0
+SIZE (mcabber-0.8.0.tar.bz2) = 373606
diff --git a/net-im/mcabber/files/patch-libjabber__jconn.c b/net-im/mcabber/files/patch-libjabber__jconn.c
new file mode 100644
index 000000000000..7272af4e5111
--- /dev/null
+++ b/net-im/mcabber/files/patch-libjabber__jconn.c
@@ -0,0 +1,12 @@
+--- ./libjabber/jconn.c.orig Sun Aug 13 23:01:59 2006
++++ ./libjabber/jconn.c Mon Aug 14 10:15:47 2006
+@@ -164,6 +164,9 @@
+ }
+ change_socket_to_blocking(j->fd);
+
++ /* XXX why do we need this?? */
++ sleep (1);
++
+ j->state = JCONN_STATE_CONNECTED;
+ STATE_EVT(JCONN_STATE_CONNECTED)
+
diff --git a/net-im/mcabber/files/patch-src__hbuf.c b/net-im/mcabber/files/patch-src__hbuf.c
index 755ebf541774..758f0cadd613 100644
--- a/net-im/mcabber/files/patch-src__hbuf.c
+++ b/net-im/mcabber/files/patch-src__hbuf.c
@@ -1,6 +1,6 @@
---- ./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 @@
+--- ./src/hbuf.c.orig Sun Aug 13 23:01:59 2006
++++ ./src/hbuf.c Mon Aug 14 10:15:38 2006
+@@ -252,6 +252,7 @@
hbuf_block *blk;
guchar last_persist_prefixflags = 0;
GList *last_persist; // last persistent flags
@@ -8,7 +8,7 @@
hbb_line **array, **array_elt;
// To be able to correctly highlight multi-line messages,
-@@ -273,7 +274,6 @@
+@@ -272,7 +273,6 @@
for (i = 0 ; i < n ; i++) {
if (hbuf) {
diff --git a/net-im/mcabber/pkg-plist b/net-im/mcabber/pkg-plist
index a2870bef3263..1b4b64ed06f6 100644
--- a/net-im/mcabber/pkg-plist
+++ b/net-im/mcabber/pkg-plist
@@ -1,5 +1,11 @@
bin/mcabber
%%EXAMPLESDIR%%/mcabberrc
+%%DATADIR%%/contrib/cicq2mcabber.pl
+%%DATADIR%%/contrib/eventcmd
+%%DATADIR%%/contrib/mcwizz.pl
+%%DATADIR%%/contrib/themes/light.txt
+%%DATADIR%%/contrib/themes/light2.txt
+%%DATADIR%%/contrib/themes/oliver.txt
%%DATADIR%%/help/en/hlp.txt
%%DATADIR%%/help/en/hlp_add.txt
%%DATADIR%%/help/en/hlp_alias.txt
@@ -85,6 +91,8 @@ bin/mcabber
%%DATADIR%%/help/pl/hlp_status_to.txt
%%DATADIR%%/help/pl/hlp_version.txt
@dirrm %%EXAMPLESDIR%%
+@dirrm %%DATADIR%%/contrib/themes
+@dirrm %%DATADIR%%/contrib
@dirrm %%DATADIR%%/help/en
@dirrm %%DATADIR%%/help/fr
@dirrm %%DATADIR%%/help/pl