Update to r8765.

pkgsrc changes:
  - use REPLACE_PERL instead of hand-rolled sed
  - use ncursesw
  - make curses selection work
  - add INSTALLATION_DIRS

upstream changes:
  Changes to support Unicode terminals. Link against ncursesw instead
  of ncurses, since the former knows how to translate ACS_ULCORNER et
  al into the right Unicode code points; also call setlocale() before
  starting up curses, so that it knows it has to.

Also closes PR pkg/37366.

3 files changed, 26 insertions, 22 deletions

diff --git a/misc/ipbt/Makefile b/misc/ipbt/Makefile
index c2936fc02f8..b79a35dd8f5 100644
--- a/misc/ipbt/Makefile
+++ b/misc/ipbt/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2008/03/04 19:21:11 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2009/12/06 23:32:56 dholland Exp $
 #
 
-DISTNAME=	ipbt-r7471
-PKGNAME=	ipbt-7471
+DISTNAME=	ipbt-r8765
+PKGNAME=	ipbt-8765
 CATEGORIES=	misc
 MASTER_SITES=	http://www.chiark.greenend.org.uk/~sgtatham/ipbt/
 
@@ -12,23 +12,25 @@ COMMENT=	High-tech ttyrec player
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-USE_TOOLS+=	perl
-BUILD_TARGET=	ipbt
+USE_TOOLS+=		perl
+REPLACE_PERL=		ttydump ttygrep
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
-INCOMPAT_CURSES=NetBSD-*-*
+BUILD_TARGET=		ipbt
 
-post-build:
-	${SED} -e "s,/usr/bin/perl,${PERL5}," \
-	    ${WRKSRC}/ttydump > ${WRKSRC}/ttydump.path
-	${SED} -e "s,/usr/bin/perl,${PERL5}," \
-	    ${WRKSRC}/ttygrep > ${WRKSRC}/ttygrep.path
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "NetBSD"
+# NetBSD's curses do not work
+USE_BUILTIN.ncursesw=	no
+.endif
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/ipbt ${DESTDIR}${PREFIX}/bin/ipbt
 	${INSTALL_MAN} ${WRKSRC}/ipbt.1 \
 		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/ipbt.1
-	${INSTALL_SCRIPT} ${WRKSRC}/ttydump.path ${DESTDIR}${PREFIX}/bin/ttydump
-	${INSTALL_SCRIPT} ${WRKSRC}/ttygrep.path ${DESTDIR}${PREFIX}/bin/ttygrep
+	${INSTALL_SCRIPT} ${WRKSRC}/ttydump ${DESTDIR}${PREFIX}/bin/ttydump
+	${INSTALL_SCRIPT} ${WRKSRC}/ttygrep ${DESTDIR}${PREFIX}/bin/ttygrep
 
-.include "../../devel/ncurses/buildlink3.mk"
+.include "../../devel/ncursesw/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/ipbt/distinfo b/misc/ipbt/distinfo
index 69147969e9b..3e221e31b2d 100644
--- a/misc/ipbt/distinfo
+++ b/misc/ipbt/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2007/06/12 14:03:27 pooka Exp $
+$NetBSD: distinfo,v 1.3 2009/12/06 23:32:56 dholland Exp $
 
-SHA1 (ipbt-r7471.tar.gz) = fe829f38239dd3fb1f882e3a59d31dfae8ec234d
-RMD160 (ipbt-r7471.tar.gz) = 0b6bc5095800a6f8c4801f7d30f15c23c1d9b0b4
-Size (ipbt-r7471.tar.gz) = 177241 bytes
-SHA1 (patch-aa) = 849f97f82ea635f2cb022e5e8c1a86d242734f7e
+SHA1 (ipbt-r8765.tar.gz) = e53f5708d8161cc605624d853ff9c299fd168bd9
+RMD160 (ipbt-r8765.tar.gz) = eac672b5ae8529946c03d6e32b1e4f13d214328b
+Size (ipbt-r8765.tar.gz) = 174878 bytes
+SHA1 (patch-aa) = 7c1f622e31619624594aa8a8e87549b03b7665d7
diff --git a/misc/ipbt/patches/patch-aa b/misc/ipbt/patches/patch-aa
index 81b56d6c168..d48d8a996f9 100644
--- a/misc/ipbt/patches/patch-aa
+++ b/misc/ipbt/patches/patch-aa
@@ -1,4 +1,6 @@
-$NetBSD: patch-aa,v 1.1.1.1 2007/06/08 06:07:25 pooka Exp $
+$NetBSD: patch-aa,v 1.2 2009/12/06 23:32:56 dholland Exp $
+
+Adjust makefile variables per pkgsrc covnentions.
 
 --- Makefile.orig	2007-04-19 15:24:41.000000000 +0300
 +++ Makefile	2007-06-08 08:57:16.000000000 +0300
@@ -6,8 +8,8 @@ $NetBSD: patch-aa,v 1.1.1.1 2007/06/08 06:07:25 pooka Exp $
         wcwidth.o xenc.o
  
  ipbt: $(IPBT)
--	$(CC) $(LFLAGS) -o ipbt $(IPBT) -lm -lncurses
-+	$(CC) $(LDFLAGS) -o ipbt $(IPBT) -lm -lncurses
+-	$(CC) $(LFLAGS) -o ipbt $(IPBT) -lm -lncursesw
++	$(CC) $(LDFLAGS) -o ipbt $(IPBT) -lm -lncursesw
  
  be_none.o: be_none.c putty.h puttyps.h unix.h charset.h network.h misc.h \
    puttymem.h