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

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 <features.h>
+-	#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 ;;
+     *:ekkoBSD:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
+@@ -868,25 +816,25 @@ EOF
+ 	echo ${UNAME_MACHINE}-pc-minix
+ 	exit ;;
+     arm*:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
+ 	exit ;;
+     cris:Linux:*:*)
+-	echo cris-axis-linux-${LIBC}
++	echo cris-axis-linux-gnu
+ 	exit ;;
+     crisv32:Linux:*:*)
+-	echo crisv32-axis-linux-${LIBC}
++	echo crisv32-axis-linux-gnu
+ 	exit ;;
+     frv:Linux:*:*)
+-    	echo frv-unknown-linux-${LIBC}
++    	echo frv-unknown-linux-gnu
+ 	exit ;;
+     ia64:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
+ 	exit ;;
+     m32r*:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
+ 	exit ;;
+     m68*:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
+ 	exit ;;
+     mips:Linux:*:*)
+ 	eval $set_cc_for_build
+@@ -905,7 +853,7 @@ EOF
+ 	#endif
+ EOF
+ 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
++	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+ 	;;
+     mips64:Linux:*:*)
+ 	eval $set_cc_for_build
+@@ -924,13 +872,13 @@ EOF
+ 	#endif
+ EOF
+ 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
++	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+ 	;;
+     ppc:Linux:*:*)
+-	echo powerpc-unknown-linux-${LIBC}
++	echo powerpc-unknown-linux-gnu
+ 	exit ;;
+     ppc64:Linux:*:*)
+-	echo powerpc64-unknown-linux-${LIBC}
++	echo powerpc64-unknown-linux-gnu
+ 	exit ;;
+     alpha:Linux:*:*)
+ 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+@@ -943,34 +891,34 @@ EOF
+ 	  EV68*) UNAME_MACHINE=alphaev68 ;;
+         esac
+ 	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
+-	if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
+-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
++	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+ 	exit ;;
+     parisc:Linux:*:* | hppa:Linux:*:*)
+ 	# Look for CPU level
+ 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
+-	  PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
+-	  PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
+-	  *)    echo hppa-unknown-linux-${LIBC} ;;
++	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
++	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
++	  *)    echo hppa-unknown-linux-gnu ;;
+ 	esac
+ 	exit ;;
+     parisc64:Linux:*:* | hppa64:Linux:*:*)
+-	echo hppa64-unknown-linux-${LIBC}
++	echo hppa64-unknown-linux-gnu
+ 	exit ;;
+     s390:Linux:*:* | s390x:Linux:*:*)
+ 	echo ${UNAME_MACHINE}-ibm-linux
+ 	exit ;;
+     sh64*:Linux:*:*)
+-    	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++    	echo ${UNAME_MACHINE}-unknown-linux-gnu
+ 	exit ;;
+     sh*:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
+ 	exit ;;
+     sparc:Linux:*:* | sparc64:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
+ 	exit ;;
+     x86_64:Linux:*:*)
+-	echo x86_64-unknown-linux-${LIBC}
++	echo x86_64-unknown-linux-gnu
+ 	exit ;;
+     i*86:Linux:*:*)
+ 	# The BFD linker knows what the default object file format is, so
+@@ -985,21 +933,20 @@ EOF
+ 				    p'`
+         case "$ld_supported_targets" in
+ 	  elf32-i386)
+-		TENTATIVE="${UNAME_MACHINE}-pc-linux-${LIBC}"
++		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
+ 		;;
+ 	  a.out-i386-linux)
+-		echo "${UNAME_MACHINE}-pc-linux-${LIBC}aout"
++		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
+ 		exit ;;
+ 	  coff-i386)
+-		echo "${UNAME_MACHINE}-pc-linux-${LIBC}coff"
++		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
+ 		exit ;;
+ 	  "")
+ 		# Either a pre-BFD a.out linker (linux-gnuoldld) or
+ 		# one that does not give us useful --help.
+-		echo "${UNAME_MACHINE}-pc-linux-${LIBC}oldld"
++		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
+ 		exit ;;
+ 	esac
+-	if [ "$LIBC" != "gnu" ] ; then echo "$TENTATIVE" && exit 0 ; fi
+ 	# Determine whether the default compiler is a.out or elf
+ 	eval $set_cc_for_build
+ 	sed 's/^	//' << EOF >$dummy.c
diff -udrPs /usr/ports/net/irssi/patches/patch-config_sub /home/viq/irssi/patches/patch-config_sub
--- /usr/ports/net/irssi/patches/patch-config_sub	Thu Jan  1 01:00:00 1970
+++ /home/viq/irssi/patches/patch-config_sub	Fri Feb  3 02:48:09 2006
@@ -0,0 +1,104 @@
+$OpenBSD$
+--- config.sub.orig	Wed Nov  2 17:32:16 2005
++++ config.sub	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-06-02'
++timestamp='2005-07-01'
+ 
+ # This file is (in principle) common to ALL GNU software.
+ # The presence of a machine in this file suggests that SOME GNU software
+@@ -234,7 +234,7 @@ case $basic_machine in
+ 	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
+ 	| bfin \
+ 	| c4x | clipper \
+-	| d10v | d30v | dlx | dsp16xx | dvp \
++	| d10v | d30v | dlx | dsp16xx \
+ 	| fr30 | frv \
+ 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+ 	| i370 | i860 | i960 | ia64 \
+@@ -248,7 +248,7 @@ case $basic_machine in
+ 	| mips64vr4100 | mips64vr4100el \
+ 	| mips64vr4300 | mips64vr4300el \
+ 	| mips64vr5000 | mips64vr5000el \
+-	| mips64r5900 | mips64r5900el \
++	| mips64vr5900 | mips64vr5900el \
+ 	| mipsisa32 | mipsisa32el \
+ 	| mipsisa32r2 | mipsisa32r2el \
+ 	| mipsisa64 | mipsisa64el \
+@@ -260,7 +260,7 @@ case $basic_machine in
+ 	| ms1 \
+ 	| msp430 \
+ 	| ns16k | ns32k \
+-	| openrisc | or32 \
++	| or32 \
+ 	| pdp10 | pdp11 | pj | pjl \
+ 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
+ 	| pyramid \
+@@ -327,7 +327,7 @@ case $basic_machine in
+ 	| mips64vr4100-* | mips64vr4100el-* \
+ 	| mips64vr4300-* | mips64vr4300el-* \
+ 	| mips64vr5000-* | mips64vr5000el-* \
+-	| mips64r5900-* | mips64r5900el-* \
++	| mips64vr5900-* | mips64vr5900el-* \
+ 	| mipsisa32-* | mipsisa32el-* \
+ 	| mipsisa32r2-* | mipsisa32r2el-* \
+ 	| mipsisa64-* | mipsisa64el-* \
+@@ -678,24 +678,6 @@ case $basic_machine in
+ 		basic_machine=m68k-atari
+ 		os=-mint
+ 		;;
+-	mipsEE* | ee | ps2)
+-		basic_machine=mips64r5900el-scei
+-		case $os in
+-		    -linux*)
+-			;;
+-		    *)
+-			os=-elf
+-			;;
+-		esac
+-		;;
+-	iop)
+-		basic_machine=mipsel-scei
+-		os=-irx
+-		;;
+-	dvp)
+-		basic_machine=dvp-scei
+-		os=-elf
+-		;;
+ 	mips3*-*)
+ 		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
+ 		;;
+@@ -789,9 +771,8 @@ case $basic_machine in
+ 		basic_machine=hppa1.1-oki
+ 		os=-proelf
+ 		;;
+-	or32 | or32-*)
++	openrisc | openrisc-*)
+ 		basic_machine=or32-unknown
+-		os=-coff
+ 		;;
+ 	os400)
+ 		basic_machine=powerpc-ibm
+@@ -1120,9 +1101,6 @@ case $basic_machine in
+ 	sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
+ 		basic_machine=sh-unknown
+ 		;;
+-	sh64)
+-		basic_machine=sh64-unknown
+-		;;
+ 	sparc | sparcv8 | sparcv9 | sparcv9b)
+ 		basic_machine=sparc-sun
+ 		;;
+@@ -1209,8 +1187,7 @@ case $os in
+ 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
+ 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
+ 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
+-	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* | -skyos* \
+-	      | -irx* )
++	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* | -skyos*)
+ 	# Remember, each alternative MUST END IN *, to match a version number.
+ 		;;
+ 	-qnx*)
diff -udrPs /usr/ports/net/irssi/patches/patch-ltmain_sh /home/viq/irssi/patches/patch-ltmain_sh
--- /usr/ports/net/irssi/patches/patch-ltmain_sh	Sun Dec 14 04:25:19 2003
+++ /home/viq/irssi/patches/patch-ltmain_sh	Fri Feb  3 02:53:01 2006
@@ -1,12 +1,324 @@
-$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
+$OpenBSD$
+--- ltmain.sh.orig	Wed Nov  2 19:30:31 2005
++++ ltmain.sh	Fri Feb  3 02:29:56 2006
+@@ -33,9 +33,6 @@ basename="s,^.*/,,g"
+ # function.
+ progpath="$0"
+ 
+-# define SED for historic ltconfig's generated by Libtool 1.3
+-test -z "$SED" && SED=sed
+-
+ # The name of this program:
+ progname=`echo "$progpath" | $SED $basename`
+ modename="$progname"
+@@ -54,13 +51,6 @@ TIMESTAMP=" (1.1220.2.287 2005/08/31 18:
+ if test -n "${ZSH_VERSION+set}" ; then
+   setopt NO_GLOB_SUBST
+ fi
+-# Same for EGREP, and just to be sure, do LTCC as well
+-if test "X$EGREP" = X ; then
+-    EGREP=egrep
+-fi
+-if test "X$LTCC" = X ; then
+-    LTCC=${CC-gcc}
+-fi
+ 
+ # Check that we have a working $echo.
+ if test "X$1" = X--no-reexec; then
+@@ -145,30 +135,6 @@ execute_dlfiles=
+ lo2o="s/\\.lo\$/.${objext}/"
+ o2lo="s/\\.${objext}\$/.lo/"
+ 
+-if test -z "$max_cmd_len"; then
+-  i=0
+-  testring="ABCD"
+-  new_result=
+-  
+-  # If test is not a shell built-in, we'll probably end up computing a
+-  # maximum length that is only half of the actual maximum length, but
+-  # we can't tell.
+-  while (test "X"`$SHELL $0 --fallback-echo "X$testring" 2>/dev/null` \
+-             = "XX$testring") >/dev/null 2>&1 &&
+-          new_result=`expr "X$testring" : ".*" 2>&1` &&
+-          max_cmd_len="$new_result" &&
+-          test "$i" != 17 # 1/2 MB should be enough
+-  do
+-    i=`expr $i + 1`
+-    testring="$testring$testring"
+-  done
+-  testring=
+-  # Add a significant safety factor because C++ compilers can tack on massive
+-  # amounts of additional arguments before passing them to the linker.
+-  # It appears as though 1/2 is a usable value.
+-  max_cmd_len=`expr $max_cmd_len \/ 2`
+-fi
+-
+ #####################################
+ # Shell function definitions:
+ # This seems to be the best place for them
+@@ -253,21 +219,7 @@ func_infer_tag ()
+ 	    esac
+ 	    CC_quoted="$CC_quoted $arg"
+ 	  done
+-	    # user sometimes does CC=<HOST>-gcc so we need to match that to 'gcc'
+-	    trimedcc=`echo ${CC} | $SED -e "s/${host}-//g"`
+-	    # and sometimes libtool has CC=<HOST>-gcc but user does CC=gcc
+-	    extendcc=${host}-${CC}
+-	    # and sometimes libtool has CC=<OLDHOST>-gcc but user has CC=<NEWHOST>-gcc  
+-	    # (Gentoo-specific hack because we always export $CHOST)
+-	    mungedcc=${CHOST-${host}}-${trimedcc}
+ 	    case "$@ " in
+-	      "cc "* | " cc "* | "${host}-cc "* | " ${host}-cc "*|\
+-	      "gcc "* | " gcc "* | "${host}-gcc "* | " ${host}-gcc "*)
+-	      tagname=CC
+-	      break ;;
+-	      "$trimedcc "* | " $trimedcc "* | "`$echo $trimedcc` "* | " `$echo $trimedcc` "*|\
+-	      "$extendcc "* | " $extendcc "* | "`$echo $extendcc` "* | " `$echo $extendcc` "*|\
+-	      "$mungedcc "* | " $mungedcc "* | "`$echo $mungedcc` "* | " `$echo $mungedcc` "*|\
+ 	      " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*)
+ 	      # The compiler in the base compile command matches
+ 	      # the one in the tagged configuration.
+@@ -843,7 +795,7 @@ if test -z "$show_help"; then
+     # Lock this critical section if it is needed
+     # We use this script file to make the link, it avoids creating a new file
+     if test "$need_locks" = yes; then
+-      until $run ln "$srcfile" "$lockfile" 2>/dev/null; do
++      until $run ln "$progpath" "$lockfile" 2>/dev/null; do
+ 	$show "Waiting for $lockfile to be removed"
+ 	sleep 2
+       done
+@@ -1137,14 +1089,15 @@ EOF
+ 	  if test -n "$link_static_flag"; then
+ 	    dlopen_self=$dlopen_self_static
+ 	  fi
++	  prefer_static_libs=yes
+ 	else
+ 	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
+ 	    dlopen_self=$dlopen_self_static
+ 	  fi
++	  prefer_static_libs=built
  	fi
+ 	build_libtool_libs=no
+ 	build_old_libs=yes
+-	prefer_static_libs=yes
+ 	break
+ 	;;
+       esac
+@@ -1751,11 +1704,6 @@ EOF
+ 	continue
+ 	;;
  
- 	# 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=""
+-      -Kthread | -mthreads | -mt | -pthread | -pthreads | -threads | -qthreaded | -kthread )
+-        compiler_flags="$compiler_flags $arg"
+-        continue
+-        ;;
+-
+       # Some other compiler flag.
+       -* | +*)
+ 	# Unknown arguments in both finalize_command and compile_command need
+@@ -2037,6 +1985,17 @@ EOF
+ 	;;
+     esac
+     for pass in $passes; do
++      # The preopen pass in lib mode reverses $deplibs; put it back here
++      # so that -L comes before libs that need it for instance...
++      if test "$linkmode,$pass" = "lib,link"; then
++	## FIXME: Find the place where the list is rebuilt in the wrong
++	##        order, and fix it there properly
++	tmp_deplibs=
++	for deplib in $deplibs; do
++	  tmp_deplibs="$deplib $tmp_deplibs"
++	done
++	deplibs="$tmp_deplibs"
++      fi
+       if test "$linkmode,$pass" = "lib,link" ||
+ 	 test "$linkmode,$pass" = "prog,scan"; then
+ 	libs="$deplibs"
+@@ -2298,20 +2257,20 @@ EOF
+ 	    # It is a libtool convenience library, so add in its objects.
+ 	    convenience="$convenience $ladir/$objdir/$old_library"
+ 	    old_convenience="$old_convenience $ladir/$objdir/$old_library"
+-	    tmp_libs=
+-	    for deplib in $dependency_libs; do
+-	      deplibs="$deplib $deplibs"
+-              if test "X$duplicate_deps" = "Xyes" ; then
+-	        case "$tmp_libs " in
+-	        *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+-	        esac
+-              fi
+-	      tmp_libs="$tmp_libs $deplib"
+-	    done
+ 	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
+ 	    $echo "$modename: \`$lib' is not a convenience library" 1>&2
+ 	    exit $EXIT_FAILURE
+ 	  fi
++	  tmp_libs=
++	  for deplib in $dependency_libs; do
++	    deplibs="$deplib $deplibs"
++	    if test "X$duplicate_deps" = "Xyes" ; then
++	      case "$tmp_libs " in
++	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
++	      esac
++	    fi
++	    tmp_libs="$tmp_libs $deplib"
++	  done
+ 	  continue
+ 	fi # $pass = conv
+ 
+@@ -2498,8 +2457,12 @@ EOF
+ 	fi
+ 
+ 	link_static=no # Whether the deplib will be linked statically
++	use_static_libs=$prefer_static_libs
++	if test "$use_static_libs" = built && test "$installed" = yes ; then
++	  use_static_libs=no
++	fi
+ 	if test -n "$library_names" &&
+-	   { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
++	   { test "$use_static_libs" = no || test -z "$old_library"; }; then
+ 	  if test "$installed" = no; then
+ 	    notinst_deplibs="$notinst_deplibs $lib"
+ 	    need_relink=yes
+@@ -2697,7 +2660,7 @@ EOF
+ 	    add_dir=
+ 	    add=
+ 	    # Finalize command for both is simple: just hardcode it.
+-	    if test "$hardcode_direct" = yes; then
++	    if test "$hardcode_direct" = yes && test -f $libdir/$linklib; then
+ 	      add="$libdir/$linklib"
+ 	    elif test "$hardcode_minus_L" = yes; then
+ 	      add_dir="-L$libdir"
+@@ -3593,13 +3556,6 @@ EOF
+ 			*) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
+ 			esac
+ 		      done
+-		      # It is ok to link against an archive when
+-		      # building a shared library.
+-		      if $AR -t $potlib > /dev/null 2>&1; then
+-		        newdeplibs="$newdeplibs $a_deplib"
+-		        a_deplib=""
+-		        break 2
+-		      fi
+ 		      if eval $file_magic_cmd \"\$potlib\" 2>/dev/null \
+ 			 | ${SED} 10q \
+ 			 | $EGREP "$file_magic_regex" > /dev/null; then
+@@ -5103,11 +5059,6 @@ else
+ 	$echo >> $output "\
+     if test \"\$libtool_execute_magic\" != \"$magic\"; then
+       # Run the actual program with our arguments.
+-
+-      # Make sure env LD_LIBRARY_PATH does not mess us up
+-      if test -n \"\${LD_LIBRARY_PATH+set}\"; then
+-        export LD_LIBRARY_PATH=\$progdir:\$LD_LIBRARY_PATH
+-      fi
+ "
+ 	case $host in
+ 	# Backslashes separate directories on plain windows
+@@ -5335,53 +5286,9 @@ fi\
+ 		  $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
+ 		  exit $EXIT_FAILURE
+ 		fi
+-		if test "X$EGREP" = X ; then
+-			EGREP=egrep
+-		fi
+-		# We do not want portage's install root ($D) present.  Check only for
+-		# this if the .la is being installed.
+-		if test "$installed" = yes && test "$D"; then
+-		  eval mynewdependency_lib=`echo "$libdir/$name" |sed -e "s:$D:/:g" -e 's:/\+:/:g'`
+-		else
+-		  mynewdependency_lib="$libdir/$name"
+-		fi
+-		# Do not add duplicates
+-		if test "$mynewdependency_lib"; then
+-		  my_little_ninja_foo_1=`echo $newdependency_libs |$EGREP -e "$mynewdependency_lib"`
+-		  if test -z "$my_little_ninja_foo_1"; then
+-		    newdependency_libs="$newdependency_libs $mynewdependency_lib"
+-		  fi
+-		fi
++		newdependency_libs="$newdependency_libs $libdir/$name"
+ 		;;
+-		  *)
+-		if test "$installed" = yes; then
+-		  # Rather use S=WORKDIR if our version of portage supports it.
+-		  # This is because some ebuild (gcc) do not use $S as buildroot.
+-		  if test "$PWORKDIR"; then
+-		    S="$PWORKDIR"
+-		  fi
+-		  # We do not want portage's build root ($S) present.
+-		  my_little_ninja_foo_2=`echo $deplib |$EGREP -e "$S"`
+-		  # We do not want portage's install root ($D) present.
+-		  my_little_ninja_foo_3=`echo $deplib |$EGREP -e "$D"`
+-		  if test -n "$my_little_ninja_foo_2" && test "$S"; then
+-		    mynewdependency_lib=""
+-		  elif test -n "$my_little_ninja_foo_3" && test "$D"; then
+-		    eval mynewdependency_lib=`echo "$deplib" |sed -e "s:$D:/:g" -e 's:/\+:/:g'`
+-		  else
+-		    mynewdependency_lib="$deplib"
+-		  fi
+-		else
+-		  mynewdependency_lib="$deplib"
+-		fi
+-		# Do not add duplicates
+-		if test "$mynewdependency_lib"; then
+-		  my_little_ninja_foo_4=`echo $newdependency_libs |$EGREP -e "$mynewdependency_lib"`
+-		  if test -z "$my_little_ninja_foo_4"; then
+-			newdependency_libs="$newdependency_libs $mynewdependency_lib"
+-		  fi
+-		fi
+-		;;
++	      *) newdependency_libs="$newdependency_libs $deplib" ;;
+ 	      esac
+ 	    done
+ 	    dependency_libs="$newdependency_libs"
+@@ -5433,10 +5340,6 @@ fi\
+ 	  case $host,$output,$installed,$module,$dlname in
+ 	    *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
+ 	  esac
+-	  # Do not add duplicates
+-	  if test "$installed" = yes && test "$D"; then
+-	    install_libdir=`echo "$install_libdir" |sed -e "s:$D:/:g" -e 's:/\+:/:g'`
+-	  fi
+ 	  $echo > $output "\
+ # $outputname - a libtool library file
+ # Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
+@@ -6045,40 +5948,6 @@ relink_command=\"$relink_command\""
+     # Exit here if they wanted silent mode.
+     test "$show" = : && exit $EXIT_SUCCESS
+ 
+-    $echo "----------------------------------------------------------------------"
+-    $echo "Libraries have been installed in:"
+-    for libdir in $libdirs; do
+-      $echo "   $libdir"
+-    done
+-    $echo
+-    $echo "If you ever happen to want to link against installed libraries"
+-    $echo "in a given directory, LIBDIR, you must either use libtool, and"
+-    $echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
+-    $echo "flag during linking and do at least one of the following:"
+-    if test -n "$shlibpath_var"; then
+-      $echo "   - add LIBDIR to the \`$shlibpath_var' environment variable"
+-      $echo "     during execution"
+-    fi
+-    if test -n "$runpath_var"; then
+-      $echo "   - add LIBDIR to the \`$runpath_var' environment variable"
+-      $echo "     during linking"
+-    fi
+-    if test -n "$hardcode_libdir_flag_spec"; then
+-      libdir=LIBDIR
+-      eval flag=\"$hardcode_libdir_flag_spec\"
+-
+-      $echo "   - use the \`$flag' linker flag"
+-    fi
+-    if test -n "$admincmds"; then
+-      $echo "   - have your system administrator run these commands:$admincmds"
+-    fi
+-    if test -f /etc/ld.so.conf; then
+-      $echo "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
+-    fi
+-    $echo
+-    $echo "See any operating system documentation about shared libraries for"
+-    $echo "more information, such as the ld(1) and ld.so(8) manual pages."
+-    $echo "----------------------------------------------------------------------"
+     exit $EXIT_SUCCESS
+     ;;
+ 
diff -udrPs /usr/ports/net/irssi/patches/patch-src_fe-common_core_fe-common-core_c /home/viq/irssi/patches/patch-src_fe-common_core_fe-common-core_c
--- /usr/ports/net/irssi/patches/patch-src_fe-common_core_fe-common-core_c	Thu Jan  1 01:00:00 1970
+++ /home/viq/irssi/patches/patch-src_fe-common_core_fe-common-core_c	Fri Feb  3 02:49:23 2006
@@ -0,0 +1,31 @@
+$OpenBSD$
+--- src/fe-common/core/fe-common-core.c.orig	Fri Feb  3 02:41:33 2006
++++ src/fe-common/core/fe-common-core.c	Fri Feb  3 02:47:45 2006
+@@ -25,8 +25,8 @@
+ #include "levels.h"
+ #include "settings.h"
+ #include "irssi-version.h"
+-#ifdef HAVE_NL_LANGINFO
+-#  include <langinfo.h>
++#ifdef USE_LIBICONV
++#include <localcharset.h>
+ #endif
+ 
+ #include "servers.h"
+@@ -174,10 +174,12 @@ void fe_common_core_init(void)
+ 
+ 	settings_add_bool("lookandfeel", "use_status_window", TRUE);
+ 	settings_add_bool("lookandfeel", "use_msgs_window", FALSE);
+-#if defined (HAVE_NL_LANGINFO) && defined(CODESET)
+-	settings_add_str("lookandfeel", "term_charset", 
+-			 *nl_langinfo(CODESET) != '\0' ? 
+-			 nl_langinfo(CODESET) : "ISO8859-1");
++
++#ifdef USE_LIBICONV
++	settings_add_str("lookandfeel", "term_charset",
++			 *locale_charset() != '\0' ?
++			 locale_charset() : "ISO8859-1");
++
+ #else
+ 	settings_add_str("lookandfeel", "term_charset", "ISO8859-1");
+ #endif
Only in /usr/ports/net/irssi/patches: patch-src_fe_common_core_fe_settings_c
Only in /usr/ports/net/irssi/patches: patch-src_irc_dcc_dcc_autoget_c
diff -udrPs /usr/ports/net/irssi/patches/patch-src_irc_proxy_Makefile_in /home/viq/irssi/patches/patch-src_irc_proxy_Makefile_in
--- /usr/ports/net/irssi/patches/patch-src_irc_proxy_Makefile_in	Sat Feb 23 13:25:03 2002
+++ /home/viq/irssi/patches/patch-src_irc_proxy_Makefile_in	Sat Jan 28 11:58:25 2006
@@ -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	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 \
Only in /usr/ports/net/irssi/pkg: CVS
Files /usr/ports/net/irssi/pkg/DESCR and /home/viq/irssi/pkg/DESCR are identical
diff -udrPs /usr/ports/net/irssi/pkg/PLIST /home/viq/irssi/pkg/PLIST
--- /usr/ports/net/irssi/pkg/PLIST	Wed Sep 15 20:17:41 2004
+++ /home/viq/irssi/pkg/PLIST	Sat Jan 28 12:25:06 2006
@@ -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