cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to irssi-silc-1.1.3

Browse Source 
tweaks, looks good steven@;  tested by Wiktor Izdebski and Simon Kuhnle
This commit is contained in:
martynas 2007-11-18 17:36:18 +00:00
parent cad9a67bcc
commit 240fcb302a
23 changed files with 178 additions and 278 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

133
net/irssi-silc/Makefile
View File

@ -1,16 +1,13 @@
# $OpenBSD: Makefile,v 1.6 2007/09/15 22:36:54 merdely Exp $
# $OpenBSD: Makefile,v 1.7 2007/11/18 17:36:18 martynas Exp $
SHARED_ONLY= Yes
COMMENT= irssi module allowing you to connect to SILC network
COMMENT= SILC plugin for irssi
VERSION= 1.1.3
DISTNAME= silc-client-${VERSION}
PKGNAME= irssi-silc-${VERSION}
IRSSI_VERSION= 0.8.10
SILC_VERSION= 1.0.4.1
DISTNAME= irssi-${IRSSI_VERSION}
DISTFILES= ${DISTNAME}a.tar.gz \
silc-plugin-${SILC_VERSION}.tar.gz:0 \
silc-client-${SILC_VERSION}.tar.gz:1
PKGNAME= irssi-silc-${SILC_VERSION}p2
CATEGORIES= net
HOMEPAGE= http://penguin-breeder.org/silc/
@ -23,10 +20,7 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= http://www.irssi.org/files/
MASTER_SITES0= ${HOMEPAGE}/download/ \
http://mirrors.protection.cx/~jolan/
MASTER_SITES1= http://ftp.silcnet.org/client/sources/ \
MASTER_SITES= http://ftp.silcnet.org/client/sources/ \
ftp://ftp.silcnet.org/silc/client/sources/ \
http://www.planetmirror.com/pub/silcnet/client/sources/ \
http://munitions.vipul.net/software/mirrors/silc/client/sources/ \
@ -34,108 +28,33 @@ MASTER_SITES1= http://ftp.silcnet.org/client/sources/ \
http://the.wiretapped.net/security/network-security/silc/client/sources/ \
ftp://ftp.wiretapped.net/pub/security/network-security/silc/client/sources/
MODULES= devel/gettext
BUILD_DEPENDS= :autoconf-${AUTOCONF_VERSION}:devel/autoconf/${AUTOCONF_VERSION} \
:automake-${AUTOMAKE_VERSION}.*:devel/automake/${AUTOMAKE_VERSION} \
::devel/glib \
BUILD_DEPENDS= ::devel/gettext \
::devel/glib2
RUN_DEPENDS= :irssi-0.*:net/irssi \
::devel/p5-IO-stringy \
::mail/p5-MIME-tools \
::misc/p5-File-MMagic
RUN_DEPENDS= ::net/irssi
USE_LIBTOOL= Yes
LIBTOOL_FLAGS+= --tag=disable-static
MAKE_FLAGS= libfe_common_silc_la_LDFLAGS=-avoid-version \
libsilc_core_la_LDFLAGS=-avoid-version
CONFIGURE_STYLE= gnu
AUTOCONF_VERSION= 2.59
AUTOMAKE_VERSION= 1.9
MODGNU_CONFIG_GUESS_DIRS=${WRKSRC} \
${CLIENT_DIR}
CONFIGURE_ARGS+= --enable-ipv6 \
--with-pic \
--with-proxy \
--without-included-gettext \
--enable-perl=yes \
--with-perl-lib=${PREFIX}/libdata/perl5/site_perl \
--sysconfdir=/etc
CONFIGURE_ARGS0+= ${CONFIGURE_ARGS} \
USE_LIBTOOL= Yes
LIBTOOL_FLAGS+= --tag=disable-static
CONFIGURE_STYLE= autoconf
AUTOCONF_VERSION= 2.61
CONFIGURE_ARGS+= --docdir=${PREFIX}/share/doc/irssi/silc \
--enable-ipv6 \
--with-helpdir=${PREFIX}/share/irssi/help/silc \
--with-docdir=${PREFIX}/share/doc/silc \
--with-etcdir=${SYSCONFDIR}/silc \
--with-iconv=${LOCALBASE} \
--with-perl-lib=${PREFIX}/libdata/perl5/site_perl
# needed by plugin
CONFIGURE_ARGS0+= --without-libtoolfix \
--enable-static \
--enable-debug \
--without-silc-libs
--with-perl \
--with-perl-lib=${PREFIX}/libdata/perl5/site_perl \
--with-pic \
--with-silc-plugin=${PREFIX}/lib/irssi \
--without-libtoolfix
.if ${MACHINE_ARCH} != "i386"
CONFIGURE_ARGS0+= --disable-asm
CONFIGURE_ARGS+= --disable-asm
.endif
CFLAGS+= -fPIC -DPIC
CLIENT_DIR=${WRKDIR}/silc-client-${SILC_VERSION}
PLUGIN_DIR=${WRKDIR}/silc-plugin-${SILC_VERSION}
PATCH_ARGS+= -d ${WRKDIR} --quiet
PATCH_DIST_ARGS+= -d ${WRKDIR} --quiet
pre-configure:
@cd ${CLIENT_DIR} && ${SETENV} CC="${CC}" ac_cv_path_CC="${CC}" \
CFLAGS="${CFLAGS:C/ *$//}" CXX="${CXX}" \
ac_cv_path_CXX="${CXX}" CXXFLAGS="${CXXFLAGS:C/ *$//}" \
${CONFIGURE_ENV} LIBTOOL="${LIBTOOL} --tag=disable-shared" \
./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS0}
# Do NOT use any kind of parallel build system to compile the silc-client!
@cd ${CLIENT_DIR}/lib && ${SETENV} ${MAKE_ENV} \
${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKE_FILE} ${ALL_TARGET} \
LIBTOOL="${LIBTOOL} --tag=disable-shared"
@cd ${PLUGIN_DIR} && ${SETENV} ${MAKE_ENV} \
${SETENV} ${CONFIGURE_ENV} \
AUTOCONF_VERSION=${AUTOCONF_VERSION} \
AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \
${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKE_FILE} patch \
IRSSI=${WRKSRC} SILC=${CLIENT_DIR}
do-build:
@cd ${WRKSRC}/src/perl && ${SETENV} ${MAKE_ENV} \
${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKE_FILE} ${ALL_TARGET}
@cd ${WRKSRC}/src/fe-common/silc && ${SETENV} ${MAKE_ENV} \
${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKE_FILE} ${ALL_TARGET}
@cd ${WRKSRC}/src/silc/core && ${SETENV} ${MAKE_ENV} \
${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKE_FILE} ${ALL_TARGET}
do-install:
@cd ${WRKSRC}/src/perl/silc && ${SETENV} ${MAKE_ENV} \
${MAKE_PROGRAM} ${FAKE_FLAGS} -f ${MAKE_FILE} ${FAKE_TARGET}
@cd ${WRKSRC}/src/fe-common/silc && ${SETENV} ${MAKE_ENV} \
${MAKE_PROGRAM} ${FAKE_FLAGS} -f ${MAKE_FILE} ${FAKE_TARGET}
@cd ${WRKSRC}/src/silc/core && ${SETENV} ${MAKE_ENV} \
${MAKE_PROGRAM} ${FAKE_FLAGS} -f ${MAKE_FILE} ${FAKE_TARGET}
@cd ${CLIENT_DIR}/apps/irssi/docs/help && ${SETENV} ${MAKE_ENV} \
${MAKE_PROGRAM} ${FAKE_FLAGS} -f ${MAKE_FILE} ${FAKE_TARGET}
.for i in la so
@mv -f ${PREFIX}/lib/irssi/modules/libfe_common_silc.${i} \
${PREFIX}/lib/irssi/modules/libfe_silc.${i}
.endfor
${INSTALL_DATA} ${PLUGIN_DIR}/docs/silc ${PREFIX}/share/irssi/help/silc/
@mkdir -p ${PREFIX}/share/examples/irssi/scripts && \
${INSTALL_DATA} ${PLUGIN_DIR}/scripts/*.pl \
${PREFIX}/share/examples/irssi/scripts/
@mkdir -p ${PREFIX}/share/examples/irssi/themes && \
${INSTALL_DATA} ${PLUGIN_DIR}/default.theme \
${PREFIX}/share/examples/irssi/themes/silc.theme
@mkdir -p ${PREFIX}/share/doc/irssi/silc && \
${INSTALL_DATA} ${PLUGIN_DIR}/{README,USAGE} \
${PREFIX}/share/doc/irssi/silc/
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/irssi
mv -f ${PREFIX}/share/irssi/scripts ${PREFIX}/share/examples/irssi/
mv -f ${PREFIX}/share/irssi/themes ${PREFIX}/share/examples/irssi/
.include <bsd.port.mk>

20
net/irssi-silc/distinfo
View File

@ -1,15 +1,5 @@
MD5 (irssi-0.8.10a.tar.gz) = eBQHliBcb6HEPkbS555gqg==
MD5 (silc-client-1.0.4.1.tar.gz) = MVSStAPtOxvQALgWXlrg0g==
MD5 (silc-plugin-1.0.4.1.tar.gz) = zbpd9ONn4RzAVnRVDxqChA==
RMD160 (irssi-0.8.10a.tar.gz) = iAUI4YpNiWpcMdwgtnpu+Gyca5Q=
RMD160 (silc-client-1.0.4.1.tar.gz) = uU8P46b7QpB7eszC/4FhqJ8ILYo=
RMD160 (silc-plugin-1.0.4.1.tar.gz) = bwH5bMu4KFIaNXwD+c206JD0JJM=
SHA1 (irssi-0.8.10a.tar.gz) = qi0vFwG7Sa/F6gkQLWOW9OATod0=
SHA1 (silc-client-1.0.4.1.tar.gz) = LyzteYgvXxLkpOPqH42qIeVgndY=
SHA1 (silc-plugin-1.0.4.1.tar.gz) = TiA6CyQlItEYeBRludWfxKLzOLM=
SHA256 (irssi-0.8.10a.tar.gz) = Q/7SccKA1hzOPe6Vsu+WAyak99clvRxinUjWsuipZGM=
SHA256 (silc-client-1.0.4.1.tar.gz) = JWn3VgCOxI33s4MArBvwPLKJHvKwsRtnt2KyGQlXv2k=
SHA256 (silc-plugin-1.0.4.1.tar.gz) = mw0Q+RzenHsEAeiS5LQyU995LTFbpW8Y5zLkLBkRJwg=
SIZE (irssi-0.8.10a.tar.gz) = 1056233
SIZE (silc-client-1.0.4.1.tar.gz) = 1973143
SIZE (silc-plugin-1.0.4.1.tar.gz) = 26771
MD5 (silc-client-1.1.3.tar.gz) = 3s8TKPwngJlXQ6SdIzNTtQ==
RMD160 (silc-client-1.1.3.tar.gz) = hjcD5PJbbqrCamuoIJKtYaWnJ4Y=
SHA1 (silc-client-1.1.3.tar.gz) = +xCFQBWMykKlpVWqvbzja/SDOTM=
SHA256 (silc-client-1.1.3.tar.gz) = hoR0X2LiYzhxHh0E/dZpuDWrr7Qp3ssPvJjcO8HoGmg=
SIZE (silc-client-1.1.3.tar.gz) = 2210753

17
net/irssi-silc/patches/patch-apps_irssi_src_fe-common_core_Makefile_in Normal file
View File

@ -0,0 +1,17 @@
$OpenBSD: patch-apps_irssi_src_fe-common_core_Makefile_in,v 1.1 2007/11/18 17:36:18 martynas Exp $
--- apps/irssi/src/fe-common/core/Makefile.in.orig Thu Nov 8 21:45:14 2007
+++ apps/irssi/src/fe-common/core/Makefile.in Thu Nov 8 21:45:45 2007
@@ -266,11 +266,11 @@ noinst_LIBRARIES = libfe_common_core.a
#
# INCLUDE defines
#
-INCLUDES = $(ADD_INCLUDES) $(SILC_CFLAGS) -DHAVE_SILCDEFS_H \
+INCLUDES = $(ADD_INCLUDES) -DHAVE_SILCDEFS_H \
-I$(srcdir) -I$(top_srcdir) -I$(silc_top_srcdir) \
$(SILC_LIB_INCLUDES) -I$(silc_top_srcdir)/includes \
-I$(silc_top_srcdir)/doc -I$(top_srcdir)/src \
- -I$(top_srcdir)/src/core/ $(GLIB_CFLAGS) \
+ -I$(top_srcdir)/src/core/ $(GLIB_CFLAGS) $(SILC_CFLAGS) \
-DHELPDIR=\""$(silc_helpdir)"\" \
-DTHEMESDIR=\""$(silc_etcdir)"\"
libfe_common_core_a_SOURCES = \

13
net/irssi-silc/patches/patch-apps_irssi_src_fe-common_core_fe-common-core_c Normal file
View File

@ -0,0 +1,13 @@
$OpenBSD: patch-apps_irssi_src_fe-common_core_fe-common-core_c,v 1.1 2007/11/18 17:36:18 martynas Exp $
--- apps/irssi/src/fe-common/core/fe-common-core.c.orig Thu Jan 25 13:02:14 2007
+++ apps/irssi/src/fe-common/core/fe-common-core.c Tue Nov 6 10:48:23 2007
@@ -176,7 +176,8 @@ void fe_common_core_init(void)
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) != '\0') &&
+ (strcmp(nl_langinfo(CODESET), "646") != 0)) ? /* ASCII */
nl_langinfo(CODESET) : "ISO8859-1");
#else
settings_add_str("lookandfeel", "term_charset", "ISO8859-1");

14
net/irssi-silc/patches/patch-apps_irssi_src_fe-common_core_fe-recode_c Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-apps_irssi_src_fe-common_core_fe-recode_c,v 1.1 2007/11/18 17:36:18 martynas Exp $
--- apps/irssi/src/fe-common/core/fe-recode.c.orig Thu Jan 25 13:02:14 2007
+++ apps/irssi/src/fe-common/core/fe-recode.c Tue Nov 6 10:48:23 2007
@@ -182,8 +182,8 @@ static void read_settings(void)
g_free(term_charset);
#if defined (HAVE_NL_LANGINFO) && defined(CODESET)
term_charset = is_valid_charset(old_term_charset) ? g_strdup(old_term_charset) :
- *nl_langinfo(CODESET) != '\0' ? g_strdup(nl_langinfo(CODESET)) :
- "ISO8859-1";
+ ((*nl_langinfo(CODESET) != '\0') && (strcmp(nl_langinfo(CODESET), "646") != 0)) ?
+ g_strdup(nl_langinfo(CODESET)) : "ISO8859-1";
#else
term_charset = is_valid_charset(old_term_charset) ? g_strdup(old_term_charset) : "ISO8859-1";
#endif

11
net/irssi-silc/patches/patch-apps_irssi_src_fe-common_silc_Makefile_in Normal file
View File

@ -0,0 +1,11 @@
$OpenBSD: patch-apps_irssi_src_fe-common_silc_Makefile_in,v 1.1 2007/11/18 17:36:18 martynas Exp $
--- apps/irssi/src/fe-common/silc/Makefile.in.orig Thu Nov 15 18:04:13 2007
+++ apps/irssi/src/fe-common/silc/Makefile.in Thu Nov 15 18:10:48 2007
@@ -649,7 +649,6 @@ clean-local:
-rm -f libfe_common_silc.a
libfe_common_silc.a: libfe_common_silc.la
- cp .libs/libfe_common_silc.a .
@SILCPLUGIN_TRUE@install-data-hook: libfe_common_silc.la
@SILCPLUGIN_TRUE@ -ln -s libfe_common_silc.so $(DESTDIR)$(moduledir)/libfe_silc.so

11
net/irssi-silc/patches/patch-apps_irssi_src_fe-common_silc_fe-common-silc_c Normal file
View File

@ -0,0 +1,11 @@
$OpenBSD: patch-apps_irssi_src_fe-common_silc_fe-common-silc_c,v 1.1 2007/11/18 17:36:18 martynas Exp $
--- apps/irssi/src/fe-common/silc/fe-common-silc.c.orig Sun May 20 19:40:29 2007
+++ apps/irssi/src/fe-common/silc/fe-common-silc.c Wed Nov 14 00:06:11 2007
@@ -42,6 +42,7 @@ static void silc_init(void)
fe_silc_messages_init();
fe_silc_queries_init();
fe_silcnet_init();
+ irssi_redraw();
}
void fe_common_silc_init(void)

11
net/irssi-silc/patches/patch-apps_irssi_src_silc_core_Makefile_in Normal file
View File

@ -0,0 +1,11 @@
$OpenBSD: patch-apps_irssi_src_silc_core_Makefile_in,v 1.1 2007/11/18 17:36:18 martynas Exp $
--- apps/irssi/src/silc/core/Makefile.in.orig Thu Nov 15 18:04:13 2007
+++ apps/irssi/src/silc/core/Makefile.in Thu Nov 15 18:11:14 2007
@@ -656,7 +656,6 @@ clean-local:
-rm -f libsilc_core.a
libsilc_core.a: libsilc_core.la
- cp .libs/libsilc_core.a .
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:

14
net/irssi-silc/patches/patch-configure_ac Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-configure_ac,v 1.1 2007/11/18 17:36:18 martynas Exp $
--- configure.ac.orig Tue Nov 6 16:45:06 2007
+++ configure.ac Fri Nov 16 00:26:36 2007
@@ -613,8 +613,8 @@ if test -n "$with_silc_includes" || test -n "$with_sil
else
# pkg-config check
- PKG_CHECK_MODULES(SILC, [silc >= 1.1], compile_libs=false, compile_libs=true)
- PKG_CHECK_MODULES(SILCCLIENT, [silcclient >= 1.1.1], compile_libs=false, compile_libs=true)
+ #PKG_CHECK_MODULES(SILC, [silc >= 1.1], compile_libs=false, compile_libs=true)
+ #PKG_CHECK_MODULES(SILCCLIENT, [silcclient >= 1.1.1], compile_libs=false, compile_libs=true)
if test x$compile_libs = xfalse; then
LIBSUBDIR=

12
net/irssi-silc/patches/patch-doc_Makefile_in Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-doc_Makefile_in,v 1.1 2007/11/18 17:36:18 martynas Exp $
--- doc/Makefile.in.orig Thu Jun 28 12:54:19 2007
+++ doc/Makefile.in Sat Jun 30 15:13:22 2007
@@ -225,7 +225,7 @@ build_vendor = @build_vendor@
builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
-docdir = @docdir@
+docdir = $(DESTDIR)$(DOCDIR)
dvidir = @dvidir@
exec_prefix = @exec_prefix@
host = @host@

13
net/irssi-silc/patches/patch-irssi-0_8_10_src_perl_Makefile_am
View File

@ -1,13 +0,0 @@
$OpenBSD: patch-irssi-0_8_10_src_perl_Makefile_am,v 1.1.1.1 2007/03/22 19:55:38 martynas Exp $
--- irssi-0.8.10/src/perl/Makefile.am.orig Wed Oct 19 05:13:21 2005
+++ irssi-0.8.10/src/perl/Makefile.am Sun Nov 5 13:14:34 2006
@@ -23,7 +23,8 @@ INCLUDES = \
-DSCRIPTDIR=\""$(datadir)/irssi/scripts"\" \
-DPERL_USE_LIB=\""$(PERL_USE_LIB)"\" \
-DPERL_STATIC_LIBS=$(PERL_STATIC_LIBS) \
- $(PERL_CFLAGS)
+ $(PERL_CFLAGS) \
+ -DSYSCONFDIR=\""$(sysconfdir)"\"
perl_sources = \
perl-core.c \

24
net/irssi-silc/patches/patch-irssi-0_8_10_src_perl_perl-core_c
View File

@ -1,24 +0,0 @@
$OpenBSD: patch-irssi-0_8_10_src_perl_perl-core_c,v 1.1.1.1 2007/03/22 19:55:38 martynas Exp $
--- irssi-0.8.10/src/perl/perl-core.c.orig Fri Apr 7 12:56:00 2006
+++ irssi-0.8.10/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-silc/patches/patch-irssi-0_8_10_src_perl_perl-fe_c
View File

@ -1,11 +0,0 @@
$OpenBSD: patch-irssi-0_8_10_src_perl_perl-fe_c,v 1.1.1.1 2007/03/22 19:55:38 martynas Exp $
--- irssi-0.8.10/src/perl/perl-fe.c.orig Wed Oct 19 04:13:21 2005
+++ irssi-0.8.10/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);

11
net/irssi-silc/patches/patch-lib_Makefile_in Normal file
View File

@ -0,0 +1,11 @@
$OpenBSD: patch-lib_Makefile_in,v 1.1 2007/11/18 17:36:18 martynas Exp $
--- lib/Makefile.in.orig Tue Nov 6 16:45:06 2007
+++ lib/Makefile.in Fri Nov 16 00:26:36 2007
@@ -580,7 +580,6 @@ install-dvi: install-dvi-recursive
install-exec-am:
@$(NORMAL_INSTALL)
- $(MAKE) $(AM_MAKEFLAGS) install-exec-hook
install-html: install-html-recursive

11
net/irssi-silc/patches/patch-lib_silcmath_tma_c Normal file
View File

@ -0,0 +1,11 @@
$OpenBSD: patch-lib_silcmath_tma_c,v 1.1 2007/11/18 17:36:18 martynas Exp $
--- lib/silcmath/tma.c.orig Thu May 3 11:13:16 2007
+++ lib/silcmath/tma.c Wed Jun 13 22:55:31 2007
@@ -1570,6 +1570,7 @@ tma_mp_count_bits (tma_mp_int * a)
* Tom St Denis, tomstdenis@gmail.com, http://libtom.org
*/
+#define BN_MP_DIV_SMALL
#ifdef BN_MP_DIV_SMALL
/* slower bit-bang division... also smaller */

19
net/irssi-silc/patches/patch-silc-client-1_0_4_1_apps_irssi_docs_help_Makefile_in
View File

@ -1,19 +0,0 @@
$OpenBSD: patch-silc-client-1_0_4_1_apps_irssi_docs_help_Makefile_in,v 1.1.1.1 2007/03/22 19:55:38 martynas Exp $
--- silc-client-1.0.4.1/apps/irssi/docs/help/Makefile.in.orig Fri Jan 6 08:46:28 2006
+++ silc-client-1.0.4.1/apps/irssi/docs/help/Makefile.in Tue Oct 3 14:20:37 2006
@@ -403,12 +403,12 @@ distclean-libtool:
uninstall-info-am:
install-helpDATA: $(help_DATA)
@$(NORMAL_INSTALL)
- test -z "$(helpdir)" || $(mkdir_p) "$(DESTDIR)$(helpdir)"
+ test -z "$(helpdir)" || $(mkdir_p) "$(helpdir)"
@list='$(help_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
- echo " $(helpDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(helpdir)/$$f'"; \
- $(helpDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(helpdir)/$$f"; \
+ echo " $(helpDATA_INSTALL) '$$d$$p' '$(helpdir)/$$f'"; \
+ $(helpDATA_INSTALL) "$$d$$p" "$(helpdir)/$$f"; \
done
uninstall-helpDATA:

15
net/irssi-silc/patches/patch-silc-client-1_0_4_1_configure_ac
View File

@ -1,15 +0,0 @@
$OpenBSD: patch-silc-client-1_0_4_1_configure_ac,v 1.1.1.1 2007/03/22 19:55:38 martynas Exp $
--- silc-client-1.0.4.1/configure.ac.orig Fri Jan 6 08:46:28 2006
+++ silc-client-1.0.4.1/configure.ac Tue Oct 3 14:20:37 2006
@@ -455,8 +455,9 @@ if test -n "$with_silc_includes" || test
else
# pkg-config check
- PKG_CHECK_MODULES(SILC, silc, compile_libs=false, compile_libs=true)
- PKG_CHECK_MODULES(SILCCLIENT, silcclient, compile_libs=false, compile_libs=true)
+ #PKG_CHECK_MODULES(SILC, silc, compile_libs=false, compile_libs=true)
+ #PKG_CHECK_MODULES(SILCCLIENT, silcclient, compile_libs=false, compile_libs=true)
+ compile_libs=true
if test x$compile_libs = xfalse; then
LIBSUBDIR=

11
net/irssi-silc/patches/patch-silc-client-1_0_4_1_doc_Makefile_in
View File

@ -1,11 +0,0 @@
$OpenBSD: patch-silc-client-1_0_4_1_doc_Makefile_in,v 1.1.1.1 2007/03/22 19:55:38 martynas Exp $
--- silc-client-1.0.4.1/doc/Makefile.in.orig Wed Mar 7 21:02:19 2007
+++ silc-client-1.0.4.1/doc/Makefile.in Sat Mar 17 18:29:19 2007
@@ -272,6 +272,7 @@ target_os = @target_os@
target_vendor = @target_vendor@
with_irssi_FALSE = @with_irssi_FALSE@
with_irssi_TRUE = @with_irssi_TRUE@
+docdir = $(DESTDIR)$(DOCDIR)
AUTOMAKE_OPTIONS = 1.0 no-dependencies foreign
EXTRA_DIST = silc.1 FAQ silcalgs.conf draft-riikonen*.txt

11
net/irssi-silc/patches/patch-silc-client-1_0_4_1_lib_silcmath_tma_c
View File

@ -1,11 +0,0 @@
$OpenBSD: patch-silc-client-1_0_4_1_lib_silcmath_tma_c,v 1.1.1.1 2007/03/22 19:55:38 martynas Exp $
--- silc-client-1.0.4.1/lib/silcmath/tma.c.orig Sun Apr 24 11:24:12 2005
+++ silc-client-1.0.4.1/lib/silcmath/tma.c Tue Oct 3 14:20:26 2006
@@ -1488,6 +1488,7 @@ mp_count_bits (mp_int * a)
* Tom St Denis, tomstdenis@iahu.ca, http://math.libtomcrypt.org
*/
+#define BN_MP_DIV_SMALL
#ifdef BN_MP_DIV_SMALL
/* slower bit-bang division... also smaller */

25
net/irssi-silc/patches/patch-silc-client-1_0_4_1_lib_silcutil_silcutf8_c
View File

@ -1,25 +0,0 @@
$OpenBSD: patch-silc-client-1_0_4_1_lib_silcutil_silcutf8_c,v 1.1.1.1 2007/03/22 19:55:38 martynas Exp $
--- silc-client-1.0.4.1/lib/silcutil/silcutf8.c.orig Sun Apr 3 08:20:34 2005
+++ silc-client-1.0.4.1/lib/silcutil/silcutf8.c Sun Aug 27 15:23:38 2006
@@ -565,15 +565,19 @@ bool silc_utf8_strncasecmp(const char *s
if (s1 == s2)
return TRUE;
+ s1u = memchr(s1, '\0', n);
+ s1u_len = (s1u == NULL) ? n : (s1u - (unsigned char *)s1);
/* Casefold and normalize */
- status = silc_stringprep(s1, strlen(s1), SILC_STRING_UTF8,
+ status = silc_stringprep(s1, s1u_len, SILC_STRING_UTF8,
SILC_IDENTIFIERC_PREP, 0, &s1u,
&s1u_len, SILC_STRING_UTF8);
if (status != SILC_STRINGPREP_OK)
return FALSE;
+ s2u = memchr(s2, '\0', n);
+ s2u_len = (s2u == NULL) ? n : (s2u - (unsigned char *)s2);
/* Casefold and normalize */
- status = silc_stringprep(s2, strlen(s2), SILC_STRING_UTF8,
+ status = silc_stringprep(s2, s2u_len, SILC_STRING_UTF8,
SILC_IDENTIFIERC_PREP, 0, &s2u,
&s2u_len, SILC_STRING_UTF8);
if (status != SILC_STRINGPREP_OK)

14
net/irssi-silc/patches/patch-silc-plugin-1_0_4_1_patches_irssi_src_fe-common_silc_fe-common-silc_c_patch
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-silc-plugin-1_0_4_1_patches_irssi_src_fe-common_silc_fe-common-silc_c_patch,v 1.1.1.1 2007/03/22 19:55:38 martynas Exp $
--- silc-plugin-1.0.4.1/patches/irssi.src.fe-common.silc.fe-common-silc.c.patch.orig Sun Nov 5 12:46:12 2006
+++ silc-plugin-1.0.4.1/patches/irssi.src.fe-common.silc.fe-common-silc.c.patch Sun Nov 5 12:51:22 2006
@@ -0,0 +1,10 @@
+--- irssi-0.8.10/src/fe-common/silc/fe-common-silc.c.orig Sat Jan 3 13:17:49 2004
++++ irssi-0.8.10/src/fe-common/silc/fe-common-silc.c Sun Nov 5 12:13:10 2006
+@@ -42,6 +42,7 @@
+ fe_silc_messages_init();
+ fe_silc_queries_init();
+ fe_silcnet_init();
++ irssi_redraw();
+
+ module_register("silc", "fe");
+ }

8
net/irssi-silc/pkg/MESSAGE
View File

@ -1,7 +1,3 @@
You need to change theme, otherwise you might experience problems related to
SILC-specific features (e.g. signed messages): /SET theme silc
You may want to run silc and silc-mime scripts when working with SILC:
/SCRIPT LOAD silc
/SCRIPT LOAD silc-mime
See ${PREFIX}/share/doc/irssi/silc/USAGE for more details
SILC-specific features (e.g. signed messages): /SET theme plugin
You may want to run silc script when working with SILC: /SCRIPT LOAD silc

27
net/irssi-silc/pkg/PLIST
View File

@ -1,5 +1,6 @@
@comment $OpenBSD: PLIST,v 1.3 2007/05/16 19:30:01 martynas Exp $
lib/irssi/modules/libfe_silc.la
@comment $OpenBSD: PLIST,v 1.4 2007/11/18 17:36:18 martynas Exp $
lib/irssi/modules/libfe_common_silc.la
lib/irssi/modules/libfe_common_silc.so
lib/irssi/modules/libfe_silc.so
lib/irssi/modules/libsilc_core.la
lib/irssi/modules/libsilc_core.so
@ -7,15 +8,26 @@ libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/Irssi/Silc.pm
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/Irssi/Silc/
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/Irssi/Silc/Silc.bs
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/Irssi/Silc/Silc.so
@comment @man man/man1/silc.1
share/doc/irssi/silc/
@comment share/doc/irssi/silc/CHANGES
@comment share/doc/irssi/silc/COPYING
@comment share/doc/irssi/silc/CREDITS
share/doc/irssi/silc/FAQ
@comment share/doc/irssi/silc/INSTALL
share/doc/irssi/silc/README
share/doc/irssi/silc/USAGE
share/examples/irssi/scripts/silc-mime.pl
@sample ${SYSCONFDIR}/irssi/scripts/silc-mime.pl
share/doc/irssi/silc/README.PLUGIN
@comment share/doc/irssi/silc/TODO
@comment share/doc/irssi/silc/example_silc.conf
share/doc/irssi/silc/formats.txt
share/doc/irssi/silc/manual.txt
share/doc/irssi/silc/signals.txt
share/doc/irssi/silc/special_vars.txt
share/doc/irssi/silc/startup-HOWTO.html
share/examples/irssi/scripts/silc.pl
@sample ${SYSCONFDIR}/irssi/scripts/silc.pl
share/examples/irssi/themes/silc.theme
@sample ${SYSCONFDIR}/irssi/themes/silc.theme
share/examples/irssi/themes/plugin.theme
@sample ${SYSCONFDIR}/irssi/themes/plugin.theme
share/irssi/help/silc/
share/irssi/help/silc/action
share/irssi/help/silc/admin
@ -76,6 +88,7 @@ share/irssi/help/silc/perlflush
share/irssi/help/silc/ping
share/irssi/help/silc/query
share/irssi/help/silc/quit
share/irssi/help/silc/recode
share/irssi/help/silc/reconnect
share/irssi/help/silc/reload
share/irssi/help/silc/rmreconns