update to 0.8.10; rearrange locations of installed files.
based on diff from new maintainer Wiktor Izdebski, vicviq at gmail
This commit is contained in:
steven
parent
79fe1909e0
commit
99d57bc1a0
@ -1,40 +1,44 @@
|
||||
# $OpenBSD: Makefile,v 1.25 2004/12/16 00:31:22 alek Exp $
|
||||
# $OpenBSD: Makefile,v 1.26 2006/04/18 20:30:02 steven Exp $
|
||||
# Original from: Timo Sirainen <tss@iki.fi>
|
||||
|
||||
NOT_FOR_ARCHS= ${NO_SHARED_ARCHS}
|
||||
SHARED_ONLY= Yes
|
||||
|
||||
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/ \
|
||||
http://nl.irssi.org/files/ \
|
||||
http://fi.irssi.org/files/ \
|
||||
http://no.irssi.org/files/ \
|
||||
http://de.irssi.org/files/ \
|
||||
http://uk.irssi.org/files/ \
|
||||
http://pl.irssi.org/files/ \
|
||||
http://us.irssi.org/files/
|
||||
|
||||
HOMEPAGE= http://www.irssi.org/
|
||||
|
||||
MAINTAINER= Reinhard J. Sammer <reinhard@openbsd.org>
|
||||
MAINTAINER= Wiktor Izdebski <vicviq@gmail.com>
|
||||
|
||||
# GPL
|
||||
PERMIT_PACKAGE_CDROM= Yes
|
||||
PERMIT_PACKAGE_FTP= Yes
|
||||
PERMIT_DISTFILES_CDROM= Yes
|
||||
PERMIT_DISTFILES_FTP= Yes
|
||||
WANTLIB= c crypto m ncurses perl ssl util
|
||||
|
||||
LIB_DEPENDS+= glib.1.2,gmodule::devel/glib
|
||||
MASTER_SITES= ${HOMEPAGE}/files/
|
||||
|
||||
CONFIGURE_STYLE= gnu
|
||||
WANTLIB= c crypto m ncurses perl ssl util
|
||||
|
||||
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
|
||||
MODULES= devel/gettext
|
||||
|
||||
LIB_DEPENDS= glib-2.0.0.0,gmodule-2.0.0.0::devel/glib2
|
||||
BUILD_DEPENDS= :pkgconfig-*:devel/pkgconfig
|
||||
|
||||
USE_LIBTOOL= Yes
|
||||
LIBTOOL_FLAGS+= --tag=disable-static
|
||||
|
||||
CONFIGURE_STYLE=gnu
|
||||
MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}
|
||||
CONFIGURE_ARGS+=--enable-ipv6 \
|
||||
--with-pic \
|
||||
--with-proxy \
|
||||
--without-included-gettext \
|
||||
--enable-perl=yes \
|
||||
--with-perl-lib=${PREFIX}/libdata/perl5/site_perl
|
||||
|
||||
FLAVORS= socks
|
||||
FLAVOR?=
|
||||
@ -44,14 +48,12 @@ CONFIGURE_ARGS+= --with-socks
|
||||
BUILD_DEPENDS+= ::security/dante
|
||||
.endif
|
||||
|
||||
SAMPLE= default.theme colorless.theme
|
||||
|
||||
pre-configure:
|
||||
@perl -pi -e 's,doc/irssi,irssi,g' ${WRKSRC}/docs/Makefile.in
|
||||
@perl -pi -e "s,!!LOCALBASE!!,${LOCALBASE},g;" \
|
||||
-e "s,!!SYSCONFDIR!!,${SYSCONFDIR},g" ${WRKSRC}/docs/irssi.1
|
||||
|
||||
post-install:
|
||||
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/irssi
|
||||
cd ${WRKDIST} && ${INSTALL_DATA} ${SAMPLE} \
|
||||
${PREFIX}/share/examples/irssi
|
||||
${INSTALL_DATA} ${WRKDIST}/irssi.conf ${PREFIX}/share/examples/irssi
|
||||
@rm -rf ${PREFIX}/include
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
@ -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
|
||||
|
||||
12
net/irssi/patches/patch-Makefile_in
Normal file
12
net/irssi/patches/patch-Makefile_in
Normal file
@ -0,0 +1,12 @@
|
||||
$OpenBSD: patch-Makefile_in,v 1.1 2006/04/18 20:30:03 steven Exp $
|
||||
--- Makefile.in.orig Mon Apr 17 14:39:54 2006
|
||||
+++ Makefile.in Mon Apr 17 14:40:27 2006
|
||||
@@ -132,7 +132,7 @@ SUBDIRS = src docs scripts
|
||||
confdir = $(sysconfdir)
|
||||
conf_DATA = irssi.conf
|
||||
|
||||
-themedir = $(datadir)/irssi/themes
|
||||
+themedir = $(datadir)/examples/irssi/themes
|
||||
theme_DATA = default.theme colorless.theme
|
||||
|
||||
pkginclude_HEADERS = config.h irssi-version.h
|
||||
52
net/irssi/patches/patch-docs_irssi_1
Normal file
52
net/irssi/patches/patch-docs_irssi_1
Normal file
@ -0,0 +1,52 @@
|
||||
$OpenBSD: patch-docs_irssi_1,v 1.1 2006/04/18 20:30:03 steven Exp $
|
||||
--- docs/irssi.1.orig Wed Oct 19 04:13:33 2005
|
||||
+++ docs/irssi.1 Tue Apr 18 11:19:37 2006
|
||||
@@ -69,10 +69,10 @@ display brief usage message.
|
||||
.SH SEE ALSO
|
||||
.B Irssi
|
||||
has been supplied with a huge amount of documentation. Check /help or look
|
||||
-at the files contained by /usr/share/doc/irssi*
|
||||
+at the files contained by !!LOCALBASE!!/share/irssi/* and !!LOCALBASE!!/share/doc/irssi/*
|
||||
.SH FILES
|
||||
.TP
|
||||
-.I /etc/irssi.conf
|
||||
+.I !!SYSCONFDIR!!/irssi/irssi.conf
|
||||
Global configuration file
|
||||
.TP
|
||||
.I ~/.irssi/config
|
||||
@@ -87,14 +87,29 @@ Default irssi theme
|
||||
.I ~/.irssi/away.log
|
||||
Logged messages in away status
|
||||
.TP
|
||||
-.I /usr/share/irssi/help/
|
||||
-Directory including many help files
|
||||
+.I !!LOCALBASE!!/share/irssi/help/
|
||||
+.RS .3
|
||||
+.I !!LOCALBASE!!/share/doc/irssi/
|
||||
+.RE
|
||||
+.RS
|
||||
+Directories including many help files
|
||||
+.RE
|
||||
.TP
|
||||
-.I /usr/share/irssi/scripts/
|
||||
-Global scripts directory
|
||||
+.I !!SYSCONFDIR!!/irssi/scripts/
|
||||
+.RS .3
|
||||
+.I !!LOCALBASE!!/share/examples/irssi/scripts/
|
||||
+.RE
|
||||
+.RS
|
||||
+Global scripts directories
|
||||
+.RE
|
||||
.TP
|
||||
-.I /usr/share/irssi/themes/
|
||||
-Global themes directory
|
||||
+.I !!SYSCONFDIR!!/irssi/themes/
|
||||
+.RS .3
|
||||
+.I !!LOCALBASE!!/share/examples/irssi/themes/
|
||||
+.RE
|
||||
+.RS
|
||||
+Global themes directories
|
||||
+.RE
|
||||
.TP
|
||||
.I ~/.irssi/scripts/
|
||||
Default scripts directory
|
||||
@ -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=""
|
||||
12
net/irssi/patches/patch-scripts_Makefile_in
Normal file
12
net/irssi/patches/patch-scripts_Makefile_in
Normal file
@ -0,0 +1,12 @@
|
||||
$OpenBSD: patch-scripts_Makefile_in,v 1.1 2006/04/18 20:30:03 steven Exp $
|
||||
--- scripts/Makefile.in.orig Mon Apr 17 17:08:15 2006
|
||||
+++ scripts/Makefile.in Mon Apr 17 17:09:13 2006
|
||||
@@ -125,7 +125,7 @@ sedpath = @sedpath@
|
||||
|
||||
SUBDIRS = examples
|
||||
|
||||
-scriptdir = $(datadir)/irssi/scripts
|
||||
+scriptdir = $(datadir)/examples/irssi/scripts
|
||||
|
||||
script_DATA = autoop.pl autorejoin.pl buf.pl dns.pl kills.pl mail.pl mlock.pl quitmsg.pl scriptassist.pl splitlong.pl usercount.pl
|
||||
|
||||
12
net/irssi/patches/patch-scripts_examples_Makefile_in
Normal file
12
net/irssi/patches/patch-scripts_examples_Makefile_in
Normal file
@ -0,0 +1,12 @@
|
||||
$OpenBSD: patch-scripts_examples_Makefile_in,v 1.1 2006/04/18 20:30:03 steven Exp $
|
||||
--- scripts/examples/Makefile.in.orig Mon Apr 17 20:09:09 2006
|
||||
+++ scripts/examples/Makefile.in Mon Apr 17 20:09:31 2006
|
||||
@@ -123,7 +123,7 @@ perl_static_lib = @perl_static_lib@
|
||||
perlpath = @perlpath@
|
||||
sedpath = @sedpath@
|
||||
|
||||
-scriptdir = $(datadir)/irssi/scripts
|
||||
+scriptdir = $(datadir)/examples/irssi/scripts
|
||||
|
||||
script_DATA = command.pl msg-event.pl redirect.pl
|
||||
|
||||
12
net/irssi/patches/patch-src_core_settings_c
Normal file
12
net/irssi/patches/patch-src_core_settings_c
Normal file
@ -0,0 +1,12 @@
|
||||
$OpenBSD: patch-src_core_settings_c,v 1.1 2006/04/18 20:30:03 steven Exp $
|
||||
--- 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 */
|
||||
12
net/irssi/patches/patch-src_fe-common_core_Makefile_in
Normal file
12
net/irssi/patches/patch-src_fe-common_core_Makefile_in
Normal file
@ -0,0 +1,12 @@
|
||||
$OpenBSD: patch-src_fe-common_core_Makefile_in,v 1.1 2006/04/18 20:30:03 steven Exp $
|
||||
--- 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)/examples/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
|
||||
31
net/irssi/patches/patch-src_fe-common_core_fe-common-core_c
Normal file
31
net/irssi/patches/patch-src_fe-common_core_fe-common-core_c
Normal file
@ -0,0 +1,31 @@
|
||||
$OpenBSD: patch-src_fe-common_core_fe-common-core_c,v 1.1 2006/04/18 20:30:03 steven Exp $
|
||||
--- 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
|
||||
24
net/irssi/patches/patch-src_fe-common_core_themes_c
Normal file
24
net/irssi/patches/patch-src_fe-common_core_themes_c
Normal file
@ -0,0 +1,24 @@
|
||||
$OpenBSD: patch-src_fe-common_core_themes_c,v 1.1 2006/04/18 20:30:03 steven Exp $
|
||||
--- 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 */
|
||||
+ }
|
||||
}
|
||||
}
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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);
|
||||
@ -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: patch-src_irc_proxy_Makefile_in,v 1.2 2006/04/18 20:30:03 steven Exp $
|
||||
--- 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
|
||||
|
||||
|
||||
12
net/irssi/patches/patch-src_perl_Makefile_in
Normal file
12
net/irssi/patches/patch-src_perl_Makefile_in
Normal file
@ -0,0 +1,12 @@
|
||||
$OpenBSD: patch-src_perl_Makefile_in,v 1.1 2006/04/18 20:30:03 steven Exp $
|
||||
--- 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)/examples/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
|
||||
24
net/irssi/patches/patch-src_perl_perl-core_c
Normal file
24
net/irssi/patches/patch-src_perl_perl-core_c
Normal file
@ -0,0 +1,24 @@
|
||||
$OpenBSD: patch-src_perl_perl-core_c,v 1.1 2006/04/18 20:30:03 steven Exp $
|
||||
--- 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);
|
||||
11
net/irssi/patches/patch-src_perl_perl-fe_c
Normal file
11
net/irssi/patches/patch-src_perl_perl-fe_c
Normal file
@ -0,0 +1,11 @@
|
||||
$OpenBSD: patch-src_perl_perl-fe_c,v 1.1 2006/04/18 20:30:03 steven Exp $
|
||||
--- 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);
|
||||
|
||||
@ -1,8 +1,7 @@
|
||||
@comment $OpenBSD: PLIST,v 1.13 2004/09/15 18:17:41 espie Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.14 2006/04/18 20:30:03 steven Exp $
|
||||
bin/irssi
|
||||
lib/irssi/
|
||||
lib/irssi/modules/
|
||||
lib/irssi/modules/libirc_proxy.a
|
||||
lib/irssi/modules/libirc_proxy.la
|
||||
lib/irssi/modules/libirc_proxy.so
|
||||
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/
|
||||
@ -31,153 +30,159 @@ share/doc/irssi/design.txt
|
||||
share/doc/irssi/faq.html
|
||||
share/doc/irssi/faq.txt
|
||||
share/doc/irssi/formats.txt
|
||||
share/doc/irssi/help/
|
||||
share/doc/irssi/help/action
|
||||
share/doc/irssi/help/admin
|
||||
share/doc/irssi/help/alias
|
||||
share/doc/irssi/help/away
|
||||
share/doc/irssi/help/ban
|
||||
share/doc/irssi/help/beep
|
||||
share/doc/irssi/help/bind
|
||||
share/doc/irssi/help/cat
|
||||
share/doc/irssi/help/cd
|
||||
share/doc/irssi/help/channel
|
||||
share/doc/irssi/help/clear
|
||||
share/doc/irssi/help/completion
|
||||
share/doc/irssi/help/connect
|
||||
share/doc/irssi/help/ctcp
|
||||
share/doc/irssi/help/cycle
|
||||
share/doc/irssi/help/date
|
||||
share/doc/irssi/help/dcc
|
||||
share/doc/irssi/help/dehilight
|
||||
share/doc/irssi/help/deop
|
||||
share/doc/irssi/help/devoice
|
||||
share/doc/irssi/help/die
|
||||
share/doc/irssi/help/disconnect
|
||||
share/doc/irssi/help/echo
|
||||
share/doc/irssi/help/eval
|
||||
share/doc/irssi/help/exec
|
||||
share/doc/irssi/help/flushbuffers
|
||||
share/doc/irssi/help/format
|
||||
share/doc/irssi/help/hash
|
||||
share/doc/irssi/help/help
|
||||
share/doc/irssi/help/hilight
|
||||
share/doc/irssi/help/ignore
|
||||
share/doc/irssi/help/info
|
||||
share/doc/irssi/help/invite
|
||||
share/doc/irssi/help/invitelist
|
||||
share/doc/irssi/help/ircnet
|
||||
share/doc/irssi/help/ison
|
||||
share/doc/irssi/help/join
|
||||
share/doc/irssi/help/kick
|
||||
share/doc/irssi/help/kickban
|
||||
share/doc/irssi/help/kill
|
||||
share/doc/irssi/help/knock
|
||||
share/doc/irssi/help/knockout
|
||||
share/doc/irssi/help/lastlog
|
||||
share/doc/irssi/help/layout
|
||||
share/doc/irssi/help/levels
|
||||
share/doc/irssi/help/links
|
||||
share/doc/irssi/help/list
|
||||
share/doc/irssi/help/load
|
||||
share/doc/irssi/help/log
|
||||
share/doc/irssi/help/lusers
|
||||
share/doc/irssi/help/map
|
||||
share/doc/irssi/help/me
|
||||
share/doc/irssi/help/mircdcc
|
||||
share/doc/irssi/help/mode
|
||||
share/doc/irssi/help/motd
|
||||
share/doc/irssi/help/msg
|
||||
share/doc/irssi/help/names
|
||||
share/doc/irssi/help/nctcp
|
||||
share/doc/irssi/help/netsplit
|
||||
share/doc/irssi/help/nick
|
||||
share/doc/irssi/help/note
|
||||
share/doc/irssi/help/notice
|
||||
share/doc/irssi/help/notify
|
||||
share/doc/irssi/help/op
|
||||
share/doc/irssi/help/oper
|
||||
share/doc/irssi/help/part
|
||||
share/doc/irssi/help/ping
|
||||
share/doc/irssi/help/query
|
||||
share/doc/irssi/help/quit
|
||||
share/doc/irssi/help/quote
|
||||
share/doc/irssi/help/rawlog
|
||||
share/doc/irssi/help/reconnect
|
||||
share/doc/irssi/help/rehash
|
||||
share/doc/irssi/help/reload
|
||||
share/doc/irssi/help/restart
|
||||
share/doc/irssi/help/rmreconns
|
||||
share/doc/irssi/help/rmrejoins
|
||||
share/doc/irssi/help/rping
|
||||
share/doc/irssi/help/save
|
||||
share/doc/irssi/help/say
|
||||
share/doc/irssi/help/sconnect
|
||||
share/doc/irssi/help/script
|
||||
share/doc/irssi/help/scrollback
|
||||
share/doc/irssi/help/server
|
||||
share/doc/irssi/help/servlist
|
||||
share/doc/irssi/help/set
|
||||
share/doc/irssi/help/silence
|
||||
share/doc/irssi/help/squery
|
||||
share/doc/irssi/help/squit
|
||||
share/doc/irssi/help/stats
|
||||
share/doc/irssi/help/statusbar
|
||||
share/doc/irssi/help/time
|
||||
share/doc/irssi/help/toggle
|
||||
share/doc/irssi/help/topic
|
||||
share/doc/irssi/help/trace
|
||||
share/doc/irssi/help/ts
|
||||
share/doc/irssi/help/unalias
|
||||
share/doc/irssi/help/unban
|
||||
share/doc/irssi/help/unignore
|
||||
share/doc/irssi/help/unload
|
||||
share/doc/irssi/help/unnotify
|
||||
share/doc/irssi/help/unquery
|
||||
share/doc/irssi/help/unsilence
|
||||
share/doc/irssi/help/upgrade
|
||||
share/doc/irssi/help/uping
|
||||
share/doc/irssi/help/userhost
|
||||
share/doc/irssi/help/ver
|
||||
share/doc/irssi/help/version
|
||||
share/doc/irssi/help/voice
|
||||
share/doc/irssi/help/wait
|
||||
share/doc/irssi/help/wall
|
||||
share/doc/irssi/help/wallchops
|
||||
share/doc/irssi/help/wallops
|
||||
share/doc/irssi/help/watch
|
||||
share/doc/irssi/help/who
|
||||
share/doc/irssi/help/whois
|
||||
share/doc/irssi/help/whowas
|
||||
share/doc/irssi/help/window
|
||||
share/doc/irssi/help/wjoin
|
||||
share/doc/irssi/help/wquery
|
||||
share/doc/irssi/manual.txt
|
||||
share/doc/irssi/perl.txt
|
||||
share/doc/irssi/scripts/
|
||||
share/doc/irssi/scripts/autoop.pl
|
||||
share/doc/irssi/scripts/autorejoin.pl
|
||||
share/doc/irssi/scripts/buf.pl
|
||||
share/doc/irssi/scripts/command.pl
|
||||
share/doc/irssi/scripts/dns.pl
|
||||
share/doc/irssi/scripts/kills.pl
|
||||
share/doc/irssi/scripts/mail.pl
|
||||
share/doc/irssi/scripts/mlock.pl
|
||||
share/doc/irssi/scripts/msg-event.pl
|
||||
share/doc/irssi/scripts/quitmsg.pl
|
||||
share/doc/irssi/scripts/redirect.pl
|
||||
share/doc/irssi/scripts/scriptassist.pl
|
||||
share/doc/irssi/scripts/splitlong.pl
|
||||
share/doc/irssi/scripts/usercount.pl
|
||||
share/doc/irssi/signals.txt
|
||||
share/doc/irssi/special_vars.txt
|
||||
share/doc/irssi/startup-HOWTO.html
|
||||
share/doc/irssi/themes/
|
||||
share/doc/irssi/themes/colorless.theme
|
||||
share/doc/irssi/themes/default.theme
|
||||
share/examples/irssi/
|
||||
@sample ${SYSCONFDIR}/irssi/
|
||||
share/examples/irssi/colorless.theme
|
||||
@sample ${SYSCONFDIR}/irssi/colorless.theme
|
||||
share/examples/irssi/default.theme
|
||||
@sample ${SYSCONFDIR}/irssi/default.theme
|
||||
share/examples/irssi/irssi.conf
|
||||
@sample ${SYSCONFDIR}/irssi/irssi.conf
|
||||
share/examples/irssi/scripts/
|
||||
@sample ${SYSCONFDIR}/irssi/scripts/
|
||||
share/examples/irssi/scripts/autoop.pl
|
||||
share/examples/irssi/scripts/autorejoin.pl
|
||||
share/examples/irssi/scripts/buf.pl
|
||||
share/examples/irssi/scripts/command.pl
|
||||
share/examples/irssi/scripts/dns.pl
|
||||
share/examples/irssi/scripts/kills.pl
|
||||
share/examples/irssi/scripts/mail.pl
|
||||
share/examples/irssi/scripts/mlock.pl
|
||||
share/examples/irssi/scripts/msg-event.pl
|
||||
share/examples/irssi/scripts/quitmsg.pl
|
||||
share/examples/irssi/scripts/redirect.pl
|
||||
share/examples/irssi/scripts/scriptassist.pl
|
||||
share/examples/irssi/scripts/splitlong.pl
|
||||
share/examples/irssi/scripts/usercount.pl
|
||||
share/examples/irssi/themes/
|
||||
@sample ${SYSCONFDIR}/irssi/themes/
|
||||
share/examples/irssi/themes/colorless.theme
|
||||
@sample ${SYSCONFDIR}/irssi/themes/colorless.theme
|
||||
share/examples/irssi/themes/default.theme
|
||||
@sample ${SYSCONFDIR}/irssi/themes/default.theme
|
||||
share/irssi/
|
||||
share/irssi/help/
|
||||
share/irssi/help/action
|
||||
share/irssi/help/admin
|
||||
share/irssi/help/alias
|
||||
share/irssi/help/away
|
||||
share/irssi/help/ban
|
||||
share/irssi/help/beep
|
||||
share/irssi/help/bind
|
||||
share/irssi/help/cat
|
||||
share/irssi/help/cd
|
||||
share/irssi/help/channel
|
||||
share/irssi/help/clear
|
||||
share/irssi/help/completion
|
||||
share/irssi/help/connect
|
||||
share/irssi/help/ctcp
|
||||
share/irssi/help/cycle
|
||||
share/irssi/help/date
|
||||
share/irssi/help/dcc
|
||||
share/irssi/help/dehilight
|
||||
share/irssi/help/deop
|
||||
share/irssi/help/devoice
|
||||
share/irssi/help/die
|
||||
share/irssi/help/disconnect
|
||||
share/irssi/help/echo
|
||||
share/irssi/help/eval
|
||||
share/irssi/help/exec
|
||||
share/irssi/help/flushbuffer
|
||||
share/irssi/help/flushbuffers
|
||||
share/irssi/help/format
|
||||
share/irssi/help/hash
|
||||
share/irssi/help/help
|
||||
share/irssi/help/hilight
|
||||
share/irssi/help/ignore
|
||||
share/irssi/help/info
|
||||
share/irssi/help/invite
|
||||
share/irssi/help/invitelist
|
||||
share/irssi/help/ircnet
|
||||
share/irssi/help/ison
|
||||
share/irssi/help/join
|
||||
share/irssi/help/kick
|
||||
share/irssi/help/kickban
|
||||
share/irssi/help/kill
|
||||
share/irssi/help/knock
|
||||
share/irssi/help/knockout
|
||||
share/irssi/help/lastlog
|
||||
share/irssi/help/layout
|
||||
share/irssi/help/levels
|
||||
share/irssi/help/links
|
||||
share/irssi/help/list
|
||||
share/irssi/help/load
|
||||
share/irssi/help/log
|
||||
share/irssi/help/lusers
|
||||
share/irssi/help/map
|
||||
share/irssi/help/me
|
||||
share/irssi/help/mircdcc
|
||||
share/irssi/help/mode
|
||||
share/irssi/help/motd
|
||||
share/irssi/help/msg
|
||||
share/irssi/help/names
|
||||
share/irssi/help/nctcp
|
||||
share/irssi/help/netsplit
|
||||
share/irssi/help/network
|
||||
share/irssi/help/nick
|
||||
share/irssi/help/note
|
||||
share/irssi/help/notice
|
||||
share/irssi/help/notify
|
||||
share/irssi/help/op
|
||||
share/irssi/help/oper
|
||||
share/irssi/help/part
|
||||
share/irssi/help/ping
|
||||
share/irssi/help/query
|
||||
share/irssi/help/quit
|
||||
share/irssi/help/quote
|
||||
share/irssi/help/rawlog
|
||||
share/irssi/help/recode
|
||||
share/irssi/help/reconnect
|
||||
share/irssi/help/rehash
|
||||
share/irssi/help/reload
|
||||
share/irssi/help/restart
|
||||
share/irssi/help/rmreconns
|
||||
share/irssi/help/rmrejoins
|
||||
share/irssi/help/rping
|
||||
share/irssi/help/save
|
||||
share/irssi/help/say
|
||||
share/irssi/help/sconnect
|
||||
share/irssi/help/script
|
||||
share/irssi/help/scrollback
|
||||
share/irssi/help/server
|
||||
share/irssi/help/servlist
|
||||
share/irssi/help/set
|
||||
share/irssi/help/silence
|
||||
share/irssi/help/squery
|
||||
share/irssi/help/squit
|
||||
share/irssi/help/stats
|
||||
share/irssi/help/statusbar
|
||||
share/irssi/help/time
|
||||
share/irssi/help/toggle
|
||||
share/irssi/help/topic
|
||||
share/irssi/help/trace
|
||||
share/irssi/help/ts
|
||||
share/irssi/help/unalias
|
||||
share/irssi/help/unban
|
||||
share/irssi/help/unignore
|
||||
share/irssi/help/unload
|
||||
share/irssi/help/unnotify
|
||||
share/irssi/help/unquery
|
||||
share/irssi/help/unsilence
|
||||
share/irssi/help/upgrade
|
||||
share/irssi/help/uping
|
||||
share/irssi/help/userhost
|
||||
share/irssi/help/ver
|
||||
share/irssi/help/version
|
||||
share/irssi/help/voice
|
||||
share/irssi/help/wait
|
||||
share/irssi/help/wall
|
||||
share/irssi/help/wallchops
|
||||
share/irssi/help/wallops
|
||||
share/irssi/help/watch
|
||||
share/irssi/help/who
|
||||
share/irssi/help/whois
|
||||
share/irssi/help/whowas
|
||||
share/irssi/help/window
|
||||
share/irssi/help/wjoin
|
||||
share/irssi/help/wquery
|
||||
|
||||
Loading…
Reference in New Issue
Block a user