CVS commit: pkgsrc/devel/ncurses

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sat Sep 15 22:47:41 UTC 2018

Modified Files:
        pkgsrc/devel/ncurses: Makefile Makefile.common PLIST

Log Message:
ncurses: update to 6.1nb2.

Fix installation of pkg-config files, and move
them to the standard directory.


To generate a diff of this commit:
cvs rdiff -u -r1.98 -r1.99 pkgsrc/devel/ncurses/Makefile
cvs rdiff -u -r1.36 -r1.37 pkgsrc/devel/ncurses/Makefile.common
cvs rdiff -u -r1.25 -r1.26 pkgsrc/devel/ncurses/PLIST

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

Modified files:

Index: pkgsrc/devel/ncurses/Makefile
diff -u pkgsrc/devel/ncurses/Makefile:1.98 pkgsrc/devel/ncurses/Makefile:1.99
--- pkgsrc/devel/ncurses/Makefile:1.98  Sat Sep 15 10:21:53 2018
+++ pkgsrc/devel/ncurses/Makefile       Sat Sep 15 22:47:41 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.98 2018/09/15 10:21:53 maya Exp $
+# $NetBSD: Makefile,v 1.99 2018/09/15 22:47:41 wiz Exp $
 
 .include "Makefile.common"
-PKGREVISION=   1
+PKGREVISION=   2
 COMMENT=       CRT screen handling and optimization package
 
 INSTALLATION_DIRS+=    share/examples

Index: pkgsrc/devel/ncurses/Makefile.common
diff -u pkgsrc/devel/ncurses/Makefile.common:1.36 pkgsrc/devel/ncurses/Makefile.common:1.37
--- pkgsrc/devel/ncurses/Makefile.common:1.36   Sat Sep 15 10:21:53 2018
+++ pkgsrc/devel/ncurses/Makefile.common        Sat Sep 15 22:47:41 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.36 2018/09/15 10:21:53 maya Exp $
+# $NetBSD: Makefile.common,v 1.37 2018/09/15 22:47:41 wiz Exp $
 #
 # used by devel/ncurses/Makefile
 # used by devel/ncursesw/Makefile
@@ -16,13 +16,14 @@ LICENSE=    mit
 
 USE_LANGUAGES=         c c++
 USE_LIBTOOL=           yes
-USE_TOOLS+=            gmake tbl
+USE_TOOLS+=            gmake pkg-config tbl
 GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --with-libtool
 CONFIGURE_ARGS+=       --enable-bsdpad
 CONFIGURE_ARGS+=       --enable-overwrite
 CONFIGURE_ARGS+=       --with-cxx-binding
 CONFIGURE_ARGS+=       --enable-pc-files
+CONFIGURE_ARGS+=       --with-pkg-config-libdir=${PREFIX}/lib/pkgconfig
 CONFIGURE_ARGS+=       --without-ada
 CONFIGURE_ARGS+=       --without-gpm
 CONFIGURE_ARGS+=       --with-manpage-format=normal

Index: pkgsrc/devel/ncurses/PLIST
diff -u pkgsrc/devel/ncurses/PLIST:1.25 pkgsrc/devel/ncurses/PLIST:1.26
--- pkgsrc/devel/ncurses/PLIST:1.25     Sat Sep 15 10:21:53 2018
+++ pkgsrc/devel/ncurses/PLIST  Sat Sep 15 22:47:41 2018
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.25 2018/09/15 10:21:53 maya Exp $
+@comment $NetBSD: PLIST,v 1.26 2018/09/15 22:47:41 wiz Exp $
 bin/captoinfo
 bin/clear
 bin/infocmp
@@ -35,6 +35,11 @@ lib/libgnumenu.la
 lib/libgnupanel.la
 lib/libncurses++.la
 lib/libncurses.la
+lib/pkgconfig/form.pc
+lib/pkgconfig/menu.pc
+lib/pkgconfig/ncurses++.pc
+lib/pkgconfig/ncurses.pc
+lib/pkgconfig/panel.pc
 man/man1/captoinfo.1
 man/man1/clear.1
 man/man1/infocmp.1
@@ -925,11 +930,6 @@ man/man5/terminfo.5
 man/man5/user_caps.5
 man/man7/term.7
 share/examples/ncurses++demo.cc
-share/pkgconfig/form.pc
-share/pkgconfig/menu.pc
-share/pkgconfig/ncurses++.pc
-share/pkgconfig/ncurses.pc
-share/pkgconfig/panel.pc
 share/tabset/std
 share/tabset/stdcrt
 share/tabset/vt100