On Thursday 06 April 2006 15:39, viq wrote:
[...]
> Now you also made me think, and I wanted to make irssi also
> use /etc/irssi/scripts/ as the default dir for the scripts, but didn't find
> the setting yet...
Ok, here's an attempt at that. It should first look for script in
~/irssi/scripts/ then in /etc/irssi/scripts/ and last
in /usr/local/share/doc/irssi/scripts/
I also corrected the man page to reflect that.
Should the default set of scripts be copied as well to /etc/irssi/scripts/, or
should I leave them where they are?
Also, please test and review, there is one instance of SCRIPTDIR in
w-irssi-0.8.10/irssi-0.8.10/src/perl/perl-common.c I didn't know what to do
about - so I'm not yet sure everything will work as it should.
Hah, with the amount of time I am spending poking things here I may muster
enough courage to take maintainership of this ;) Not quite yet, though, I
don't feel confident enough in the quality of what I'm doing.
--
viq
----------------------------------------------------------------------
Poznaj Stefana! Zmien komunikator! >>> http://link.interia.pl/f1924
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/irssi/Makefile,v
retrieving revision 1.25
diff -u -d -r1.25 Makefile
--- Makefile 16 Dec 2004 00:31:22 -0000 1.25
+++ Makefile 7 Apr 2006 12:01:04 -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
@@ -53,5 +59,6 @@
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/irssi
cd ${WRKDIST} && ${INSTALL_DATA} ${SAMPLE} \
${PREFIX}/share/examples/irssi
+ rm -rf ${PREFIX}/include
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/irssi/distinfo,v
retrieving revision 1.11
diff -u -d -r1.11 distinfo
--- distinfo 5 Jan 2005 17:14:46 -0000 1.11
+++ distinfo 7 Apr 2006 12:01:04 -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-docs_irssi_1
===================================================================
RCS file: patches/patch-docs_irssi_1
diff -N patches/patch-docs_irssi_1
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-docs_irssi_1 7 Apr 2006 12:01:04 -0000
@@ -0,0 +1,28 @@
+$OpenBSD$
+--- docs/irssi.1.orig Wed Oct 19 04:13:33 2005
++++ docs/irssi.1 Fri Apr 7 14:00:29 2006
+@@ -72,7 +72,7 @@ has been supplied with a huge amount of
+ at the files contained by /usr/share/doc/irssi*
+ .SH FILES
+ .TP
+-.I /etc/irssi.conf
++.I /etc/irssi/irssi.conf
+ Global configuration file
+ .TP
+ .I ~/.irssi/config
+@@ -90,11 +90,13 @@ Logged messages in away status
+ .I /usr/share/irssi/help/
+ Directory including many help files
+ .TP
++.I /etc/irssi/scripts/
+ .I /usr/share/irssi/scripts/
+-Global scripts directory
++Global scripts directories
+ .TP
++.I /etc/irssi/themes/
+ .I /usr/share/irssi/themes/
+-Global themes directory
++Global themes directories
+ .TP
+ .I ~/.irssi/scripts/
+ Default scripts directory
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 7 Apr 2006 12:01:04 -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 7 Apr 2006 12:01:04 -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 7 Apr 2006 12:01:04 -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 7 Apr 2006 12:01:04 -0000
@@ -0,0 +1,24 @@
+$OpenBSD$
+--- src/fe-common/core/themes.c.orig Wed Oct 19 04:13:20 2005
++++ src/fe-common/core/themes.c Thu Apr 6 14:00:43 2006
+@@ -838,12 +838,15 @@ THEME_REC *theme_load(const char *setnam
+ if (stat(fname, &statbuf) != 0) {
+ /* check global config dir */
+ g_free(fname);
+- fname = g_strdup_printf(THEMESDIR"/%s.theme", name);
++ 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 */
++ 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 */
++ }
+ }
+ }
+
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 -u -d -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 7 Apr 2006 12:01:04 -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: patches/patch-src_perl_Makefile_in
===================================================================
RCS file: patches/patch-src_perl_Makefile_in
diff -N patches/patch-src_perl_Makefile_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_perl_Makefile_in 7 Apr 2006 12:01:04 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- src/perl/Makefile.in.orig Fri Apr 7 12:37:34 2006
++++ src/perl/Makefile.in Fri Apr 7 12:39:34 2006
+@@ -136,7 +136,7 @@ EXTRA_LTLIBRARIES = libperl_core.la li
+ libperl_core_la_LDFLAGS = -module -avoid-version -rpath $(moduledir)
+ libfe_perl_la_LDFLAGS = -module -avoid-version -rpath $(moduledir)
+
+-INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/core -I$(top_srcdir)/src/fe-common/core $(GLIB_CFLAGS) -DSCRIPTDIR=\""$(datadir)/irssi/scripts"\" -DPERL_USE_LIB=\""$(PERL_USE_LIB)"\" -DPERL_STATIC_LIBS=$(PERL_STATIC_LIBS) $(PERL_CFLAGS)
++INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/core -I$(top_srcdir)/src/fe-common/core $(GLIB_CFLAGS) -DSCRIPTDIR=\""$(datadir)/irssi/scripts"\" -DPERL_USE_LIB=\""$(PERL_USE_LIB)"\" -DPERL_STATIC_LIBS=$(PERL_STATIC_LIBS) $(PERL_CFLAGS) -DSYSCONFDIR=\""$(sysconfdir)"\"
+
+
+ perl_sources = perl-core.c perl-common.c perl-signals.c perl-sources.c
Index: patches/patch-src_perl_perl-core_c
===================================================================
RCS file: patches/patch-src_perl_perl-core_c
diff -N patches/patch-src_perl_perl-core_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_perl_perl-core_c 7 Apr 2006 12:01:04 -0000
@@ -0,0 +1,24 @@
+$OpenBSD$
+--- src/perl/perl-core.c.orig Fri Apr 7 12:56:00 2006
++++ src/perl/perl-core.c Fri Apr 7 13:06:09 2006
+@@ -370,12 +370,17 @@ char *perl_script_get_path(const char *n
+ /* check from ~/.irssi/scripts/ */
+ path = g_strdup_printf("%s/scripts/%s", get_irssi_dir(), file);
+ if (stat(path, &statbuf) != 0) {
+- /* check from SCRIPTDIR */
++ /* check from SYSCONFDIR and SCRIPTDIR */
+ g_free(path);
+- path = g_strdup_printf(SCRIPTDIR"/%s", file);
++ //path = g_strdup_printf(SCRIPTDIR"/%s", file);
++ path = g_strdup_printf(SYSCONFDIR"/irssi/scripts/%s", file);
+ if (stat(path, &statbuf) != 0) {
+ g_free(path);
+- path = NULL;
++ path = g_strdup_printf(SCRIPTDIR"/%s", file);
++ if (stat(path, &statbuf) != 0) {
++ g_free(path);
++ path = NULL;
++ }
+ }
+ }
+ g_free(file);
Index: patches/patch-src_perl_perl-fe_c
===================================================================
RCS file: patches/patch-src_perl_perl-fe_c
diff -N patches/patch-src_perl_perl-fe_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_perl_perl-fe_c 7 Apr 2006 12:01:04 -0000
@@ -0,0 +1,11 @@
+$OpenBSD$
+--- src/perl/perl-fe.c.orig Wed Oct 19 04:13:21 2005
++++ src/perl/perl-fe.c Fri Apr 7 13:43:29 2006
+@@ -199,6 +199,7 @@ static void sig_complete_load(GList **li
+ /* completing filename parameter for /SCRIPT LOAD */
+ user_dir = g_strdup_printf("%s/scripts", get_irssi_dir());
+ *list = filename_complete(word, user_dir);
++ *list = g_list_concat(*list, filename_complete(word, SYSCONFDIR"/irssi/scripts"));
+ *list = g_list_concat(*list, filename_complete(word, SCRIPTDIR));
+ g_free(user_dir);
+
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/net/irssi/pkg/PLIST,v
retrieving revision 1.13
diff -u -d -r1.13 PLIST
--- pkg/PLIST 15 Sep 2004 18:17:41 -0000 1.13
+++ pkg/PLIST 7 Apr 2006 12:01:04 -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,11 @@
share/doc/irssi/themes/default.theme
share/examples/irssi/
@sample ${SYSCONFDIR}/irssi/
[EMAIL PROTECTED] ${SYSCONFDIR}/irssi/themes/
share/examples/irssi/colorless.theme
[EMAIL PROTECTED] ${SYSCONFDIR}/irssi/colorless.theme
[EMAIL PROTECTED] ${SYSCONFDIR}/irssi/themes/colorless.theme
share/examples/irssi/default.theme
[EMAIL PROTECTED] ${SYSCONFDIR}/irssi/default.theme
[EMAIL PROTECTED] ${SYSCONFDIR}/irssi/themes/default.theme
+share/examples/irssi/irssi.conf
[EMAIL PROTECTED] ${SYSCONFDIR}/irssi/irssi.conf
[EMAIL PROTECTED] ${SYSCONFDIR}/irssi/scripts/
