ncurses: update to 5.8, bump abi_depends.

ncurses now builds the widec version by default and provides non-widec
for compatiblity. ABI has been bumped because I've enabled "--enable-ext-colors"
which changes the soname to foo.so.6.

Removed the ncursesw packages.

srcpkgs/ncurses/depends

@@ -1,2 +1,2 @@
-abi_depends=">=5.6"
+abi_depends=">=5.8"
 api_depends="${abi_depends}"

srcpkgs/ncurses/ncurses-base.template

@@ -6,25 +6,14 @@ long_desc="${long_desc}
  This package contains the base files."
 
 noarch=yes
-revision=1
 
 do_install()
 {
 	cat $XBPS_SRCPKGDIR/ncurses/base-files | while read line; do
 		if [ -f ${SRCPKGDESTDIR}/${line} ]; then
-			install -D ${SRCPKGDESTDIR}/${line} ${DESTDIR}/${line}
+			install -D -m644 ${SRCPKGDESTDIR}/${line} \
+				${DESTDIR}/${line}
 			rm -f ${SRCPKGDESTDIR}/${line}
 		fi
 	done
-
-	mkdir -p ${DESTDIR}/lib/terminfo/a
-	mkdir -p ${DESTDIR}/lib/terminfo/l
-	mkdir -p ${DESTDIR}/lib/terminfo/v
-
-	cp ${DESTDIR}/usr/share/terminfo/a/ansi ${DESTDIR}/lib/terminfo/a
-	cp ${DESTDIR}/usr/share/terminfo/l/linux ${DESTDIR}/lib/terminfo/l
-	for f in vt100 vt100-am vt100-nav vt102 vt200 vt220 vt52; do
-		cp ${DESTDIR}/usr/share/terminfo/v/${f} \
-			${DESTDIR}/lib/terminfo/v
-	done
 }

srcpkgs/ncurses/ncurses-devel.template

@@ -5,21 +5,24 @@ long_desc="${long_desc}
 
  This package contains files for development: headers, static libs, etc."
 
-revision=3
+replaces="ncursesw-devel>=0"
-
+Add_dependency run glibc-devel
 Add_dependency run ncurses
 
 do_install()
 {
 	mkdir -p ${DESTDIR}/usr/lib
 	mkdir -p ${DESTDIR}/usr/bin
-	mkdir -p ${DESTDIR}/usr/share/man
+	mkdir -p ${DESTDIR}/usr/share/man/man1
 
 	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
-	mv ${SRCPKGDESTDIR}/usr/lib/lib*.*a ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/lib/*.a ${DESTDIR}/usr/lib
-	cd ${DESTDIR}/usr/lib && \
-		ln -s ../../lib/libncurses.so.5 libncurses.so && \
-		ln -s libncurses.so libcurses.so
 	mv ${SRCPKGDESTDIR}/usr/share/man/man3 ${DESTDIR}/usr/share/man
-	mv ${SRCPKGDESTDIR}/usr/bin/ncurses5* ${DESTDIR}/usr/bin
+	mv ${SRCPKGDESTDIR}/usr/bin/ncursesw6-config ${DESTDIR}/usr/bin
+	ln -sf ../../usr/bin/ncursesw6-config \
+		${DESTDIR}/usr/bin/ncursesw5-config
+	ln -sf ../../usr/bin/ncursesw6-config \
+		${DESTDIR}/usr/bin/ncurses5-config
+	mv ${SRCPKGDESTDIR}/usr/share/man/man1/ncursesw6-config.1* \
+		${DESTDIR}/usr/share/man/man1
 }

srcpkgs/ncurses/ncurses-libs.template

@@ -5,8 +5,7 @@ long_desc="${long_desc}
 
  This package contains the shared libraries."
 
-revision=3
+replaces="ncursesw>=0"
-
 Add_dependency run glibc
 Add_dependency run ncurses-base
 
@@ -15,8 +14,8 @@ do_install()
 	mkdir -p ${DESTDIR}/lib
 	mkdir -p ${DESTDIR}/usr/lib
 
-	mv ${SRCPKGDESTDIR}/usr/lib/libncurses.so* ${DESTDIR}/lib
+	mv ${SRCPKGDESTDIR}/lib/* ${DESTDIR}/lib
-	chmod 755 ${DESTDIR}/lib/*.so*
+	chmod 755 ${DESTDIR}/lib/*
-	mv ${SRCPKGDESTDIR}/usr/lib/lib*.so.* ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/lib/*.so* ${DESTDIR}/usr/lib
 	chmod 755 ${DESTDIR}/usr/lib/*.so*
 }

srcpkgs/ncurses/ncurses-term.template

@@ -6,7 +6,6 @@ long_desc="${long_desc}
  This package contains all available terminal descriptions."
 
 noarch=yes
-revision=1
 
 Add_dependency run ncurses-base
 

srcpkgs/ncurses/template

@@ -1,12 +1,11 @@
 # Template build file for 'ncurses'.
 pkgname=ncurses
-version=5.7
+version=5.8
 distfiles="http://ftp.gnu.org/pub/gnu/ncurses/$pkgname-$version.tar.gz"
-build_style=gnu_configure
+build_style=custom-install
-configure_args="--with-shared --without-debug CFLAGS=-fPIC"
 short_desc="A System V Release 4.0 curses emulation library"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=0a9bdea5c7de8ded5c9327ed642915f2cc380753f12d4ad120ef7da3ea3498f4
+checksum=51597f89fd53aa990321954e33e5b4869c4a5ee6137bfa800f98f91d4b6b54b5
 long_desc="
  The ncurses (new curses) library is a freeware emulation of System V Release
  4.0 curses. It uses terminfo format, supports pads and color and multiple
@@ -21,8 +20,59 @@ subpackages="ncurses-base ncurses-devel ncurses-libs ncurses-term"
 Add_dependency run glibc
 Add_dependency run ncurses-libs
 
-post_install()
+do_build()
 {
-	# Remove broken symlinks.
+	mkdir ncurses-build ncursesw-build
-	rm -f ${DESTDIR}/usr/lib/lib*.so
+	cd ${wrksrc}/ncursesw-build
+
+	# widec build
+	CFLAGS="$XBPS_CFLAGS -fPIC" \
+		../configure --enable-widec --with-shared \
+		--prefix=/usr --mandir=/usr/share/man --without-debug \
+		--with-manpage-symlinks --without-ada --enable-ext-colors \
+		--with-install-prefix=${DESTDIR}
+	make ${makejobs}
+
+	cd ${wrksrc}/ncurses-build
+	# non-widec build
+	CFLAGS="$XBPS_CFLAGS -fPIC" \
+		../configure --prefix=/usr --with-shared \
+		--without-debug --without-ada --with-install-prefix=${DESTDIR}
+	make ${makejobs}
+}
+
+do_install()
+{
+	cd ${wrksrc}/ncursesw-build
+	make install
+
+	install -dm755 ${DESTDIR}/lib
+	mv ${DESTDIR}/usr/lib/libncursesw.so.* ${DESTDIR}/lib
+	ln -sf ../../lib/libncursesw.so.6 ${DESTDIR}/usr/lib/libncursesw.so
+
+	# Fool packages looking to link to non-wide-character ncurses libraries
+	for lib in curses ncurses form panel menu; do
+		rm -f ${DESTDIR}/usr/lib/lib${lib}.so
+		echo "INPUT(-l${lib}w)" >${DESTDIR}/usr/lib/lib${lib}.so
+		ln -sf lib${lib}w.a ${DESTDIR}/usr/lib/lib${lib}.a
+	done
+	ln -sf libncurses++w.a ${DESTDIR}/usr/lib/libncurses++.a
+
+	# install tput to /bin
+	install -dm755 ${DESTDIR}/bin/
+	mv ${DESTDIR}/usr/bin/tput ${DESTDIR}/bin/tput
+
+	# Some packages look for -lcurses during build
+	rm -f ${DESTDIR}/usr/lib/libcursesw.so
+	echo "INPUT(-lncursesw)" >${DESTDIR}/usr/lib/libcursesw.so
+	ln -sf libncurses.so ${DESTDIR}/usr/lib/libcurses.so
+	ln -sf libncursesw.a ${DESTDIR}/usr/lib/libcursesw.a
+	ln -sf libncurses.a ${DESTDIR}/usr/lib/libcurses.a
+
+	# non-widec compatibility library
+	cd ${wrksrc}/ncurses-build
+	install -Dm755 lib/libncurses.so.${version} \
+		${DESTDIR}/usr/lib/libncurses.so.${version}
+	ln -sf libncurses.so.${version} \
+		${DESTDIR}/usr/lib/libncurses.so.5
 }

srcpkgs/ncursesw-devel

@@ -1 +0,0 @@
-ncursesw

srcpkgs/ncursesw/depends

@@ -1,2 +0,0 @@
-abi_depends=">=5.6"
-api_depends="${abi_depends}"

srcpkgs/ncursesw/ncursesw-devel.template

@@ -1,22 +0,0 @@
-# Template file for 'ncursesw-devel'.
-#
-short_desc="${sourcepkg} development files"
-long_desc="${long_desc}
-
- This package contains files for development: headers, static libs, etc."
-
-revision=2
-
-Add_dependency run glibc-devel
-Add_dependency run ncurses-devel
-Add_dependency run ncursesw
-
-do_install()
-{
-	mkdir -p ${DESTDIR}/usr/lib
-	mkdir -p ${DESTDIR}/usr/bin
-
-	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
-	mv ${SRCPKGDESTDIR}/usr/lib/lib*.*a ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/bin/ncursesw5* ${DESTDIR}/usr/bin
-}

srcpkgs/ncursesw/template

@@ -1,37 +0,0 @@
-# Template build file for 'ncursesw'.
-pkgname=ncursesw
-version=5.7
-revision=2
-wrksrc="ncurses-${version}"
-distfiles="http://ftp.gnu.org/pub/gnu/ncurses/ncurses-$version.tar.gz"
-build_style=gnu_configure
-configure_args="--with-shared --without-debug --enable-widec
---includedir=/usr/include/ncursesw CFLAGS=-fPIC"
-make_install_target="DESTDIR=$XBPS_DESTDIR/$pkgname-$version install.includes install.libs"
-short_desc="Shared libraries for terminal handling (wide character)"
-maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=0a9bdea5c7de8ded5c9327ed642915f2cc380753f12d4ad120ef7da3ea3498f4
-long_desc="
- The ncurses (new curses) library is a freeware emulation of System V Release
- 4.0 curses. It uses terminfo format, supports pads and color and multiple
- highlights and forms characters and function-key mapping, and has all the
- other SYSV-curses enhancements over BSD curses. The distribution includes
- the library and support utilities, including a terminfo compiler tic, a 
- ecompiler infocmp, clear, tput, tset, and a termcap conversion tool captoinfo.
- Full manual pages are provided for the library and tools."
-
-subpackages="$pkgname-devel"
-Add_dependency run glibc
-
-post_install()
-{
-	rm -f ${DESTDIR}/usr/lib/lib*.so
-	rm -f ${DESTDIR}/usr/lib/libncursesw.so.5
-	mkdir -p ${DESTDIR}/lib
-	mv ${DESTDIR}/usr/lib/lib*.so.5.7 ${DESTDIR}/lib
-	for f in panelw formw ncursesw menuw; do
-		cd ${DESTDIR}/usr/lib && \
-			ln -sf ../../lib/lib${f}.so.5.7 lib${f}.so.5 && \
-			ln -sf ../../lib/lib${f}.so.5.7 lib${f}.so
-	done
-}

xbps-src/common/mapping_shlib_binpkg.txt

@@ -52,14 +52,15 @@ libppl.so			ppl			ppl-devel
 libppl_c.so			ppl			ppl-devel
 libstdc++.so			libstdc++		libstdc++-devel
 libssp.so			libssp			libssp-devel
+libcurses.so			ncurses-libs		ncurses-devel
 libncurses.so			ncurses-libs		ncurses-devel
 libform.so			ncurses-libs		ncurses-devel
 libpanel.so			ncurses-libs		ncurses-devel
 libmenu.so			ncurses-libs		ncurses-devel
-libncursesw.so			ncursesw		ncursesw-devel
+libncursesw.so			ncurses-libs		ncurses-devel
-libformw.so			ncursesw		ncursesw-devel
+libformw.so			ncurses-libs		ncurses-devel
-libpanelw.so			ncursesw		ncursesw-devel
+libpanelw.so			ncurses-libs		ncurses-devel
-libmenuw.so			ncursesw		ncursesw-devel
+libmenuw.so			ncurses-libs		ncurses-devel
 libobjc.so			libobjc			libobjc-devel
 libmudflap.so			libmudflap		libmudflap-devel
 libmudflapth.so			libmudflap		libmudflap-devel