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

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 -0000	1.25
+++ Makefile	19 Mar 2006 00:45:03 -0000
@@ -5,7 +5,8 @@
 
 COMMENT=	"modular IRC client with many features (ipv6,socks,proxy)"
 
-DISTNAME=	irssi-0.8.9
+DISTNAME=	irssi-0.8.10
+DISTFILES=	irssi-0.8.10a.tar.gz
 CATEGORIES=	net
 
 MASTER_SITES=	${HOMEPAGE}/files/ \
@@ -28,13 +29,18 @@
 PERMIT_DISTFILES_FTP=	Yes
 WANTLIB=		c crypto m ncurses perl ssl util
 
-LIB_DEPENDS+=		glib.1.2,gmodule::devel/glib
+MODULES=devel/gettext
 
-CONFIGURE_STYLE=	gnu
+USE_LIBTOOL=Yes
+
+LIB_DEPENDS+=		glib-2.0.0.0,gmodule-2.0.0.0::devel/glib2
+BUILD_DEPENDS+=		:pkgconfig-*:devel/pkgconfig
 
+CONFIGURE_STYLE=	gnu
+MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}
 CONFIGURE_ARGS+=	--datadir=${PREFIX}/share/doc --enable-ipv6 \
-	--with-proxy --enable-perl=yes --with-included-gettext \
-	--with-perl-lib=${PREFIX}/libdata/perl5/site_perl --with-glib1
+	--with-proxy --enable-perl=yes --without-included-gettext \
+	--with-perl-lib=${PREFIX}/libdata/perl5/site_perl
 
 FLAVORS=	socks
 FLAVOR?=
@@ -44,7 +50,7 @@
 BUILD_DEPENDS+=		::security/dante
 .endif
 
-SAMPLE=		default.theme colorless.theme
+SAMPLE=		default.theme colorless.theme irssi.conf
 
 pre-configure:
 	@perl -pi -e 's,doc/irssi,irssi,g' ${WRKSRC}/docs/Makefile.in
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/irssi/distinfo,v
retrieving revision 1.11
diff -d -u -r1.11 distinfo
--- distinfo	5 Jan 2005 17:14:46 -0000	1.11
+++ distinfo	19 Mar 2006 00:45:03 -0000
@@ -1,4 +1,4 @@
-MD5 (irssi-0.8.9.tar.gz) = 1df516a770656ff0bec0ab62f9096bf6
-RMD160 (irssi-0.8.9.tar.gz) = 71432741b8096b35bb9745f93170b24b8545d9d8
-SHA1 (irssi-0.8.9.tar.gz) = 786dac6b7ddaff65683e78c8ea7686fd4569cf9f
-SIZE (irssi-0.8.9.tar.gz) = 1153560
+MD5 (irssi-0.8.10a.tar.gz) = 78140796205c6fa1c43e46d2e79e60aa
+RMD160 (irssi-0.8.10a.tar.gz) = 880508e18a4d896a5c31dc20b67a6ef86c9c6b94
+SHA1 (irssi-0.8.10a.tar.gz) = aa2d2f1701bb49afc5ea09102d6396f4e013a1dd
+SIZE (irssi-0.8.10a.tar.gz) = 1056233
Index: patches/patch-ltmain_sh
===================================================================
RCS file: patches/patch-ltmain_sh
diff -N patches/patch-ltmain_sh
--- patches/patch-ltmain_sh	14 Dec 2003 03:25:19 -0000	1.3
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-ltmain_sh,v 1.3 2003/12/14 03:25:19 margarida Exp $
---- ltmain.sh.orig	2003-12-12 21:40:54.000000000 +0000
-+++ ltmain.sh	2003-12-12 21:41:48.000000000 +0000
-@@ -3056,7 +3056,7 @@ EOF
- 	fi
- 
- 	# Remove version info from name if versioning should be avoided
--	if test "$avoid_version" = yes && test "$need_version" = no; then
-+	if test "$avoid_version" = yes; then
- 	  major=
- 	  versuffix=
- 	  verstring=""
Index: patches/patch-src_fe_common_core_fe_settings_c
===================================================================
RCS file: patches/patch-src_fe_common_core_fe_settings_c
diff -N patches/patch-src_fe_common_core_fe_settings_c
--- patches/patch-src_fe_common_core_fe_settings_c	24 Jan 2005 21:17:46 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,20 +0,0 @@
-$OpenBSD: patch-src_fe_common_core_fe_settings_c,v 1.2 2005/01/24 21:17:46 mjc Exp $
---- src/fe-common/core/fe-settings.c.orig	Sat Dec 28 10:00:03 2002
-+++ src/fe-common/core/fe-settings.c	Thu Jan 20 23:58:12 2005
-@@ -86,12 +86,15 @@ static void cmd_set(char *data)
- 	clear = g_hash_table_lookup(optlist, "clear") != NULL;
- 	set_default = g_hash_table_lookup(optlist, "default") != NULL;
- 
-+	if (*key == '\0')
-+		clear = set_default = FALSE;
-+
- 	last_section = ""; found = 0;
- 	sets = settings_get_sorted();
- 	for (tmp = sets; tmp != NULL; tmp = tmp->next) {
- 		SETTINGS_REC *rec = tmp->data;
- 
--		if (((clear || *value != '\0') && g_strcasecmp(rec->key, key) != 0) ||
-+		if (((clear || set_default || *value != '\0') && g_strcasecmp(rec->key, key) != 0) ||
- 		    (*value == '\0' && *key != '\0' && stristr(rec->key, key) == NULL))
- 			continue;
- 
Index: patches/patch-src_irc_dcc_dcc_autoget_c
===================================================================
RCS file: patches/patch-src_irc_dcc_dcc_autoget_c
diff -N patches/patch-src_irc_dcc_dcc_autoget_c
--- patches/patch-src_irc_dcc_dcc_autoget_c	2 Mar 2004 22:15:29 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_irc_dcc_dcc_autoget_c,v 1.1 2004/03/02 22:15:29 pvalchev Exp $
---- src/irc/dcc/dcc-autoget.c.orig	Tue Mar  2 21:11:43 2004
-+++ src/irc/dcc/dcc-autoget.c	Tue Mar  2 21:11:57 2004
-@@ -77,7 +77,7 @@
- 	settings_add_bool("dcc", "dcc_autoget", FALSE);
- 	settings_add_bool("dcc", "dcc_autoaccept_lowports", FALSE);
- 	settings_add_bool("dcc", "dcc_autoresume", FALSE);
--	settings_add_size("dcc", "dcc_autoget_max_size", 0);
-+	settings_add_size("dcc", "dcc_autoget_max_size", "0k");
- 	settings_add_str("dcc", "dcc_autoget_masks", "");
- 
- 	signal_add_last("dcc request", (SIGNAL_FUNC) sig_dcc_request);
Index: patches/patch-src_irc_proxy_Makefile_in
===================================================================
RCS file: /cvs/ports/net/irssi/patches/patch-src_irc_proxy_Makefile_in,v
retrieving revision 1.1
diff -d -u -r1.1 patch-src_irc_proxy_Makefile_in
--- patches/patch-src_irc_proxy_Makefile_in	23 Feb 2002 12:25:03 -0000	1.1
+++ patches/patch-src_irc_proxy_Makefile_in	19 Mar 2006 00:45:03 -0000
@@ -1,12 +1,12 @@
-$OpenBSD: patch-src_irc_proxy_Makefile_in,v 1.1 2002/02/23 12:25:03 reinhard Exp $
---- src/irc/proxy/Makefile.in.orig	Sun Feb 17 16:49:42 2002
-+++ src/irc/proxy/Makefile.in	Sat Feb 23 12:07:22 2002
-@@ -125,7 +125,7 @@ DEFS = @DEFS@ -I. -I$(srcdir) -I../../..
- CPPFLAGS = @CPPFLAGS@
- LDFLAGS = @LDFLAGS@
- LIBS = @LIBS@
--libirc_proxy_la_LDFLAGS = 
-+libirc_proxy_la_LDFLAGS = -avoid-version
- libirc_proxy_la_LIBADD = 
- libirc_proxy_la_OBJECTS =  proxy.lo dump.lo listen.lo
- CFLAGS = @CFLAGS@
+$OpenBSD$
+--- src/irc/proxy/Makefile.in.orig	Sun Dec 11 23:47:47 2005
++++ src/irc/proxy/Makefile.in	Sun Mar 19 01:28:02 2006
+@@ -129,7 +129,7 @@ module_LTLIBRARIES = libirc_proxy.la
+ INCLUDES =  	-I$(top_srcdir)/src 	-I$(top_srcdir)/src/core/ 	-I$(top_srcdir)/src/irc/core/ 	$(GLIB_CFLAGS)
+ 
+ 
+-libirc_proxy_la_LDFLAGS = -module
++libirc_proxy_la_LDFLAGS = -module -avoid-version
+ 
+ libirc_proxy_la_DEPENDENCIES = libirc_proxy.a
+ 
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/net/irssi/pkg/PLIST,v
retrieving revision 1.13
diff -d -u -r1.13 PLIST
--- pkg/PLIST	15 Sep 2004 18:17:41 -0000	1.13
+++ pkg/PLIST	19 Mar 2006 00:45:03 -0000
@@ -1,5 +1,137 @@
 @comment $OpenBSD: PLIST,v 1.13 2004/09/15 18:17:41 espie Exp $
 bin/irssi
+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
+include/irssi/src/core/channel-rec.h
+include/irssi/src/core/channel-setup-rec.h
+include/irssi/src/core/channels-setup.h
+include/irssi/src/core/channels.h
+include/irssi/src/core/chat-protocols.h
+include/irssi/src/core/chatnet-rec.h
+include/irssi/src/core/chatnets.h
+include/irssi/src/core/commands.h
+include/irssi/src/core/core.h
+include/irssi/src/core/expandos.h
+include/irssi/src/core/ignore.h
+include/irssi/src/core/levels.h
+include/irssi/src/core/line-split.h
+include/irssi/src/core/log.h
+include/irssi/src/core/masks.h
+include/irssi/src/core/misc.h
+include/irssi/src/core/module.h
+include/irssi/src/core/modules-load.h
+include/irssi/src/core/modules.h
+include/irssi/src/core/net-disconnect.h
+include/irssi/src/core/net-nonblock.h
+include/irssi/src/core/net-sendbuffer.h
+include/irssi/src/core/network.h
+include/irssi/src/core/nick-rec.h
+include/irssi/src/core/nicklist.h
+include/irssi/src/core/nickmatch-cache.h
+include/irssi/src/core/pidwait.h
+include/irssi/src/core/queries.h
+include/irssi/src/core/query-rec.h
+include/irssi/src/core/rawlog.h
+include/irssi/src/core/recode.h
+include/irssi/src/core/server-connect-rec.h
+include/irssi/src/core/server-rec.h
+include/irssi/src/core/server-setup-rec.h
+include/irssi/src/core/servers-reconnect.h
+include/irssi/src/core/servers-setup.h
+include/irssi/src/core/servers.h
+include/irssi/src/core/session.h
+include/irssi/src/core/settings.h
+include/irssi/src/core/signals.h
+include/irssi/src/core/special-vars.h
+include/irssi/src/core/window-item-def.h
+include/irssi/src/core/window-item-rec.h
+include/irssi/src/core/write-buffer.h
+include/irssi/src/fe-common/
+include/irssi/src/fe-common/core/
+include/irssi/src/fe-common/core/autorun.h
+include/irssi/src/fe-common/core/chat-completion.h
+include/irssi/src/fe-common/core/command-history.h
+include/irssi/src/fe-common/core/completion.h
+include/irssi/src/fe-common/core/fe-channels.h
+include/irssi/src/fe-common/core/fe-common-core.h
+include/irssi/src/fe-common/core/fe-core-commands.h
+include/irssi/src/fe-common/core/fe-exec.h
+include/irssi/src/fe-common/core/fe-messages.h
+include/irssi/src/fe-common/core/fe-queries.h
+include/irssi/src/fe-common/core/fe-recode.h
+include/irssi/src/fe-common/core/fe-windows.h
+include/irssi/src/fe-common/core/formats.h
+include/irssi/src/fe-common/core/hilight-text.h
+include/irssi/src/fe-common/core/keyboard.h
+include/irssi/src/fe-common/core/module-formats.h
+include/irssi/src/fe-common/core/module.h
+include/irssi/src/fe-common/core/printtext.h
+include/irssi/src/fe-common/core/themes.h
+include/irssi/src/fe-common/core/translation.h
+include/irssi/src/fe-common/core/utf8.h
+include/irssi/src/fe-common/core/window-activity.h
+include/irssi/src/fe-common/core/window-items.h
+include/irssi/src/fe-common/core/windows-layout.h
+include/irssi/src/fe-common/irc/
+include/irssi/src/fe-common/irc/dcc/
+include/irssi/src/fe-common/irc/dcc/fe-dcc.h
+include/irssi/src/fe-common/irc/dcc/module-formats.h
+include/irssi/src/fe-common/irc/dcc/module.h
+include/irssi/src/fe-common/irc/fe-irc-server.h
+include/irssi/src/fe-common/irc/module-formats.h
+include/irssi/src/fe-common/irc/module.h
+include/irssi/src/fe-common/irc/notifylist/
+include/irssi/src/fe-common/irc/notifylist/module-formats.h
+include/irssi/src/fe-common/irc/notifylist/module.h
+include/irssi/src/irc/
+include/irssi/src/irc/core/
+include/irssi/src/irc/core/bans.h
+include/irssi/src/irc/core/channel-rejoin.h
+include/irssi/src/irc/core/ctcp.h
+include/irssi/src/irc/core/irc-channels.h
+include/irssi/src/irc/core/irc-chatnets.h
+include/irssi/src/irc/core/irc-commands.h
+include/irssi/src/irc/core/irc-masks.h
+include/irssi/src/irc/core/irc-nicklist.h
+include/irssi/src/irc/core/irc-queries.h
+include/irssi/src/irc/core/irc-servers-setup.h
+include/irssi/src/irc/core/irc-servers.h
+include/irssi/src/irc/core/irc.h
+include/irssi/src/irc/core/mode-lists.h
+include/irssi/src/irc/core/modes.h
+include/irssi/src/irc/core/module.h
+include/irssi/src/irc/core/netsplit.h
+include/irssi/src/irc/core/servers-idle.h
+include/irssi/src/irc/core/servers-redirect.h
+include/irssi/src/irc/dcc/
+include/irssi/src/irc/dcc/dcc-chat.h
+include/irssi/src/irc/dcc/dcc-file-rec.h
+include/irssi/src/irc/dcc/dcc-file.h
+include/irssi/src/irc/dcc/dcc-get.h
+include/irssi/src/irc/dcc/dcc-queue.h
+include/irssi/src/irc/dcc/dcc-rec.h
+include/irssi/src/irc/dcc/dcc-send.h
+include/irssi/src/irc/dcc/dcc-server.h
+include/irssi/src/irc/dcc/dcc.h
+include/irssi/src/irc/dcc/module.h
+include/irssi/src/irc/flood/
+include/irssi/src/irc/flood/module.h
+include/irssi/src/irc/notifylist/
+include/irssi/src/irc/notifylist/module.h
+include/irssi/src/irc/notifylist/notify-setup.h
+include/irssi/src/irc/notifylist/notifylist.h
+include/irssi/src/lib-config/
+include/irssi/src/lib-config/iconfig.h
+include/irssi/src/lib-config/module.h
+include/irssi/src/lib-popt/
+include/irssi/src/lib-popt/findme.h
+include/irssi/src/lib-popt/popt.h
+include/irssi/src/lib-popt/poptint.h
 lib/irssi/
 lib/irssi/modules/
 lib/irssi/modules/libirc_proxy.a
@@ -57,6 +189,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 +224,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 +237,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
@@ -181,3 +316,5 @@
 @sample ${SYSCONFDIR}/irssi/colorless.theme
 share/examples/irssi/default.theme
 @sample ${SYSCONFDIR}/irssi/default.theme
+share/examples/irssi/irssi.conf
+_(_at_)_sample ${SYSCONFDIR}/irssi/irssi.conf

Visit your host, monkey.org