diff --git a/sys-libs/ncurses/ncurses6-6.0.recipe b/sys-libs/ncurses/ncurses6-6.2.recipe similarity index 56% rename from sys-libs/ncurses/ncurses6-6.0.recipe rename to sys-libs/ncurses/ncurses6-6.2.recipe index e81034917..dae912079 100644 --- a/sys-libs/ncurses/ncurses6-6.0.recipe +++ b/sys-libs/ncurses/ncurses6-6.2.recipe @@ -1,52 +1,85 @@ SUMMARY="New curses library" -HOMEPAGE="http://www.gnu.org/software/ncurses/ncurses.html" -SOURCE_URI="http://ftp.gnu.org/pub/gnu/ncurses/ncurses-$portVersion.tar.gz" -CHECKSUM_SHA256="f551c24b30ce8bfb6e96d9f59b42fbea30fa3a6123384172f9e7284bcf647260" -SOURCE_DIR="ncurses-$portVersion" +DESCRIPTION="The Ncurses (new curses) library is a free software emulation of \ +curses in System V Release 4.0, and more. 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 ncurses code was developed under GNU/Linux. It has been in use for some \ +time with OpenBSD as the system curses library, and on FreeBSD and NetBSD as \ +an external package. It should port easily to any ANSI/POSIX-conforming UNIX. \ +It has even been ported to OS/2 Warp! +The distribution includes the library and support utilities, including a \ +terminfo compiler tic, a decompiler infocmp, clear, tput, tset, and a \ +termcap conversion tool captoinfo. Full manual pages are provided for the \ +library and tools." +HOMEPAGE="https://www.gnu.org/software/ncurses/ncurses.html" +COPYRIGHT="1998-2018 Free Software Foundation, Inc." LICENSE="MIT" -COPYRIGHT="1998-2015 Free Software Foundation, Inc." -REVISION="3" -ARCHITECTURES="x86_gcc2 x86 x86_64 arm" +REVISION="1" +SOURCE_URI="https://ftpmirror.gnu.org/ncurses/ncurses-$portVersion.tar.gz + https://ftp.gnu.org/gnu/ncurses/ncurses-$portVersion.tar.gz" +CHECKSUM_SHA256="30306e0c76e0f9f1f0de987cf1c82a5c21e1ce6568b9227f7da5b71cbea86c9d" +SOURCE_DIR="ncurses-$portVersion" +PATCHES="ncurses-$portVersion.patchset" + +ARCHITECTURES="x86_gcc2 x86 x86_64 arm sparc m68k" SECONDARY_ARCHITECTURES="x86_gcc2 x86" -PATCHES="ncurses-6.0.patchset" +libVersion="6.2.0" +libVersionCompat="$libVersion compat >= 6" +portVersionCompat="$portVersion compat >= 6" PROVIDES=" - ncurses6$secondaryArchSuffix = $portVersion compat >= 6 - lib:libform$secondaryArchSuffix = $portVersion compat >= 6 - lib:libformw$secondaryArchSuffix = $portVersion compat >= 6 - lib:libmenu$secondaryArchSuffix = $portVersion compat >= 6 - lib:libmenuw$secondaryArchSuffix = $portVersion compat >= 6 - lib:libncurses$secondaryArchSuffix = $portVersion compat >= 6 - lib:libncursesw$secondaryArchSuffix = $portVersion compat >= 6 - lib:libncurses++$secondaryArchSuffix = $portVersion compat >= 6 - lib:libncurses++w$secondaryArchSuffix = $portVersion compat >= 6 - lib:libpanel$secondaryArchSuffix = $portVersion compat >= 6 - lib:libpanelw$secondaryArchSuffix = $portVersion compat >= 6 + ncurses6$secondaryArchSuffix = $portVersion + lib:libform$secondaryArchSuffix = $libVersionCompat + lib:libformw$secondaryArchSuffix = $libVersionCompat + lib:libmenu$secondaryArchSuffix = $libVersionCompat + lib:libmenuw$secondaryArchSuffix = $libVersionCompat + lib:libncurses$secondaryArchSuffix = $libVersionCompat + lib:libncursesw$secondaryArchSuffix = $libVersionCompat + lib:libncurses++$secondaryArchSuffix = $libVersionCompat + lib:libncurses++w$secondaryArchSuffix = $libVersionCompat + lib:libpanel$secondaryArchSuffix = $libVersionCompat + lib:libpanelw$secondaryArchSuffix = $libVersionCompat " if [ -z "$secondaryArchSuffix" ]; then PROVIDES="$PROVIDES - cmd:captoinfo = $portVersion compat >= 5 - cmd:clear = $portVersion compat >= 5 - cmd:infocmp = $portVersion compat >= 5 - cmd:infotocap = $portVersion compat >= 5 - cmd:reset = $portVersion compat >= 5 - cmd:tabs = $portVersion compat >= 5 - cmd:tic = $portVersion compat >= 5 - cmd:toe = $portVersion compat >= 5 - cmd:tput = $portVersion compat >= 5 - cmd:tset = $portVersion compat >= 5 + cmd:captoinfo = $portVersionCompat + cmd:clear = $portVersionCompat + cmd:infocmp = $portVersionCompat + cmd:infotocap = $portVersionCompat + cmd:reset = $portVersionCompat + cmd:tabs = $portVersionCompat + cmd:tic = $portVersionCompat + cmd:toe = $portVersionCompat + cmd:tput = $portVersionCompat + cmd:tset = $portVersionCompat " fi - REQUIRES=" haiku$secondaryArchSuffix " -if [ -n "$secondaryArchSuffix" ]; then - REQUIRES="$REQUIRES - ncurses6 == $portVersion base - " -fi + +PROVIDES_devel=" + ncurses6${secondaryArchSuffix}_devel = $portVersion + cmd:ncurses6_config${secondaryArchSuffix} = $portVersion + cmd:ncursesw6_config${secondaryArchSuffix} = $portVersion + devel:libform$secondaryArchSuffix = $libVersionCompat + devel:libformw$secondaryArchSuffix = $libVersionCompat + devel:libmenu$secondaryArchSuffix = $libVersionCompat + devel:libmenuw$secondaryArchSuffix = $libVersionCompat + devel:libncurses$secondaryArchSuffix = $libVersionCompat + devel:libncursesw$secondaryArchSuffix = $libVersionCompat + devel:libncurses++$secondaryArchSuffix = $libVersionCompat + devel:libncurses++w$secondaryArchSuffix = $libVersionCompat + devel:libpanel$secondaryArchSuffix = $libVersionCompat + devel:libpanelw$secondaryArchSuffix = $libVersionCompat + " +REQUIRES_devel=" + ncurses6$secondaryArchSuffix == $portVersion base + " +CONFLICTS_devel=" + ncurses${secondaryArchSuffix}_devel + " BUILD_REQUIRES=" " @@ -55,7 +88,7 @@ BUILD_PREREQUIRES=" cmd:gcc$secondaryArchSuffix cmd:grep cmd:ld$secondaryArchSuffix - cmd:libtool + cmd:libtoolize$secondaryArchSuffix cmd:make cmd:sed " @@ -182,42 +215,3 @@ INSTALL() rm -rf $documentationDir fi } - -DESCRIPTION=" -The Ncurses (new curses) library is a free software emulation of curses in \ -System V Release 4.0, and more. 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 ncurses code was developed under GNU/Linux. It has been in use for some \ -time with OpenBSD as the system curses library, and on FreeBSD and NetBSD as \ -an external package. It should port easily to any ANSI/POSIX-conforming UNIX. \ -It has even been ported to OS/2 Warp! -The distribution includes the library and support utilities, including a \ -terminfo compiler tic, a decompiler infocmp, clear, tput, tset, and a termcap \ -conversion tool captoinfo. Full manual pages are provided for the library and \ -tools. -" - -# ----- devel package ------------------------------------------------------- - -PROVIDES_devel=" - ncurses6${secondaryArchSuffix}_devel = $portVersion compat >= 6 - cmd:ncurses6_config${secondaryArchSuffix} = $portVersion compat >= 6 - cmd:ncursesw6_config${secondaryArchSuffix} = $portVersion compat >= 6 - devel:libform${secondaryArchSuffix} = $portVersion compat >= 6 - devel:libformw${secondaryArchSuffix} = $portVersion compat >= 6 - devel:libmenu${secondaryArchSuffix} = $portVersion compat >= 6 - devel:libmenuw${secondaryArchSuffix} = $portVersion compat >= 6 - devel:libncurses${secondaryArchSuffix} = $portVersion compat >= 6 - devel:libncursesw${secondaryArchSuffix} = $portVersion compat >= 6 - devel:libncurses++${secondaryArchSuffix} = $portVersion compat >= 6 - devel:libncurses++w${secondaryArchSuffix} = $portVersion compat >= 6 - devel:libpanel${secondaryArchSuffix} = $portVersion compat >= 6 - devel:libpanelw${secondaryArchSuffix} = $portVersion compat >= 6 - " -REQUIRES_devel=" - ncurses6${secondaryArchSuffix} == $portVersion base - " -CONFLICTS_devel=" - ncurses${secondaryArchSuffix}_devel - " diff --git a/sys-libs/ncurses/patches/ncurses-6.0.patchset b/sys-libs/ncurses/patches/ncurses-6.2.patchset similarity index 100% rename from sys-libs/ncurses/patches/ncurses-6.0.patchset rename to sys-libs/ncurses/patches/ncurses-6.2.patchset