[Midnightbsd-cvs] mports: irc/irssi: Update to 0.8.11.
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Thu Aug 30 12:39:09 EDT 2007
Log Message:
-----------
Update to 0.8.11. Mark perl option broken temporarily until we can look at the perl port.
Modified Files:
--------------
mports/irc/irssi:
Makefile (r1.3 -> r1.4)
distinfo (r1.1.1.1 -> r1.2)
pkg-plist (r1.1.1.1 -> r1.2)
Removed Files:
-------------
mports/irc/irssi/files:
patch-src-fe-text-gui-entry.h
patch-src_irc_dcc_dcc.c
patch-tabcomp
-------------- next part --------------
Index: pkg-plist
===================================================================
RCS file: /home/cvs/mports/irc/irssi/pkg-plist,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -Lirc/irssi/pkg-plist -Lirc/irssi/pkg-plist -u -r1.1.1.1 -r1.2
--- irc/irssi/pkg-plist
+++ irc/irssi/pkg-plist
@@ -1,3 +1,4 @@
+%%WITH_BOT%%bin/botti
bin/irssi
etc/irssi.conf
etc/irssi.conf.sample
@@ -119,6 +120,8 @@
include/irssi/src/lib-popt/popt.h
include/irssi/src/lib-popt/poptint.h
@exec mkdir -p %D/lib/irssi/modules
+%%WITH_PROXY%%lib/irssi/modules/libirc_proxy.a
+%%WITH_PROXY%%lib/irssi/modules/libirc_proxy.la
%%WITH_PROXY%%lib/irssi/modules/libirc_proxy.so
%%WITH_PROXY%%lib/irssi/modules/libirc_proxy.so.0
%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/Irssi.pm
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/irc/irssi/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -Lirc/irssi/Makefile -Lirc/irssi/Makefile -u -r1.3 -r1.4
--- irc/irssi/Makefile
+++ irc/irssi/Makefile
@@ -7,16 +7,13 @@
#
PORTNAME= irssi
-PORTVERSION= 0.8.10
-PORTREVISION?= 2
+PORTVERSION= 0.8.11
CATEGORIES?= irc
MASTER_SITES= http://mirror.irssi.org/
MAINTAINER?= ports at MidnightBSD.org
COMMENT?= A modular IRC client with many features
-CONFLICTS= irssi-devel-[0-9]*
-
USE_BZIP2= yes
USE_GNOME= glib20
GNU_CONFIGURE= yes
@@ -24,7 +21,7 @@
MAN1= irssi.1
-OPTIONS= PERL "Enable perl support" on \
+OPTIONS= PERL "Enable perl support (broken)" off \
PROXY "Enable proxy support" off \
SOCKS "Enable socks proxy support" off \
IPV6 "Enable IPv6" on \
@@ -43,6 +40,7 @@
# Process options.
.if defined(WITH_PERL)
+BROKEN= "libperl.so is missing"
USE_PERL5= yes
CONFIGURE_ARGS+= --with-perl-lib=site
PLIST_SUB+= WITH_PERL=""
@@ -69,6 +67,10 @@
.if defined(WITH_BOT)
CONFIGURE_ARGS+= --with-bot
+PLIST_SUB+= WITH_BOT=""
+.else
+CONFIGURE_ARGS+= --without-bot
+PLIST_SUB+= WITH_BOT="@comment "
.endif
post-patch:
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/irc/irssi/distinfo,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -Lirc/irssi/distinfo -Lirc/irssi/distinfo -u -r1.1.1.1 -r1.2
--- irc/irssi/distinfo
+++ irc/irssi/distinfo
@@ -1,3 +1,3 @@
-MD5 (irssi-0.8.10.tar.bz2) = 4b83d4047670eb75bd14ae1bdd68dc38
-SHA256 (irssi-0.8.10.tar.bz2) = 47344b444d78ad5965eb40cc4c8df8450fdc54135e2b058710ee8c500b958d6c
-SIZE (irssi-0.8.10.tar.bz2) = 933152
+MD5 (irssi-0.8.11.tar.bz2) = b62417fb3dba9e36eaebea0410a67cd3
+SHA256 (irssi-0.8.11.tar.bz2) = 425cf24f13bfda05c6a468523cd2874d05675ea1bc4e37a8c284f2f78c2dd6b2
+SIZE (irssi-0.8.11.tar.bz2) = 933075
--- irc/irssi/files/patch-tabcomp
+++ /dev/null
@@ -1,121 +0,0 @@
---- src/fe-common/core/utf8.h.orig Fri Dec 9 01:32:44 2005
-+++ src/fe-common/core/utf8.h Mon Dec 12 12:13:50 2005
-@@ -18,6 +18,10 @@
- Make sure out is at least 6 x length of str. */
- void utf16_to_utf8(const unichar *str, char *out);
-
-+/* unichar -> UTF-8 string with position transformed. The NUL is copied as well.
-+ Make sure out is at least 6 x length of str. */
-+void utf16_to_utf8_with_pos(const unichar *str, int spos, char *out, int *opos);
-+
- /* XXX I didn't check the encoding range of big5+. This is standard big5. */
- #define is_big5_los(lo) (0x40 <= (lo) && (lo) <= 0x7E) /* standard */
- #define is_big5_lox(lo) (0x80 <= (lo) && (lo) <= 0xFE) /* extended */
---- src/fe-common/core/utf8.c.orig Fri Dec 9 01:32:44 2005
-+++ src/fe-common/core/utf8.c Mon Dec 12 12:15:20 2005
-@@ -182,6 +182,24 @@
- *out = '\0';
- }
-
-+void utf16_to_utf8_with_pos(const unichar *str, int spos, char *out, int *opos)
-+{
-+ int len;
-+ const unichar *sstart = str;
-+ char *ostart = out;
-+
-+ *opos = 0;
-+ while (*str != '\0') {
-+ len = utf16_char_to_utf8(*str, out);
-+ out += len;
-+
-+ str++;
-+ if(str - sstart == spos)
-+ *opos = out - ostart;
-+ }
-+ *out = '\0';
-+}
-+
- static const unichar wcc[] = {
- 0x0, 0x300, 0x34F, 0x360, 0x363, 0x483, 0x487, 0x488, 0x48A, 0x591,
- 0x5A2, 0x5A3, 0x5BA, 0x5BB, 0x5BE, 0x5BF, 0x5C0, 0x5C1, 0x5C3, 0x5C4,
---- src/fe-text/gui-entry.c.orig Fri Dec 9 01:32:46 2005
-+++ src/fe-text/gui-entry.c Mon Dec 12 12:26:13 2005
-@@ -81,6 +81,24 @@
- *out = '\0';
- }
-
-+void unichars_to_big5_with_pos(const unichar *str, int spos, char *out, int *opos)
-+{
-+ const unichar *sstart = str;
-+ char *ostart = out;
-+
-+ *opos = 0;
-+ while(*str != '\0')
-+ {
-+ if(*str > 0xff)
-+ *out ++ = (*str >> 8) & 0xff;
-+ *out ++ = *str & 0xff;
-+ str ++;
-+ if(str - sstart == spos)
-+ *opos = out - ostart;
-+ }
-+ *out = '\0';
-+}
-+
- int strlen_big5(const unsigned char *str)
- {
- int len=0;
-@@ -367,6 +385,29 @@
- else
- for (i = 0; i <= entry->text_len; i++)
- buf[i] = entry->text[i];
-+ }
-+ return buf;
-+}
-+
-+char *gui_entry_get_text_and_pos(GUI_ENTRY_REC *entry, int *pos)
-+{
-+ char *buf;
-+ int i;
-+
-+ g_return_val_if_fail(entry != NULL, NULL);
-+
-+ buf = g_malloc(entry->text_len*6 + 1);
-+ if (entry->utf8)
-+ utf16_to_utf8_with_pos(entry->text, entry->pos, buf, pos);
-+ else {
-+ if(term_type==TERM_TYPE_BIG5)
-+ unichars_to_big5_with_pos(entry->text, entry->pos, buf, pos);
-+ else
-+ {
-+ for (i = 0; i <= entry->text_len; i++)
-+ buf[i] = entry->text[i];
-+ *pos = entry->pos;
-+ }
- }
- return buf;
- }
---- src/fe-text/gui-readline.c.orig Fri Dec 9 01:32:46 2005
-+++ src/fe-text/gui-readline.c Mon Dec 12 12:32:35 2005
-@@ -778,9 +778,7 @@
- char *text, *line;
- int pos;
-
-- pos = gui_entry_get_pos(active_entry);
--
-- text = gui_entry_get_text(active_entry);
-+ text = gui_entry_get_text_and_pos(active_entry, &pos);
- line = word_complete(active_win, text, &pos, erase);
- g_free(text);
-
-@@ -806,9 +804,7 @@
- char *text, *line;
- int pos;
-
-- pos = gui_entry_get_pos(active_entry);
--
-- text = gui_entry_get_text(active_entry);
-+ text = gui_entry_get_text_and_pos(active_entry, &pos);
- line = auto_word_complete(text, &pos);
- g_free(text);
-
--- irc/irssi/files/patch-src-fe-text-gui-entry.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/fe-text/gui-entry.h.orig Sun Jan 15 05:08:57 2006
-+++ src/fe-text/gui-entry.h Sun Jan 15 05:09:04 2006
-@@ -34,6 +34,7 @@
-
- void gui_entry_set_text(GUI_ENTRY_REC *entry, const char *str);
- char *gui_entry_get_text(GUI_ENTRY_REC *entry);
-+char *gui_entry_get_text_and_pos(GUI_ENTRY_REC *entry, int *pos);
-
- void gui_entry_insert_text(GUI_ENTRY_REC *entry, const char *str);
- void gui_entry_insert_char(GUI_ENTRY_REC *entry, unichar chr);
--- irc/irssi/files/patch-src_irc_dcc_dcc.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/irc/dcc/dcc.c.orig Fri Dec 9 01:32:48 2005
-+++ src/irc/dcc/dcc.c Thu May 4 13:39:02 2006
-@@ -58,8 +58,8 @@
-
- pos = gslist_find_string(dcc_types, type);
- if (pos != NULL) {
-- dcc_types = g_slist_remove(dcc_types, pos->data);
- g_free(pos->data);
-+ dcc_types = g_slist_remove(dcc_types, pos->data);
- }
- }
-
More information about the Midnightbsd-cvs
mailing list