aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2015-10-15 12:32:46 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2015-10-15 13:22:47 +0000
commit71ae6527c2727f9575f037d378546ff4276d2309 (patch)
tree12f749c2e849fa0a239e2309def622100f9b60d9 /main
parenta967bc78b1615c2adea2f6108106e20047af0a83 (diff)
downloadaports-71ae6527c2727f9575f037d378546ff4276d2309.tar.bz2
aports-71ae6527c2727f9575f037d378546ff4276d2309.tar.xz
main/ncurses: upgrade to 6.0
provide ncurses5 compat for migration
Diffstat (limited to 'main')
-rw-r--r--main/ncurses/APKBUILD31
-rw-r--r--main/ncurses5/APKBUILD85
-rw-r--r--main/ncurses5/ncurses-5.9-gcc-5.patch (renamed from main/ncurses/ncurses-5.9-gcc-5.patch)0
3 files changed, 98 insertions, 18 deletions
diff --git a/main/ncurses/APKBUILD b/main/ncurses/APKBUILD
index 6bd603e1c3..fd16b65ce6 100644
--- a/main/ncurses/APKBUILD
+++ b/main/ncurses/APKBUILD
@@ -1,21 +1,20 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=ncurses
-pkgver=5.9
-pkgrel=4
+pkgver=6.0
+pkgrel=0
pkgdesc="Console display library"
url="http://www.gnu.org/software/ncurses/"
arch="all"
license=MIT
depends=
-source="ftp://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz
- ncurses-5.9-gcc-5.patch
+source="http://ftp.gnu.org/pub/gnu/ncurses/ncurses-${pkgver}.tar.gz
"
subpackages="$pkgname-dev $pkgname-doc $pkgname-terminfo-base:base
$pkgname-terminfo $pkgname-widec-libs:widec $pkgname-libs"
+_builddir="$srcdir"/ncurses-$pkgver
prepare() {
- cd "$srcdir/$pkgname-$pkgver"
- update_config_sub || return 1
+ cd "$_builddir"
for i in $source; do
case $i in
*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
@@ -35,7 +34,7 @@ build() {
--with-terminfo-dirs="/etc/terminfo:/usr/share/terminfo"
--enable-pc-files \
--with-shared"
- cd "$srcdir/$pkgname-$pkgver"
+ cd "$_builddir"
mkdir ncurses-build ncursesw-build
cd ncurses-build
@@ -54,7 +53,7 @@ build() {
}
package() {
- cd "$srcdir/$pkgname-$pkgver"
+ cd "$_builddir"
make -j1 -C ncurses-build DESTDIR="$pkgdir" install.libs \
install.progs install.data || return 1
@@ -77,7 +76,7 @@ package() {
}
terminfo() {
- depends="ncurses-terminfo-base"
+ depends="$pkgname-terminfo-base"
rm -rf $subpkgdir
mkdir -p $subpkgdir/usr/share
mv $pkgdir/usr/share/terminfo $subpkgdir/usr/share
@@ -85,28 +84,24 @@ terminfo() {
widec() {
pkgdesc="Ncurses wide character libraries"
- depends="ncurses-terminfo-base"
+ depends="$pkgname-terminfo-base"
mkdir -p "$subpkgdir"/usr/lib
mv "$pkgdir"/usr/lib/lib*w.so.* "$subpkgdir"/usr/lib/
}
libs() {
pkgdesc="Ncurses libraries"
- depends="ncurses-terminfo-base"
+ depends="$pkgname-terminfo-base"
mkdir -p "$subpkgdir"/usr/
mv "$pkgdir"/usr/lib "$subpkgdir"/usr/
}
-
base() {
pkgdesc="Descriptions of common terminals"
mkdir -p "$subpkgdir"/etc
mv "$pkgdir"/etc/terminfo "$subpkgdir"/etc/
}
-md5sums="8cb9c412e5f2d96bc6f459aa8c6282a1 ncurses-5.9.tar.gz
-57f4cd0cc0c0a42a5ddb2167f9546d72 ncurses-5.9-gcc-5.patch"
-sha256sums="9046298fb440324c9d4135ecea7879ffed8546dd1b58e59430ea07a4633f563b ncurses-5.9.tar.gz
-6d40c4841e031fbb8b1ea6691b112aabc398d23b20b4458ec0b6eb78c33af88d ncurses-5.9-gcc-5.patch"
-sha512sums="d7c5e54b6d4d8b9211f0006ca8786f7609d180cc1aaebf4f25e7e35e12959779cf66447359a602daed625621ca32b0d910d67aef3eb8b6fdc3c373819a88faa1 ncurses-5.9.tar.gz
-200388ee1e8d8f656620d067e8993f79a50ed1a6ebee41ce8bd32b2a61cbe10c93347e2604229b58299c457640b247261a4d05afe60802dd4cce80d17bc2f10c ncurses-5.9-gcc-5.patch"
+md5sums="ee13d052e1ead260d7c28071f46eefb1 ncurses-6.0.tar.gz"
+sha256sums="f551c24b30ce8bfb6e96d9f59b42fbea30fa3a6123384172f9e7284bcf647260 ncurses-6.0.tar.gz"
+sha512sums="9ec194f4783dae6de8c529cac31b5cfbfcfea212c5d47b1f87cd49df013e38f8580a9e7aa1384918df0921b4ba999d5e73eb6d6362cce2d7287e64308b673963 ncurses-6.0.tar.gz"
diff --git a/main/ncurses5/APKBUILD b/main/ncurses5/APKBUILD
new file mode 100644
index 0000000000..8fc270a380
--- /dev/null
+++ b/main/ncurses5/APKBUILD
@@ -0,0 +1,85 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=ncurses5
+pkgver=5.9
+pkgrel=0
+pkgdesc="Console display library - ncurses5 compat"
+url="http://www.gnu.org/software/ncurses/"
+arch="all"
+license=MIT
+depends=
+source="http://ftp.gnu.org/pub/gnu/ncurses/ncurses-${pkgver}.tar.gz
+ ncurses-5.9-gcc-5.patch
+ "
+subpackages="$pkgname-widec-libs:widec $pkgname-libs"
+
+replaces="ncurses"
+_builddir="$srcdir"/ncurses-$pkgver
+prepare() {
+ cd "$_builddir"
+ update_config_sub || return 1
+ for i in $source; do
+ case $i in
+ *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+ esac
+ done
+}
+
+build() {
+ local _confopts="
+ --build=$CBUILD
+ --host=$CHOST
+ --mandir=/usr/share/man
+ --without-ada
+ --disable-termcap
+ --disable-rpath-hack
+ --without-cxx-binding
+ --with-terminfo-dirs=/etc/terminfo:/usr/share/terminfo
+ --disable-pc-files
+ --with-shared
+ --without-static
+ --without-progs"
+ cd "$_builddir"
+
+ mkdir ncurses-build ncursesw-build
+ cd ncurses-build
+ ../configure $_confopts \
+ || return 1
+ make libs || return 1
+
+ cd ../ncursesw-build
+ ../configure $_confopts \
+ --enable-widec \
+ || return 1
+ make libs || return 1
+ cd ..
+}
+
+package() {
+ cd "$_builddir"
+ make -j1 -C ncurses-build DESTDIR="$pkgdir" install.libs || return 1
+ make -j1 -C ncursesw-build DESTDIR="$pkgdir" install.libs || return 1
+ rm -r "$pkgdir"/usr/lib/*.a "$pkgdir"/usr/lib/*.so \
+ "$pkgdir"/usr/include "$pkgdir"/usr/bin || return 1
+}
+
+widec() {
+ pkgdesc="Ncurses wide character libraries - ncurses 5 compat"
+ replaces="ncurses-widec-libs"
+ depends="ncurses-terminfo-base"
+ mkdir -p "$subpkgdir"/usr/lib
+ mv "$pkgdir"/usr/lib/lib*w.so.* "$subpkgdir"/usr/lib/
+}
+
+libs() {
+ pkgdesc="Ncurses5 libraries - ncurses 5 compat"
+ depends="ncurses-terminfo-base"
+ mkdir -p "$subpkgdir"/usr/
+ mv "$pkgdir"/usr/lib "$subpkgdir"/usr/
+}
+
+md5sums="8cb9c412e5f2d96bc6f459aa8c6282a1 ncurses-5.9.tar.gz
+57f4cd0cc0c0a42a5ddb2167f9546d72 ncurses-5.9-gcc-5.patch"
+sha256sums="9046298fb440324c9d4135ecea7879ffed8546dd1b58e59430ea07a4633f563b ncurses-5.9.tar.gz
+6d40c4841e031fbb8b1ea6691b112aabc398d23b20b4458ec0b6eb78c33af88d ncurses-5.9-gcc-5.patch"
+sha512sums="d7c5e54b6d4d8b9211f0006ca8786f7609d180cc1aaebf4f25e7e35e12959779cf66447359a602daed625621ca32b0d910d67aef3eb8b6fdc3c373819a88faa1 ncurses-5.9.tar.gz
+200388ee1e8d8f656620d067e8993f79a50ed1a6ebee41ce8bd32b2a61cbe10c93347e2604229b58299c457640b247261a4d05afe60802dd4cce80d17bc2f10c ncurses-5.9-gcc-5.patch"
diff --git a/main/ncurses/ncurses-5.9-gcc-5.patch b/main/ncurses5/ncurses-5.9-gcc-5.patch
index 2448229b88..2448229b88 100644
--- a/main/ncurses/ncurses-5.9-gcc-5.patch
+++ b/main/ncurses5/ncurses-5.9-gcc-5.patch