From a99b3ebf5a683797ac8bae73d4908a9742cea60a Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Sun, 7 Apr 2013 02:00:23 +0200
Subject: [PATCH] ncurses: fix depends in subpkgs and modernize.

---
 srcpkgs/ncurses/ncurses-base.template  | 10 ++--------
 srcpkgs/ncurses/ncurses-devel.template | 11 +++--------
 srcpkgs/ncurses/ncurses-libs.template  |  7 +------
 srcpkgs/ncurses/ncurses-term.template  | 13 +++----------
 srcpkgs/ncurses/template               |  6 +++---
 5 files changed, 12 insertions(+), 35 deletions(-)

diff --git a/srcpkgs/ncurses/ncurses-base.template b/srcpkgs/ncurses/ncurses-base.template
index 3bd7295882f..5e96892a4af 100644
--- a/srcpkgs/ncurses/ncurses-base.template
+++ b/srcpkgs/ncurses/ncurses-base.template
@@ -1,15 +1,9 @@
 # Template file for 'ncurses-base'.
 #
-short_desc="${sourcepkg} base files"
-long_desc="${long_desc}
-
- This package contains the base files."
-
+short_desc="${short_desc} -- base terminfo files"
 noarch=yes
-noverifyrdeps=yes
 
-do_install()
-{
+do_install() {
 	cat $XBPS_SRCPKGDIR/ncurses/base-files | while read line; do
 		if [ -f ${SRCPKGDESTDIR}/${line} ]; then
 			install -D -m644 ${SRCPKGDESTDIR}/${line} \
diff --git a/srcpkgs/ncurses/ncurses-devel.template b/srcpkgs/ncurses/ncurses-devel.template
index 1ddfe8514e1..60e31bb25e5 100644
--- a/srcpkgs/ncurses/ncurses-devel.template
+++ b/srcpkgs/ncurses/ncurses-devel.template
@@ -1,15 +1,10 @@
 # Template file for 'ncurses-devel'.
 #
-depends="glibc-devel ncurses"
-short_desc="${sourcepkg} development files"
-long_desc="${long_desc}
-
- This package contains files for development: headers, static libs, etc."
-
+depends="ncurses-libs>=${version}"
+short_desc="${short_desc} -- development files"
 replaces="ncursesw-devel>=0"
 
-do_install()
-{
+do_install() {
 	mkdir -p ${DESTDIR}/usr/lib
 	mkdir -p ${DESTDIR}/usr/bin
 	mkdir -p ${DESTDIR}/usr/share/man/man1
diff --git a/srcpkgs/ncurses/ncurses-libs.template b/srcpkgs/ncurses/ncurses-libs.template
index f07fc912f0c..e1ff321f26b 100644
--- a/srcpkgs/ncurses/ncurses-libs.template
+++ b/srcpkgs/ncurses/ncurses-libs.template
@@ -1,11 +1,6 @@
 # Template file for 'ncurses-libs'.
 #
-depends="ncurses-base"
-short_desc="${sourcepkg} shared libraries"
-long_desc="${long_desc}
-
- This package contains the shared libraries."
-
+short_desc="${short_desc} -- shared libraries"
 replaces="ncursesw>=0"
 
 do_install() {
diff --git a/srcpkgs/ncurses/ncurses-term.template b/srcpkgs/ncurses/ncurses-term.template
index 5e7fc6f1d17..eafe042033e 100644
--- a/srcpkgs/ncurses/ncurses-term.template
+++ b/srcpkgs/ncurses/ncurses-term.template
@@ -1,17 +1,10 @@
 # Template file for 'ncurses-term'.
 #
-depends="ncurses-base"
-short_desc="${sourcepkg} full terminal descriptions"
-long_desc="${long_desc}
-
- This package contains all available terminal descriptions."
-
+depends="ncurses-base>=${version}"
+short_desc="${short_desc} -- full terminal descriptions"
 noarch=yes
-noverifyrdeps=yes
 
-
-do_install()
-{
+do_install() {
 	mkdir -p ${DESTDIR}/usr/share
 
 	mv ${SRCPKGDESTDIR}/usr/share/tabset ${DESTDIR}/usr/share
diff --git a/srcpkgs/ncurses/template b/srcpkgs/ncurses/template
index ea612192458..70edc663c33 100644
--- a/srcpkgs/ncurses/template
+++ b/srcpkgs/ncurses/template
@@ -1,7 +1,7 @@
 # Template build file for 'ncurses'.
 pkgname=ncurses
 version=5.9
-revision=4
+revision=5
 short_desc="A System V Release 4.0 curses emulation library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnu.org/software/ncurses/"
@@ -17,7 +17,7 @@ long_desc="
  ecompiler infocmp, clear, tput, tset, and a termcap conversion tool captoinfo.
  Full manual pages are provided for the library and tools."
 
-if [ -n "$XBPS_CROSS_TRIPLET" ]; then
+if [ "$XBPS_CROSS_BUILD" ]; then
 	subpackages="ncurses-devel ncurses-libs"
 else
 	subpackages="ncurses-base ncurses-devel ncurses-libs ncurses-term"
@@ -54,7 +54,7 @@ do_build() {
 
 do_install() {
 	cd ${wrksrc}/ncursesw-build
-	if [ -n "$XBPS_CROSS_TRIPLET" ]; then
+	if [ "$XBPS_CROSS_BUILD" ]; then
 		sed -e "s#install : install.data install.libs#install: install.libs#g" -i misc/Makefile
 	fi
 	make DESTDIR=${DESTDIR} install