[Gsrc-commit] trunk r7837: update ncurses to 6.2

[Carl Hansen]

------------------------------------------------------------
revno: 7837
revision-id: carlhansen1234@gmail.com-20211009071817-ha9y5rptsrrbhhap
parent: carlhansen1234@gmail.com-20211008204206-nxkise005xvjqqnh
committer: carlhansen1234@gmail.com
branch nick: trunk
timestamp: Sat 2021-10-09 00:18:17 -0700
message:
  update ncurses to 6.2
modified:
  pkg/gnu/ncurses/Makefile       makefile-20160617014725-uokjfnggs70iry9h-1464

=== modified file 'pkg/gnu/ncurses/Makefile'
--- a/pkg/gnu/ncurses/Makefile  2021-10-08 03:22:26 +0000
+++ b/pkg/gnu/ncurses/Makefile  2021-10-09 07:18:17 +0000
@@ -48,10 +48,7 @@
 BUILD_SCRIPTS = $(WORKDIR)/ncurses-$(GARVERSION)-build/Makefile 
$(WORKDIR)/ncursesw-$(GARVERSION)-build/Makefile
 #INSTALL_SCRIPTS =  ncursesw ncurses
 # INSTALL_SCRIPTS = $(WORKDIR)/ncurses-$(GARVERSION)-build/Makefile  ncurses
-# ncursesw #
-#INSTALL_SCRIPTS = $(WORKDIR)/ncursesw-$(GARVERSION)-build/Makefile ncurses 
-INSTALL_SCRIPTS = $(WORKDIR)/ncurses-$(GARVERSION)-build/Makefile ncurses \
-                   $(WORKDIR)/ncursesw-$(GARVERSION)-build/Makefile ncursesw 
+INSTALL_SCRIPTS = $(WORKDIR)/ncursesw-$(GARVERSION)-build/Makefile ncursesw  
$(WORKDIR)/ncurses-$(GARVERSION)-build/Makefile ncurses 
 
 BUILDDEPS = 
 LIBDEPS =
@@ -75,19 +72,20 @@
 configure-ncurses: 
        @printf "[$(OK)configure$(OFF)] $(MSG)Running $(CONFIGURE_NAME) in 
$(OFF)$*\n"
        mkdir -p $(WORKDIR)/ncurses-$(GARVERSION)-build
-       cd $(WORKDIR)/ncurses-$(GARVERSION)-build && $(CONFIGURE_ENV) 
../$(DISTNAME)/configure $(CONFIGURE_ARGS) $(ARCH_ARG) $(OUTPUT)
+       cd $(WORKDIR)/ncurses-$(GARVERSION)-build && $(CONFIGURE_ENV) 
../$(DISTNAME)/configure  $(ARCH_ARG) \
+               $(CONFIGURE_ARGS)  --enable-pc-files 
--with-pkg-config=$(packageprefix)/lib/pkgconfig $(OUTPUT)
        $(MAKECOOKIE)
 
 configure-ncursesw:
        @printf "[$(OK)configure$(OFF)] $(MSG)Running $(CONFIGURE_NAME) in 
$(OFF)$*\n"
        mkdir -p $(WORKDIR)/ncursesw-$(GARVERSION)-build
-       cd $(WORKDIR)/ncursesw-$(GARVERSION)-build && $(CONFIGURE_ENV) 
../$(DISTNAME)/configure \
+       cd $(WORKDIR)/ncursesw-$(GARVERSION)-build && $(CONFIGURE_ENV) 
../$(DISTNAME)/configure   $(ARCH_ARG) \
                $(CONFIGURE_ARGS) --enable-widec --enable-pc-files 
--with-pkg-config=$(packageprefix)/lib/pkgconfig $(OUTPUT)
        $(MAKECOOKIE)
 
 install-ncurses:
        @printf "[$(OK)install$(OFF)] $(MSG)Installing ncurses libraries 
$(OFF)\n"
-       for lib in ncurses form panel menu; do \
+       for lib in ncurses ncurses++ form panel menu; do \
                $(INSTALL_LIB) 
$(WORKDIR)/ncurses-$(GARVERSION)-build/lib/lib$${lib}.so.$(GARVERSION); \
                ln -s $(prefix)/lib/lib$${lib}.so.$(GARVERSION) 
$(packageprefix)/lib/lib$${lib}.so.5; \
        done
@@ -95,15 +93,24 @@
 
 install-ncursesw:
        @printf "[$(OK)install$(OFF)] $(MSG)Installing ncursesw libraries 
$(OFF)\n"
-       for lib in ncurses form panel menu; do \
-               echo "INPUT(-l$${lib}w)" >$(packageprefix)/lib/lib$${lib}.so; \
-       done
        for lib in ncurses ncurses++ form panel menu; do \
-               ln -s $(prefix)/lib/pkgconfig/$${lib}w.pc 
$(packageprefix)/lib/pkgconfig/$${lib}.pc; \
+               $(INSTALL_LIB) 
$(WORKDIR)/ncursesw-$(GARVERSION)-build/lib/lib$${lib}w.so.$(GARVERSION); \
+               ln -s $(prefix)/lib/lib$${lib}w.so.$(GARVERSION) 
$(packageprefix)/lib/lib$${lib}w.so.5; \
        done
-       echo "INPUT(-lncursesw)" >$(packageprefix)/lib/libcursesw.so
-       ln -s $(prefix)/lib/libncurses.so $(packageprefix)/lib/libcurses.so
        $(MAKECOOKIE)
 
 
+#install-ncursesw:
+#      @printf "[$(OK)install$(OFF)] $(MSG)Installing ncursesw libraries 
$(OFF)\n"
+#      for lib in ncurses form panel menu; do \
+#              echo "INPUT(-l$${lib}w)" >$(packageprefix)/lib/lib$${lib}.so; \
+#      done
+#      for lib in ncurses ncurses++ form panel menu; do \
+#              ln -s $(prefix)/lib/pkgconfig/$${lib}w.pc 
$(packageprefix)/lib/pkgconfig/$${lib}.pc; \
+#      done
+##     echo "INPUT(-lncursesw)" >$(packageprefix)/lib/libcursesw.so
+#      ln -s $(prefix)/lib/libncurses.so $(packageprefix)/lib/libcurses.so
+#      $(MAKECOOKIE)
+
+