CVS commit: pkgsrc/databases/ldapvi

["Roy Marples" <roy%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   roy
Date:           Wed Jan  4 17:19:52 UTC 2017

Modified Files:
        pkgsrc/databases/ldapvi: Makefile distinfo
        pkgsrc/databases/ldapvi/patches: patch-ac

Log Message:
Use curses framework.


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 pkgsrc/databases/ldapvi/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/databases/ldapvi/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/databases/ldapvi/patches/patch-ac

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/databases/ldapvi/Makefile
diff -u pkgsrc/databases/ldapvi/Makefile:1.20 pkgsrc/databases/ldapvi/Makefile:1.21
--- pkgsrc/databases/ldapvi/Makefile:1.20       Sat Mar  5 11:28:11 2016
+++ pkgsrc/databases/ldapvi/Makefile    Wed Jan  4 17:19:52 2017
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2016/03/05 11:28:11 jperkin Exp $
+# $NetBSD: Makefile,v 1.21 2017/01/04 17:19:52 roy Exp $
 
 DISTNAME=              ldapvi-1.7
-PKGREVISION=           13
+PKGREVISION=           14
 CATEGORIES=            databases
 MASTER_SITES=          http://www.lichteblau.com/download/
 
@@ -19,14 +19,17 @@ INSTALLATION_DIRS=  bin ${PKGMANDIR}/man1
 
 .include "options.mk"
 
+# Really use terminfo, not curses
+INCOMPAT_CURSES+=      NetBSD-[0-5].*-*
+
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/ldapvi ${DESTDIR}${PREFIX}/bin/
        ${INSTALL_DATA} ${WRKSRC}/ldapvi.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/
 
 .include "../../databases/openldap-client/buildlink3.mk"
-.include "../../devel/ncurses/buildlink3.mk"
 .include "../../devel/popt/buildlink3.mk"
-.include "../../devel/readline/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
+.include "../../devel/readline/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
+.include "../../mk/curses.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/databases/ldapvi/distinfo
diff -u pkgsrc/databases/ldapvi/distinfo:1.4 pkgsrc/databases/ldapvi/distinfo:1.5
--- pkgsrc/databases/ldapvi/distinfo:1.4        Tue Nov  3 01:56:13 2015
+++ pkgsrc/databases/ldapvi/distinfo    Wed Jan  4 17:19:52 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2015/11/03 01:56:13 agc Exp $
+$NetBSD: distinfo,v 1.5 2017/01/04 17:19:52 roy Exp $
 
 SHA1 (ldapvi-1.7.tar.gz) = d1cde4cbb618180f9ae0e77c56a1520b8ad61c9a
 RMD160 (ldapvi-1.7.tar.gz) = f4cd1c2fcfc87e7a9e912269e60280e9ecd82156
@@ -6,4 +6,4 @@ SHA512 (ldapvi-1.7.tar.gz) = 4b38cee0763
 Size (ldapvi-1.7.tar.gz) = 119503 bytes
 SHA1 (patch-aa) = 7f700c9296c724c8afd72d1cd7d8ca898018208a
 SHA1 (patch-ab) = a04bc868aa44f1ac15359cb78858a0f604acb475
-SHA1 (patch-ac) = 52ea228b5ac8bdd2df6c90e7151bcfed13c77b0d
+SHA1 (patch-ac) = 434c0aeacb9260ad692d6bc7b94e2f8a6220e2be

Index: pkgsrc/databases/ldapvi/patches/patch-ac
diff -u pkgsrc/databases/ldapvi/patches/patch-ac:1.2 pkgsrc/databases/ldapvi/patches/patch-ac:1.3
--- pkgsrc/databases/ldapvi/patches/patch-ac:1.2        Sat Mar  2 18:18:10 2013
+++ pkgsrc/databases/ldapvi/patches/patch-ac    Wed Jan  4 17:19:52 2017
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.2 2013/03/02 18:18:10 joerg Exp $
+$NetBSD: patch-ac,v 1.3 2017/01/04 17:19:52 roy Exp $
 
 --- ldapvi.c.orig      2007-05-05 10:17:26.000000000 +0000
 +++ ldapvi.c
@@ -11,6 +11,15 @@ $NetBSD: patch-ac,v 1.2 2013/03/02 18:18
  }
  
  static int
+@@ -835,7 +835,7 @@ setcolor(int fg)
+ {
+       char *bold = tigetstr("bold");
+       char *setaf = tigetstr("setaf");
+-      if (setaf) putp(tparm(setaf, fg));
++      if (setaf) putp(tparm(setaf, fg, 0, 0, 0, 0, 0, 0, 0, 0));
+       if (bold) putp(bold);
+ }
+ 
 @@ -1465,7 +1465,7 @@ copy_sasl_output(FILE *out, char *sasl)
        int line = 0;
        int c;