[Gsrc-commit] trunk r8170: ncurses fixes

[Carl Hansen]

------------------------------------------------------------
revno: 8170
revision-id: carlhansen1234@gmail.com-20220313192948-qc1tuzg8iak7poz4
parent: carlhansen1234@gmail.com-20220313174730-iv2757u8dgirylez
committer: carlhansen1234@gmail.com
branch nick: trunk
timestamp: Sun 2022-03-13 12:29:48 -0700
message:
  ncurses fixes
modified:
  pkg/gnu/ncurses/Makefile       makefile-20160617014725-uokjfnggs70iry9h-1464
  pkg/gnu/ncurses/config.mk      config.mk-20160617020810-ahjiq7ink5ddd20u-1

=== modified file 'pkg/gnu/ncurses/Makefile'
--- a/pkg/gnu/ncurses/Makefile  2022-03-13 07:58:31 +0000
+++ b/pkg/gnu/ncurses/Makefile  2022-03-13 19:29:48 +0000
@@ -23,6 +23,7 @@
 NAME = Ncurses
 GARNAME = ncurses
 GARVERSION = 6.3-20220312
+GARVERSIONMAJOR = 6.3
 HOME_URL = http://www.gnu.org/software/ncurses/
 #HOME_URL = http://invisible-island.net/ncurses
 DESCRIPTION = text-to-termimal library
@@ -88,29 +89,29 @@
 install-ncurses:
        @printf "[$(OK)install$(OFF)] $(MSG)Installing ncurses libraries 
$(OFF)\n"
        for lib in ncurses ncurses++ form panel menu; do \
-               $(INSTALL_LIB) 
$(WORKDIR)/ncurses-$(GARVERSION)-build/lib/lib$${lib}.so.$(GARVERSION); \
-       done
-       $(MAKECOOKIE)
-
+               $(INSTALL_LIB) 
$(WORKDIR)/ncurses-$(GARVERSION)-build/lib/lib$${lib}.so.$(GARVERSIONMAJOR); \
+       done
+       $(MAKECOOKIE)
+
+install-ncursesw:
+       @printf "[$(OK)install$(OFF)] $(MSG)Installing ncursesw libraries 
$(OFF)\n"
+       for lib in ncurses ncurses++ form panel menu; do \
+               $(INSTALL_LIB) 
$(WORKDIR)/ncursesw-$(GARVERSION)-build/lib/lib$${lib}w.so.$(GARVERSIONMAJOR); \
+       done
+       $(MAKECOOKIE)
+
+# old way:
 #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 \
-#              $(INSTALL_LIB) 
$(WORKDIR)/ncursesw-$(GARVERSION)-build/lib/lib$${lib}w.so.$(GARVERSION); \
+#              ln -s $(prefix)/lib/pkgconfig/$${lib}w.pc 
$(packageprefix)/lib/pkgconfig/$${lib}.pc; \
 #      done
-#      $(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)
+#      echo "INPUT(-lncursesw)" >$(packageprefix)/lib/libcursesw.so
+#      ln -s $(prefix)/lib/libncurses.so $(packageprefix)/lib/libcurses.so
+##     $(MAKECOOKIE)
 
 
 

=== modified file 'pkg/gnu/ncurses/config.mk'
--- a/pkg/gnu/ncurses/config.mk 2016-06-17 19:08:15 +0000
+++ b/pkg/gnu/ncurses/config.mk 2022-03-13 19:29:48 +0000
@@ -1,4 +1,4 @@
 ## Configuration options for ncurses ##
 
-CONFIGURE_OPTS ?= 
+CONFIGURE_OPTS ?=  --enable-rpath
 BUILD_OPTS ?=