packages: Separate out most of the remaining packages into recipes

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

4 files changed, 0 insertions, 5100 deletions

diff --git a/meta/packages/ncurses/ncurses.inc b/meta/packages/ncurses/ncurses.inc
deleted file mode 100644
index 259750cb46..0000000000
--- a/meta/packages/ncurses/ncurses.inc
+++ /dev/null
@@ -1,99 +0,0 @@
-DESCRIPTION = "Ncurses library"
-HOMEPAGE = "http://www.gnu.org/software/ncurses/ncurses.html"
-LICENSE = "MIT"
-SECTION = "libs"
-DEPENDS = "ncurses-native"
-DEPENDS_virtclass-native = ""
-PACKAGES_prepend = "ncurses-tools "
-PACKAGES_append = " ncurses-terminfo"
-FILES_ncurses_append = " ${datadir}/tabset"
-RSUGGESTS_${PN} = "ncurses-terminfo"
-RPROVIDES = "libncurses5"
-
-inherit autotools
-
-# This keeps only tput/tset in ncurses
-# clear/reset are in already busybox
-FILES_ncurses-tools = "${bindir}/tic ${bindir}/toe ${bindir}/infotocap ${bindir}/captoinfo ${bindir}/infocmp ${bindir}/clear.${PN} ${bindir}/reset.${PN} ${bindir}/tack "
-FILES_ncurses-terminfo = "${datadir}/terminfo"
-FILES_${PN} = "${bindir}/tput ${bindir}/tset ${libdir}/lib*.so.* /usr/share/tabset /etc/terminfo"
-
-PARALLEL_MAKE=""
-
-FILESPATH = "${FILE_DIRNAME}/local:${FILE_DIRNAME}/ncurses-${PV}-${PR}:${FILE_DIRNAME}/ncurses-${PV}:${FILE_DIRNAME}/ncurses:${FILE_DIRNAME}"
-
-EXTRA_OECONF = "--with-shared \
-                --with-libtool \
-	        --without-profile \
-	        --without-debug \
-	        --disable-rpath \
-	        --enable-echo \
-	        --enable-const \
-	        --without-ada \
-	        --enable-termcap \
-	        --without-cxx-binding \
-	        --with-terminfo-dirs=${sysconfdir}/terminfo:${datadir}/terminfo \
-	        --enable-overwrite \
-	        --with-build-ldflags='' \
-	        --with-build-ccflags='' "
-export BUILD_CCFLAGS = "-I${S}/ncurses -I${S}/include ${BUILD_CFLAGS}"
-export BUILD_LDFLAGS = ""
-export EXTRA_OEMAKE = '"BUILD_LDFLAGS=" "BUILD_CCFLAGS=${BUILD_CCFLAGS}"'
-
-# This is necessary so that the "tic" command executed during the install can
-# link with the correct libary in staging.
-export LD_LIBRARY_PATH = "${STAGING_LIBDIR_NATIVE}"
-
-do_install() {
-	autotools_do_install
-
-	ln -sf curses.h ${D}${includedir}/ncurses.h
-
-	# our ncurses has termcap support
-	ln -sf libncurses.so ${D}${libdir}/libtermcap.so
-	ln -sf libncurses.a ${D}${libdir}/libtermcap.a
-
-	# include some basic terminfo files
-	# stolen ;) from gentoo and modified a bit
-	for x in ansi console dumb linux rxvt screen sun vt{52,100,102,200,220} xterm-color xterm-xfree86
-        do
-                local termfile="$(find "${D}${datadir}/terminfo/" -name "${x}" 2>/dev/null)"
-                local basedir="$(basename $(dirname "${termfile}"))"
-
-                if [ -n "${termfile}" ]
-                then
-                        install -d ${D}${sysconfdir}/terminfo/${basedir}
-                        mv ${termfile} ${D}${sysconfdir}/terminfo/${basedir}/
-                        ln -s /etc/terminfo/${basedir}/${x} \
-                                ${D}${datadir}/terminfo/${basedir}/${x}
-                fi
-        done
-	# i think we can use xterm-color as default xterm
-	if [ -e ${D}${sysconfdir}/terminfo/x/xterm-color ]
-	then
-		ln -sf xterm-color ${D}${sysconfdir}/terminfo/x/xterm
-	fi
-
-	if [ "${PN}" = "ncurses" ]; then
-		mv ${D}${bindir}/clear ${D}${bindir}/clear.${PN}
-		mv ${D}${bindir}/reset ${D}${bindir}/reset.${PN}
-	fi
-}
-		
-		
-pkg_postinst_ncurses-tools () {
-	if [ "${PN}" = "ncurses" ]; then
-		update-alternatives --install ${bindir}/clear clear clear.${PN} 100
-		update-alternatives --install ${bindir}/reset reset reset.${PN} 100
-	fi
-}
-				
-			
-pkg_prerm_ncurses-tools () {
-	if [ "${PN}" = "ncurses" ]; then
-		update-alternatives --remove clear clear.${PN}
-		update-alternatives --remove reset reset.${PN}
-	fi
-}
-
-BBCLASSEXTEND = "native nativesdk"
diff --git a/meta/packages/ncurses/ncurses/makefile_tweak.patch b/meta/packages/ncurses/ncurses/makefile_tweak.patch
deleted file mode 100644
index 480855bcc6..0000000000
--- a/meta/packages/ncurses/ncurses/makefile_tweak.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-Libtool 2.2.2 needs to be able to use top_builddir. Automake usually exports 
-this but ncurses doesn't use automake.
-
-RP 14/4/08
-
-Index: ncurses-5.4/ncurses/Makefile.in
-===================================================================
---- ncurses-5.4.orig/ncurses/Makefile.in	2008-04-14 12:22:34.000000000 +0100
-+++ ncurses-5.4/ncurses/Makefile.in	2008-04-14 12:22:53.000000000 +0100
-@@ -57,6 +57,7 @@
- MODEL		= @DFT_LWR_MODEL@
- DESTDIR		= @DESTDIR@
- top_srcdir	= @top_srcdir@
-+top_builddir	= @top_srcdir@
- srcdir		= @srcdir@
- prefix		= @prefix@
- exec_prefix	= @exec_prefix@
-Index: ncurses-5.4/form/Makefile.in
-===================================================================
---- ncurses-5.4.orig/form/Makefile.in	2008-04-14 12:30:35.000000000 +0100
-+++ ncurses-5.4/form/Makefile.in	2008-04-14 12:30:59.000000000 +0100
-@@ -51,6 +51,7 @@
- MODEL		= @DFT_LWR_MODEL@
- DESTDIR		= @DESTDIR@
- srcdir		= @srcdir@
-+top_builddir	= @top_srcdir@
- prefix		= @prefix@
- exec_prefix	= @exec_prefix@
- bindir		= @bindir@
-Index: ncurses-5.4/menu/Makefile.in
-===================================================================
---- ncurses-5.4.orig/menu/Makefile.in	2008-04-14 12:29:00.000000000 +0100
-+++ ncurses-5.4/menu/Makefile.in	2008-04-14 12:29:13.000000000 +0100
-@@ -51,6 +51,7 @@
- MODEL		= @DFT_LWR_MODEL@
- DESTDIR		= @DESTDIR@
- srcdir		= @srcdir@
-+top_builddir	= @top_srcdir@
- prefix		= @prefix@
- exec_prefix	= @exec_prefix@
- bindir		= @bindir@
-Index: ncurses-5.4/panel/Makefile.in
-===================================================================
---- ncurses-5.4.orig/panel/Makefile.in	2008-04-14 12:27:40.000000000 +0100
-+++ ncurses-5.4/panel/Makefile.in	2008-04-14 12:27:59.000000000 +0100
-@@ -51,6 +51,7 @@
- MODEL		= @DFT_LWR_MODEL@
- DESTDIR		= @DESTDIR@
- srcdir		= @srcdir@
-+top_builddir	= @top_srcdir@
- prefix		= @prefix@
- exec_prefix	= @exec_prefix@
- bindir		= @bindir@
-Index: ncurses-5.4/progs/Makefile.in
-===================================================================
---- ncurses-5.4.orig/progs/Makefile.in	2008-04-14 12:24:37.000000000 +0100
-+++ ncurses-5.4/progs/Makefile.in	2008-04-14 12:25:06.000000000 +0100
-@@ -54,6 +54,7 @@
- MODEL		= ../@DFT_OBJ_SUBDIR@
- DESTDIR		= @DESTDIR@
- srcdir		= @srcdir@
-+top_builddir	= @top_srcdir@
- prefix		= @prefix@
- exec_prefix	= @exec_prefix@
- bindir		= @bindir@
-Index: ncurses-5.4/tack/Makefile.in
-===================================================================
---- ncurses-5.4.orig/tack/Makefile.in	2008-04-14 12:26:05.000000000 +0100
-+++ ncurses-5.4/tack/Makefile.in	2008-04-14 12:26:26.000000000 +0100
-@@ -22,6 +22,7 @@
- MODEL		= ../@DFT_OBJ_SUBDIR@
- DESTDIR		= @DESTDIR@
- srcdir		= @srcdir@
-+top_builddir    = @top_srcdir@
- prefix		= @prefix@
- exec_prefix	= @exec_prefix@
- bindir		= @bindir@
-Index: ncurses-5.4/test/Makefile.in
-===================================================================
---- ncurses-5.4.orig/test/Makefile.in	2008-04-14 12:32:37.000000000 +0100
-+++ ncurses-5.4/test/Makefile.in	2008-04-14 12:32:56.000000000 +0100
-@@ -43,6 +43,7 @@
- 
- MODEL		= ../@DFT_OBJ_SUBDIR@
- srcdir		= @srcdir@
-+top_builddir	= @top_srcdir@
- prefix		= @prefix@
- exec_prefix	= @exec_prefix@
- libdir		= @libdir@
diff --git a/meta/packages/ncurses/ncurses/visibility.patch b/meta/packages/ncurses/ncurses/visibility.patch
deleted file mode 100644
index 29cac5f1b8..0000000000
--- a/meta/packages/ncurses/ncurses/visibility.patch
+++ /dev/null
@@ -1,4904 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- ncurses-5.4/ncurses/Makefile.in~visibility.patch
-+++ ncurses-5.4/ncurses/Makefile.in
-@@ -107,7 +107,7 @@
- CFLAGS_NORMAL	= $(CCFLAGS)
- CFLAGS_DEBUG	= $(CCFLAGS) @CC_G_OPT@ -DTRACE
- CFLAGS_PROFILE	= $(CCFLAGS) -pg
--CFLAGS_SHARED	= $(CCFLAGS) @CC_SHARED_OPTS@
-+CFLAGS_SHARED	= $(CCFLAGS) @CC_SHARED_OPTS@ @LIBOPTS@
- 
- CFLAGS_DEFAULT	= $(CFLAGS_@DFT_UPR_MODEL@)
- 
---- ncurses-5.4/panel/Makefile.in~visibility.patch
-+++ ncurses-5.4/panel/Makefile.in
-@@ -88,7 +88,7 @@
- CFLAGS_NORMAL	= $(CCFLAGS)
- CFLAGS_DEBUG	= $(CCFLAGS) @CC_G_OPT@ -DTRACE
- CFLAGS_PROFILE	= $(CCFLAGS) -pg
--CFLAGS_SHARED	= $(CCFLAGS) @CC_SHARED_OPTS@
-+CFLAGS_SHARED	= $(CCFLAGS) @CC_SHARED_OPTS@ @LIBOPTS@
- 
- CFLAGS_DEFAULT	= $(CFLAGS_@DFT_UPR_MODEL@)
- 
---- ncurses-5.4/menu/Makefile.in~visibility.patch
-+++ ncurses-5.4/menu/Makefile.in
-@@ -87,7 +87,7 @@
- CFLAGS_NORMAL	= $(CCFLAGS)
- CFLAGS_DEBUG	= $(CCFLAGS) @CC_G_OPT@ -DTRACE
- CFLAGS_PROFILE	= $(CCFLAGS) -pg
--CFLAGS_SHARED	= $(CCFLAGS) @CC_SHARED_OPTS@
-+CFLAGS_SHARED	= $(CCFLAGS) @CC_SHARED_OPTS@ @LIBOPTS@
- 
- CFLAGS_DEFAULT	= $(CFLAGS_@DFT_UPR_MODEL@)
- 
---- ncurses-5.4/c++/Makefile.in~visibility.patch
-+++ ncurses-5.4/c++/Makefile.in
-@@ -80,7 +80,7 @@
- CFLAGS_NORMAL	= $(CCFLAGS)
- CFLAGS_DEBUG	= $(CCFLAGS) @CXX_G_OPT@ -DTRACE
- CFLAGS_PROFILE	= $(CCFLAGS) -pg
--CFLAGS_SHARED	= $(CCFLAGS) @CC_SHARED_OPTS@
-+CFLAGS_SHARED	= $(CCFLAGS) @CC_SHARED_OPTS@ @LIBOPTS@
- 
- CFLAGS_DEFAULT	= $(CFLAGS_@DFT_UPR_MODEL@)
- 
---- ncurses-5.4/form/Makefile.in~visibility.patch
-+++ ncurses-5.4/form/Makefile.in
-@@ -88,7 +88,7 @@
- CFLAGS_NORMAL	= $(CCFLAGS)
- CFLAGS_DEBUG	= $(CCFLAGS) @CC_G_OPT@ -DTRACE
- CFLAGS_PROFILE	= $(CCFLAGS) -pg
--CFLAGS_SHARED	= $(CCFLAGS) @CC_SHARED_OPTS@
-+CFLAGS_SHARED	= $(CCFLAGS) @CC_SHARED_OPTS@ @LIBOPTS@
- 
- CFLAGS_DEFAULT	= $(CFLAGS_@DFT_UPR_MODEL@)
- 
---- ncurses-5.4/configure.in~visibility.patch
-+++ ncurses-5.4/configure.in
-@@ -34,17 +34,20 @@
- dnl See http://invisible-island.net/autoconf/ for additional information.
- dnl
- dnl ---------------------------------------------------------------------------
--AC_PREREQ(2.13.20020210)
-+AC_PREREQ(2.59)
- AC_REVISION($Revision: 1.312 $)
--AC_INIT(ncurses/base/lib_initscr.c)
-+AC_INIT
-+AC_CONFIG_SRCDIR([ncurses/base/lib_initscr.c])
- AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
- 
-+m4_include([m4/templates.m4])
-+
- CF_SUBST_NCURSES_VERSION
- 
- CF_WITH_REL_VERSION(NCURSES)
- CF_WITH_ABI_VERSION
- 
--CF_CHECK_CACHE([AC_CANONICAL_SYSTEM])
-+CF_CHECK_CACHE([AC_CANONICAL_TARGET([])])
- AC_ARG_WITH(system-type,
- [  --with-system-type=XXX  test: override derived host system-type],
- [AC_MSG_WARN(overriding system type to $withval)
-@@ -100,7 +103,7 @@
- CF_GXX_VERSION
- case $GXX_VERSION in
- 1*|2.[[0-6]]*)
--	GXX=""; CXX=""; ac_cv_prog_gxx=no
-+	GXX=""; CXX=""; ac_cv_cxx_compiler_gnu=no
- 	cf_cxx_library=no
- 	AC_MSG_WARN(templates do not work)
- 	;;
-@@ -176,7 +179,6 @@
- AC_SUBST(DESTDIR)
- 
- ###############################################################################
--CF_HELP_MESSAGE(Build-Tools Needed to Compile Temporary Applications for Cross-compiling:)
- # If we're cross-compiling, allow the user to override the tools and their
- # options.  The configure script is oriented toward identifying the host
- # compiler, etc., but we need a build compiler to generate parts of the source.
-@@ -213,7 +215,6 @@
- AC_SUBST(BUILD_EXEEXT)
- 
- ###############################################################################
--CF_HELP_MESSAGE(Options to Specify the Libraries Built/Used:)
- 
- ### Options to allow the user to specify the set of libraries which are used.
- ### Use "--without-normal --with-shared" to allow the default model to be
-@@ -343,11 +344,11 @@
- 
- AC_MSG_CHECKING(for default loader flags)
- case $DFT_LWR_MODEL in
--libtool) LD_MODEL=''   ;;
-+libtool) LD_MODEL=''; LIBOPTS="-DNCURSES_DLL" ;;
- normal)  LD_MODEL=''   ;;
- debug)   LD_MODEL=$CC_G_OPT ;;
- profile) LD_MODEL='-pg';;
--shared)  LD_MODEL=''   ;;
-+shared)  LD_MODEL=''; LIBOPTS="-DNCURSES_DLL"   ;;
- esac
- AC_SUBST(LD_MODEL)dnl		the type of link (e.g., -g or -pg)
- AC_MSG_RESULT($LD_MODEL)
-@@ -363,14 +364,14 @@
- if test "$CC_SHARED_OPTS" = "unknown"; then
- 	for model in $cf_list_models; do
- 		if test "$model" = "shared"; then
--			AC_ERROR(Shared libraries are not supported in this version)
-+			AC_MSG_ERROR([Shared libraries are not supported in this version])
- 		fi
- 	done
- fi
- 
--###############################################################################
--CF_HELP_MESSAGE(Fine-Tuning Your Configuration:)
-+AC_SUBST(LIBOPTS)
- 
-+###############################################################################
- ###	use option --disable-overwrite to leave out the link to -lcurses
- AC_MSG_CHECKING(if you wish to install ncurses overwriting curses)
- AC_ARG_ENABLE(overwrite,
-@@ -450,7 +451,7 @@
- AC_ARG_ENABLE(big-core,
- 	[  --disable-big-core      assume machine has little memory],
- 	[with_big_core=$enableval],
--	[AC_TRY_RUN([
-+	[AC_RUN_IFELSE([AC_LANG_SOURCE([[
- #include <stdlib.h>
- #include <string.h>
- int main() {
-@@ -459,10 +460,7 @@
- 	if (s != 0)
- 		s[0] = s[n-1] = 0;
- 	exit(s == 0);
--}],
--	[with_big_core=yes],
--	[with_big_core=no],
--	[with_big_core=no])])
-+}]])],[with_big_core=yes],[with_big_core=no],[with_big_core=no])])
- AC_MSG_RESULT($with_big_core)
- test "$with_big_core" = "yes" && AC_DEFINE(HAVE_BIG_CORE)
- 
-@@ -477,7 +475,7 @@
- if test "$with_termcap" != "yes" ; then
- 	if test "$use_database" = no ; then
- 		if test -z "$with_fallback" ; then
--			AC_ERROR(You have disabled the database w/o specifying fallbacks)
-+			AC_MSG_ERROR([You have disabled the database w/o specifying fallbacks])
- 		fi
- 	fi
- 	AC_DEFINE(PURE_TERMINFO)
-@@ -614,10 +612,10 @@
- test "$with_rcs_ids" = yes && AC_DEFINE(USE_RCS_IDS)
- 
- ###############################################################################
-+
- CF_MAN_PAGES([ captoinfo clear infocmp infotocap tic toe tput ])
- 
- ###############################################################################
--CF_HELP_MESSAGE(Extensions:)
- 
- ### Note that some functions (such as const) are normally disabled anyway.
- AC_MSG_CHECKING(if you want to build with function extensions)
-@@ -683,7 +681,6 @@
- 
- ###############################################################################
- # These options are relatively safe to experiment with.
--CF_HELP_MESSAGE(Development Code:)
- AC_MSG_CHECKING(if you want all development code)
- AC_ARG_WITH(develop,
- 	[  --with-develop          enable all development options],
-@@ -719,7 +716,6 @@
- 
- ###############################################################################
- # These are just experimental, probably should not be in a package:
--CF_HELP_MESSAGE(Experimental Code:)
- 
- AC_MSG_CHECKING(if you do not want to assume colors are white-on-black)
- AC_ARG_ENABLE(assumed-color,
-@@ -828,7 +824,6 @@
- AC_SUBST(TERMINFO_CAPS)
- 
- ###############################################################################
--CF_HELP_MESSAGE(Testing/development Options:)
- 
- ###	use option --disable-echo to suppress full display compiling commands
- AC_MSG_CHECKING(if you want to display full commands during build)
-@@ -931,7 +926,7 @@
- AC_SUBST(MATH_LIB)
- 
- ###	Checks for header files.
--AC_STDC_HEADERS
-+AC_HEADER_STDC([])
- AC_HEADER_DIRENT
- AC_HEADER_TIME
- CF_REGEX
-@@ -965,7 +960,7 @@
- CF_SYS_TIME_SELECT
- 
- ###	checks for compiler characteristics
--AC_LANG_C
-+AC_LANG([C])
- AC_C_CONST
- AC_C_INLINE
- test "$ac_cv_c_inline" != no && AC_DEFINE(CC_HAS_INLINE_FUNCS)
-@@ -1040,7 +1035,7 @@
- 
- # Check for C++ compiler characteristics (and ensure that it's there!)
- if test -n "$CXX" ; then
--	AC_LANG_CPLUSPLUS
-+	AC_LANG([C++])
- 	CF_STDCPP_LIBRARY
- 
- 	case $GXX_VERSION in
-@@ -1135,7 +1130,6 @@
- fi
- AC_SUBST(USE_CXX_BOOL)
- 
--CF_HELP_MESSAGE(Ada95 Binding Options:)
- 
- dnl Check for availability of GNU Ada Translator (GNAT).
- dnl At the moment we support no other Ada95 compiler.
-@@ -1309,15 +1303,16 @@
- 
- ################################################################################
- test "$use_database" = yes && SUB_MAKEFILES="$SUB_MAKEFILES misc/run_tic.sh:misc/run_tic.in"
--AC_OUTPUT( \
-+AC_CONFIG_FILES([\
- 	include/MKterm.h.awk \
- 	include/curses.head:include/curses.h.in \
- 	include/termcap.h \
- 	include/unctrl.h \
- 	$SUB_MAKEFILES \
--	Makefile,[
-+	Makefile])
-+AC_CONFIG_COMMANDS([default],[
- CF_LIB_RULES
--],[
-+],[[
- ### Special initialization commands, used to pass information from the
- ### configuration-run into config.status
- 
-@@ -1348,5 +1343,6 @@
- host="$host"
- target="$target"
- 
--],cat)dnl
-+]])
-+AC_OUTPUT
- ${MAKE-make} preinstall
---- ncurses-5.4/include/ncurses_dll.h~visibility.patch
-+++ ncurses-5.4/include/ncurses_dll.h
-@@ -7,8 +7,8 @@
- /* but this structure may be useful at some point for an MSVC build */
- /* so, for now unconditionally define the important flags           */
- /* "the right way" for proper static and dll+auto-import behavior   */
--#undef NCURSES_DLL
--#define NCURSES_STATIC
-+//#undef NCURSES_DLL
-+//#define NCURSES_STATIC
- 
- #if defined(__CYGWIN__)
- #  if defined(NCURSES_DLL)
-@@ -32,12 +32,20 @@
- #  endif
- #  define NCURSES_API __cdecl
- #  define NCURSES_EXPORT(type) NCURSES_IMPEXP type NCURSES_API
--#  define NCURSES_EXPORT_VAR(type) NCURSES_IMPEXP type
-+#  define NCURSES_EXPORT_VAR(var) var NCURSES_IMPEXP
- #endif
- 
- /* Take care of non-cygwin platforms */
- #if !defined(NCURSES_IMPEXP)
--#  define NCURSES_IMPEXP /* nothing */
-+#  if defined(GCC_HASCLASSVISIBILITY)
-+#    if defined(NCURSES_DLL)
-+#      define NCURSES_IMPEXP __attribute__ ((visibility("default")))
-+#    else
-+#      define NCURSES_IMPEXP /* nothing */
-+#    endif
-+#  else
-+#    define NCURSES_IMPEXP /* nothing */
-+#  endif
- #endif
- #if !defined(NCURSES_API)
- #  define NCURSES_API /* nothing */
-@@ -46,7 +54,7 @@
- #  define NCURSES_EXPORT(type) NCURSES_IMPEXP type NCURSES_API
- #endif
- #if !defined(NCURSES_EXPORT_VAR)
--#  define NCURSES_EXPORT_VAR(type) NCURSES_IMPEXP type
-+#  define NCURSES_EXPORT_VAR(var) var NCURSES_IMPEXP
- #endif
- 
- #endif /* NCURSES_DLL_H_incl */
---- ncurses-5.4/form/fty_alnum.c~visibility.patch
-+++ ncurses-5.4/form/fty_alnum.c
-@@ -132,6 +132,6 @@
-   NULL
- };
- 
--NCURSES_EXPORT_VAR(FIELDTYPE*) TYPE_ALNUM = &typeALNUM;
-+FIELDTYPE* NCURSES_EXPORT_VAR(TYPE_ALNUM) = &typeALNUM;
- 
- /* fty_alnum.c ends here */
---- ncurses-5.4/form/fty_alpha.c~visibility.patch
-+++ ncurses-5.4/form/fty_alpha.c
-@@ -133,6 +133,6 @@
-   NULL
- };
- 
--NCURSES_EXPORT_VAR(FIELDTYPE*) TYPE_ALPHA = &typeALPHA;
-+FIELDTYPE* NCURSES_EXPORT_VAR(TYPE_ALPHA) = &typeALPHA;
- 
- /* fty_alpha.c ends here */
---- ncurses-5.4/form/fld_newftyp.c~visibility.patch
-+++ ncurses-5.4/form/fld_newftyp.c
-@@ -48,7 +48,7 @@
-   NULL                 /* enumerate previous function                 */
- };
- 
--NCURSES_EXPORT_VAR(const FIELDTYPE*) _nc_Default_FieldType = &default_fieldtype;
-+const FIELDTYPE* NCURSES_EXPORT_VAR(_nc_Default_FieldType) = &default_fieldtype;
- 
- /*---------------------------------------------------------------------------
- |   Facility      :  libnform  
---- ncurses-5.4/form/form.h~visibility.patch
-+++ ncurses-5.4/form/form.h
-@@ -248,24 +248,24 @@
- 	/*************************
- 	*  standard field types  *
- 	*************************/
--extern NCURSES_EXPORT_VAR(FIELDTYPE *) TYPE_ALPHA;
--extern NCURSES_EXPORT_VAR(FIELDTYPE *) TYPE_ALNUM;
--extern NCURSES_EXPORT_VAR(FIELDTYPE *) TYPE_ENUM;
--extern NCURSES_EXPORT_VAR(FIELDTYPE *) TYPE_INTEGER;
--extern NCURSES_EXPORT_VAR(FIELDTYPE *) TYPE_NUMERIC;
--extern NCURSES_EXPORT_VAR(FIELDTYPE *) TYPE_REGEXP;
-+extern FIELDTYPE * NCURSES_EXPORT_VAR(TYPE_ALPHA);
-+extern FIELDTYPE * NCURSES_EXPORT_VAR(TYPE_ALNUM);
-+extern FIELDTYPE * NCURSES_EXPORT_VAR(TYPE_ENUM);
-+extern FIELDTYPE * NCURSES_EXPORT_VAR(TYPE_INTEGER);
-+extern FIELDTYPE * NCURSES_EXPORT_VAR(TYPE_NUMERIC);
-+extern FIELDTYPE * NCURSES_EXPORT_VAR(TYPE_REGEXP);
- 
-         /************************************
- 	*  built-in additional field types  *
-         *  They are not defined in SVr4     *
- 	************************************/
--extern NCURSES_EXPORT_VAR(FIELDTYPE *) TYPE_IPV4;      /* Internet IP Version 4 address */
-+extern FIELDTYPE * NCURSES_EXPORT_VAR(TYPE_IPV4);      /* Internet IP Version 4 address */
- 
-         /*********************** 
-         *   Default objects    *
-         ***********************/ 
--extern NCURSES_EXPORT_VAR(FORM *)	_nc_Default_Form;
--extern NCURSES_EXPORT_VAR(FIELD *)	_nc_Default_Field;
-+extern FORM * NCURSES_EXPORT_VAR(_nc_Default_Form);
-+extern FIELD * NCURSES_EXPORT_VAR(_nc_Default_Field);
- 
- 
- 	/***********************
---- ncurses-5.4/form/fty_int.c~visibility.patch
-+++ ncurses-5.4/form/fty_int.c
-@@ -155,6 +155,6 @@
-   NULL
- };
- 
--NCURSES_EXPORT_VAR(FIELDTYPE*) TYPE_INTEGER = &typeINTEGER;
-+FIELDTYPE* NCURSES_EXPORT_VAR(TYPE_INTEGER) = &typeINTEGER;
- 
- /* fty_int.c ends here */
---- ncurses-5.4/form/fty_num.c~visibility.patch
-+++ ncurses-5.4/form/fty_num.c
-@@ -190,6 +190,6 @@
-   NULL
- };
- 
--NCURSES_EXPORT_VAR(FIELDTYPE*) TYPE_NUMERIC = &typeNUMERIC;
-+FIELDTYPE* NCURSES_EXPORT_VAR(TYPE_NUMERIC) = &typeNUMERIC;
- 
- /* fty_num.c ends here */
---- ncurses-5.4/form/fty_regex.c~visibility.patch
-+++ ncurses-5.4/form/fty_regex.c
-@@ -252,6 +252,6 @@
-   NULL
- };
- 
--NCURSES_EXPORT_VAR(FIELDTYPE*) TYPE_REGEXP = &typeREGEXP;
-+FIELDTYPE* NCURSES_EXPORT_VAR(TYPE_REGEXP) = &typeREGEXP;
- 
- /* fty_regex.c ends here */
---- ncurses-5.4/form/frm_def.c~visibility.patch
-+++ ncurses-5.4/form/frm_def.c
-@@ -60,7 +60,7 @@
-   NULL                                  /* fieldterm  */
- };
- 
--NCURSES_EXPORT_VAR(FORM *) _nc_Default_Form = &default_form;
-+FORM * NCURSES_EXPORT_VAR(_nc_Default_Form) = &default_form;
- 
- /*---------------------------------------------------------------------------
- |   Facility      :  libnform  
---- ncurses-5.4/form/fld_def.c~visibility.patch
-+++ ncurses-5.4/form/fld_def.c
-@@ -63,7 +63,7 @@
-   (char *)0                /* usrptr */
- };
- 
--NCURSES_EXPORT_VAR(FIELD *) _nc_Default_Field = &default_field;
-+FIELD * NCURSES_EXPORT_VAR(_nc_Default_Field) = &default_field;
- 
- /*---------------------------------------------------------------------------
- |   Facility      :  libnform  
---- ncurses-5.4/form/fty_enum.c~visibility.patch
-+++ ncurses-5.4/form/fty_enum.c
-@@ -290,6 +290,6 @@
-   Previous_Enum
- };
- 
--NCURSES_EXPORT_VAR(FIELDTYPE*) TYPE_ENUM = &typeENUM;
-+FIELDTYPE* NCURSES_EXPORT_VAR(TYPE_ENUM) = &typeENUM;
- 
- /* fty_enum.c ends here */
---- ncurses-5.4/form/fty_ipv4.c~visibility.patch
-+++ ncurses-5.4/form/fty_ipv4.c
-@@ -76,6 +76,6 @@
-   NULL
- };
- 
--NCURSES_EXPORT_VAR(FIELDTYPE*) TYPE_IPV4 = &typeIPV4;
-+FIELDTYPE* NCURSES_EXPORT_VAR(TYPE_IPV4) = &typeIPV4;
- 
- /* fty_ipv4.c ends here */
---- ncurses-5.4/form/form.priv.h~visibility.patch
-+++ ncurses-5.4/form/form.priv.h
-@@ -112,7 +112,7 @@
- #define C_BLANK ' '
- #define is_blank(c) ((c)==C_BLANK)
- 
--extern NCURSES_EXPORT_VAR(const FIELDTYPE *) _nc_Default_FieldType;
-+extern const FIELDTYPE * NCURSES_EXPORT_VAR(_nc_Default_FieldType);
- 
- extern NCURSES_EXPORT(TypeArgument *) _nc_Make_Argument (const FIELDTYPE*,va_list*,int*);
- extern NCURSES_EXPORT(TypeArgument *) _nc_Copy_Argument (const FIELDTYPE*,const TypeArgument*, int*);
---- ncurses-5.4/include/tic.h~visibility.patch
-+++ ncurses-5.4/include/tic.h
-@@ -117,7 +117,7 @@
- #define DEBUG(n, a)	/*nothing*/
- #endif
- 
--extern NCURSES_EXPORT_VAR(unsigned) _nc_tracing;
-+extern unsigned NCURSES_EXPORT_VAR(_nc_tracing);
- extern NCURSES_EXPORT(void) _nc_tracef (char *, ...) GCC_PRINTFLIKE(1,2);
- extern NCURSES_EXPORT(const char *) _nc_visbuf (const char *);
- extern NCURSES_EXPORT(const char *) _nc_visbuf2 (int, const char *);
-@@ -151,7 +151,7 @@
- 	char	*tk_valstring;	/* value of capability (if a string) */
- };
- 
--extern NCURSES_EXPORT_VAR(struct token)	_nc_curr_token;
-+extern struct token NCURSES_EXPORT_VAR(_nc_curr_token);
- 
- 	/*
- 	 * List of keynames with their corresponding code.
-@@ -161,7 +161,7 @@
- 	int code;
- };
- 
--extern NCURSES_EXPORT_VAR(const struct kn) _nc_key_names[];
-+extern const struct kn NCURSES_EXPORT_VAR(_nc_key_names[]);
- 
- 	/*
- 	 * Offsets to string capabilities, with the corresponding functionkey
-@@ -179,7 +179,7 @@
- 
- #else
- 
--extern NCURSES_EXPORT_VAR(struct tinfo_fkeys) _nc_tinfo_fkeys[];
-+extern struct tinfo_fkeys NCURSES_EXPORT_VAR(_nc_tinfo_fkeys[]);
- 
- #endif
- 
-@@ -204,11 +204,11 @@
- 	const char	*source;
- };
- 
--extern NCURSES_EXPORT_VAR(const struct name_table_entry * const) _nc_info_hash_table[];
--extern NCURSES_EXPORT_VAR(const struct name_table_entry * const) _nc_cap_hash_table[];
-+extern const struct name_table_entry * const NCURSES_EXPORT_VAR(_nc_info_hash_table[]);
-+extern const struct name_table_entry * const NCURSES_EXPORT_VAR(_nc_cap_hash_table[]);
- 
--extern NCURSES_EXPORT_VAR(const struct alias) _nc_capalias_table[];
--extern NCURSES_EXPORT_VAR(const struct alias) _nc_infoalias_table[];
-+extern const struct alias NCURSES_EXPORT_VAR(_nc_capalias_table[]);
-+extern const struct alias NCURSES_EXPORT_VAR(_nc_infoalias_table[]);
- 
- extern NCURSES_EXPORT(const struct name_table_entry *) _nc_get_table (bool);
- extern NCURSES_EXPORT(const struct name_table_entry * const *) _nc_get_hash_table (bool);
-@@ -255,13 +255,13 @@
- extern NCURSES_EXPORT(void) _nc_panic_mode (char);
- extern NCURSES_EXPORT(void) _nc_push_token (int);
- extern NCURSES_EXPORT(void) _nc_reset_input (FILE *, char *);
--extern NCURSES_EXPORT_VAR(int) _nc_curr_col;
--extern NCURSES_EXPORT_VAR(int) _nc_curr_line;
--extern NCURSES_EXPORT_VAR(int) _nc_syntax;
--extern NCURSES_EXPORT_VAR(long) _nc_comment_end;
--extern NCURSES_EXPORT_VAR(long) _nc_comment_start;
--extern NCURSES_EXPORT_VAR(long) _nc_curr_file_pos;
--extern NCURSES_EXPORT_VAR(long) _nc_start_line;
-+extern int NCURSES_EXPORT_VAR(_nc_curr_col);
-+extern int NCURSES_EXPORT_VAR(_nc_curr_line);
-+extern int NCURSES_EXPORT_VAR(_nc_syntax);
-+extern long NCURSES_EXPORT_VAR(_nc_comment_end);
-+extern long NCURSES_EXPORT_VAR(_nc_comment_start);
-+extern long NCURSES_EXPORT_VAR(_nc_curr_file_pos);
-+extern long NCURSES_EXPORT_VAR(_nc_start_line);
- #define SYN_TERMINFO	0
- #define SYN_TERMCAP	1
- 
-@@ -272,7 +272,7 @@
- extern NCURSES_EXPORT(void) _nc_syserr_abort (const char *const,...) GCC_PRINTFLIKE(1,2) GCC_NORETURN;
- extern NCURSES_EXPORT(void) _nc_err_abort (const char *const,...) GCC_PRINTFLIKE(1,2) GCC_NORETURN;
- extern NCURSES_EXPORT(void) _nc_warning (const char *const,...) GCC_PRINTFLIKE(1,2);
--extern NCURSES_EXPORT_VAR(bool) _nc_suppress_warnings;
-+extern bool NCURSES_EXPORT_VAR(_nc_suppress_warnings);
- 
- /* comp_expand.c: expand string into readable form */
- extern NCURSES_EXPORT(char *) _nc_tic_expand (const char *, bool, int);
-@@ -287,12 +287,12 @@
- /* lib_tparm.c */
- #define NUM_PARM 9
- 
--extern NCURSES_EXPORT_VAR(int) _nc_tparm_err;
-+extern int NCURSES_EXPORT_VAR(_nc_tparm_err);
- 
- extern NCURSES_EXPORT(int) _nc_tparm_analyze(const char *string, char *p_is_s[NUM_PARM], int *popcount);
- 
- /* lib_tputs.c */
--extern NCURSES_EXPORT_VAR(int) _nc_nulls_sent;		/* Add one for every null sent */
-+extern int NCURSES_EXPORT_VAR(_nc_nulls_sent);		/* Add one for every null sent */
- 
- /* comp_main.c: compiler main */
- extern const char * _nc_progname;
---- ncurses-5.4/include/MKterm.h.awk.in~visibility.patch
-+++ ncurses-5.4/include/MKterm.h.awk.in
-@@ -228,9 +228,9 @@
- 			print  "    char *      _termname;      /* used for termname() */"
- 			print  "} TERMINAL;"
- 			print  ""
--			print  "extern NCURSES_EXPORT_VAR(TERMINAL *) cur_term;"
-+			print  "extern TERMINAL * NCURSES_EXPORT_VAR(cur_term);"
- 			print  ""
--			print  "#if BROKEN_LINKER"
-+			print  "#if defined(BROKEN_LINKER)"
- 			print  "#define boolnames  _nc_boolnames()"
- 			print  "#define boolcodes  _nc_boolcodes()"
- 			print  "#define boolfnames _nc_boolfnames()"
-@@ -253,15 +253,15 @@
- 			print  ""
- 			print  "#else"
- 			print  ""
--			print  "extern NCURSES_EXPORT_VAR(NCURSES_CONST char * const ) boolnames[];"
--			print  "extern NCURSES_EXPORT_VAR(NCURSES_CONST char * const ) boolcodes[];"
--			print  "extern NCURSES_EXPORT_VAR(NCURSES_CONST char * const ) boolfnames[];"
--			print  "extern NCURSES_EXPORT_VAR(NCURSES_CONST char * const ) numnames[];"
--			print  "extern NCURSES_EXPORT_VAR(NCURSES_CONST char * const ) numcodes[];"
--			print  "extern NCURSES_EXPORT_VAR(NCURSES_CONST char * const ) numfnames[];"
--			print  "extern NCURSES_EXPORT_VAR(NCURSES_CONST char * const ) strnames[];"
--			print  "extern NCURSES_EXPORT_VAR(NCURSES_CONST char * const ) strcodes[];"
--			print  "extern NCURSES_EXPORT_VAR(NCURSES_CONST char * const ) strfnames[];"
-+			print  "extern NCURSES_CONST char * const  NCURSES_EXPORT_VAR(boolnames[]);"
-+			print  "extern NCURSES_CONST char * const  NCURSES_EXPORT_VAR(boolcodes[]);"
-+			print  "extern NCURSES_CONST char * const  NCURSES_EXPORT_VAR(boolfnames[]);"
-+			print  "extern NCURSES_CONST char * const  NCURSES_EXPORT_VAR(numnames[]);"
-+			print  "extern NCURSES_CONST char * const  NCURSES_EXPORT_VAR(numcodes[]);"
-+			print  "extern NCURSES_CONST char * const  NCURSES_EXPORT_VAR(numfnames[]);"
-+			print  "extern NCURSES_CONST char * const  NCURSES_EXPORT_VAR(strnames[]);"
-+			print  "extern NCURSES_CONST char * const  NCURSES_EXPORT_VAR(strcodes[]);"
-+			print  "extern NCURSES_CONST char * const  NCURSES_EXPORT_VAR(strfnames[]);"
- 			print  ""
- 			print  "#endif"
- 			print  ""
-@@ -287,7 +287,7 @@
- 			print  "#if !defined(__NCURSES_H)"
- 			print  "extern NCURSES_EXPORT(char *) tigetstr (NCURSES_CONST char *);"
- 			print  "extern NCURSES_EXPORT(char *) tparm (NCURSES_CONST char *, ...);"
--			print  "extern NCURSES_EXPORT_VAR(char) ttytype[];"
-+			print  "extern char NCURSES_EXPORT_VAR(ttytype[]);"
- 			print  "extern NCURSES_EXPORT(int) putp (const char *);"
- 			print  "extern NCURSES_EXPORT(int) tigetflag (NCURSES_CONST char *);"
- 			print  "extern NCURSES_EXPORT(int) tigetnum (NCURSES_CONST char *);"
---- ncurses-5.4/include/termcap.h.in~visibility.patch
-+++ ncurses-5.4/include/termcap.h.in
-@@ -54,10 +54,10 @@
- #undef  NCURSES_OSPEED 
- #define NCURSES_OSPEED @NCURSES_OSPEED@ 
- 
--extern NCURSES_EXPORT_VAR(char) PC;
--extern NCURSES_EXPORT_VAR(char *) UP;
--extern NCURSES_EXPORT_VAR(char *) BC;
--extern NCURSES_EXPORT_VAR(NCURSES_OSPEED) ospeed; 
-+extern char NCURSES_EXPORT_VAR(PC);
-+extern char * NCURSES_EXPORT_VAR(UP);
-+extern char * NCURSES_EXPORT_VAR(BC);
-+extern NCURSES_OSPEED NCURSES_EXPORT_VAR(ospeed); 
- 
- #if !defined(NCURSES_TERM_H_incl)
- extern NCURSES_EXPORT(char *) tgetstr (NCURSES_CONST char *, char **);
---- ncurses-5.4/include/term_entry.h~visibility.patch
-+++ ncurses-5.4/include/term_entry.h
-@@ -90,8 +90,8 @@
- #define ExtNumname(tp,i,names)  EXT_NAMES(tp, i, NUMCOUNT, (i - (tp->num_Numbers - tp->ext_Numbers)) + tp->ext_Booleans, names)
- #define ExtStrname(tp,i,names)  EXT_NAMES(tp, i, STRCOUNT, (i - (tp->num_Strings - tp->ext_Strings)) + (tp->ext_Numbers + tp->ext_Booleans), names)
- 
--extern NCURSES_EXPORT_VAR(ENTRY *) _nc_head;
--extern NCURSES_EXPORT_VAR(ENTRY *) _nc_tail;
-+extern ENTRY * NCURSES_EXPORT_VAR(_nc_head);
-+extern ENTRY * NCURSES_EXPORT_VAR(_nc_tail);
- #define for_entry_list(qp)	for (qp = _nc_head; qp; qp = qp->next)
- 
- #define MAX_LINE	132
-@@ -135,8 +135,8 @@
- 
- /* parse_entry.c: entry-parsing code */
- #if NCURSES_XNAMES
--extern NCURSES_EXPORT_VAR(bool) _nc_user_definable;
--extern NCURSES_EXPORT_VAR(bool) _nc_disable_period;
-+extern bool NCURSES_EXPORT_VAR(_nc_user_definable);
-+extern bool NCURSES_EXPORT_VAR(_nc_disable_period);
- #endif
- extern NCURSES_EXPORT(int) _nc_parse_entry (ENTRY *, int, bool);
- extern NCURSES_EXPORT(int) _nc_capcmp (const char *, const char *);
---- ncurses-5.4/include/curses.h.in~visibility.patch
-+++ ncurses-5.4/include/curses.h.in
-@@ -171,8 +171,8 @@
- #define WA_VERTICAL	A_VERTICAL
- 
- /* colors */
--extern NCURSES_EXPORT_VAR(int) COLORS;
--extern NCURSES_EXPORT_VAR(int) COLOR_PAIRS;
-+extern int NCURSES_EXPORT_VAR(COLORS);
-+extern int NCURSES_EXPORT_VAR(COLOR_PAIRS);
- 
- #define COLOR_BLACK	0
- #define COLOR_RED	1
-@@ -186,10 +186,10 @@
- /* line graphics */
- 
- #if @BROKEN_LINKER@
--extern NCURSES_EXPORT_VAR(chtype*) _nc_acs_map(void);
-+extern chtype* NCURSES_EXPORT_VAR(_nc_acs_map)(void);
- #define acs_map (_nc_acs_map())
- #else
--extern NCURSES_EXPORT_VAR(chtype) acs_map[];
-+extern chtype NCURSES_EXPORT_VAR(acs_map[]);
- #endif
- 
- #define NCURSES_ACS(c)	(acs_map[(unsigned char)c])
-@@ -369,20 +369,20 @@
- #endif
- };
- 
--extern NCURSES_EXPORT_VAR(WINDOW *)   stdscr;
--extern NCURSES_EXPORT_VAR(WINDOW *)   curscr;
--extern NCURSES_EXPORT_VAR(WINDOW *)   newscr;
-+extern WINDOW * NCURSES_EXPORT_VAR(stdscr);
-+extern WINDOW * NCURSES_EXPORT_VAR(curscr);
-+extern WINDOW * NCURSES_EXPORT_VAR(newscr);
- 
--extern NCURSES_EXPORT_VAR(int)	LINES;
--extern NCURSES_EXPORT_VAR(int)	COLS;
--extern NCURSES_EXPORT_VAR(int)	TABSIZE;
-+extern int NCURSES_EXPORT_VAR(LINES);
-+extern int NCURSES_EXPORT_VAR(COLS);
-+extern int NCURSES_EXPORT_VAR(TABSIZE);
- 
- /*
-  * This global was an undocumented feature under AIX curses.
-  */
--extern NCURSES_EXPORT_VAR(int) ESCDELAY;	/* ESC expire time in milliseconds */
-+extern int NCURSES_EXPORT_VAR(ESCDELAY);	/* ESC expire time in milliseconds */
- 
--extern NCURSES_EXPORT_VAR(char) ttytype[];	/* needed for backward compatibility */
-+extern char NCURSES_EXPORT_VAR(ttytype[]);	/* needed for backward compatibility */
- 
- /*
-  * These functions are extensions - not in XSI Curses.
---- ncurses-5.4/include/curses.tail~visibility.patch
-+++ ncurses-5.4/include/curses.tail
-@@ -110,7 +110,7 @@
- #define TRACE_MAXIMUM	((1 << TRACE_SHIFT) - 1) /* maximum trace level */
- 
- #if defined(TRACE) || defined(NCURSES_TEST)
--extern NCURSES_EXPORT_VAR(int) _nc_optimize_enable;		/* enable optimizations */
-+extern int NCURSES_EXPORT_VAR(_nc_optimize_enable);		/* enable optimizations */
- #ifdef _XOPEN_SOURCE_EXTENDED
- extern NCURSES_EXPORT(const char *) _nc_viswbuf(const wchar_t *);
- #endif
---- ncurses-5.4/include/curses.wide~visibility.patch
-+++ ncurses-5.4/include/curses.wide
-@@ -3,7 +3,7 @@
- 
- /* $Id: curses.wide,v 1.28 2004/01/03 20:35:14 tom Exp $ */
- 
--extern NCURSES_EXPORT_VAR(cchar_t *) _nc_wacs;
-+extern cchar_t * NCURSES_EXPORT_VAR(_nc_wacs);
- 
- #define NCURSES_WACS(c)	(&_nc_wacs[(unsigned char)c])
- 
---- ncurses-5.4/menu/menu.priv.h~visibility.patch
-+++ ncurses-5.4/menu/menu.priv.h
-@@ -49,8 +49,8 @@
- /* Backspace code */
- #define BS (8)
- 
--extern NCURSES_EXPORT_VAR(ITEM) _nc_Default_Item;
--extern NCURSES_EXPORT_VAR(MENU) _nc_Default_Menu;
-+extern ITEM NCURSES_EXPORT_VAR(_nc_Default_Item);
-+extern MENU NCURSES_EXPORT_VAR(_nc_Default_Menu);
- 
- /* Normalize item to default if none was given */
- #define Normalize_Item( item ) ((item)=(item)?(item):&_nc_Default_It