diff options
| author | vsevolod <vsevolod@FreeBSD.org> | 2005-10-21 08:14:14 +0000 |
|---|---|---|
| committer | vsevolod <vsevolod@FreeBSD.org> | 2005-10-21 08:14:14 +0000 |
| commit | 18c252a66f55329e32f77b7c17baaf45596ceb43 (patch) | |
| tree | 2277d24df57042d9daed4529ea64151392f33183 | |
| parent | 13ffe8ce240b5df8c21037a28875ee47acb78a66 (diff) | |
| download | FreeBSD-ports-18c252a66f55329e32f77b7c17baaf45596ceb43.zip FreeBSD-ports-18c252a66f55329e32f77b7c17baaf45596ceb43.tar.gz | |
Actually fix build of mcabber on 4.x by fixing getopt usage.
Submitted by: vs
| -rw-r--r-- | net-im/mcabber/Makefile | 5 | ||||
| -rw-r--r-- | net-im/mcabber/files/patch-src_hbuf.c | 19 | ||||
| -rw-r--r-- | net/mcabber/Makefile | 5 | ||||
| -rw-r--r-- | net/mcabber/files/patch-src_hbuf.c | 19 |
4 files changed, 44 insertions, 4 deletions
diff --git a/net-im/mcabber/Makefile b/net-im/mcabber/Makefile index 83b2108..41a025a 100644 --- a/net-im/mcabber/Makefile +++ b/net-im/mcabber/Makefile @@ -7,7 +7,7 @@ PORTNAME= mcabber PORTVERSION= 0.7.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MASTER_SITES= http://www.lilotux.net/~mikael/mcabber/files/ @@ -22,7 +22,8 @@ USE_GETTEXT= yes USE_GNOME= glib20 USE_GETOPT_LONG= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" +LDFLAGS+= -lcrypto + MAN1= mcabber.1 PLIST_FILES= bin/mcabber %%EXAMPLESDIR%%/mcabberrc PLIST_DIRS= %%EXAMPLESDIR%% diff --git a/net-im/mcabber/files/patch-src_hbuf.c b/net-im/mcabber/files/patch-src_hbuf.c new file mode 100644 index 0000000..4184cd9 --- /dev/null +++ b/net-im/mcabber/files/patch-src_hbuf.c @@ -0,0 +1,19 @@ +$FreeBSD$ + +--- src/hbuf.c.orig ++++ src/hbuf.c +@@ -70,12 +70,12 @@ + // Set p_hbuf to the end of the list, to speed up history loading + // (or CPU time will be used by g_list_last() for each line) + hbuf = *p_hbuf = g_list_last(*p_hbuf); +- hbuf_block *hbuf_b_prev = hbuf->data; ++ { hbuf_block *hbuf_b_prev = hbuf->data; + hbuf_block_elt->ptr = hbuf_b_prev->ptr_end; + hbuf_block_elt->flags = HBB_FLAG_PERSISTENT; + hbuf_block_elt->ptr_end_alloc = hbuf_b_prev->ptr_end_alloc; + g_list_append(*p_hbuf, hbuf_block_elt); +- } ++ }} + + if (strlen(text) >= HBB_BLOCKSIZE) { + // Too long diff --git a/net/mcabber/Makefile b/net/mcabber/Makefile index 83b2108..41a025a 100644 --- a/net/mcabber/Makefile +++ b/net/mcabber/Makefile @@ -7,7 +7,7 @@ PORTNAME= mcabber PORTVERSION= 0.7.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MASTER_SITES= http://www.lilotux.net/~mikael/mcabber/files/ @@ -22,7 +22,8 @@ USE_GETTEXT= yes USE_GNOME= glib20 USE_GETOPT_LONG= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" +LDFLAGS+= -lcrypto + MAN1= mcabber.1 PLIST_FILES= bin/mcabber %%EXAMPLESDIR%%/mcabberrc PLIST_DIRS= %%EXAMPLESDIR%% diff --git a/net/mcabber/files/patch-src_hbuf.c b/net/mcabber/files/patch-src_hbuf.c new file mode 100644 index 0000000..4184cd9 --- /dev/null +++ b/net/mcabber/files/patch-src_hbuf.c @@ -0,0 +1,19 @@ +$FreeBSD$ + +--- src/hbuf.c.orig ++++ src/hbuf.c +@@ -70,12 +70,12 @@ + // Set p_hbuf to the end of the list, to speed up history loading + // (or CPU time will be used by g_list_last() for each line) + hbuf = *p_hbuf = g_list_last(*p_hbuf); +- hbuf_block *hbuf_b_prev = hbuf->data; ++ { hbuf_block *hbuf_b_prev = hbuf->data; + hbuf_block_elt->ptr = hbuf_b_prev->ptr_end; + hbuf_block_elt->flags = HBB_FLAG_PERSISTENT; + hbuf_block_elt->ptr_end_alloc = hbuf_b_prev->ptr_end_alloc; + g_list_append(*p_hbuf, hbuf_block_elt); +- } ++ }} + + if (strlen(text) >= HBB_BLOCKSIZE) { + // Too long |
