Update to libirman-0.4.1bnb2

    Fix default serial port to be ${DEFAULT_SERIAL_DEVICE}
    Drop 'test_' prefix on test_irman_{name,io,func}, and call
    setlinebuf(stdout) so they are usable when piped to an interactive
    program.
    Mmmm, fixes to libirman and mserv in the same day. Can they be related? :)

7 files changed, 58 insertions, 13 deletions

diff --git a/sysutils/libirman/Makefile b/sysutils/libirman/Makefile
index 4caba2412bd..54792b93887 100644
--- a/sysutils/libirman/Makefile
+++ b/sysutils/libirman/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2002/05/17 13:06:09 abs Exp $
+# $NetBSD: Makefile,v 1.3 2002/06/14 20:38:40 abs Exp $
 #
 
 DISTNAME=	libirman-0.4.1b
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.evation.com/libirman/
 
@@ -18,15 +18,18 @@ CONF_FILES=	${EGDIR}/irman.conf ${PKG_SYSCONFDIR}/irman.conf
 post-build:
 	    ${SED}  -e "s:/usr/local/etc:${PKG_SYSCONFDIR}:g" \
 		    -e "s:/usr/local:${PREFIX}:g" \
-		    -e 's/test_func/irman_&/g' \
-		    -e 's/test_io/irman_&/g' \
-		    -e 's/test_name/irman_&/g' \
+		    -e 's/test_func/irman_func/g' \
+		    -e 's/test_io/irman_func/g' \
+		    -e 's/test_name/irman_func/g' \
 			${WRKSRC}/README > ${WRKSRC}/libirman.README
+	    ${SED}  -e 's:port /dev/ttyS1:port ${DEFAULT_SERIAL_DEVICE}:' \
+			${WRKSRC}/irman.conf > ${WRKSRC}/irman.conf.patched
+	    ${MV} ${WRKSRC}/irman.conf.patched ${WRKSRC}/irman.conf
 
 post-install:
-	    ${INSTALL_PROGRAM} ${WRKSRC}/test_func ${PREFIX}/bin/irman_test_func
-	    ${INSTALL_PROGRAM} ${WRKSRC}/test_io ${PREFIX}/bin/irman_test_io
-	    ${INSTALL_PROGRAM} ${WRKSRC}/test_name ${PREFIX}/bin/irman_test_name
+	    ${INSTALL_PROGRAM} ${WRKSRC}/test_func ${PREFIX}/bin/irman_func
+	    ${INSTALL_PROGRAM} ${WRKSRC}/test_io ${PREFIX}/bin/irman_io
+	    ${INSTALL_PROGRAM} ${WRKSRC}/test_name ${PREFIX}/bin/irman_name
 	    ${INSTALL_DATA} ${WRKSRC}/libirman.README \
 					${PREFIX}/share/doc/libirman.README
 
diff --git a/sysutils/libirman/PLIST b/sysutils/libirman/PLIST
index edba8119d45..c77971dbdf2 100644
--- a/sysutils/libirman/PLIST
+++ b/sysutils/libirman/PLIST
@@ -1,7 +1,7 @@
-@comment $NetBSD: PLIST,v 1.2 2002/05/17 13:06:09 abs Exp $
-bin/irman_test_func
-bin/irman_test_io
-bin/irman_test_name
+@comment $NetBSD: PLIST,v 1.3 2002/06/14 20:38:40 abs Exp $
+bin/irman_func
+bin/irman_io
+bin/irman_name
 bin/workmanir
 lib/libirman.a
 sbin/lirmand
diff --git a/sysutils/libirman/distinfo b/sysutils/libirman/distinfo
index 567f58f1282..b6a884e7d83 100644
--- a/sysutils/libirman/distinfo
+++ b/sysutils/libirman/distinfo
@@ -2,3 +2,6 @@
 SHA1 (libirman-0.4.1b.tar.gz) = 739e7cbb4c7e0af59fd244e3d2ed73b97905849a
 Size (libirman-0.4.1b.tar.gz) = 52874 bytes
 SHA1 (patch-aa) = e060a7e54fc817634cd7e92d7e5e17f147003363
+SHA1 (patch-ab) = 94bf4bbbadc36ff47ded256c37eb86b36a2ad1d9
+SHA1 (patch-ac) = 4a4cef60aa053a2781bc48d9c268cc10ae9654cf
+SHA1 (patch-ad) = a5ec71dd27d0d9033ab6464a28146c7fe6ca8d0e
diff --git a/sysutils/libirman/patches/patch-aa b/sysutils/libirman/patches/patch-aa
index c2d1a5d0a44..002d3f95f95 100644
--- a/sysutils/libirman/patches/patch-aa
+++ b/sysutils/libirman/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/05/17 11:32:51 abs Exp $
+$NetBSD: patch-aa,v 1.2 2002/06/14 20:38:41 abs Exp $
 
 --- Makefile.in.orig	Thu Feb 18 11:14:57 1999
 +++ Makefile.in
diff --git a/sysutils/libirman/patches/patch-ab b/sysutils/libirman/patches/patch-ab
new file mode 100644
index 00000000000..6e5fd19524f
--- /dev/null
+++ b/sysutils/libirman/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2002/06/14 20:38:41 abs Exp $
+
+--- test_func.c.orig	Thu Feb 18 11:15:03 1999
++++ test_func.c
+@@ -17,6 +17,8 @@
+   unsigned char *code;
+   char *text;
+ 
++  setlinebuf(stdout);
++
+   if (argc < 2) {
+     fprintf(stderr, "usage: test_func device\n");
+     fprintf(stderr, "       where device is the serial port at which the infra red receiver resides\n");
diff --git a/sysutils/libirman/patches/patch-ac b/sysutils/libirman/patches/patch-ac
new file mode 100644
index 00000000000..edd95fc7860
--- /dev/null
+++ b/sysutils/libirman/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2002/06/14 20:38:41 abs Exp $
+
+--- test_io.c.orig	Thu Feb 18 11:15:03 1999
++++ test_io.c
+@@ -17,6 +17,8 @@
+   int datum;
+   int i;
+ 
++  setlinebuf(stdout);
++
+   if (argc < 2) {
+     fprintf(stderr, "usage: test_io device\n");
+     fprintf(stderr, "       where device is the serial port at which the infra red receiver resides\n");
diff --git a/sysutils/libirman/patches/patch-ad b/sysutils/libirman/patches/patch-ad
new file mode 100644
index 00000000000..47c88ba1a52
--- /dev/null
+++ b/sysutils/libirman/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2002/06/14 20:38:41 abs Exp $
+
+--- test_name.c.orig	Thu Feb 18 11:15:03 1999
++++ test_name.c
+@@ -18,6 +18,8 @@
+   char *name;
+   char *filename;
+ 
++  setlinebuf(stdout);
++
+   if (ir_init_commands(NULL, 1) < 0) {
+     fprintf(stderr, "error initialising commands: %s\n", strerror(errno));
+     exit(1);