[Gsrc-commit] trunk r8809: update ncurses to 6.3-20221119

[Carl Hansen]

------------------------------------------------------------
revno: 8809
revision-id: carlhansen1234@gmail.com-20221120191023-638np3a4pvioriec
parent: carlhansen1234@gmail.com-20221119205500-9sdx429f3hegha1j
committer: carlhansen1234@gmail.com
branch nick: trunk
timestamp: Sun 2022-11-20 11:10:23 -0800
message:
  update ncurses to 6.3-20221119
modified:
  pkg/gnu/ncurses/Makefile       makefile-20160617014725-uokjfnggs70iry9h-1464
  pkg/gnu/ncurses/config.mk      config.mk-20160617020810-ahjiq7ink5ddd20u-1
  pkg/gnu/ncurses/sha256sums     sha256sums-20160617014725-uokjfnggs70iry9h-1469

=== modified file 'pkg/gnu/ncurses/Makefile'
--- a/pkg/gnu/ncurses/Makefile  2022-11-07 02:39:50 +0000
+++ b/pkg/gnu/ncurses/Makefile  2022-11-20 19:10:23 +0000
@@ -20,9 +20,9 @@
 # 
 # Send bug reports and comments about GSRC problems to bug-gsrc@gnu.org
 
-NAME = Ncurses
+NAME = ncurses
 GARNAME = ncurses
-GARVERSION = 6.3-20221105
+GARVERSION = 6.3-20221119
 GARVERSIONMAJOR = 6.3
 
 HOME_URL = http://www.gnu.org/software/ncurses/
@@ -46,74 +46,90 @@
 MASTER_SITES = http://invisible-island.net/
 MASTER_SUBDIR = archives/$(GARNAME)/current/
 DISTFILES = $(DISTNAME).tgz
-SIGFILES = $(DISTNAME).tgz.asc
-
-#CONFIGURE_SCRIPTS = ncurses  
-CONFIGURE_SCRIPTS = ncurses  ncursesw
-
-BUILD_SCRIPTS = $(WORKDIR)/ncurses-$(GARVERSION)-build/Makefile 
$(WORKDIR)/ncursesw-$(GARVERSION)-build/Makefile
-#BUILD_SCRIPTS = $(WORKDIR)/ncurses-$(GARVERSION)-build/Makefile 
-INSTALL_SCRIPTS = $(WORKDIR)/ncursesw-$(GARVERSION)-build/Makefile ncursesw  
$(WORKDIR)/ncurses-$(GARVERSION)-build/Makefile ncurses 
-#INSTALL_SCRIPTS =  $(WORKDIR)/ncurses-$(GARVERSION)-build/Makefile ncurses 
-
+SIGFILES  = $(DISTNAME).tgz.asc
 BUILDDEPS = 
 LIBDEPS =
 
-WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION)
-WORKOBJ = $(WORKDIR)/$(GARNAME)-$(GARVERSION)-build
-
-include ../../../gar/gar.lib/auto.mk
-include config.mk
-
-CONFIGURE_ARGS += --with-shared --with-normal --without-debug
+
 ifeq ($(GARARCH),x86_64)
        ARCH_ARG = --with-chtype=long
 else
        ARCH_ARG =
 endif
 
-.PHONY: pre-configure configure-ncurses configure-ncursesw install-ncurses 
install-ncursesw
-
-pre-configure:
-       mkdir -p $(packageprefix)/lib/pkgconfig
-       $(MAKECOOKIE)
-
-configure-ncurses: 
-       @printf "[$(OK)configure-ncureses$(OFF)] $(MSG)Running 
$(CONFIGURE_NAME) in $(OFF)$*\n"
+CONFIGURE_SCRIPTS = nonwide  wide
+
+BUILD_SCRIPTS =  nonwide wide
+#BUILD_SCRIPTS = $(WORKDIR)/ncurses-$(GARVERSION)-build/Makefile 
$(WORKDIR)/ncursesw-$(GARVERSION)-build/Makefile
+# questionable. do ? all: nonwide wide?
+
+INSTALL_SCRIPTS = nonwide  wide
+#INSTALL_SCRIPTS = $(WORKDIR)/ncursesw-$(GARVERSION)-build/Makefile wide  
$(WORKDIR)/ncurses-$(GARVERSION)-build/Makefile nonwide 
+#INSTALL_SCRIPTS =  $(WORKDIR)/ncurses-$(GARVERSION)-build/Makefile ncurses 
+
+
+##########################################
+include ../../../gar/gar.lib/autotools.mk
+include config.mk
+
+#CONFIGURE_ARGS +=                --with-normal --without-debug --enable-rpath 
 
+#CONFIGURE_ARGS  += --enable-pc-files   --without-debug --enable-rpath  
+#CONFIGURE_ARGS  += --enable-pc-files  --with-normal --with-shared 
--without-debug --enable-rpath  
+CONFIGURE_ARGS  += --enable-pc-files                 --with-shared 
--without-debug --enable-rpath  
+#CONFIGURE_ARGS  += --enable-pc-files                              
--without-debug --enable-rpath  
+
+.PHONY: pre-configure configure-nonwide configure-wide build-nonwide 
build-wide install-nonwide install-wide
+
+#pre-configure:
+#      mkdir -p $(packageprefix)/lib/pkgconfig
+#      $(MAKECOOKIE)
+
+
+configure-nonwide: 
+       @printf "[$(OK)configure-nonwide$(OFF)] ncurses $(MSG)Running 
$(CONFIGURE_NAME) in $(OFF)$*\n"
        mkdir -p $(WORKDIR)/ncurses-$(GARVERSION)-build
        cd $(WORKDIR)/ncurses-$(GARVERSION)-build && $(CONFIGURE_ENV) 
../$(DISTNAME)/configure  $(ARCH_ARG) \
-               $(CONFIGURE_ARGS)  --enable-pc-files 
--with-pkg-config=$(packageprefix)/lib/pkgconfig $(OUTPUT)
+               $(CONFIGURE_ARGS)                 --enable-pc-files 
--with-pkg-config=$(packageprefix)/lib/pkgconfig $(OUTPUT)
        $(MAKECOOKIE)
 
-configure-ncursesw:
-       @printf "[$(OK)configure-ncursesw$(OFF)] $(MSG)Running 
$(CONFIGURE_NAME) in $(OFF)$*\n"
+configure-wide:
+       @printf "[$(OK)configure-wide$(OFF)] ncursesw $(MSG)Running 
$(CONFIGURE_NAME) in $(OFF)$*\n"
        mkdir -p $(WORKDIR)/ncursesw-$(GARVERSION)-build
        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)
 
+
+build-nonwide:  
+       cd  $(WORKDIR)/ncurses-$(GARVERSION)-build/ && $(MAKE) 
+       $(MAKECOOKIE)
+
+build-wide:   
+       cd  $(WORKDIR)/ncursesw-$(GARVERSION)-build/ && $(MAKE)
+       $(MAKECOOKIE)
+
 pre-install: 
        cd $(WORKSRC)/doc  &&  $(INSTALL_DOCS) hackguide.doc  html/  
ncurses-intro.doc
        $(MAKECOOKIE)
 
 
-install-ncurses: 
+install-nonwide:  
        @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.$(GARVERSIONMAJOR); \
        done
        $(MAKECOOKIE)
 
-install-ncursesw: 
+install-wide:  
        @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)
 
-post-install: install-ncursesw install-ncurses
-       $(MAKE) finish-package-install
-       $(MAKECOOKIE)
+#post-install: install-nonwide install-wide
+#      $(MAKE) finish-package-install
+#      $(MAKECOOKIE)
 
 # old way:
 #install-ncursesw:

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

=== modified file 'pkg/gnu/ncurses/sha256sums'
--- a/pkg/gnu/ncurses/sha256sums        2022-11-07 02:39:50 +0000
+++ b/pkg/gnu/ncurses/sha256sums        2022-11-20 19:10:23 +0000
@@ -1,2 +1,2 @@
-21c2ec475bf6f6c8d098942417b086d6f02ec998a1de32bbd47a03808932626b  
download/ncurses-6.3-20221105.tgz
-885ba05b3cf3a75cafe3d5e1c3bcd5567fe9d67e6d23d2945ead23dd84afb9dd  
download/ncurses-6.3-20221105.tgz.asc
+2cc037ac2b2f00f7b4321ddf86515995871da36100a4d759d85742ff881e1b8e  
download/ncurses-6.3-20221119.tgz
+b1c3be341ee1978d6b861e4a87060c2d4b4d3bed06d8f9287d3a744575a2374f  
download/ncurses-6.3-20221119.tgz.asc