[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: UPDATE: net/irssi-0.8.10



On Monday 27 March 2006 01:57, viq wrote:
> On Saturday 18 March 2006 22:52, steven mestdagh wrote:
> > viq [2006-03-12, 22:46:07]:
> > > Ok, here's another patch, before I start playing with what Antti Harri
> > > posted. I should start making a changelog ;) So: included
> > > MODGNU_CONFIG_GUESS_DIRS instead of copying config.* files, added
> > > installation of sample irssi.conf. Still getting those grep errors on
> > > configure though.
> >
> > [...]
> >
> > is it necessary to install all these header files?
>
> Removed.
>
> > > +share/examples/irssi/irssi.conf
> > > +_(_at_)_sample ${SYSCONFDIR}/irssi/irssi.conf
> >
> > i think this is good, but you may want to check settings.c. it is
> > expecting ${SYSCONFDIR}/irssi.conf right now.
>
> Changed, verified that it's working.
>
> > also, are the theme files in ${SYSCONFDIR}/irssi used at all?
>
> No, apparently not... Apparently only /usr/local/share/irssi is used. Do
> you think I should keep it that way and remove theme files from
> ${SYSCONFDIR}/irssi, or would it be better to find how to make it use the
> files there?

Treated that as a challenge, and here's the result. Just put your default 
config in /etc/irssi/irssi.conf and system-wide themes in /etc/irssi/themes/ 
- and enjoy ;)

-- 
viq



----------------------------------------------------------------------
Jak sie go pozbyc? >>> http://link.interia.pl/f191a
? w-irssi-0.8.10
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/irssi/Makefile,v
retrieving revision 1.25
diff -d -u -r1.25 Makefile
--- Makefile	16 Dec 2004 00:31:22 -0000	1.25
+++ Makefile	27 Mar 2006 11:14:12 -0000
@@ -5,7 +5,8 @@
 
 COMMENT=	"modular IRC client with many features (ipv6,socks,proxy)"
 
-DISTNAME=	irssi-0.8.9
+DISTNAME=	irssi-0.8.10
+DISTFILES=	irssi-0.8.10a.tar.gz
 CATEGORIES=	net
 
 MASTER_SITES=	${HOMEPAGE}/files/ \
@@ -28,13 +29,18 @@
 PERMIT_DISTFILES_FTP=	Yes
 WANTLIB=		c crypto m ncurses perl ssl util
 
-LIB_DEPENDS+=		glib.1.2,gmodule::devel/glib
+MODULES=devel/gettext
 
-CONFIGURE_STYLE=	gnu
+USE_LIBTOOL=Yes
+
+LIB_DEPENDS+=		glib-2.0.0.0,gmodule-2.0.0.0::devel/glib2
+BUILD_DEPENDS+=		:pkgconfig-*:devel/pkgconfig
 
+CONFIGURE_STYLE=	gnu
+MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}
 CONFIGURE_ARGS+=	--datadir=${PREFIX}/share/doc --enable-ipv6 \
-	--with-proxy --enable-perl=yes --with-included-gettext \
-	--with-perl-lib=${PREFIX}/libdata/perl5/site_perl --with-glib1
+	--with-proxy --enable-perl=yes --without-included-gettext \
+	--with-perl-lib=${PREFIX}/libdata/perl5/site_perl
 
 FLAVORS=	socks
 FLAVOR?=
@@ -44,7 +50,7 @@
 BUILD_DEPENDS+=		::security/dante
 .endif
 
-SAMPLE=		default.theme colorless.theme
+SAMPLE=		default.theme colorless.theme irssi.conf
 
 pre-configure:
 	@perl -pi -e 's,doc/irssi,irssi,g' ${WRKSRC}/docs/Makefile.in
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/irssi/distinfo,v
retrieving revision 1.11
diff -d -u -r1.11 distinfo
--- distinfo	5 Jan 2005 17:14:46 -0000	1.11
+++ distinfo	27 Mar 2006 11:14:12 -0000
@@ -1,4 +1,4 @@
-MD5 (irssi-0.8.9.tar.gz) = 1df516a770656ff0bec0ab62f9096bf6
-RMD160 (irssi-0.8.9.tar.gz) = 71432741b8096b35bb9745f93170b24b8545d9d8
-SHA1 (irssi-0.8.9.tar.gz) = 786dac6b7ddaff65683e78c8ea7686fd4569cf9f
-SIZE (irssi-0.8.9.tar.gz) = 1153560
+MD5 (irssi-0.8.10a.tar.gz) = 78140796205c6fa1c43e46d2e79e60aa
+RMD160 (irssi-0.8.10a.tar.gz) = 880508e18a4d896a5c31dc20b67a6ef86c9c6b94
+SHA1 (irssi-0.8.10a.tar.gz) = aa2d2f1701bb49afc5ea09102d6396f4e013a1dd
+SIZE (irssi-0.8.10a.tar.gz) = 1056233
Index: patches/patch-ltmain_sh
===================================================================
RCS file: patches/patch-ltmain_sh
diff -N patches/patch-ltmain_sh
--- patches/patch-ltmain_sh	14 Dec 2003 03:25:19 -0000	1.3
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-ltmain_sh,v 1.3 2003/12/14 03:25:19 margarida Exp $
---- ltmain.sh.orig	2003-12-12 21:40:54.000000000 +0000
-+++ ltmain.sh	2003-12-12 21:41:48.000000000 +0000
-@@ -3056,7 +3056,7 @@ EOF
- 	fi
- 
- 	# Remove version info from name if versioning should be avoided
--	if test "$avoid_version" = yes && test "$need_version" = no; then
-+	if test "$avoid_version" = yes; then
- 	  major=
- 	  versuffix=
- 	  verstring=""
Index: patches/patch-src_core_settings_c
===================================================================
RCS file: patches/patch-src_core_settings_c
diff -N patches/patch-src_core_settings_c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_core_settings_c	27 Mar 2006 11:14:12 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- src/core/settings.c.orig	Sun Mar 26 23:59:41 2006
++++ src/core/settings.c	Mon Mar 27 00:13:38 2006
+@@ -674,7 +674,7 @@ static CONFIG_REC *parse_configfile(cons
+ 	else {
+ 		/* user configuration file not found, use the default one
+ 		   from sysconfdir */
+-                path = SYSCONFDIR"/"IRSSI_GLOBAL_CONFIG;
++                path = SYSCONFDIR"/irssi/"IRSSI_GLOBAL_CONFIG;
+ 		if (stat(path, &statbuf) != 0) {
+ 			/* no configuration file in sysconfdir ..
+ 			   use the build-in configuration */
Index: patches/patch-src_fe-common_core_Makefile_in
===================================================================
RCS file: patches/patch-src_fe-common_core_Makefile_in
diff -N patches/patch-src_fe-common_core_Makefile_in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_fe-common_core_Makefile_in	27 Mar 2006 11:14:12 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- src/fe-common/core/Makefile.in.orig	Mon Mar 27 04:17:59 2006
++++ src/fe-common/core/Makefile.in	Mon Mar 27 04:18:52 2006
+@@ -125,7 +125,7 @@ sedpath = @sedpath@
+ 
+ noinst_LIBRARIES = libfe_common_core.a
+ 
+-INCLUDES =  	-I$(top_srcdir)/src -I$(top_srcdir)/src/core/ 	$(GLIB_CFLAGS) 	-DHELPDIR=\""$(datadir)/irssi/help"\" 	-DTHEMESDIR=\""$(datadir)/irssi/themes"\"
++INCLUDES =  	-I$(top_srcdir)/src -I$(top_srcdir)/src/core/ 	$(GLIB_CFLAGS) 	-DHELPDIR=\""$(datadir)/irssi/help"\" 	-DTHEMESDIR=\""$(datadir)/irssi/themes"\"	-DSYSCONFDIR=\""$(sysconfdir)"\"
+ 
+ 
+ libfe_common_core_a_SOURCES =  	autorun.c 	chat-completion.c 	command-history.c 	completion.c 	fe-channels.c 	fe-common-core.c 	fe-core-commands.c 	fe-exec.c 	fe-expandos.c 	fe-help.c 	fe-ignore.c 	fe-ignore-messages.c 	fe-log.c 	fe-messages.c 	fe-modules.c 	fe-queries.c 	fe-server.c 	fe-settings.c 	utf8.c 	formats.c 	hilight-text.c 	keyboard.c 	module-formats.c 	printtext.c 	fe-recode.c 	themes.c 	translation.c 	window-activity.c 	window-commands.c 	window-items.c 	windows-layout.c 	fe-windows.c
Index: patches/patch-src_fe-common_core_fe-common-core_c
===================================================================
RCS file: patches/patch-src_fe-common_core_fe-common-core_c
diff -N patches/patch-src_fe-common_core_fe-common-core_c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_fe-common_core_fe-common-core_c	27 Mar 2006 11:14:12 -0000
@@ -0,0 +1,31 @@
+$OpenBSD$
+--- src/fe-common/core/fe-common-core.c.orig	Fri Feb  3 02:41:33 2006
++++ src/fe-common/core/fe-common-core.c	Fri Feb  3 02:47:45 2006
+@@ -25,8 +25,8 @@
+ #include "levels.h"
+ #include "settings.h"
+ #include "irssi-version.h"
+-#ifdef HAVE_NL_LANGINFO
+-#  include <langinfo.h>
++#ifdef USE_LIBICONV
++#include <localcharset.h>
+ #endif
+ 
+ #include "servers.h"
+@@ -174,10 +174,12 @@ void fe_common_core_init(void)
+ 
+ 	settings_add_bool("lookandfeel", "use_status_window", TRUE);
+ 	settings_add_bool("lookandfeel", "use_msgs_window", FALSE);
+-#if defined (HAVE_NL_LANGINFO) && defined(CODESET)
+-	settings_add_str("lookandfeel", "term_charset", 
+-			 *nl_langinfo(CODESET) != '\0' ? 
+-			 nl_langinfo(CODESET) : "ISO8859-1");
++
++#ifdef USE_LIBICONV
++	settings_add_str("lookandfeel", "term_charset",
++			 *locale_charset() != '\0' ?
++			 locale_charset() : "ISO8859-1");
++
+ #else
+ 	settings_add_str("lookandfeel", "term_charset", "ISO8859-1");
+ #endif
Index: patches/patch-src_fe-common_core_themes_c
===================================================================
RCS file: patches/patch-src_fe-common_core_themes_c
diff -N patches/patch-src_fe-common_core_themes_c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_fe-common_core_themes_c	27 Mar 2006 11:14:12 -0000
@@ -0,0 +1,21 @@
+$OpenBSD$
+--- src/fe-common/core/themes.c.orig	Mon Mar 27 02:16:47 2006
++++ src/fe-common/core/themes.c	Mon Mar 27 02:21:02 2006
+@@ -840,10 +840,13 @@ THEME_REC *theme_load(const char *setnam
+ 		g_free(fname);
+ 		fname = g_strdup_printf(THEMESDIR"/%s.theme", name);
+ 		if (stat(fname, &statbuf) != 0) {
+-			/* theme not found */
+-			g_free(fname);
+-			g_free(name);
+-			return theme; /* use the one in memory if possible */
++			fname = g_strdup_printf(SYSCONFDIR"/irssi/themes/%s.theme", name);
++			if (stat(fname, &statbuf) != 0) {
++				/* theme not found */
++				g_free(fname);
++				g_free(name);
++				return theme; /* use the one in memory if possible */
++			}
+ 		}
+ 	}
+ 
Index: patches/patch-src_fe_common_core_fe_settings_c
===================================================================
RCS file: patches/patch-src_fe_common_core_fe_settings_c
diff -N patches/patch-src_fe_common_core_fe_settings_c
--- patches/patch-src_fe_common_core_fe_settings_c	24 Jan 2005 21:17:46 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,20 +0,0 @@
-$OpenBSD: patch-src_fe_common_core_fe_settings_c,v 1.2 2005/01/24 21:17:46 mjc Exp $
---- src/fe-common/core/fe-settings.c.orig	Sat Dec 28 10:00:03 2002
-+++ src/fe-common/core/fe-settings.c	Thu Jan 20 23:58:12 2005
-@@ -86,12 +86,15 @@ static void cmd_set(char *data)
- 	clear = g_hash_table_lookup(optlist, "clear") != NULL;
- 	set_default = g_hash_table_lookup(optlist, "default") != NULL;
- 
-+	if (*key == '\0')
-+		clear = set_default = FALSE;
-+
- 	last_section = ""; found = 0;
- 	sets = settings_get_sorted();
- 	for (tmp = sets; tmp != NULL; tmp = tmp->next) {
- 		SETTINGS_REC *rec = tmp->data;
- 
--		if (((clear || *value != '\0') && g_strcasecmp(rec->key, key) != 0) ||
-+		if (((clear || set_default || *value != '\0') && g_strcasecmp(rec->key, key) != 0) ||
- 		    (*value == '\0' && *key != '\0' && stristr(rec->key, key) == NULL))
- 			continue;
- 
Index: patches/patch-src_irc_dcc_dcc_autoget_c
===================================================================
RCS file: patches/patch-src_irc_dcc_dcc_autoget_c
diff -N patches/patch-src_irc_dcc_dcc_autoget_c
--- patches/patch-src_irc_dcc_dcc_autoget_c	2 Mar 2004 22:15:29 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_irc_dcc_dcc_autoget_c,v 1.1 2004/03/02 22:15:29 pvalchev Exp $
---- src/irc/dcc/dcc-autoget.c.orig	Tue Mar  2 21:11:43 2004
-+++ src/irc/dcc/dcc-autoget.c	Tue Mar  2 21:11:57 2004
-@@ -77,7 +77,7 @@
- 	settings_add_bool("dcc", "dcc_autoget", FALSE);
- 	settings_add_bool("dcc", "dcc_autoaccept_lowports", FALSE);
- 	settings_add_bool("dcc", "dcc_autoresume", FALSE);
--	settings_add_size("dcc", "dcc_autoget_max_size", 0);
-+	settings_add_size("dcc", "dcc_autoget_max_size", "0k");
- 	settings_add_str("dcc", "dcc_autoget_masks", "");
- 
- 	signal_add_last("dcc request", (SIGNAL_FUNC) sig_dcc_request);
Index: patches/patch-src_irc_proxy_Makefile_in
===================================================================
RCS file: /cvs/ports/net/irssi/patches/patch-src_irc_proxy_Makefile_in,v
retrieving revision 1.1
diff -d -u -r1.1 patch-src_irc_proxy_Makefile_in
--- patches/patch-src_irc_proxy_Makefile_in	23 Feb 2002 12:25:03 -0000	1.1
+++ patches/patch-src_irc_proxy_Makefile_in	27 Mar 2006 11:14:12 -0000
@@ -1,12 +1,12 @@
-$OpenBSD: patch-src_irc_proxy_Makefile_in,v 1.1 2002/02/23 12:25:03 reinhard Exp $
---- src/irc/proxy/Makefile.in.orig	Sun Feb 17 16:49:42 2002
-+++ src/irc/proxy/Makefile.in	Sat Feb 23 12:07:22 2002
-@@ -125,7 +125,7 @@ DEFS = @DEFS@ -I. -I$(srcdir) -I../../..
- CPPFLAGS = @CPPFLAGS@
- LDFLAGS = @LDFLAGS@
- LIBS = @LIBS@
--libirc_proxy_la_LDFLAGS = 
-+libirc_proxy_la_LDFLAGS = -avoid-version
- libirc_proxy_la_LIBADD = 
- libirc_proxy_la_OBJECTS =  proxy.lo dump.lo listen.lo
- CFLAGS = @CFLAGS@
+$OpenBSD$
+--- src/irc/proxy/Makefile.in.orig	Sun Dec 11 23:47:47 2005
++++ src/irc/proxy/Makefile.in	Sun Mar 19 01:28:02 2006
+@@ -129,7 +129,7 @@ module_LTLIBRARIES = libirc_proxy.la
+ INCLUDES =  	-I$(top_srcdir)/src 	-I$(top_srcdir)/src/core/ 	-I$(top_srcdir)/src/irc/core/ 	$(GLIB_CFLAGS)
+ 
+ 
+-libirc_proxy_la_LDFLAGS = -module
++libirc_proxy_la_LDFLAGS = -module -avoid-version
+ 
+ libirc_proxy_la_DEPENDENCIES = libirc_proxy.a
+ 
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/net/irssi/pkg/PLIST,v
retrieving revision 1.13
diff -d -u -r1.13 PLIST
--- pkg/PLIST	15 Sep 2004 18:17:41 -0000	1.13
+++ pkg/PLIST	27 Mar 2006 11:14:12 -0000
@@ -57,6 +57,7 @@
 share/doc/irssi/help/echo
 share/doc/irssi/help/eval
 share/doc/irssi/help/exec
+share/doc/irssi/help/flushbuffer
 share/doc/irssi/help/flushbuffers
 share/doc/irssi/help/format
 share/doc/irssi/help/hash
@@ -91,6 +92,7 @@
 share/doc/irssi/help/names
 share/doc/irssi/help/nctcp
 share/doc/irssi/help/netsplit
+share/doc/irssi/help/network
 share/doc/irssi/help/nick
 share/doc/irssi/help/note
 share/doc/irssi/help/notice
@@ -103,6 +105,7 @@
 share/doc/irssi/help/quit
 share/doc/irssi/help/quote
 share/doc/irssi/help/rawlog
+share/doc/irssi/help/recode
 share/doc/irssi/help/reconnect
 share/doc/irssi/help/rehash
 share/doc/irssi/help/reload
@@ -177,7 +180,10 @@
 share/doc/irssi/themes/default.theme
 share/examples/irssi/
 @sample ${SYSCONFDIR}/irssi/
+_(_at_)_sample ${SYSCONFDIR}/irssi/themes/
 share/examples/irssi/colorless.theme
-_(_at_)_sample ${SYSCONFDIR}/irssi/colorless.theme
+_(_at_)_sample ${SYSCONFDIR}/irssi/themes/colorless.theme
 share/examples/irssi/default.theme
-_(_at_)_sample ${SYSCONFDIR}/irssi/default.theme
+_(_at_)_sample ${SYSCONFDIR}/irssi/themes/default.theme
+share/examples/irssi/irssi.conf
+_(_at_)_sample ${SYSCONFDIR}/irssi/irssi.conf

Visit your host, monkey.org