pkgsrc-Bugs archive

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

Re: pkg/46639: irssi port disables ncurses on non-NetBSD platforms



The following reply was made to PR pkg/46639; it has been noted by GNATS.

From: Matthew Mondor <mm_lists%pulsar-zone.net@localhost>
To: gnats-bugs%NetBSD.org@localhost
Cc: 
Subject: Re: pkg/46639: irssi port disables ncurses on non-NetBSD platforms
Date: Fri, 6 Jul 2012 00:49:37 -0400

 --MP_/NwGMfMDX7y+=ma9AzxX5brg
 Content-Type: text/plain; charset=US-ASCII
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline
 
 On Fri,  6 Jul 2012 01:20:03 +0000 (UTC)
 David Holland <dholland-pbugs%netbsd.org@localhost> wrote:
 
 >  It should probably also include termcap.buildlink3.mk for the terminfo
 >  case.
 >  
 >  For that matter, it may be sufficient to include termcap.buildlink3.mk
 >  unconditionally on all platforms - it is supposed to be able to
 >  provide termcap/terminfo with ncurses if that's what's available.
 
 I wasn't sure about this, it's probably worth adding, but I can't
 currently test it elsewhere than on NetBSD, unfortunately.
 
 >  Is there any functionality difference between the terminfo and ncurses
 >  builds, or is it just selecting which libraries to put on the link
 >  line?
 
 I've seen no apparent difference at first, but I noticed that despite
 LANG set to en_US.UTF-8, if built with ncurses support on NetBSD,
 pasting some UTF-8 into a channel causes it to be displayed incorrectly
 (I'm not sure if it happens because of input or output translation or
 both), while this works fine for terminfo builds.
 
 Attached is a new version of the patches making the
 termcap.buildlink3.mk include unconditional.  On NetBSD, the build
 still succeeds with terminfo or ncurses.
 
 Moritz, would it be possible to test this version in your environment,
 to confirm that it builds with ncurses and works fine?  A shell archive
 of the already patched irssi pkgsrc stub is also attached for
 convenience.
 
 Thanks,
 -- 
 Matt
 
 --MP_/NwGMfMDX7y+=ma9AzxX5brg
 Content-Type: text/plain
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment; filename=pkgsrc-chat-irssi-diff.txt
 
 Index: Makefile
 ===================================================================
 RCS file: /data/rsync/netbsd-cvs/pkgsrc/chat/irssi/Makefile,v
 retrieving revision 1.58
 diff -u -r1.58 Makefile
 --- Makefile   3 Mar 2012 00:12:48 -0000       1.58
 +++ Makefile   6 Jul 2012 04:18:38 -0000
 @@ -20,9 +20,7 @@
  USE_LIBTOOL=          yes
  USE_TOOLS+=           pkg-config
  
 -CONFIGURE_ARGS+=      --with-terminfo \
 -                      --with-proxy \
 -                      --without-ncurses \
 +CONFIGURE_ARGS+=      --with-proxy \
                        --sysconfdir=${PKG_SYSCONFDIR}
  
  EGDIR=                ${PREFIX}/share/examples/irssi
 @@ -32,6 +30,7 @@
  
  .include "options.mk"
  .include "../../devel/glib2/buildlink3.mk"
 +.include "../../mk/termcap.buildlink3.mk"
  
  post-install:
        ${INSTALL_DATA} ${WRKSRC}/irssi-config ${DESTDIR}${IRSSI_CONFIG}
 Index: options.mk
 ===================================================================
 RCS file: /data/rsync/netbsd-cvs/pkgsrc/chat/irssi/options.mk,v
 retrieving revision 1.10
 diff -u -r1.10 options.mk
 --- options.mk 6 Mar 2011 04:12:09 -0000       1.10
 +++ options.mk 6 Jul 2012 04:27:57 -0000
 @@ -1,12 +1,29 @@
  # $NetBSD: options.mk,v 1.10 2011/03/06 04:12:09 dholland Exp $
  
  PKG_OPTIONS_VAR=      PKG_OPTIONS.irssi
 +PKG_OPTIONS_REQUIRED_GROUPS= display
 +PKG_OPTIONS_GROUP.display= terminfo ncurses
  PKG_SUPPORTED_OPTIONS=        inet6 perl ssl
  PKG_SUGGESTED_OPTIONS=        inet6
  PKG_OPTIONS_LEGACY_OPTS+=     irssi-perl:perl
  
 +.if ${OPSYS} == "NetBSD"
 +PKG_SUGGESTED_OPTIONS+= terminfo
 +.else
 +PKG_SUGGESTED_OPTIONS+= ncurses
 +.endif
 +
  .include "../../mk/bsd.options.mk"
  
 +.if !empty(PKG_OPTIONS:Mterminfo)
 +CONFIGURE_ARGS+=      --with-terminfo --without-ncurses
 +.endif
 +
 +.if !empty(PKG_OPTIONS:Mncurses)
 +.include "../../devel/ncurses/buildlink3.mk"
 +CONFIGURE_ARGS+=      --without-terminfo --with-ncurses
 +.endif
 +
  .if !empty(PKG_OPTIONS:Mperl)
  USE_TOOLS+=           perl:run
  PERL5_PACKLIST=               auto/Irssi/.packlist
 
 --MP_/NwGMfMDX7y+=ma9AzxX5brg
 Content-Type: text/plain
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment; filename=irssi.shar
 
 # This is a shell archive.  Save it in a file, remove anything before
 # this line, and then unpack it by entering "sh file".  Note, it may
 # create directories; files and directories will be owned by you and
 # have default permissions.
 #
 # This archive contains:
 #
 #      irssi/
 #      irssi/DESCR
 #      irssi/MESSAGE
 #      irssi/Makefile
 #      irssi/Makefile.common
 #      irssi/PLIST
 #      irssi/distinfo
 #      irssi/options.mk
 #      irssi/patches
 #      irssi/patches/patch-aa
 #      irssi/patches/patch-ad
 #      irssi/patches/patch-ae
 #
 echo c - irssi/
 mkdir -p irssi/ > /dev/null 2>&1
 echo x - irssi/DESCR
 sed 's/^X//' >irssi/DESCR << 'END-of-irssi/DESCR'
 XIrssi is a modular IRC client that currently has only text mode user
 Xinterface, but 80-90% of the code isn't text mode specific, so other UIs
 Xcould be created pretty easily. Also, Irssi isn't really even IRC specific
 Xanymore, there's already a working SILC module available. Support for other
 Xprotocols like ICQ could be created some day too.
 END-of-irssi/DESCR
 echo x - irssi/MESSAGE
 sed 's/^X//' >irssi/MESSAGE << 'END-of-irssi/MESSAGE'
 X===========================================================================
 X$NetBSD: MESSAGE,v 1.1 2006/01/17 21:45:52 veego Exp $
 X
 XThis version of irssi has support for character set conversions. Irssi is
 Xable to transliterate unavailable characters if transliteration is
 Xsupported by GLib.
 XThis is currently only supported on systems which use the gnu iconv for
 Xglib2. Enabling it on systems without the gnu iconv will case the following
 Xwarning: Transliterations not supported in this system
 X
 X===========================================================================
 END-of-irssi/MESSAGE
 echo x - irssi/Makefile
 sed 's/^X//' >irssi/Makefile << 'END-of-irssi/Makefile'
 X# $NetBSD: Makefile,v 1.58 2012/03/03 00:12:48 wiz Exp $
 X
 XDISTNAME=             ${IRSSI_DISTNAME}
 XPKGREVISION=          4
 XCATEGORIES=           chat
 XMASTER_SITES=         http://www.irssi.org/files/
 XEXTRACT_SUFX=         ${IRSSI_EXTRACT_SUFX}
 X
 XMAINTAINER=           pkgsrc-users%NetBSD.org@localhost
 XHOMEPAGE=             http://www.irssi.org/
 XCOMMENT=              Secure and modular IRC client with text mode user 
interface
 XLICENSE=              gnu-gpl-v2
 X
 XPKG_DESTDIR_SUPPORT=  user-destdir
 X
 X.include "../../mk/bsd.prefs.mk"
 X.include "Makefile.common"
 X
 XGNU_CONFIGURE=                yes
 XUSE_LIBTOOL=          yes
 XUSE_TOOLS+=           pkg-config
 X
 XCONFIGURE_ARGS+=      --with-proxy \
 X                      --sysconfdir=${PKG_SYSCONFDIR}
 X
 XEGDIR=                ${PREFIX}/share/examples/irssi
 XCONF_FILES=   ${EGDIR}/irssi.conf ${PKG_SYSCONFDIR}/irssi.conf
 X
 XINSTALL_MAKE_FLAGS+=  sysconfdir=${EGDIR}
 X
 X.include "options.mk"
 X.include "../../devel/glib2/buildlink3.mk"
 X.include "../../mk/termcap.buildlink3.mk"
 X
 Xpost-install:
 X      ${INSTALL_DATA} ${WRKSRC}/irssi-config ${DESTDIR}${IRSSI_CONFIG}
 X
 X.include "../../mk/bsd.pkg.mk"
 END-of-irssi/Makefile
 echo x - irssi/Makefile.common
 sed 's/^X//' >irssi/Makefile.common << 'END-of-irssi/Makefile.common'
 X# $NetBSD: Makefile.common,v 1.11 2010/04/18 06:29:16 spz Exp $
 X# used by chat/irssi-icb/Makefile
 X
 X# Specific distribution information.
 XIRSSI_VERSION=                0.8.15
 XIRSSI_DISTNAME=               irssi-${IRSSI_VERSION}
 XIRSSI_EXTRACT_SUFX=   .tar.bz2
 XIRSSI_DISTFILE=               ${IRSSI_DISTNAME}${IRSSI_EXTRACT_SUFX}
 X
 X# These files are generated during Irssi's build, but are required by
 X# plugins to compile properly.
 XIRSSI_CONFIG=         ${PREFIX}/share/irssi/irssi-config
 XIRSSI_CONFIG_H=               ${PREFIX}/include/irssi/irssi-config.h
 X
 X.if ${OPSYS} == "Darwin"
 XINSTALL_UNSTRIPPED=YES
 X.endif
 END-of-irssi/Makefile.common
 echo x - irssi/PLIST
 sed 's/^X//' >irssi/PLIST << 'END-of-irssi/PLIST'
 X@comment $NetBSD: PLIST,v 1.11 2009/07/27 12:59:44 obache Exp $
 Xbin/irssi
 Xinclude/irssi/irssi-config.h
 Xinclude/irssi/irssi-version.h
 Xinclude/irssi/src/common.h
 Xinclude/irssi/src/core/args.h
 Xinclude/irssi/src/core/channel-rec.h
 Xinclude/irssi/src/core/channel-setup-rec.h
 Xinclude/irssi/src/core/channels-setup.h
 Xinclude/irssi/src/core/channels.h
 Xinclude/irssi/src/core/chat-protocols.h
 Xinclude/irssi/src/core/chatnet-rec.h
 Xinclude/irssi/src/core/chatnets.h
 Xinclude/irssi/src/core/commands.h
 Xinclude/irssi/src/core/core.h
 Xinclude/irssi/src/core/expandos.h
 Xinclude/irssi/src/core/ignore.h
 Xinclude/irssi/src/core/levels.h
 Xinclude/irssi/src/core/line-split.h
 Xinclude/irssi/src/core/log.h
 Xinclude/irssi/src/core/masks.h
 Xinclude/irssi/src/core/misc.h
 Xinclude/irssi/src/core/module.h
 Xinclude/irssi/src/core/modules-load.h
 Xinclude/irssi/src/core/modules.h
 Xinclude/irssi/src/core/net-disconnect.h
 Xinclude/irssi/src/core/net-nonblock.h
 Xinclude/irssi/src/core/net-sendbuffer.h
 Xinclude/irssi/src/core/network.h
 Xinclude/irssi/src/core/nick-rec.h
 Xinclude/irssi/src/core/nicklist.h
 Xinclude/irssi/src/core/nickmatch-cache.h
 Xinclude/irssi/src/core/pidwait.h
 Xinclude/irssi/src/core/queries.h
 Xinclude/irssi/src/core/query-rec.h
 Xinclude/irssi/src/core/rawlog.h
 Xinclude/irssi/src/core/recode.h
 Xinclude/irssi/src/core/server-connect-rec.h
 Xinclude/irssi/src/core/server-rec.h
 Xinclude/irssi/src/core/server-setup-rec.h
 Xinclude/irssi/src/core/servers-reconnect.h
 Xinclude/irssi/src/core/servers-setup.h
 Xinclude/irssi/src/core/servers.h
 Xinclude/irssi/src/core/session.h
 Xinclude/irssi/src/core/settings.h
 Xinclude/irssi/src/core/signals.h
 Xinclude/irssi/src/core/special-vars.h
 Xinclude/irssi/src/core/window-item-def.h
 Xinclude/irssi/src/core/window-item-rec.h
 Xinclude/irssi/src/core/write-buffer.h
 Xinclude/irssi/src/fe-common/core/chat-completion.h
 Xinclude/irssi/src/fe-common/core/command-history.h
 Xinclude/irssi/src/fe-common/core/completion.h
 Xinclude/irssi/src/fe-common/core/fe-channels.h
 Xinclude/irssi/src/fe-common/core/fe-common-core.h
 Xinclude/irssi/src/fe-common/core/fe-core-commands.h
 Xinclude/irssi/src/fe-common/core/fe-exec.h
 Xinclude/irssi/src/fe-common/core/fe-messages.h
 Xinclude/irssi/src/fe-common/core/fe-queries.h
 Xinclude/irssi/src/fe-common/core/fe-recode.h
 Xinclude/irssi/src/fe-common/core/fe-windows.h
 Xinclude/irssi/src/fe-common/core/formats.h
 Xinclude/irssi/src/fe-common/core/hilight-text.h
 Xinclude/irssi/src/fe-common/core/keyboard.h
 Xinclude/irssi/src/fe-common/core/module-formats.h
 Xinclude/irssi/src/fe-common/core/module.h
 Xinclude/irssi/src/fe-common/core/printtext.h
 Xinclude/irssi/src/fe-common/core/themes.h
 Xinclude/irssi/src/fe-common/core/window-activity.h
 Xinclude/irssi/src/fe-common/core/window-items.h
 Xinclude/irssi/src/fe-common/core/windows-layout.h
 Xinclude/irssi/src/fe-common/irc/dcc/fe-dcc.h
 Xinclude/irssi/src/fe-common/irc/dcc/module-formats.h
 Xinclude/irssi/src/fe-common/irc/dcc/module.h
 Xinclude/irssi/src/fe-common/irc/fe-irc-server.h
 Xinclude/irssi/src/fe-common/irc/module-formats.h
 Xinclude/irssi/src/fe-common/irc/module.h
 Xinclude/irssi/src/fe-common/irc/notifylist/module-formats.h
 Xinclude/irssi/src/fe-common/irc/notifylist/module.h
 Xinclude/irssi/src/fe-text/statusbar-item.h
 Xinclude/irssi/src/irc/core/bans.h
 Xinclude/irssi/src/irc/core/channel-rejoin.h
 Xinclude/irssi/src/irc/core/ctcp.h
 Xinclude/irssi/src/irc/core/irc-channels.h
 Xinclude/irssi/src/irc/core/irc-chatnets.h
 Xinclude/irssi/src/irc/core/irc-commands.h
 Xinclude/irssi/src/irc/core/irc-masks.h
 Xinclude/irssi/src/irc/core/irc-nicklist.h
 Xinclude/irssi/src/irc/core/irc-queries.h
 Xinclude/irssi/src/irc/core/irc-servers-setup.h
 Xinclude/irssi/src/irc/core/irc-servers.h
 Xinclude/irssi/src/irc/core/irc.h
 Xinclude/irssi/src/irc/core/mode-lists.h
 Xinclude/irssi/src/irc/core/modes.h
 Xinclude/irssi/src/irc/core/module.h
 Xinclude/irssi/src/irc/core/netsplit.h
 Xinclude/irssi/src/irc/core/servers-idle.h
 Xinclude/irssi/src/irc/core/servers-redirect.h
 Xinclude/irssi/src/irc/dcc/dcc-chat.h
 Xinclude/irssi/src/irc/dcc/dcc-file-rec.h
 Xinclude/irssi/src/irc/dcc/dcc-file.h
 Xinclude/irssi/src/irc/dcc/dcc-get.h
 Xinclude/irssi/src/irc/dcc/dcc-queue.h
 Xinclude/irssi/src/irc/dcc/dcc-rec.h
 Xinclude/irssi/src/irc/dcc/dcc-send.h
 Xinclude/irssi/src/irc/dcc/dcc-server.h
 Xinclude/irssi/src/irc/dcc/dcc.h
 Xinclude/irssi/src/irc/dcc/module.h
 Xinclude/irssi/src/irc/flood/module.h
 Xinclude/irssi/src/irc/notifylist/module.h
 Xinclude/irssi/src/irc/notifylist/notify-setup.h
 Xinclude/irssi/src/irc/notifylist/notifylist.h
 Xinclude/irssi/src/lib-config/iconfig.h
 Xinclude/irssi/src/lib-config/module.h
 Xlib/irssi/modules/libirc_proxy.la
 Xman/man1/irssi.1
 Xshare/doc/irssi/design.txt
 Xshare/doc/irssi/faq.html
 Xshare/doc/irssi/faq.txt
 Xshare/doc/irssi/formats.txt
 Xshare/doc/irssi/manual.txt
 Xshare/doc/irssi/perl.txt
 Xshare/doc/irssi/signals.txt
 Xshare/doc/irssi/special_vars.txt
 Xshare/doc/irssi/startup-HOWTO.html
 Xshare/examples/irssi/irssi.conf
 Xshare/irssi/help/accept
 Xshare/irssi/help/action
 Xshare/irssi/help/admin
 Xshare/irssi/help/alias
 Xshare/irssi/help/away
 Xshare/irssi/help/ban
 Xshare/irssi/help/beep
 Xshare/irssi/help/bind
 Xshare/irssi/help/cat
 Xshare/irssi/help/cd
 Xshare/irssi/help/channel
 Xshare/irssi/help/clear
 Xshare/irssi/help/completion
 Xshare/irssi/help/connect
 Xshare/irssi/help/ctcp
 Xshare/irssi/help/cycle
 Xshare/irssi/help/dcc
 Xshare/irssi/help/dehilight
 Xshare/irssi/help/deop
 Xshare/irssi/help/devoice
 Xshare/irssi/help/die
 Xshare/irssi/help/disconnect
 Xshare/irssi/help/echo
 Xshare/irssi/help/eval
 Xshare/irssi/help/exec
 Xshare/irssi/help/flushbuffer
 Xshare/irssi/help/format
 Xshare/irssi/help/hash
 Xshare/irssi/help/help
 Xshare/irssi/help/hilight
 Xshare/irssi/help/ignore
 Xshare/irssi/help/info
 Xshare/irssi/help/invite
 Xshare/irssi/help/invitelist
 Xshare/irssi/help/ircnet
 Xshare/irssi/help/ison
 Xshare/irssi/help/join
 Xshare/irssi/help/kick
 Xshare/irssi/help/kickban
 Xshare/irssi/help/kill
 Xshare/irssi/help/knock
 Xshare/irssi/help/knockout
 Xshare/irssi/help/lastlog
 Xshare/irssi/help/layout
 Xshare/irssi/help/levels
 Xshare/irssi/help/links
 Xshare/irssi/help/list
 Xshare/irssi/help/load
 Xshare/irssi/help/log
 Xshare/irssi/help/lusers
 Xshare/irssi/help/map
 Xshare/irssi/help/me
 Xshare/irssi/help/mircdcc
 Xshare/irssi/help/mode
 Xshare/irssi/help/motd
 Xshare/irssi/help/msg
 Xshare/irssi/help/names
 Xshare/irssi/help/nctcp
 Xshare/irssi/help/netsplit
 Xshare/irssi/help/network
 Xshare/irssi/help/nick
 Xshare/irssi/help/note
 Xshare/irssi/help/notice
 Xshare/irssi/help/notify
 Xshare/irssi/help/op
 Xshare/irssi/help/oper
 Xshare/irssi/help/part
 Xshare/irssi/help/ping
 Xshare/irssi/help/query
 Xshare/irssi/help/quit
 Xshare/irssi/help/quote
 Xshare/irssi/help/rawlog
 Xshare/irssi/help/recode
 Xshare/irssi/help/reconnect
 Xshare/irssi/help/rehash
 Xshare/irssi/help/reload
 Xshare/irssi/help/restart
 Xshare/irssi/help/rmreconns
 Xshare/irssi/help/rmrejoins
 Xshare/irssi/help/rping
 Xshare/irssi/help/save
 Xshare/irssi/help/say
 Xshare/irssi/help/sconnect
 Xshare/irssi/help/script
 Xshare/irssi/help/scrollback
 Xshare/irssi/help/server
 Xshare/irssi/help/servlist
 Xshare/irssi/help/set
 Xshare/irssi/help/silence
 Xshare/irssi/help/squery
 Xshare/irssi/help/squit
 Xshare/irssi/help/stats
 Xshare/irssi/help/statusbar
 Xshare/irssi/help/time
 Xshare/irssi/help/toggle
 Xshare/irssi/help/topic
 Xshare/irssi/help/trace
 Xshare/irssi/help/ts
 Xshare/irssi/help/unalias
 Xshare/irssi/help/unban
 Xshare/irssi/help/unignore
 Xshare/irssi/help/unload
 Xshare/irssi/help/unnotify
 Xshare/irssi/help/unquery
 Xshare/irssi/help/unsilence
 Xshare/irssi/help/upgrade
 Xshare/irssi/help/uping
 Xshare/irssi/help/userhost
 Xshare/irssi/help/ver
 Xshare/irssi/help/version
 Xshare/irssi/help/voice
 Xshare/irssi/help/wait
 Xshare/irssi/help/wall
 Xshare/irssi/help/wallops
 Xshare/irssi/help/watch
 Xshare/irssi/help/who
 Xshare/irssi/help/whois
 Xshare/irssi/help/whowas
 Xshare/irssi/help/window
 Xshare/irssi/help/wjoin
 Xshare/irssi/help/wquery
 Xshare/irssi/irssi-config
 Xshare/irssi/scripts/autoop.pl
 Xshare/irssi/scripts/autorejoin.pl
 Xshare/irssi/scripts/buf.pl
 Xshare/irssi/scripts/command.pl
 Xshare/irssi/scripts/dns.pl
 Xshare/irssi/scripts/kills.pl
 Xshare/irssi/scripts/mail.pl
 Xshare/irssi/scripts/mlock.pl
 Xshare/irssi/scripts/msg-event.pl
 Xshare/irssi/scripts/quitmsg.pl
 Xshare/irssi/scripts/redirect.pl
 Xshare/irssi/scripts/sb_search.pl
 Xshare/irssi/scripts/scriptassist.pl
 Xshare/irssi/scripts/splitlong.pl
 Xshare/irssi/scripts/usercount.pl
 Xshare/irssi/themes/colorless.theme
 Xshare/irssi/themes/default.theme
 END-of-irssi/PLIST
 echo x - irssi/distinfo
 sed 's/^X//' >irssi/distinfo << 'END-of-irssi/distinfo'
 X$NetBSD: distinfo,v 1.31 2010/04/18 06:29:16 spz Exp $
 X
 XSHA1 (irssi-0.8.15.tar.bz2) = b79ce8c2c98a76b004f63706e7868cd363000d89
 XRMD160 (irssi-0.8.15.tar.bz2) = 0c8fba8cf3409621f6c1883127e14538a58c3359
 XSize (irssi-0.8.15.tar.bz2) = 948847 bytes
 XSHA1 (patch-aa) = 83a0f6def09cb283aa55b63a249a81121748232b
 XSHA1 (patch-ad) = 8cb41612afcd6088b869235166da9a6eb37e6ec7
 XSHA1 (patch-ae) = b5475edc01da7b8778522a77155b2b76b2a7b738
 END-of-irssi/distinfo
 echo x - irssi/options.mk
 sed 's/^X//' >irssi/options.mk << 'END-of-irssi/options.mk'
 X# $NetBSD: options.mk,v 1.10 2011/03/06 04:12:09 dholland Exp $
 X
 XPKG_OPTIONS_VAR=      PKG_OPTIONS.irssi
 XPKG_OPTIONS_REQUIRED_GROUPS= display
 XPKG_OPTIONS_GROUP.display= terminfo ncurses
 XPKG_SUPPORTED_OPTIONS=        inet6 perl ssl
 XPKG_SUGGESTED_OPTIONS=        inet6
 XPKG_OPTIONS_LEGACY_OPTS+=     irssi-perl:perl
 X
 X.if ${OPSYS} == "NetBSD"
 XPKG_SUGGESTED_OPTIONS+= terminfo
 X.else
 XPKG_SUGGESTED_OPTIONS+= ncurses
 X.endif
 X
 X.include "../../mk/bsd.options.mk"
 X
 X.if !empty(PKG_OPTIONS:Mterminfo)
 XCONFIGURE_ARGS+=      --with-terminfo --without-ncurses
 X.endif
 X
 X.if !empty(PKG_OPTIONS:Mncurses)
 X.include "../../devel/ncurses/buildlink3.mk"
 XCONFIGURE_ARGS+=      --without-terminfo --with-ncurses
 X.endif
 X
 X.if !empty(PKG_OPTIONS:Mperl)
 XUSE_TOOLS+=           perl:run
 XPERL5_PACKLIST=               auto/Irssi/.packlist
 XPERL5_PACKLIST+=      auto/Irssi/Irc/.packlist
 XPERL5_PACKLIST+=      auto/Irssi/UI/.packlist
 XPERL5_PACKLIST+=      auto/Irssi/TextUI/.packlist
 X.include "../../lang/perl5/packlist.mk"
 X.include "../../lang/perl5/buildlink3.mk"
 X# actually we don't need --with-perl here, irssi is compiled with it by 
default
 X# but who knows what may happen in future versions
 XCONFIGURE_ARGS+=      --with-perl
 XCONFIGURE_ARGS+=      --with-perl-lib=vendor
 X.else
 XCONFIGURE_ARGS+=      --with-perl=no
 X.endif
 X
 X.if !empty(PKG_OPTIONS:Minet6)
 XCONFIGURE_ARGS+=      --enable-ipv6
 X.else
 XCONFIGURE_ARGS+=      --disable-ipv6
 X.endif
 X
 X.if !empty(PKG_OPTIONS:Mssl)
 X.include "../../security/openssl/buildlink3.mk"
 X.else
 XCONFIGURE_ARGS+=      --disable-ssl
 X.endif
 END-of-irssi/options.mk
 echo c - irssi/patches
 mkdir -p irssi/patches > /dev/null 2>&1
 echo x - irssi/patches/patch-aa
 sed 's/^X//' >irssi/patches/patch-aa << 'END-of-irssi/patches/patch-aa'
 X$NetBSD: patch-aa,v 1.6 2009/07/27 12:59:44 obache Exp $
 X
 XCheck if sp is a null pointer before parsing it.
 X
 X--- src/fe-text/tparm.c.orig  2007-10-06 10:40:39.000000000 +0100
 X+++ src/fe-text/tparm.c
 X@@ -247,7 +247,7 @@ char *tparm(const char *str, ...) {
 X      argcnt = 0;
 X      pos = 0;
 X      termcap = 1;
 X-     while (*sp != '\0') {
 X+     while ((sp != NULL) && (*sp != '\0')) {
 X              switch(*sp) {
 X              case '\\':
 X                      if (scan_for) {
 END-of-irssi/patches/patch-aa
 echo x - irssi/patches/patch-ad
 sed 's/^X//' >irssi/patches/patch-ad << 'END-of-irssi/patches/patch-ad'
 X$NetBSD: patch-ad,v 1.9 2009/07/27 12:59:44 obache Exp $
 X
 XPerlIO mutex must be initialized before trying to fiddle with the
 Xinterpreter.
 X
 X--- src/perl/perl-core.c.orig 2008-12-04 13:45:24.000000000 +0100
 X+++ src/perl/perl-core.c
 X@@ -452,6 +452,8 @@ void perl_core_init(void)
 X      perl_signals_init();
 X         signal_add_last("script error", (SIGNAL_FUNC) sig_script_error);
 X 
 X+     PERLIO_INIT;
 X+
 X      perl_scripts_init();
 X 
 X      if (irssi_init_finished)
 END-of-irssi/patches/patch-ad
 echo x - irssi/patches/patch-ae
 sed 's/^X//' >irssi/patches/patch-ae << 'END-of-irssi/patches/patch-ae'
 X$NetBSD: patch-ae,v 1.6 2009/07/27 12:59:44 obache Exp $
 X
 XAccept ENOTCONN as indicating socket is not ready for write.
 X
 X--- src/core/network.c.orig   2005-11-19 23:45:08.000000000 +0100
 X+++ src/core/network.c
 X@@ -373,7 +373,7 @@ int net_transmit(GIOChannel *handle, con
 X 
 X      err = g_io_channel_write(handle, (char *) data, len, &ret);
 X      if (err == G_IO_ERROR_AGAIN ||
 X-         (err != 0 && (errno == EINTR || errno == EPIPE)))
 X+         (err != 0 && (errno == EINTR || errno == EPIPE || errno == 
ENOTCONN)))
 X              return 0;
 X 
 X      return err == 0 ? (int)ret : -1;
 END-of-irssi/patches/patch-ae
 exit
 
 
 --MP_/NwGMfMDX7y+=ma9AzxX5brg--
 


Home | Main Index | Thread Index | Old Index