Re: UPDATE: net/irssi-0.8.10
> Please test and comment. > -- > viq Patch applied cleanly, compiled without errors and runs fine on i386. -simon pgpv4NA9SUuOl.pgp Description: PGP signature
Re: UPDATE: net/irssi-0.8.10
Another release, I think mostly ready.
Rearranged files a bit, patched man file to reflect this, added myself as
maintainer.
A big Thank You to Steven Mestdagh for pointers and testing :)
Please test and comment.
--
viq
? w-irssi-0.8.10
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 - 1.25
+++ Makefile 18 Apr 2006 10:01:56 -
@@ -1,40 +1,41 @@
# $OpenBSD: Makefile,v 1.25 2004/12/16 00:31:22 alek Exp $
# Original from: Timo Sirainen <[EMAIL PROTECTED]>
-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 <[EMAIL PROTECTED]>
+MAINTAINER= Wiktor Izdebski <[EMAIL PROTECTED]>
# 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
+
+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+= --enable-ipv6 --with-pic \
+ --with-proxy --enable-perl=yes --without-included-gettext \
+ --with-perl-lib=${PREFIX}/libdata/perl5/site_perl
+LIBTOOL_FLAGS+= --tag=disable-static
FLAVORS= socks
FLAVOR?=
@@ -44,14 +45,16 @@
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
+ @perl -pi -e "s,!!LOCALBASE!!,${LOCALBASE},g" ${WRKSRC}/docs/irssi.1
+ @perl -pi -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
+ rm -rf ${PREFIX}/include
.include
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 - 1.11
+++ distinfo 18 Apr 2006 10:01:56 -
@@ -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-Makefile_in
===
RCS file: patches/patch-Makefile_in
diff -N patches/patch-Makefile_in
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-Makefile_in 18 Apr 2006 10:01:56 -
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- 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
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 -
+++ patches/patch-docs_irssi_1 18 Apr 2006 10:01:56 -
@@ -0,0 +1,52 @@
+$OpenBSD$
+--- 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
Re: UPDATE: net/irssi-0.8.10
On Friday 07 April 2006 22:23, steven mestdagh wrote:
> viq [2006-04-07, 14:07:54]:
> > On Thursday 06 April 2006 15:39, viq wrote:
[...]
> The paths are wrong, e.g. you have /usr/share/irssi/...
> it's probably better to also use something like !!SYSCONFDIR!! and
> !!LOCALBASE!! in there, and then substitute that for the actual
> values (look at other ports for examples).
Took me a (long) while to figure that out, but now it's fixed. Though the
indenting in man page is a bit off, I tried making it all fit with normal
formating, but it's the first time I even looked at something like that...
> > Should the default set of scripts be copied as well to
> > /etc/irssi/scripts/, or should I leave them where they are?
>
> I think you can 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.
>
> I played with the theme. This seems to work okay, it reads first from
> ~/.irssi/default.theme (you could argue to put a themes subdir in there
> as well, but the current location works fine), then
> /etc/irssi/themes/default.theme.
Yes, I was thinking of changing that to ~/.irssi/themes/ but that would be a
clear change from the default irssi behaviour, so I decided against it. Not
to mention it would take some hunting to find all references, and make sure
it doesn't break anything else.
> You also need to clean up MASTER_SITES, a bunch of mirrors are broken.
None seem to exist, so I removed them all.
> > + rm -rf ${PREFIX}/include
>
> Instead of this, you can also patch away the install-pkgincludeHEADERS
> dependency in irssi's Makefile.in. Whatever works best is fine.
Ah, I knew I forgot to look at something this time. So for now rm is still in
place.
[cut patches]
> looks basically okay, but i didn't test it...
Me and two other people are running it on my box. Not that we do anything
fancy with it, but noone complained for the basic usage.
> steven
--
viq
-
Masz w sobie cos z podgladacza?
Sprawdz >> http://blog.interia.pl/
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 - 1.25
+++ Makefile 13 Apr 2006 10:19:46 -
@@ -5,17 +5,11 @@
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/
+MASTER_SITES= ${HOMEPAGE}/files/
HOMEPAGE= http://www.irssi.org/
@@ -28,13 +22,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,14 +43,17 @@
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
+ @perl -pi -e "s,!!LOCALBASE!!,${LOCALBASE},g" ${WRKSRC}/docs/irssi.1
+ @perl -pi -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
+ rm -rf ${PREFIX}/include
.include
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 - 1.11
+++ distinfo 13 Apr 2006 10:19:46 -
@@ -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
-SI
Re: UPDATE: net/irssi-0.8.10
viq [2006-04-07, 14:07:54]:
> 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.
The paths are wrong, e.g. you have /usr/share/irssi/...
it's probably better to also use something like !!SYSCONFDIR!! and
!!LOCALBASE!! in there, and then substitute that for the actual
values (look at other ports for examples).
> Should the default set of scripts be copied as well to /etc/irssi/scripts/,
> or
> should I leave them where they are?
I think you can 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.
I played with the theme. This seems to work okay, it reads first from
~/.irssi/default.theme (you could argue to put a themes subdir in there
as well, but the current location works fine), then
/etc/irssi/themes/default.theme.
You also need to clean up MASTER_SITES, a bunch of mirrors are broken.
> + rm -rf ${PREFIX}/include
Instead of this, you can also patch away the install-pkgincludeHEADERS
dependency in irssi's Makefile.in. Whatever works best is fine.
> 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 -
> +++ patches/patch-src_perl_perl-core_c7 Apr 2006 12:01:04 -
> @@ -0,0 +1,24 @@
> +$OpenBSD$
> +--- src/perl/perl-core.c.origFri 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 -
> +++ patches/patch-src_perl_perl-fe_c 7 Apr 2006 12:01:04 -
> @@ -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);
> +
looks basically okay, but i didn't test it...
steven
Disclaimer: http://www.kuleuven.be/cwis/email_disclaimer.htm
Re: UPDATE: net/irssi-0.8.10
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 - 1.25
+++ Makefile 7 Apr 2006 12:01:04 -
@@ -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
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 - 1.11
+++ distinfo 7 Apr 2006 12:01:04 -
@@ -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 -
+++ patches/patch-docs_irssi_1 7 Apr 2006 12:01:04 -
@@ -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 - 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -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.0 +
-+++ ltmain.sh 2003-12-12 21:41:48.0 +
-@@ -3056,7 +3056,7 @@ E
Re: UPDATE: net/irssi-0.8.10
On Saturday 01 April 2006 22:52, steven mestdagh wrote:
> viq [2006-03-27, 12:16:04]:
> > 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.
>
> did you just remove them from PLIST? you can't do this, make sure they
> are not in the fake area, by not installing them, or removing them in
> post-install, whatever works best.
Yes, that's how I did it... Fixed now, by removing in post-install. How would
I go about it if I would want to not install them, instead of installing and
then removing?
Speaking of, it complains about "bogus element /etc/irssi.conf" - should I
bother with it?
> > > > > +share/examples/irssi/irssi.conf
> > > > > [EMAIL PROTECTED] ${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 ;)
>
> i tried changing something to /etc/irssi/themes/default.theme but it did
> not work. the same change in ~/.irssi/themes/default.theme does work.
Search order - it was looking for themes in ~,
then /usr/local/share/, and only then in /etc/irssi/themes - fixed
now, checked that it's working.
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...
> you should also change the location of the config file to
> /etc/irssi/irssi.conf in the man page.
Ah, yes, thank you. Corrected.
> steven
--
viq
--
Pan pozna Pania. Czeka... ;-) >>> http://link.interia.pl/f1922
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 - 1.25
+++ Makefile 6 Apr 2006 13:35:53 -
@@ -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
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 - 1.11
+++ distinfo 6 Apr 2006 13:35:53 -
@@ -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) = aa2d2f1701bb49afc5ea09102d6396f4e0
Re: UPDATE: net/irssi-0.8.10
viq [2006-03-27, 12:16:04]:
> 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.
did you just remove them from PLIST? you can't do this, make sure they
are not in the fake area, by not installing them, or removing them in
post-install, whatever works best.
> > > > +share/examples/irssi/irssi.conf
> > > > [EMAIL PROTECTED] ${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 ;)
i tried changing something to /etc/irssi/themes/default.theme but it did
not work. the same change in ~/.irssi/themes/default.theme does work.
you should also change the location of the config file to
/etc/irssi/irssi.conf in the man page.
steven
Disclaimer: http://www.kuleuven.be/cwis/email_disclaimer.htm
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
> > > [EMAIL PROTECTED] ${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 - 1.25
+++ Makefile 27 Mar 2006 11:14:12 -
@@ -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 - 1.11
+++ distinfo 27 Mar 2006 11:14:12 -
@@ -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 - 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -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.0 +
-+++ ltmain.sh 2003-12-12 21:41:48.0 +
-@@ -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 -
+++ patches/patch-src_core_settings_c 27 Mar 2006 11:14:12 -
@@ -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 = SYS
Re: UPDATE: net/irssi-0.8.10
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
> > [EMAIL PROTECTED] ${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?
[...]
--
viq
? w-irssi-0.8.10
? patches/patch-src_fe-common_core_fe-common-core_c
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 - 1.25
+++ Makefile 26 Mar 2006 23:48:18 -
@@ -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 - 1.11
+++ distinfo 26 Mar 2006 23:48:18 -
@@ -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 - 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -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.0 +
-+++ ltmain.sh 2003-12-12 21:41:48.0 +
-@@ -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 -
+++ patches/patch-src_core_settings_c 26 Mar 2006 23:48:18 -
@@ -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_fe_settings_c
===
RCS file: patches/patch-src_fe_common_cor
Re: UPDATE: net/irssi-0.8.10
On Saturday 18 March 2006 22:52, steven mestdagh wrote:
[...]
> can you prepare one complete patch that also takes care of the configure
> errors?
Here's a patch that resolves the configure errors by... using the repackaged
irssi from their page, the 0.8.10a, "use if you had problems compiling or
configuring" as they say on their page.
None of the other issues addressed here yet, I will need to look into those
closer than this quick fix required.
--
viq
? patches/patch-src_fe-common_core_fe-common-core_c
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 - 1.25
+++ Makefile 19 Mar 2006 00:45:03 -
@@ -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 - 1.11
+++ distinfo 19 Mar 2006 00:45:03 -
@@ -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 - 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -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.0 +
-+++ ltmain.sh 2003-12-12 21:41:48.0 +
-@@ -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_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 - 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -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 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,12
Re: UPDATE: net/irssi-0.8.10
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.
>
> [...]
>
> > +include/irssi/
> > +include/irssi/config.h
> > +include/irssi/irssi-version.h
> > +include/irssi/src/
> > +include/irssi/src/common.h
> > +include/irssi/src/core/
> > +include/irssi/src/core/args.h
>
> [...]
>
> is it necessary to install all these header files?
I don't know, I'll look how the old port dealt with them. And as Tobias said,
they may be useful. What do you think?
> > +share/examples/irssi/irssi.conf
> > [EMAIL PROTECTED] ${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.
> also, are the theme files in ${SYSCONFDIR}/irssi used at all?
Ah, thanks, I'll look at that.
> can you prepare one complete patch that also takes care of the configure
> errors?
Well, here's the trick - the patch that removes the grep errors introduces rm
errors for me - even on a box freshly installed from snapshots, with freshly
checked out ports tree. But yes, I guess I'll do that so testing is more
comfortable for others.
> almost forgot: do you want to maintain this port?
Well... I'd say I'm a newbie trying to scratch an itch that noone else wanted
to ;) I don't really know what I'm doing, just trying to put together
solutions others found/suggested... So I'd say I am not a competent enough
person to become a maintainer.
> steven
--
viq
Re: UPDATE: net/irssi-0.8.10
On Sat, Mar 18, 2006 at 10:52:00PM +0100, 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.
> [...]
>
> > +include/irssi/
> > +include/irssi/config.h
> > +include/irssi/irssi-version.h
> > +include/irssi/src/
> > +include/irssi/src/common.h
> > +include/irssi/src/core/
> > +include/irssi/src/core/args.h
> [...]
>
> is it necessary to install all these header files?
The headers can be helpful, if I remember correctly last time I used
them was to compile the "fish" plugin. OTOH, one can just download the
irssi source..
>
> > +share/examples/irssi/irssi.conf
> > [EMAIL PROTECTED] ${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.
> also, are the theme files in ${SYSCONFDIR}/irssi used at all?
>
> can you prepare one complete patch that also takes care of the configure
> errors?
>
> almost forgot: do you want to maintain this port?
>
> steven
>
> Disclaimer: http://www.kuleuven.be/cwis/email_disclaimer.htm
>
>
Tobias
Re: UPDATE: net/irssi-0.8.10
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.
[...]
> +include/irssi/
> +include/irssi/config.h
> +include/irssi/irssi-version.h
> +include/irssi/src/
> +include/irssi/src/common.h
> +include/irssi/src/core/
> +include/irssi/src/core/args.h
[...]
is it necessary to install all these header files?
> +share/examples/irssi/irssi.conf
> [EMAIL PROTECTED] ${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.
also, are the theme files in ${SYSCONFDIR}/irssi used at all?
can you prepare one complete patch that also takes care of the configure
errors?
almost forgot: do you want to maintain this port?
steven
Disclaimer: http://www.kuleuven.be/cwis/email_disclaimer.htm
Re: UPDATE: net/irssi-0.8.10
On Monday 13 March 2006 12:22, Tobias Ulmer wrote: > On Mon, Mar 13, 2006 at 10:58:33AM +0100, viq wrote: > > [...] > > > > > Attached is a patch that makes the grep/sed errors go away. > > > > Yeah. Now it complains about rm... > > checking if we can use recode, requires GLIB2... yes > > checking if we can link dynamic libraries with modules... rm: : Invalid > > argument > > rm: : Invalid argument > > yes > > configure: checking "location of ncurses.h file"... > > > > > Tobias > > > > -- > > viq > > Strange, I can't reproduce this. To make sure I don't have contaminated tree i rm -rf'ed irssi from ports tree, checked it out again, copied irssi to /usr/ports/mystuff (before i was working on the real one, just now figured out that there exists something like that ;), patched it with the last patch i posted, then just copied your patch-config to patches/ dir. Same result as above, that system also running GENERIC#617 i386 snapshot as yours is. (my other box runs #604) Yes, certainly strange. > Tobias -- viq --- Wzial udzial w zawodach balonowych i... niezle wypadl! KIM JEST STEFAN?!? | http://www.stefan.pl/
Re: UPDATE: net/irssi-0.8.10
On Mon, Mar 13, 2006 at 10:58:33AM +0100, viq wrote: > [...] > > Attached is a patch that makes the grep/sed errors go away. > > Yeah. Now it complains about rm... > checking if we can use recode, requires GLIB2... yes > checking if we can link dynamic libraries with modules... rm: : Invalid > argument > rm: : Invalid argument > yes > configure: checking "location of ncurses.h file"... > > > Tobias > > -- > viq > Strange, I can't reproduce this. Tobias
Re: UPDATE: net/irssi-0.8.10
On Monday 13 March 2006 02:55, Tobias Ulmer wrote: > On Sun, Mar 12, 2006 at 10:46:07PM +0100, viq wrote: > > 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. > > > > -- > > viq > > It seems to work fine on 3.9 GENERIC#617 i386, but i didn't try to do > anything fancy. The main thing that was causing issues were Glib2 warnings due to incorrect term_charset being set when you didn't have or had old ~/.irssi. > Attached is a patch that makes the grep/sed errors go away. Yeah. Now it complains about rm... checking if we can use recode, requires GLIB2... yes checking if we can link dynamic libraries with modules... rm: : Invalid argument rm: : Invalid argument yes configure: checking "location of ncurses.h file"... > Tobias -- viq - Opatentowal majtki z golfem. KIM JEST STEFAN?!? | http://www.stefan.pl/
Re: UPDATE: net/irssi-0.8.10
On Sun, Mar 12, 2006 at 10:46:07PM +0100, viq wrote:
> 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.
>
> --
> viq
>
It seems to work fine on 3.9 GENERIC#617 i386, but i didn't try to do
anything fancy.
Attached is a patch that makes the grep/sed errors go away.
Tobias
--- configure.orig Mon Mar 13 02:34:15 2006
+++ configure Mon Mar 13 02:36:04 2006
@@ -25364,14 +25364,14 @@
int modfunc(){return (int)floor(1.2);}
EOF
-./libtool --mode=compile $CC $CFLAGS -c conftest.c 2> /dev/null > /dev/null
+/usr/local/bin/libtool --tag=CXX --mode=compile $CC $CFLAGS -c conftest.c
>/dev/null
if test ! -s conftest.lo; then
{ { echo "$as_me:$LINENO: error: error compiling test module" >&5
echo "$as_me: error: error compiling test module" >&2;}
{ (exit 1); exit 1; }; }
fi
-./libtool --mode=link $CC $CFLAGS $LDFLAGS -rpath /usr/lib conftest.lo -lm -o
libconftest.la > /dev/null
+/usr/local/bin/libtool --tag=CXX --mode=link $CC $CFLAGS $LDFLAGS -rpath
/usr/lib conftest.lo -lm -o libconftest.la >/dev/null
if test ! -s .libs/libconftest.a; then
{ { echo "$as_me:$LINENO: error: error, can't even find .a library" >&5
echo "$as_me: error: error, can't even find .a library" >&2;}
Re: UPDATE: net/irssi-0.8.10
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.
--
viq
Ukonczyl zaoczne przedszkole, z wyroznieniem!
KIM JEST STEFAN?!? | http://www.stefan.pl/
? w-irssi-0.8.10
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 - 1.25
+++ Makefile 12 Mar 2006 21:40:58 -
@@ -5,7 +5,7 @@
COMMENT= "modular IRC client with many features (ipv6,socks,proxy)"
-DISTNAME= irssi-0.8.9
+DISTNAME= irssi-0.8.10
CATEGORIES= net
MASTER_SITES= ${HOMEPAGE}/files/ \
@@ -28,13 +28,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 +49,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 -u -d -r1.11 distinfo
--- distinfo 5 Jan 2005 17:14:46 - 1.11
+++ distinfo 12 Mar 2006 21:40:58 -
@@ -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.10.tar.gz) = ed29412e86e1d5fbb71d24ae02edd462
+RMD160 (irssi-0.8.10.tar.gz) = ec7995c2965c6aa3f67ccd76da2c9a5f9c0c7b87
+SHA1 (irssi-0.8.10.tar.gz) = edfde2b2e0a703f6aa3eee9140255a8e928a9d1a
+SIZE (irssi-0.8.10.tar.gz) = 1322825
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 - 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -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.0 +
-+++ ltmain.sh 2003-12-12 21:41:48.0 +
-@@ -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_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 -
+++ patches/patch-src_fe-common_core_fe-common-core_c 12 Mar 2006 21:40:58 -
@@ -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
++#ifdef USE_LIBICONV
++#include
+ #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_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 - 1.2
+++ /de
Re: UPDATE: net/irssi-0.8.10
On Sunday 12 March 2006 17:05, Antti Harri wrote: > On Sun, 12 Mar 2006, viq wrote: > > On Sunday 12 March 2006 00:55, steven mestdagh wrote: > >> configure spits some warning about grep usage here. > > > > Yeah, I saw those too, no clue yet though as to why they happen and what > > to do about it... > > > >> on startup i see > >> (process:16536): GLib-CRITICAL **: g_strcasecmp: assertion `s2 != NULL' > >> failed > > > > Argh, again? That was the main thing i was trying to get rid of, that's > > why patch-src_fe-common_core_fe-common-core_c is there. > > And strange, I wipe my ~/.irssi and start it, and don't get that error... > > When you get that error, what does "/set term_charset" tell you? > > [some lines snipped] > > Hi, > > here's a patch that will correct both of those afair. I haven't > been following to the thread actively lately, sorry for the noise > if you have already solved these issues. No, I don't know nearly enough to try fixing that besides what I had before. I see where you did this, I like it, it saves the old functions, and adds the fix for our problem. That is, the part I know that refers to the problem we were looking at, I hardly understand what the rest is doing :( > Viq, you can use that patch as a base but I don't recommend using it "as > is". I made it a while ago but I'm really too busy to help you guys > more, sorry for that. I hope you get the update properly working and > incorporated into OpenBSD! :-) Yeah, thanks for the help :) > http://openbsd.fi/~iku/files/irssi.patch > > HTH. > > -- > Antti Harri -- viq Ukonczyl zaoczne przedszkole, z wyroznieniem! KIM JEST STEFAN?!? | http://www.stefan.pl/
Re: UPDATE: net/irssi-0.8.10
On Sunday 12 March 2006 16:52, Christian Weisgerber wrote:
> steven mestdagh <[EMAIL PROTECTED]> wrote:
> > > > - is it possible to use config.guess/config.sub from
> > > > infrastructure/db?
> > >
> > > The patches bring those files exactly to the state of those in
> > > insfrastructure/db, at least according to diff. Or is there a better
> > > way to do it?
> >
> > copy the files into ${WRKSRC}?
>
> No, set MODGNU_CONFIG_GUESS_DIRS and the files will be automatically
> copied.
Ah, neat. No wonder I had problems finding example of a port doing that
copying ;) But I found - syslog-ng.
Thanks for suggestion.
--
viq
---
Odkryl najwyzszy kraweznik w Polsce.
KIM JEST STEFAN?!? | http://www.stefan.pl/
Re: UPDATE: net/irssi-0.8.10
On Sunday 12 March 2006 10:11, steven mestdagh wrote: > viq [2006-03-12, 07:15:13]: > > > configure spits some warning about grep usage here. > > > > Yeah, I saw those too, no clue yet though as to why they happen and what > > to do about it... > > > > > maybe you want to install the irssi.conf file? > > > > Ah, yes, will have to look into that. > > install it under share/examples/irssi and then add a @sample line below > in PLIST. there already are a few @sample lines there. I think that is already done, will look into that now though, expect a new patch soon, incorporating also other suggestions. As for that error, that's when "checking if we can link dynamic libraries with modules", that's between tests for GLIB2 and ncurses in config file. So most likely that would be grep in line 25381 - but I have no idea how to deal with that. > > > on startup i see > > > (process:16536): GLib-CRITICAL **: g_strcasecmp: assertion `s2 != NULL' > > > failed > > > > Argh, again? That was the main thing i was trying to get rid of, that's > > why patch-src_fe-common_core_fe-common-core_c is there. > > And strange, I wipe my ~/.irssi and start it, and don't get that error... > > When you get that error, what does "/set term_charset" tell you? > > I see, yes apparently I had an old .irssi directory, I removed it and > the error is gone. term_charset was 646, now it is ISO8859-1. Yes, that's what we were fighting with before. Though, hmm, if you have a config, I would assume you should have a correct charset in there... Strange. > steven -- viq --- Wzial udzial w zawodach balonowych i... niezle wypadl! KIM JEST STEFAN?!? | http://www.stefan.pl/
Re: UPDATE: net/irssi-0.8.10
On Sun, 12 Mar 2006, viq wrote: On Sunday 12 March 2006 00:55, steven mestdagh wrote: configure spits some warning about grep usage here. Yeah, I saw those too, no clue yet though as to why they happen and what to do about it... on startup i see (process:16536): GLib-CRITICAL **: g_strcasecmp: assertion `s2 != NULL' failed Argh, again? That was the main thing i was trying to get rid of, that's why patch-src_fe-common_core_fe-common-core_c is there. And strange, I wipe my ~/.irssi and start it, and don't get that error... When you get that error, what does "/set term_charset" tell you? [some lines snipped] Hi, here's a patch that will correct both of those afair. I haven't been following to the thread actively lately, sorry for the noise if you have already solved these issues. Viq, you can use that patch as a base but I don't recommend using it "as is". I made it a while ago but I'm really too busy to help you guys more, sorry for that. I hope you get the update properly working and incorporated into OpenBSD! :-) http://openbsd.fi/~iku/files/irssi.patch HTH. -- Antti Harri
Re: UPDATE: net/irssi-0.8.10
steven mestdagh <[EMAIL PROTECTED]> wrote:
> > > - is it possible to use config.guess/config.sub from infrastructure/db?
> >
> > The patches bring those files exactly to the state of those in
> > insfrastructure/db, at least according to diff. Or is there a better way to
> > do it?
>
> copy the files into ${WRKSRC}?
No, set MODGNU_CONFIG_GUESS_DIRS and the files will be automatically
copied.
--
Christian "naddy" Weisgerber [EMAIL PROTECTED]
Re: UPDATE: net/irssi-0.8.10
viq [2006-03-12, 07:15:13]: > > configure spits some warning about grep usage here. > > Yeah, I saw those too, no clue yet though as to why they happen and what to > do > about it... > > > maybe you want to install the irssi.conf file? > > Ah, yes, will have to look into that. install it under share/examples/irssi and then add a @sample line below in PLIST. there already are a few @sample lines there. > > on startup i see > > (process:16536): GLib-CRITICAL **: g_strcasecmp: assertion `s2 != NULL' > > failed > > Argh, again? That was the main thing i was trying to get rid of, that's why > patch-src_fe-common_core_fe-common-core_c is there. > And strange, I wipe my ~/.irssi and start it, and don't get that error... > When you get that error, what does "/set term_charset" tell you? I see, yes apparently I had an old .irssi directory, I removed it and the error is gone. term_charset was 646, now it is ISO8859-1. steven Disclaimer: http://www.kuleuven.be/cwis/email_disclaimer.htm
Re: UPDATE: net/irssi-0.8.10
On Saturday 11 March 2006 21:45, viq wrote:
> On Saturday 11 March 2006 10:37, steven mestdagh wrote:
> > i think this needs some tweaking. i haven't tried it, but
> > - is it possible to use config.guess/config.sub from infrastructure/db?
> > - instead of patching ltmain.sh, have you tried setting USE_LIBTOOL=Yes?
> > - set MODULES=devel/gettext instead of adding intl iconv to WANTLIB
> >
> > copy the files into ${WRKSRC}? then you can skip those patches.
> >
> > can you put without-included-gettext here?
>
> Here's a patch incorporating all those suggestions.
Bah, noticed that I left the ltmain patch laying around, here's a fix to that
- otherwise same diff.
--
viq
-
Toshiba i FIFA World Cup
Wygraj bilety i notebooki z Intel Centrino Duo Mobile Technology
http://link.interia.pl/f1912
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 - 1.25
+++ Makefile 12 Mar 2006 06:45:26 -
@@ -5,7 +5,7 @@
COMMENT= "modular IRC client with many features (ipv6,socks,proxy)"
-DISTNAME= irssi-0.8.9
+DISTNAME= irssi-0.8.10
CATEGORIES= net
MASTER_SITES= ${HOMEPAGE}/files/ \
@@ -28,13 +28,18 @@
PERMIT_DISTFILES_FTP= Yes
WANTLIB= c crypto m ncurses perl ssl util
-LIB_DEPENDS+= glib.1.2,gmodule::devel/glib
+MODULES=devel/gettext
+
+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
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?=
@@ -48,6 +53,8 @@
pre-configure:
@perl -pi -e 's,doc/irssi,irssi,g' ${WRKSRC}/docs/Makefile.in
+ cp -f ${PORTSDIR}/infrastructure/db/config.guess \
+ ${PORTSDIR}/infrastructure/db/config.sub ${WRKSRC}
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/irssi
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 - 1.11
+++ distinfo 12 Mar 2006 06:45:26 -
@@ -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.10.tar.gz) = ed29412e86e1d5fbb71d24ae02edd462
+RMD160 (irssi-0.8.10.tar.gz) = ec7995c2965c6aa3f67ccd76da2c9a5f9c0c7b87
+SHA1 (irssi-0.8.10.tar.gz) = edfde2b2e0a703f6aa3eee9140255a8e928a9d1a
+SIZE (irssi-0.8.10.tar.gz) = 1322825
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 - 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -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.0 +
-+++ ltmain.sh 2003-12-12 21:41:48.0 +
-@@ -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_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 -
+++ patches/patch-src_fe-common_core_fe-common-core_c 12 Mar 2006 06:45:26 -
@@ -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
++#ifdef USE_LIBICONV
++#include
+ #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
+ settin
Re: UPDATE: net/irssi-0.8.10
On Sunday 12 March 2006 00:55, steven mestdagh wrote:
> viq [2006-03-11, 21:45:11]:
> > On Saturday 11 March 2006 10:37, steven mestdagh wrote:
> > > i think this needs some tweaking. i haven't tried it, but
> > > - is it possible to use config.guess/config.sub from infrastructure/db?
> > > - instead of patching ltmain.sh, have you tried setting
> > > USE_LIBTOOL=Yes? - set MODULES=devel/gettext instead of adding intl
> > > iconv to WANTLIB
> > >
> > > copy the files into ${WRKSRC}? then you can skip those patches.
> > >
> > > can you put without-included-gettext here?
> >
> > Here's a patch incorporating all those suggestions.
>
> configure spits some warning about grep usage here.
Yeah, I saw those too, no clue yet though as to why they happen and what to do
about it...
> maybe you want to install the irssi.conf file?
Ah, yes, will have to look into that.
> on startup i see
> (process:16536): GLib-CRITICAL **: g_strcasecmp: assertion `s2 != NULL'
> failed
Argh, again? That was the main thing i was trying to get rid of, that's why
patch-src_fe-common_core_fe-common-core_c is there.
And strange, I wipe my ~/.irssi and start it, and don't get that error... When
you get that error, what does "/set term_charset" tell you?
> steven
--
viq
-
Toshiba i FIFA World Cup
Wygraj bilety i notebooki z Intel Centrino Duo Mobile Technology
http://link.interia.pl/f1912
Re: UPDATE: net/irssi-0.8.10
viq [2006-03-11, 21:45:11]:
> On Saturday 11 March 2006 10:37, steven mestdagh wrote:
>
> > i think this needs some tweaking. i haven't tried it, but
> > - is it possible to use config.guess/config.sub from infrastructure/db?
> > - instead of patching ltmain.sh, have you tried setting USE_LIBTOOL=Yes?
> > - set MODULES=devel/gettext instead of adding intl iconv to WANTLIB
>
> > copy the files into ${WRKSRC}? then you can skip those patches.
>
> > can you put without-included-gettext here?
>
> Here's a patch incorporating all those suggestions.
configure spits some warning about grep usage here.
maybe you want to install the irssi.conf file?
on startup i see
(process:16536): GLib-CRITICAL **: g_strcasecmp: assertion `s2 != NULL'
failed
steven
Disclaimer: http://www.kuleuven.be/cwis/email_disclaimer.htm
Re: UPDATE: net/irssi-0.8.10
On Saturday 11 March 2006 10:37, steven mestdagh wrote:
> i think this needs some tweaking. i haven't tried it, but
> - is it possible to use config.guess/config.sub from infrastructure/db?
> - instead of patching ltmain.sh, have you tried setting USE_LIBTOOL=Yes?
> - set MODULES=devel/gettext instead of adding intl iconv to WANTLIB
> copy the files into ${WRKSRC}? then you can skip those patches.
> can you put without-included-gettext here?
Here's a patch incorporating all those suggestions.
--
viq
-
Toshiba i FIFA World Cup
Wygraj bilety i notebooki z Intel Centrino Duo Mobile Technology
http://link.interia.pl/f1912
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 - 1.25
+++ Makefile 11 Mar 2006 20:41:26 -
@@ -5,7 +5,7 @@
COMMENT= "modular IRC client with many features (ipv6,socks,proxy)"
-DISTNAME= irssi-0.8.9
+DISTNAME= irssi-0.8.10
CATEGORIES= net
MASTER_SITES= ${HOMEPAGE}/files/ \
@@ -28,13 +28,18 @@
PERMIT_DISTFILES_FTP= Yes
WANTLIB= c crypto m ncurses perl ssl util
-LIB_DEPENDS+= glib.1.2,gmodule::devel/glib
+MODULES=devel/gettext
+
+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
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?=
@@ -48,6 +53,8 @@
pre-configure:
@perl -pi -e 's,doc/irssi,irssi,g' ${WRKSRC}/docs/Makefile.in
+ cp -f ${PORTSDIR}/infrastructure/db/config.guess \
+ ${PORTSDIR}/infrastructure/db/config.sub ${WRKSRC}
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/irssi
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 - 1.11
+++ distinfo 11 Mar 2006 20:41:26 -
@@ -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.10.tar.gz) = ed29412e86e1d5fbb71d24ae02edd462
+RMD160 (irssi-0.8.10.tar.gz) = ec7995c2965c6aa3f67ccd76da2c9a5f9c0c7b87
+SHA1 (irssi-0.8.10.tar.gz) = edfde2b2e0a703f6aa3eee9140255a8e928a9d1a
+SIZE (irssi-0.8.10.tar.gz) = 1322825
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 -
+++ patches/patch-src_fe-common_core_fe-common-core_c 11 Mar 2006 20:41:26 -
@@ -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
++#ifdef USE_LIBICONV
++#include
+ #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_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 - 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -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 = FA
Re: UPDATE: net/irssi-0.8.10
viq [2006-03-11, 07:44:15]:
> On Saturday 11 March 2006 00:57, steven mestdagh wrote:
> > viq [2006-03-10, 21:54:10]:
> > > This time a diff that seems to work. Applying that patch left me with
> > > bunch of *.orig files which I don't know whether is an error of patch,
> > > patching process I used (patch -p0 -E < irssi.diff) or just The Way
> > > Things Are.
> > >
> > > Based heavily on update posted by Antti Harri, and code pointed to by
> > > Jacob Meuser.
> > >
> > > Please test, and look whether everything is correct - especially such
> > > things like tags and comments in Makefile, I just bumped a number in
> > > there.
> > >
> > > It's my first port so I'd like it to be done correctly ;)
> >
> > i think this needs some tweaking. i haven't tried it, but
> > - is it possible to use config.guess/config.sub from infrastructure/db?
>
> The patches bring those files exactly to the state of those in
> insfrastructure/db, at least according to diff. Or is there a better way to
> do it?
copy the files into ${WRKSRC}? then you can skip those patches.
steven
Disclaimer: http://www.kuleuven.be/cwis/email_disclaimer.htm
Re: UPDATE: net/irssi-0.8.10
viq [2006-03-10, 21:54:10]:
> This time a diff that seems to work. Applying that patch left me with bunch
> of
> *.orig files which I don't know whether is an error of patch, patching
> process I used (patch -p0 -E < irssi.diff) or just The Way Things Are.
>
> Based heavily on update posted by Antti Harri, and code pointed to by Jacob
> Meuser.
>
> Please test, and look whether everything is correct - especially such things
> like tags and comments in Makefile, I just bumped a number in there.
>
> It's my first port so I'd like it to be done correctly ;)
>
> --
> viq
>
>
> -
> Toshiba i FIFA World Cup
> Wygraj bilety i notebooki z Intel Centrino Duo Mobile Technology
> http://link.interia.pl/f1912
> 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 - 1.25
> +++ Makefile 10 Mar 2006 18:02:53 -
> @@ -5,7 +5,7 @@
>
> COMMENT= "modular IRC client with many features (ipv6,socks,proxy)"
>
> -DISTNAME=irssi-0.8.9
> +DISTNAME=irssi-0.8.10
> CATEGORIES= net
>
> MASTER_SITES=${HOMEPAGE}/files/ \
> @@ -26,15 +26,16 @@
> PERMIT_PACKAGE_FTP= Yes
> PERMIT_DISTFILES_CDROM= Yes
> PERMIT_DISTFILES_FTP=Yes
> -WANTLIB= c crypto m ncurses perl ssl util
> +WANTLIB= c crypto m ncurses perl ssl util iconv intl
>
> -LIB_DEPENDS+=glib.1.2,gmodule::devel/glib
> +LIB_DEPENDS+=glib-2.0.0.0,gmodule-2.0.0.0::devel/glib2
> +BUILD_DEPENDS+= :pkgconfig-*:devel/pkgconfig
>
> CONFIGURE_STYLE= gnu
>
> CONFIGURE_ARGS+= --datadir=${PREFIX}/share/doc --enable-ipv6 \
> --with-proxy --enable-perl=yes --with-included-gettext \
can you put without-included-gettext here?
Disclaimer: http://www.kuleuven.be/cwis/email_disclaimer.htm
Re: UPDATE: net/irssi-0.8.10
On Saturday 11 March 2006 00:57, steven mestdagh wrote: > viq [2006-03-10, 21:54:10]: > > This time a diff that seems to work. Applying that patch left me with > > bunch of *.orig files which I don't know whether is an error of patch, > > patching process I used (patch -p0 -E < irssi.diff) or just The Way > > Things Are. > > > > Based heavily on update posted by Antti Harri, and code pointed to by > > Jacob Meuser. > > > > Please test, and look whether everything is correct - especially such > > things like tags and comments in Makefile, I just bumped a number in > > there. > > > > It's my first port so I'd like it to be done correctly ;) > > i think this needs some tweaking. i haven't tried it, but > - is it possible to use config.guess/config.sub from infrastructure/db? The patches bring those files exactly to the state of those in insfrastructure/db, at least according to diff. Or is there a better way to do it? > - instead of patching ltmain.sh, have you tried setting USE_LIBTOOL=Yes? > - set MODULES=devel/gettext instead of adding intl iconv to WANTLIB Trying that right now. Thanks for suggestions :) > steven -- viq - Toshiba i FIFA World Cup Wygraj bilety i notebooki z Intel Centrino Duo Mobile Technology http://link.interia.pl/f1912
Re: UPDATE: net/irssi-0.8.10
viq [2006-03-10, 21:54:10]: > This time a diff that seems to work. Applying that patch left me with bunch > of > *.orig files which I don't know whether is an error of patch, patching > process I used (patch -p0 -E < irssi.diff) or just The Way Things Are. > > Based heavily on update posted by Antti Harri, and code pointed to by Jacob > Meuser. > > Please test, and look whether everything is correct - especially such things > like tags and comments in Makefile, I just bumped a number in there. > > It's my first port so I'd like it to be done correctly ;) i think this needs some tweaking. i haven't tried it, but - is it possible to use config.guess/config.sub from infrastructure/db? - instead of patching ltmain.sh, have you tried setting USE_LIBTOOL=Yes? - set MODULES=devel/gettext instead of adding intl iconv to WANTLIB steven Disclaimer: http://www.kuleuven.be/cwis/email_disclaimer.htm
Re: UPDATE: net/irssi-0.8.10
This time a diff that seems to work. Applying that patch left me with bunch of
*.orig files which I don't know whether is an error of patch, patching
process I used (patch -p0 -E < irssi.diff) or just The Way Things Are.
Based heavily on update posted by Antti Harri, and code pointed to by Jacob
Meuser.
Please test, and look whether everything is correct - especially such things
like tags and comments in Makefile, I just bumped a number in there.
It's my first port so I'd like it to be done correctly ;)
--
viq
-
Toshiba i FIFA World Cup
Wygraj bilety i notebooki z Intel Centrino Duo Mobile Technology
http://link.interia.pl/f1912
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 - 1.25
+++ Makefile 10 Mar 2006 18:02:53 -
@@ -5,7 +5,7 @@
COMMENT= "modular IRC client with many features (ipv6,socks,proxy)"
-DISTNAME= irssi-0.8.9
+DISTNAME= irssi-0.8.10
CATEGORIES= net
MASTER_SITES= ${HOMEPAGE}/files/ \
@@ -26,15 +26,16 @@
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
-WANTLIB= c crypto m ncurses perl ssl util
+WANTLIB= c crypto m ncurses perl ssl util iconv intl
-LIB_DEPENDS+= glib.1.2,gmodule::devel/glib
+LIB_DEPENDS+= glib-2.0.0.0,gmodule-2.0.0.0::devel/glib2
+BUILD_DEPENDS+= :pkgconfig-*:devel/pkgconfig
CONFIGURE_STYLE= gnu
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-perl-lib=${PREFIX}/libdata/perl5/site_perl
FLAVORS= socks
FLAVOR?=
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 - 1.11
+++ distinfo 10 Mar 2006 18:02:53 -
@@ -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.10.tar.gz) = ed29412e86e1d5fbb71d24ae02edd462
+RMD160 (irssi-0.8.10.tar.gz) = ec7995c2965c6aa3f67ccd76da2c9a5f9c0c7b87
+SHA1 (irssi-0.8.10.tar.gz) = edfde2b2e0a703f6aa3eee9140255a8e928a9d1a
+SIZE (irssi-0.8.10.tar.gz) = 1322825
Index: patches/patch-config_guess
===
RCS file: patches/patch-config_guess
diff -N patches/patch-config_guess
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-config_guess 10 Mar 2006 18:02:53 -
@@ -0,0 +1,213 @@
+$OpenBSD$
+--- config.guess.orig Wed Nov 2 17:32:16 2005
config.guess Fri Feb 3 02:29:55 2006
+@@ -3,7 +3,7 @@
+ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+ # 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+
+-timestamp='2005-05-27'
++timestamp='2005-06-30'
+
+ # This file is free software; you can redistribute it and/or modify it
+ # under the terms of the GNU General Public License as published by
+@@ -138,23 +138,6 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` |
+ UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
+ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
+
+-if [ "${UNAME_SYSTEM}" = "Linux" ] ; then
+- eval $set_cc_for_build
+- cat << EOF > $dummy.c
+- #include
+- #ifdef __UCLIBC__
+- # ifdef __UCLIBC_CONFIG_VERSION__
+- LIBC=uclibc __UCLIBC_CONFIG_VERSION__
+- # else
+- LIBC=uclibc
+- # endif
+- #else
+- LIBC=gnu
+- #endif
+-EOF
+- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep LIBC= | sed -e 's: ::g'`
+-fi
+-
+ # Note: order is significant - the case branches are not exclusive.
+
+ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+@@ -216,44 +199,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+ # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
+ echo "${machine}-${os}${release}"
+ exit ;;
+-amd64:OpenBSD:*:*)
+- echo x86_64-unknown-openbsd${UNAME_RELEASE}
+- exit ;;
+-amiga:OpenBSD:*:*)
+- echo m68k-unknown-openbsd${UNAME_RELEASE}
+- exit ;;
+-cats:OpenBSD:*:*)
+- echo arm-unknown-openbsd${UNAME_RELEASE}
+- exit ;;
+-hp300:OpenBSD:*:*)
+- echo m68k-unknown-openbsd${UNAME_RELEASE}
+- exit ;;
+-luna88k:OpenBSD:*:*)
+- echo m88k-unknown-openbsd${UNAME_RELEASE}
+- exit ;;
+-mac68k:OpenBSD:*:*)
+- echo m68k-unknown-openbsd${UNAME_RELEASE}
+- exit ;;
+-macppc:OpenBSD:*:*)
+- echo powerpc-unknown-openbsd${UNAME_RELEASE}
+- exit ;;
+-mvme68k:OpenBSD:*:*)
+- echo m68k-unknown-openbsd${UNAME_RELEASE}
+- exit ;;
+-mvme88k:OpenBSD:*:*)
+- echo m88k-unknown-openbsd${UNAME_RELEASE}
+- exit ;;
+-mvmeppc:OpenBSD:*:*)
+- echo powerpc-unknow
Re: UPDATE: net/irssi-0.8.10
On Friday 10 March 2006 01:30, Stuart Henderson wrote: > On 2006/03/10 00:57, viq wrote: > > On Monday 06 March 2006 11:00, viq wrote: > > > Created with diff -udrPs. > > > > Yeah, I know that diff was messed up. And it seems that the correct way > > to create a diff is "cvs diff -uN" - but either I am doing something > > wrong, or that just doesn't like me, as it doesn't like files that are > > not there anymore or files that were not there before... > > 'cvs add' or 'cvs rm' the new/deleted files first. (thanks Ian for pointing > these out to me). You might want the -R flag to diff, too. Oh, yes, that's what i was missing! Thanks Stuart, thanks Ian! ;) Now to test whether the patch actually works... -- viq - Toshiba i FIFA World Cup Wygraj bilety i notebooki z Intel Centrino Duo Mobile Technology http://link.interia.pl/f1912
Re: UPDATE: net/irssi-0.8.10
On 2006/03/10 00:57, viq wrote: > On Monday 06 March 2006 11:00, viq wrote: > > Created with diff -udrPs. > > Yeah, I know that diff was messed up. And it seems that the correct way to > create a diff is "cvs diff -uN" - but either I am doing something wrong, or > that just doesn't like me, as it doesn't like files that are not there > anymore or files that were not there before... 'cvs add' or 'cvs rm' the new/deleted files first. (thanks Ian for pointing these out to me). You might want the -R flag to diff, too.
Re: UPDATE: net/irssi-0.8.10
On Monday 06 March 2006 11:00, viq wrote: > Created with diff -udrPs. Yeah, I know that diff was messed up. And it seems that the correct way to create a diff is "cvs diff -uN" - but either I am doing something wrong, or that just doesn't like me, as it doesn't like files that are not there anymore or files that were not there before... Thus, help/hint would be appreciated. Thanks -- viq - Toshiba i FIFA World Cup Wygraj bilety i notebooki z Intel Centrino Duo Mobile Technology http://link.interia.pl/f1912
Re: UPDATE: net/irssi-0.8.10
On Sunday 05 March 2006 23:25, viq wrote:
> So, now that things seem to be moving again... What about irssi getting
> updated? ;)
"where's the diff?" someone said, so here it is. Please review, I'd be the
first one to be surprised if it was perfect.
Created with diff -udrPs.
--
viq
--
Kliknij po wiecej! >>> http://link.interia.pl/f18ed
Only in /usr/ports/net/irssi: CVS
diff -udrPs /usr/ports/net/irssi/Makefile /home/viq/irssi/Makefile
--- /usr/ports/net/irssi/Makefile Thu Dec 16 01:31:22 2004
+++ /home/viq/irssi/Makefile Sat Jan 28 19:14:25 2006
@@ -5,7 +5,7 @@
COMMENT= "modular IRC client with many features (ipv6,socks,proxy)"
-DISTNAME= irssi-0.8.9
+DISTNAME= irssi-0.8.10
CATEGORIES= net
MASTER_SITES= ${HOMEPAGE}/files/ \
@@ -26,15 +26,16 @@
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
-WANTLIB= c crypto m ncurses perl ssl util
+WANTLIB= c crypto m ncurses perl ssl util iconv intl
-LIB_DEPENDS+= glib.1.2,gmodule::devel/glib
+LIB_DEPENDS+= glib-2.0.0.0,gmodule-2.0.0.0::devel/glib2
+BUILD_DEPENDS+= :pkgconfig-*:devel/pkgconfig
CONFIGURE_STYLE= gnu
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-perl-lib=${PREFIX}/libdata/perl5/site_perl
FLAVORS= socks
FLAVOR?=
diff -udrPs /usr/ports/net/irssi/distinfo /home/viq/irssi/distinfo
--- /usr/ports/net/irssi/distinfo Wed Jan 5 18:14:46 2005
+++ /home/viq/irssi/distinfo Sat Jan 28 12:01:19 2006
@@ -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.10.tar.gz) = ed29412e86e1d5fbb71d24ae02edd462
+RMD160 (irssi-0.8.10.tar.gz) = ec7995c2965c6aa3f67ccd76da2c9a5f9c0c7b87
+SHA1 (irssi-0.8.10.tar.gz) = edfde2b2e0a703f6aa3eee9140255a8e928a9d1a
+SIZE (irssi-0.8.10.tar.gz) = 1322825
Only in /usr/ports/net/irssi/patches: CVS
diff -udrPs /usr/ports/net/irssi/patches/patch-config_guess /home/viq/irssi/patches/patch-config_guess
--- /usr/ports/net/irssi/patches/patch-config_guess Thu Jan 1 01:00:00 1970
+++ /home/viq/irssi/patches/patch-config_guess Fri Feb 3 02:48:09 2006
@@ -0,0 +1,213 @@
+$OpenBSD$
+--- config.guess.orig Wed Nov 2 17:32:16 2005
config.guess Fri Feb 3 02:29:55 2006
+@@ -3,7 +3,7 @@
+ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+ # 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+
+-timestamp='2005-05-27'
++timestamp='2005-06-30'
+
+ # This file is free software; you can redistribute it and/or modify it
+ # under the terms of the GNU General Public License as published by
+@@ -138,23 +138,6 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` |
+ UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
+ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
+
+-if [ "${UNAME_SYSTEM}" = "Linux" ] ; then
+- eval $set_cc_for_build
+- cat << EOF > $dummy.c
+- #include
+- #ifdef __UCLIBC__
+- # ifdef __UCLIBC_CONFIG_VERSION__
+- LIBC=uclibc __UCLIBC_CONFIG_VERSION__
+- # else
+- LIBC=uclibc
+- # endif
+- #else
+- LIBC=gnu
+- #endif
+-EOF
+- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep LIBC= | sed -e 's: ::g'`
+-fi
+-
+ # Note: order is significant - the case branches are not exclusive.
+
+ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+@@ -216,44 +199,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+ # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
+ echo "${machine}-${os}${release}"
+ exit ;;
+-amd64:OpenBSD:*:*)
+- echo x86_64-unknown-openbsd${UNAME_RELEASE}
+- exit ;;
+-amiga:OpenBSD:*:*)
+- echo m68k-unknown-openbsd${UNAME_RELEASE}
+- exit ;;
+-cats:OpenBSD:*:*)
+- echo arm-unknown-openbsd${UNAME_RELEASE}
+- exit ;;
+-hp300:OpenBSD:*:*)
+- echo m68k-unknown-openbsd${UNAME_RELEASE}
+- exit ;;
+-luna88k:OpenBSD:*:*)
+- echo m88k-unknown-openbsd${UNAME_RELEASE}
+- exit ;;
+-mac68k:OpenBSD:*:*)
+- echo m68k-unknown-openbsd${UNAME_RELEASE}
+- exit ;;
+-macppc:OpenBSD:*:*)
+- echo powerpc-unknown-openbsd${UNAME_RELEASE}
+- exit ;;
+-mvme68k:OpenBSD:*:*)
+- echo m68k-unknown-openbsd${UNAME_RELEASE}
+- exit ;;
+-mvme88k:OpenBSD:*:*)
+- echo m88k-unknown-openbsd${UNAME_RELEASE}
+- exit ;;
+-mvmeppc:OpenBSD:*:*)
+- echo powerpc-unknown-openbsd${UNAME_RELEASE}
+- exit ;;
+-sgi:OpenBSD:*:*)
+- echo mips64-unknown-openbsd${UNAME_RELEASE}
+- exit ;;
+-sun3:OpenBSD:*:*)
+- echo m68k-unknown-openbsd${UNAME_RELEASE}
+- exit ;;
+ *:OpenBSD:*:*)
+- echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
++ UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
++ echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
+ exit ;;
+ *:ekkoBS
Re: UPDATE: net/irssi-0.8.10
So, now that things seem to be moving again... What about irssi getting updated? ;) -- viq -- Kliknij po wiecej! >>> http://link.interia.pl/f18ed
Re: UPDATE: net/irssi-0.8.10
On Friday 03 February 2006 18:24, Simon Kuhnle wrote: > On Fri, Feb 03, 2006 at 11:40:38AM +0100, viq wrote: > > It seems like that patch did the trick for me. I include the whole port I > > was building it with, please review. > > For me it works on i386, again. > But I didn't have the problem which is now fixed, so I can't tell you, > if your patch really solved it. But at least it means I didn't break it ;) > Hoping to see 0.8.10 soon in ports :) Yeah, me too. Now to see whether I can make newer bitlbee to install ;) -- viq -- Najwiekszy czat w Polsce!!! >>> http://link.interia.pl/f18f6
Re: UPDATE: net/irssi-0.8.10
On Fri, Feb 03, 2006 at 11:40:38AM +0100, viq wrote: > It seems like that patch did the trick for me. I include the whole port I was > building it with, please review. For me it works on i386, again. But I didn't have the problem which is now fixed, so I can't tell you, if your patch really solved it. Hoping to see 0.8.10 soon in ports :) pgpVPkBROVGzH.pgp Description: PGP signature
Re: UPDATE: net/irssi-0.8.10
It seems like that patch did the trick for me. I include the whole port I was building it with, please review. -- viq -- Kobiety i samochody... piekne! >>> http://link.interia.pl/f18f5 irssi-0.8.10-port.tar.gz Description: application/tgz
Re: UPDATE: net/irssi-0.8.10
On Monday 30 January 2006 01:44, Jacob Meuser wrote:
> On Mon, Jan 30, 2006 at 02:23:55AM +0200, Antti Harri wrote:
> > On Sun, 29 Jan 2006, Jacob Meuser wrote:
> > >http://marc.theaimsgroup.com/l=openbsd-ports&m=113384927704993&w=2
> >
> > For the archives here's the correct URL:
> > http://marc.theaimsgroup.com/?l=openbsd-ports&m=113384927704993&w=2
>
> oops! thanks.
>
> > I wrote a simple patch that makes Irssi use locale_charset()
> > instead of nl_langinfo(). At least it made the glib-warning
> > to go away (in Irssi term_charset was set to ASCII) so if this is the
> > best way to fix it
>
> I think this is the only solution for this problem.
Thanks for the link. And basing on that, I am right now trying to compile
irssi with the following patch, hopefully that will help. Shall see in the
morning, now sleep while it compiles ;)
<~/irssi>$ cat patches/patch-src_fe-common_core_fe-common-core_c
$OpenBSD$
--- src/fe-common/core/fe-common-core.c.origFri 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
+#ifdef USE_LIBICONV
+#include
#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
--
viq
Re: UPDATE: net/irssi-0.8.10
On Mon, Jan 30, 2006 at 02:23:55AM +0200, Antti Harri wrote: > > On Sun, 29 Jan 2006, Jacob Meuser wrote: > > >http://marc.theaimsgroup.com/l=openbsd-ports&m=113384927704993&w=2 > > For the archives here's the correct URL: > http://marc.theaimsgroup.com/?l=openbsd-ports&m=113384927704993&w=2 oops! thanks. > I wrote a simple patch that makes Irssi use locale_charset() > instead of nl_langinfo(). At least it made the glib-warning > to go away (in Irssi term_charset was set to ASCII) so if this is the > best way to fix it I think this is the only solution for this problem. -- <[EMAIL PROTECTED]> > I can share it after tidying it up a little. Unless > someone else is quicker of course :-) I can also ask some people to test > it before submitting.
Re: UPDATE: net/irssi-0.8.10
On Sun, 29 Jan 2006, Jacob Meuser wrote: http://marc.theaimsgroup.com/l=openbsd-ports&m=113384927704993&w=2 For the archives here's the correct URL: http://marc.theaimsgroup.com/?l=openbsd-ports&m=113384927704993&w=2 I wrote a simple patch that makes Irssi use locale_charset() instead of nl_langinfo(). At least it made the glib-warning to go away (in Irssi term_charset was set to ASCII) so if this is the best way to fix it I can share it after tidying it up a little. Unless someone else is quicker of course :-) I can also ask some people to test it before submitting. -- Antti Harri
Re: UPDATE: net/irssi-0.8.10
On Sun, Jan 29, 2006 at 02:27:06PM +0200, Antti Harri wrote:
>
> On Sun, 29 Jan 2006, viq wrote:
>
> >I think I found where such autoconfiguration is done:
> >src/fe-common/core/fe-common-core.c line 178 and few following. At least it
> [snip]
>
> I looked at it and there was a call to nl_langinfo().
> I wrote a test program to see what it outputs, here
> are there results:
>
> [EMAIL PROTECTED]:~/src$ cat test.c
> #include
> #include
> #include
>
> int main (void)
> {
> printf ("%s\n", nl_langinfo(CODESET));
> return 0;
> }
> [EMAIL PROTECTED]:~/src$ ./test
> 646
>
>
> [EMAIL PROTECTED]:~/src$ ./test
> ANSI_X3.4-1968
> [EMAIL PROTECTED]:~/src$ uname
> Linux
>
> So it seems to me Irssi functions as it is supposed to,
> but nl_langinfo seems to give results that don't work with it.
> I don't have enough programming skills to continue either
> but maybe someone else has :-)
http://marc.theaimsgroup.com/l=openbsd-ports&m=113384927704993&w=2
--
<[EMAIL PROTECTED]>
Re: UPDATE: net/irssi-0.8.10
On a completely different note, as some mentioned, shouldn't the patch-src_irc_proxy_Makefile_in be kept (and modified a bit to fit the newer file better), so the libirc_proxy.so is build without version information? That's how the patch looks on my box now: $OpenBSD$ --- src/irc/proxy/Makefile.in.orig Sat Jan 28 09:27:10 2006 +++ src/irc/proxy/Makefile.in Sat Jan 28 09:27:58 2006 @@ -239,7 +239,7 @@ INCLUDES = \ -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 libirc_proxy_la_SOURCES = \ proxy.c \ -- viq -- Najwiekszy czat w Polsce!!! >>> http://link.interia.pl/f18f6
Re: UPDATE: net/irssi-0.8.10
On Sunday 29 January 2006 13:27, Antti Harri wrote:
> On Sun, 29 Jan 2006, viq wrote:
> > I think I found where such autoconfiguration is done:
> > src/fe-common/core/fe-common-core.c line 178 and few following. At least
> > it
>
> [snip]
>
> I looked at it and there was a call to nl_langinfo().
> I wrote a test program to see what it outputs, here
> are there results:
>
> [EMAIL PROTECTED]:~/src$ cat test.c
> #include
> #include
> #include
>
> int main (void)
> {
> printf ("%s\n", nl_langinfo(CODESET));
> return 0;
> }
> [EMAIL PROTECTED]:~/src$ ./test
> 646
>
>
> [EMAIL PROTECTED]:~/src$ ./test
> ANSI_X3.4-1968
> [EMAIL PROTECTED]:~/src$ uname
> Linux
>
> So it seems to me Irssi functions as it is supposed to,
> but nl_langinfo seems to give results that don't work with it.
> I don't have enough programming skills to continue either
> but maybe someone else has :-)
Hmm.
There's:
#define CODESET 51 /* Codeset name */
in 72nd line of /usr/include/langinfo.h
...not that it looks like having much to do with the problem.
BUT!
On linux i found this:
CODESET = _NL_CTYPE_CODESET_NAME
which is line 280 of /usr/include/langinfo.h
Besides, the whole file looks mighty different.
My programming skills leave a lot to desire, so don't count on me to do
something with it, but maybe that will help someone ;)
> --
> Antti Harri
--
viq
--
Kobiety i samochody... piekne! >>> http://link.interia.pl/f18f5
Re: UPDATE: net/irssi-0.8.10
On Sun, 29 Jan 2006, viq wrote:
I think I found where such autoconfiguration is done:
src/fe-common/core/fe-common-core.c line 178 and few following. At least it
[snip]
I looked at it and there was a call to nl_langinfo().
I wrote a test program to see what it outputs, here
are there results:
[EMAIL PROTECTED]:~/src$ cat test.c
#include
#include
#include
int main (void)
{
printf ("%s\n", nl_langinfo(CODESET));
return 0;
}
[EMAIL PROTECTED]:~/src$ ./test
646
[EMAIL PROTECTED]:~/src$ ./test
ANSI_X3.4-1968
[EMAIL PROTECTED]:~/src$ uname
Linux
So it seems to me Irssi functions as it is supposed to,
but nl_langinfo seems to give results that don't work with it.
I don't have enough programming skills to continue either
but maybe someone else has :-)
--
Antti Harri
Re: UPDATE: net/irssi-0.8.10
On Sunday 29 January 2006 03:12, Antti Harri wrote: > On Sun, 29 Jan 2006, David Gwynne wrote: > > A default configuration is a misconfiguration? > > I'd say misconfiguration. Irssi's port in OpenBSD > doesn't create any system wide configuration. And at > least I used that as a base with my updated port. > In /etc/irssi there is only the default theme files > so I'm guessing that such configuration file (with wrong term_charset) > is left-over from previous installations or something similar. I think I found where such autoconfiguration is done: src/fe-common/core/fe-common-core.c line 178 and few following. At least it looks that way to me. Maybe that will help someone figure out what's going on. > -- > Antti Harri -- viq -- Najwiekszy czat w Polsce!!! >>> http://link.interia.pl/f18f6
Re: UPDATE: net/irssi-0.8.10
From: "Antti Harri" <[EMAIL PROTECTED]> On Sun, 29 Jan 2006, David Gwynne wrote: A default configuration is a misconfiguration? I'd say misconfiguration. Irssi's port in OpenBSD doesn't create any system wide configuration. And at least I used that as a base with my updated port. In /etc/irssi there is only the default theme files so I'm guessing that such configuration file (with wrong term_charset) is left-over from previous installations or something similar. Correct me if I'm wrong.. [EMAIL PROTECTED]:~$ grep term_charset .irssi/config term_charset = "646"; [EMAIL PROTECTED]:~$ irssi (process:3027): GLib-CRITICAL **: g_strcasecmp: assertion `s2 != NULL' failed [EMAIL PROTECTED]:~$ vim .irssi/config [EMAIL PROTECTED]:~$ grep term_charset .irssi/config term_charset = "ISO-8859-1"; [EMAIL PROTECTED]:~$ irssi [EMAIL PROTECTED]:~$ [EMAIL PROTECTED] loki$ find $HOME/ -name .irssi [EMAIL PROTECTED] loki$ pkg_info |grep irssi irssi-0.8.10modular IRC client with many features (ipv6,socks,proxy) [EMAIL PROTECTED] loki$ irssi (process:14716): GLib-CRITICAL **: g_strcasecmp: assertion `s2 != NULL' failed [EMAIL PROTECTED] loki$ find $HOME/ -name .irssi /xhome/loki/.irssi [EMAIL PROTECTED] loki$ if there is no configuration then irssi creates a default for me. the default config hits the assertation. if the problem is that there isn't a valid default config in /etc then perhaps the port should be set up to provide one on install. if there is a config file that irssi uses as the template for its config, then that should be fixed before the pkg is created. a new install of a package should just work. i don't want to have to tweak the default config for irssi to work for my users. i just want to go pkg_add irssi* it is possible i have an old version of the port. if someone can point me at the diff that is currently being considered for the ports tree i can try it out and see if the same thing happens. i may be talking a load of crap if the newer port is fixed. dlg
Re: UPDATE: net/irssi-0.8.10
On Sun, 29 Jan 2006, David Gwynne wrote: A default configuration is a misconfiguration? I'd say misconfiguration. Irssi's port in OpenBSD doesn't create any system wide configuration. And at least I used that as a base with my updated port. In /etc/irssi there is only the default theme files so I'm guessing that such configuration file (with wrong term_charset) is left-over from previous installations or something similar. Correct me if I'm wrong.. [EMAIL PROTECTED]:~$ grep term_charset .irssi/config term_charset = "646"; [EMAIL PROTECTED]:~$ irssi (process:3027): GLib-CRITICAL **: g_strcasecmp: assertion `s2 != NULL' failed [EMAIL PROTECTED]:~$ vim .irssi/config [EMAIL PROTECTED]:~$ grep term_charset .irssi/config term_charset = "ISO-8859-1"; [EMAIL PROTECTED]:~$ irssi [EMAIL PROTECTED]:~$ -- Antti Harri
Re: UPDATE: net/irssi-0.8.10
From: "Antti Harri" <[EMAIL PROTECTED]> On Sat, 28 Jan 2006, viq wrote: ...but it also gives the familiar "GLib-CRITICAL **: g_strcasecmp: assertion `s2 != NULL' failed" *sigh* looks like I'll have to let others deal with this. Yes it's because of misconfigured Irssi as I've reported earlier. A default configuration is a misconfiguration? dlg
Re: UPDATE: net/irssi-0.8.10
On Sat, 28 Jan 2006, viq wrote: ...but it also gives the familiar "GLib-CRITICAL **: g_strcasecmp: assertion `s2 != NULL' failed" *sigh* looks like I'll have to let others deal with this. Yes it's because of misconfigured Irssi as I've reported earlier. -- Antti Harri
Re: UPDATE: net/irssi-0.8.10
...but it also gives the familiar "GLib-CRITICAL **: g_strcasecmp: assertion `s2 != NULL' failed" *sigh* looks like I'll have to let others deal with this. -- viq -- Kliknij po wiecej! >>> http://link.interia.pl/f18ed
Re: UPDATE: net/irssi-0.8.10
That one didn't seem to be accepted, so I made my own go at creating/modifying the port. Please review it, test, and maybe finally there'll be irssi 0.8.10 in ports ;) Yes, i know there's no tag at beginning of Makefile, and no maintainer - i removed those, as i wasn't sure how to deal with those. Port attached. -- viq -- Najwiekszy czat w Polsce!!! >>> http://link.interia.pl/f18f6 irssi-0.8.10-port.tar.gz Description: application/tgz
Re: UPDATE: net/irssi-0.8.10
On Sun, Jan 08, 2006 at 10:48:08PM +0200, Antti Harri wrote:
>
> On Sun, 8 Jan 2006, Simon Dassow wrote:
>
> >On Sun, Jan 08, 2006 at 09:41:41PM +0200, Antti Harri wrote:
> >>PS. How to get rid of the SHARED_LIBS warning? I tried
> >>tweaking the Makefile but without success.
> >
> >My patch has a few differences to anttis, includes SHARED_LIBS and
> >is available as diff (follows).
>
> >[EMAIL PROTECTED] lib/irssi/modules/libirc_proxy.so.${LIBirc_proxy_VERSION}
This looks like a module and not a shared library proper so it should not
be versioned.
> I had 0.0 there and not the variable that's why it complained
> about SHARED_LIBS when I built it earlier today.
>
> When will Irssi 0.8.10 be committed to OpenBSD-current?
>
> --
> Antti Harri
>
Re: UPDATE: net/irssi-0.8.10
On Sun, 8 Jan 2006, Simon Dassow wrote:
On Sun, Jan 08, 2006 at 09:41:41PM +0200, Antti Harri wrote:
PS. How to get rid of the SHARED_LIBS warning? I tried
tweaking the Makefile but without success.
My patch has a few differences to anttis, includes SHARED_LIBS and
is available as diff (follows).
[EMAIL PROTECTED] lib/irssi/modules/libirc_proxy.so.${LIBirc_proxy_VERSION}
I had 0.0 there and not the variable that's why it complained
about SHARED_LIBS when I built it earlier today.
When will Irssi 0.8.10 be committed to OpenBSD-current?
--
Antti Harri
Re: UPDATE: net/irssi-0.8.10
On Sun, Jan 08, 2006 at 09:41:41PM +0200, Antti Harri wrote:
> On Mon, 12 Dec 2005, David Gwynne wrote:
>
> >I get this warning when I start irssi 0.8.10 on sparc64:
> >
> >(process:25066): GLib-CRITICAL **: g_strcasecmp: assertion `s2 != NULL'
> >failed
> >
> >0.8.9 doesn't produce this message.
>
> No and neither does 0.8.10 built using my port if one uses
> correct term_charset (/set term_charset ISO-8859-1 for example).
> I found out the fault today when it started giving that message
> and scandinavian characters were shown incorrectly in my terminal.
>
> PS. How to get rid of the SHARED_LIBS warning? I tried
> tweaking the Makefile but without success.
My patch has a few differences to anttis, includes SHARED_LIBS and
is available as diff (follows).
Regards
Simon
diff:
cvs server: cannot find patches/patch-ltmain_sh
cvs server: cannot find patches/patch-src_fe_common_core_fe_settings_c
cvs server: cannot find patches/patch-src_irc_dcc_dcc_autoget_c
cvs server: cannot find patches/patch-src_irc_proxy_Makefile_in
Index: Makefile
===
RCS file: /cvs/ports/net/irssi/Makefile,v
retrieving revision 1.25
diff -u -r1.25 Makefile
--- Makefile16 Dec 2004 00:31:22 - 1.25
+++ Makefile8 Jan 2006 20:33:55 -
@@ -5,7 +5,7 @@
COMMENT= "modular IRC client with many features (ipv6,socks,proxy)"
-DISTNAME= irssi-0.8.9
+DISTNAME= irssi-0.8.10
CATEGORIES=net
MASTER_SITES= ${HOMEPAGE}/files/ \
@@ -26,15 +26,17 @@
PERMIT_PACKAGE_FTP=Yes
PERMIT_DISTFILES_CDROM=Yes
PERMIT_DISTFILES_FTP= Yes
-WANTLIB= c crypto m ncurses perl ssl util
+WANTLIB= c crypto m ncurses perl ssl util iconv intl
-LIB_DEPENDS+= glib.1.2,gmodule::devel/glib
+LIB_DEPENDS+= glib-2.0.0.0,gmodule-2.0.0.0::devel/glib2
CONFIGURE_STYLE= gnu
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-perl-lib=${PREFIX}/libdata/perl5/site_perl
+
+SHARED_LIBS= irc_proxy 0.0
FLAVORS= socks
FLAVOR?=
Index: distinfo
===
RCS file: /cvs/ports/net/irssi/distinfo,v
retrieving revision 1.11
diff -u -r1.11 distinfo
--- distinfo5 Jan 2005 17:14:46 - 1.11
+++ distinfo8 Jan 2006 20:33:55 -
@@ -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.10.tar.gz) = ed29412e86e1d5fbb71d24ae02edd462
+RMD160 (irssi-0.8.10.tar.gz) = ec7995c2965c6aa3f67ccd76da2c9a5f9c0c7b87
+SHA1 (irssi-0.8.10.tar.gz) = edfde2b2e0a703f6aa3eee9140255a8e928a9d1a
+SIZE (irssi-0.8.10.tar.gz) = 1322825
Index: pkg/PFRAG.shared
===
RCS file: pkg/PFRAG.shared
diff -N pkg/PFRAG.shared
--- /dev/null 1 Jan 1970 00:00:00 -
+++ pkg/PFRAG.shared8 Jan 2006 20:33:55 -
@@ -0,0 +1,2 @@
[EMAIL PROTECTED] $OpenBSD$
[EMAIL PROTECTED] lib/irssi/modules/libirc_proxy.so.${LIBirc_proxy_VERSION}
Index: pkg/PLIST
===
RCS file: /cvs/ports/net/irssi/pkg/PLIST,v
retrieving revision 1.13
diff -u -r1.13 PLIST
--- pkg/PLIST 15 Sep 2004 18:17:41 - 1.13
+++ pkg/PLIST 8 Jan 2006 20:33:55 -
@@ -1,10 +1,10 @@
@comment $OpenBSD: PLIST,v 1.13 2004/09/15 18:17:41 espie Exp $
+%%SHARED%%
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/
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/Irssi/
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/Irssi.pm
@@ -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
Re: UPDATE: net/irssi-0.8.10
On Mon, 12 Dec 2005, David Gwynne wrote: I get this warning when I start irssi 0.8.10 on sparc64: (process:25066): GLib-CRITICAL **: g_strcasecmp: assertion `s2 != NULL' failed 0.8.9 doesn't produce this message. No and neither does 0.8.10 built using my port if one uses correct term_charset (/set term_charset ISO-8859-1 for example). I found out the fault today when it started giving that message and scandinavian characters were shown incorrectly in my terminal. PS. How to get rid of the SHARED_LIBS warning? I tried tweaking the Makefile but without success. Best regards, Antti Harri
Re: UPDATE: net/irssi-0.8.10
dorqus wrote... > Based on the original port I'm also seeing > (process:3637): GLib-CRITICAL **: g_strcasecmp: assertion `s2 != NULL' failed > > This is on i386-current as of December 12th. Right now I'm compiling > the irssi-0.8.10p0 port and I'll let you know. Other than that warning, > the port works fine. Same error with the irssi-0.8.10p0 port as well I'm sorry to say. i386-current void:~> irssi (process:1115): GLib-CRITICAL **: g_strcasecmp: assertion `s2 != NULL' failed void:~> pkg_info -c irssi Information for irssi-0.8.10p0 Comment: modular IRC client with many features (ipv6,socks,proxy) -d
Re: UPDATE: net/irssi-0.8.10
Based on the original port I'm also seeing (process:3637): GLib-CRITICAL **: g_strcasecmp: assertion `s2 != NULL' failed This is on i386-current as of December 12th. Right now I'm compiling the irssi-0.8.10p0 port and I'll let you know. Other than that warning, the port works fine. -d
Re: UPDATE: net/irssi-0.8.10
On Wed, 14 Dec 2005, steven mestdagh wrote:
I updated the port, added a missing build dependency for pkgconfig
and added three patches for files: config.guess, config.sub and ltmain.sh.
The patches correct some misbehaviour in `configure` script.
maybe you could try using ${PORTSDIR}/infrastructure/db/config.guess
and friends if it is necessary. see sysutils/syslog-ng port.
I used the files that libtoolize copied, which are exactly the same as you
suggested (except for the ltmain.sh that doesn't exist in infrastructure/db/)
it will not, but we prefer using the in-tree libtool if possible.
So I thought too but wasn't sure because it adds dependency for
devel/libtool to be installed.
don't bump PKGNAME if an update has not yet been committed.
${PKGNAME} shouldn't be changed before commit even if patches are added
(change of patch level in this case)? Ok, that I didn't know.
--
Antti Harri
Re: UPDATE: net/irssi-0.8.10
On Wed, Dec 14, 2005 at 05:27:26AM +0200, Antti Harri wrote:
> >>I get this warning when I start irssi 0.8.10 on sparc64:
> >>
> >>(process:25066): GLib-CRITICAL **: g_strcasecmp: assertion `s2 !=
> >>NULL' failed
> >
> >I see the same message on sparc64.
> >
> >BTW have you tried building your port with USE_LIBTOOL=Yes ?
>
> Hello,
>
> I can't reproduce such errors/warnings on my own computers. I succesfully
> built the port on 3.8-release/sparc today (after long compiling
> process :-) ) but I didn't see any glib errors when starting the
> binary. If someone knows a solution for that I can attach it.
looks like you get a NULL pointer in a call to g_strcasecmp somewhere.
could be a 64 bit issue.
> I updated the port, added a missing build dependency for pkgconfig
> and added three patches for files: config.guess, config.sub and ltmain.sh.
> The patches correct some misbehaviour in `configure` script.
maybe you could try using ${PORTSDIR}/infrastructure/db/config.guess
and friends if it is necessary. see sysutils/syslog-ng port.
> USE_LIBTOOL=Yes is also specified in case that will fix the glib2-issues.
it will not, but we prefer using the in-tree libtool if possible.
> The updated port is available at:
> http://openbsd.fi/~iku/files/ports/irssi-0.8.10p0-obsd_port.tar.gz
don't bump PKGNAME if an update has not yet been committed.
--
steven
Disclaimer: http://www.kuleuven.be/cwis/email_disclaimer.htm
Re: UPDATE: net/irssi-0.8.10
On Mon, 12 Dec 2005, steven mestdagh wrote: On Mon, Dec 12, 2005 at 10:44:59AM +1000, David Gwynne wrote: I get this warning when I start irssi 0.8.10 on sparc64: (process:25066): GLib-CRITICAL **: g_strcasecmp: assertion `s2 != NULL' failed I see the same message on sparc64. BTW have you tried building your port with USE_LIBTOOL=Yes ? Hello, I can't reproduce such errors/warnings on my own computers. I succesfully built the port on 3.8-release/sparc today (after long compiling process :-) ) but I didn't see any glib errors when starting the binary. If someone knows a solution for that I can attach it. I updated the port, added a missing build dependency for pkgconfig and added three patches for files: config.guess, config.sub and ltmain.sh. The patches correct some misbehaviour in `configure` script. USE_LIBTOOL=Yes is also specified in case that will fix the glib2-issues. The updated port is available at: http://openbsd.fi/~iku/files/ports/irssi-0.8.10p0-obsd_port.tar.gz I would like to thank all of you that tested the port and reported back, it's much appreciated :-) -- Antti Harri
Re: UPDATE: net/irssi-0.8.10
The port make installs on current on macppc (powerbook )and arm (zaurus), however when I try to run irssi I get the following message before it starts on macppc/arm: GLib: Cannot convert message: Conversion from character set 'UTF-8' to '646' is not supported (process:9631): GLib-CRITICAL **: g_strcasecmp: assertion `s2 != NULL' failed -Harry On Sun, Dec 11, 2005 at 09:24:31PM +0200, Antti Harri wrote: > > This port brings Irssi back up to date. Tested to be > working on i386/-current. > > From irssi.org: > > "What's new in this release? > Recode support > Isupport (005 numeric) > Passive DCC support. > Many memleak fixes. > Network specific ignoring. > Updated internal error handling. > Complete 64bit support. > Revised default aliases. > Updated paste detection and settings. > Tons of bugfixes." > > http://openbsd.fi/~iku/files/ports/irssi-0.8.10-obsd_port.tar.gz > > Comments are very welcome in case there are something that I missed > as I'm not that experienced with ports. Thank you. > > Best regards, > Antti Harri >
Re: UPDATE: net/irssi-0.8.10
On Sun, Dec 11, 2005 at 09:24:31PM +0200, Antti Harri wrote: > > This port brings Irssi back up to date. Tested to be > working on i386/-current. > > From irssi.org: > > "What's new in this release? > Recode support > Isupport (005 numeric) > Passive DCC support. > Many memleak fixes. > Network specific ignoring. > Updated internal error handling. > Complete 64bit support. > Revised default aliases. > Updated paste detection and settings. > Tons of bugfixes." > > http://openbsd.fi/~iku/files/ports/irssi-0.8.10-obsd_port.tar.gz > > Comments are very welcome in case there are something that I missed > as I'm not that experienced with ports. Thank you. > > Best regards, > Antti Harri > Works for me on current of 2005-12-08, i386. Greetings, Jonathan -- | /"\ ASCII Ribbon | Jonathan Glaschke - Lorenz-Goertz-Straße 71, | \ / Campaign Against | 41238 Moenchengladbach, Germany; | XHTML In Mail | jabber: [EMAIL PROTECTED] | / \ And News | http://jonathan-glaschke.de/ pgpXMNPAYp20b.pgp Description: PGP signature
Re: UPDATE: net/irssi-0.8.10
On Mon, Dec 12, 2005 at 06:03:53PM +1000, David Gwynne wrote: > >>I get this warning when I start irssi 0.8.10 on sparc64: > >> > >>(process:25066): GLib-CRITICAL **: g_strcasecmp: assertion `s2 != > >>NULL' failed > > > >I see the same message on sparc64. > > > >BTW have you tried building your port with USE_LIBTOOL=Yes ? > > No, sorry, I'm rather clueless in the ports tree. What does USE_LIBTOOL=Yes > mean? this question was actually meant for Antti Harri. it means invocations of bundled versions of libtool are replaced with the version of libtool which is in our ports tree. see bsd.port.mk(5). -- steven Disclaimer: http://www.kuleuven.be/cwis/email_disclaimer.htm
Re: UPDATE: net/irssi-0.8.10
From: "steven mestdagh" <[EMAIL PROTECTED]> On Mon, Dec 12, 2005 at 10:44:59AM +1000, David Gwynne wrote: I get this warning when I start irssi 0.8.10 on sparc64: (process:25066): GLib-CRITICAL **: g_strcasecmp: assertion `s2 != NULL' failed I see the same message on sparc64. BTW have you tried building your port with USE_LIBTOOL=Yes ? No, sorry, I'm rather clueless in the ports tree. What does USE_LIBTOOL=Yes mean? dlg
Re: UPDATE: net/irssi-0.8.10
On Mon, Dec 12, 2005 at 10:44:59AM +1000, David Gwynne wrote: > I get this warning when I start irssi 0.8.10 on sparc64: > > (process:25066): GLib-CRITICAL **: g_strcasecmp: assertion `s2 != > NULL' failed I see the same message on sparc64. BTW have you tried building your port with USE_LIBTOOL=Yes ? -- steven Disclaimer: http://www.kuleuven.be/cwis/email_disclaimer.htm
Re: UPDATE: net/irssi-0.8.10
On 12/12/2005, at 11:55 AM, Antti Harri wrote: On Mon, 12 Dec 2005, David Gwynne wrote: I get this warning when I start irssi 0.8.10 on sparc64: (process:25066): GLib-CRITICAL **: g_strcasecmp: assertion `s2 != NULL' failed I'm not sure if this will fix it but have you tried moving your $HOME/.irssi temporarily to a new name so old settings and scripts don't interfere? It shouldn't matter but you can always try. I have sometimes seen similar warnings with buggy scripts. What version of glib2 have you got installed and does Irssi work otherwise? I ran this on a new install, there is no /home at the moment so there is no .irssi for it to get confused by, and no scripts either. I can connect to a server with it and talk on channels, so it does appear to be ok. I'm running with glib2-2.8.3. Cheers, dlg
Re: UPDATE: net/irssi-0.8.10
On Mon, 12 Dec 2005, David Gwynne wrote: I get this warning when I start irssi 0.8.10 on sparc64: (process:25066): GLib-CRITICAL **: g_strcasecmp: assertion `s2 != NULL' failed Hello, I'm not sure if this will fix it but have you tried moving your $HOME/.irssi temporarily to a new name so old settings and scripts don't interfere? It shouldn't matter but you can always try. I have sometimes seen similar warnings with buggy scripts. What version of glib2 have you got installed and does Irssi work otherwise? Can anyone else test this it on other arch than i386 to see if it throws the same warning? -- Antti Harri
Re: UPDATE: net/irssi-0.8.10
I get this warning when I start irssi 0.8.10 on sparc64: (process:25066): GLib-CRITICAL **: g_strcasecmp: assertion `s2 != NULL' failed 0.8.9 doesn't produce this message. dlg On 12/12/2005, at 5:24 AM, Antti Harri wrote: This port brings Irssi back up to date. Tested to be working on i386/-current. From irssi.org: "What's new in this release? Recode support Isupport (005 numeric) Passive DCC support. Many memleak fixes. Network specific ignoring. Updated internal error handling. Complete 64bit support. Revised default aliases. Updated paste detection and settings. Tons of bugfixes." http://openbsd.fi/~iku/files/ports/irssi-0.8.10-obsd_port.tar.gz Comments are very welcome in case there are something that I missed as I'm not that experienced with ports. Thank you. Best regards, Antti Harri
Re: UPDATE: net/irssi-0.8.10
On Sun, Dec 11, 2005 at 09:24:31PM +0200, Antti Harri wrote: > > This port brings Irssi back up to date. Tested to be > working on i386/-current. Works for me on i386/-current, too. I compiled and ran it without problems. > > >From irssi.org: > > "What's new in this release? > Recode support > Isupport (005 numeric) > Passive DCC support. > Many memleak fixes. > Network specific ignoring. > Updated internal error handling. > Complete 64bit support. > Revised default aliases. > Updated paste detection and settings. > Tons of bugfixes." > > http://openbsd.fi/~iku/files/ports/irssi-0.8.10-obsd_port.tar.gz > > Comments are very welcome in case there are something that I missed > as I'm not that experienced with ports. Thank you. > > Best regards, > Antti Harri
UPDATE: net/irssi-0.8.10
This port brings Irssi back up to date. Tested to be working on i386/-current. From irssi.org: "What's new in this release? Recode support Isupport (005 numeric) Passive DCC support. Many memleak fixes. Network specific ignoring. Updated internal error handling. Complete 64bit support. Revised default aliases. Updated paste detection and settings. Tons of bugfixes." http://openbsd.fi/~iku/files/ports/irssi-0.8.10-obsd_port.tar.gz Comments are very welcome in case there are something that I missed as I'm not that experienced with ports. Thank you. Best regards, Antti Harri
