ncurses: moved out all functions out of the main flow trying to make the conf file more readable

base/ncurses/ncurses.conf

@@ -53,25 +53,6 @@ tic_only() {
 	cp -a progs/tic $root/bin
 }
 
-if atstage toolchain; then
-	buildloops=1
-
-	custmain='tic_only'
-else
-
-# on systems having NLS support we build ncurses twice
-if [ "$SDECFG_DISABLE_NLS" != 1 ]; then
-	buildloops=2
-fi
-
-# sparc64 may need extra love
-if [ "$arch" == "sparc64" -a "$SDECFG_SPARC64_32BIT" = 1 ]; then
-	# double the loops
-	buildloops=$( expr $buildloops \* 2 )
-fi
-
-configscript="../configure"
-
 ncurses_preconf() {
 	if [ $buildloop -eq 1 ]; then
 		# first loop is easy, always simply narrowc
@@ -115,6 +96,50 @@ ncurses_preconf() {
 	fi
 }
 
+# create compatibility symlinks for curses
+make_curses_symlinks() {
+		echo "Creating compatibility symlinks for curses."
+
+	if [ "$SDECFG_STATIC" != 1 ]; then
+		ln -svf libncurses.so $root$libdir/libcurses.so
+	fi
+
+	ln -svf libncurses.a $root$libdir/libcurses.a
+}
+
+# functions we use when termcap package is installed
+remove_include_termcap() {
+	echo "Removing 'termcap.h' from include/Makefile for 'make install'."
+	sed -i 's,termcap.h,,g' include/Makefile
+}
+
+make_termcap_symlinks() {
+	echo "Creating compatibility symlinks for termcap."
+
+	if [ "$SDECFG_STATIC" != 1 ]; then
+		ln -svf libncurses.so $root$libdir/libtermcap.so
+	fi
+
+	ln -svf libncurses.a $root$libdir/libtermcap.a
+}
+
+if atstage toolchain; then
+	buildloops=1
+	custmain='tic_only'
+else
+	# on systems having NLS support we build ncurses twice
+	if [ "$SDECFG_DISABLE_NLS" != 1 ]; then
+		buildloops=2
+	fi
+
+	# sparc64 may need extra love
+	if [ "$arch" == "sparc64" -a "$SDECFG_SPARC64_32BIT" = 1 ]; then
+		# double the loops
+		buildloops=$( expr $buildloops \* 2 )
+	fi
+
+	configscript="../configure"
+
 	hook_add preconf 3 "ncurses_preconf"
 
 	[ "$SDECFG_STATIC" != 1 ] && var_append extraconfopt " " "--with-shared"
@@ -142,32 +167,8 @@ var_append extraconfopt " " "--enable-hard-tabs"
 	var_append extraconfopt " " "--enable-colorfgbg"
 
 	# always create compatibility symlinks for curses
-make_curses_symlinks() {
-	echo "Creating compatibility symlinks for curses."
-
-	if [ "$SDECFG_STATIC" != 1 ]; then
-		ln -svf libncurses.so $root$libdir/libcurses.so
-	fi
-
-	ln -svf libncurses.a $root$libdir/libcurses.a
-}
 	hook_add postmake 5 "make_curses_symlinks"
 
-remove_include_termcap() {
-	echo "Removing 'termcap.h' from include/Makefile for 'make install'."
-	sed -i 's,termcap.h,,g' include/Makefile
-}
-
-make_termcap_symlinks() {
-	echo "Creating compatibility symlinks for termcap."
-
-	if [ "$SDECFG_STATIC" != 1 ]; then
-		ln -svf libncurses.so $root$libdir/libtermcap.so
-	fi
-
-	ln -svf libncurses.a $root$libdir/libtermcap.a
-}
-
 	if pkginstalled termcap ; then
 		echo_status "Found termcap package ->" \
 				"disable ncurses internal termcap library."
@@ -176,5 +177,4 @@ if pkginstalled termcap ; then
 	else
 		hook_add postmake 6 "make_termcap_symlinks"
 	fi
-
 fi