- Fixed git, libressl, and ncurses.

- Removed popt as only rsync required it.
- Removed __PSX_DEFAULT_ROOT_DIRECTORY psxscl patch as chroot(8) can be used instead.
- Swapped 204.psxscl.build with 205.ntcon.build.

8 files changed, 101 insertions, 86 deletions

diff --git a/204.psxscl.build b/204.ntcon.build
index 52bb82e5..52bb82e5 120000
--- a/204.psxscl.build
+++ b/204.ntcon.build
diff --git a/205.ntcon.build b/205.psxscl.build
index 52bb82e5..52bb82e5 120000
--- a/205.ntcon.build
+++ b/205.psxscl.build
diff --git a/build.vars b/build.vars
index 4fb802ce..11900606 100644
--- a/build.vars
+++ b/build.vars
@@ -108,8 +108,7 @@ export PATH="${PREFIX}/bin${PATH:+:${PATH}}";
 : ${PKG_GIT_CC:=${HOST_NATIVE}-gcc};
 : ${PKG_GIT_CFLAGS:=-I. -I${PREFIX_LVL3}/include};
 : ${PKG_GIT_LDFLAGS:=-L${PREFIX_LVL3}/lib};
-: ${PKG_GIT_MAKEFLAGS:=NO_CURL=1 NO_PERL=1 PREFIX=${PREFIX_LVL3} V=99};
-: ${PKG_GIT_MAKEFLAGS_INSTALL_EXTRA:=NO_CURL=1 NO_PERL=1 PREFIX=${PREFIX_LVL3} V=99};
+: ${PKG_GIT_MAKEFLAGS:=NO_CURL=1 NO_PERL=1 prefix=${PREFIX_LVL3} V=99};
 : ${PKG_GIT_GIT_ARGS_EXTRA:=--branch v2.7.1};
 : ${PKG_GIT_NO_CONFIGURE:=1};
 : ${PKG_GIT_NO_DESTDIR:=1};
@@ -167,7 +166,7 @@ export PATH="${PREFIX}/bin${PATH:+:${PATH}}";
 : ${PKG_MUSL_SHA256SUM:=720b83c7e276b4b679c0bffe9509340d5f81fd601508e607e708177df0d31c0e};
 : ${PKG_MUSL_VERSION:=1.1.12};
 : ${PKG_MUSL_URL:=http://www.musl-libc.org/releases/musl-${PKG_MUSL_VERSION}.tar.gz};
-: ${PKG_NCURSES_CONFIGURE_ARGS_EXTRA:=--with-pkg-config --with-pkg-config-libdir=${PREFIX_LVL3}/lib/pkgconfig --enable-pc-files --enable-widec};
+: ${PKG_NCURSES_CONFIGURE_ARGS_EXTRA:=--with-pkg-config --with-pkg-config-libdir=${PREFIX_LVL3}/lib/pkgconfig --enable-pc-files --enable-widec --with-shared};
 : ${PKG_NCURSES_MAKEFLAGS_INSTALL_EXTRA:=PKG_CONFIG_LIBDIR=/lib/pkgconfig};
 : ${PKG_NCURSES_SHA256SUM:=f551c24b30ce8bfb6e96d9f59b42fbea30fa3a6123384172f9e7284bcf647260};
 : ${PKG_NCURSES_VERSION:=6.0};
diff --git a/libressl-2.2.6.local.patch b/libressl-2.2.6.local.patch
index a2f10741..b6cf20fb 100644
--- a/libressl-2.2.6.local.patch
+++ b/libressl-2.2.6.local.patch
@@ -19,55 +19,6 @@
  	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
  	      | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
  	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
---- libressl-2.2.6/configure.orig	2016-01-28 19:18:06.000000000 +0100
-+++ libressl-2.2.6/configure	2016-02-12 17:46:12.545206600 +0100
-@@ -690,6 +690,8 @@
- HOST_NETBSD_TRUE
- HOST_LINUX_FALSE
- HOST_LINUX_TRUE
-+HOST_MIDIPIX_FALSE
-+HOST_MIDIPIX_TRUE
- HOST_HPUX_FALSE
- HOST_HPUX_TRUE
- HOST_FREEBSD_FALSE
-@@ -11902,6 +11904,11 @@
- 		HOST_ABI=elf
- 		CPPFLAGS="$CPPFLAGS -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_POSIX_SOURCE -D_GNU_SOURCE"
- 		;;
-+	*midipix*)
-+		HOST_OS=midipix
-+		HOST_ABI=pe
-+		CFLAGS="$CFLAGS -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_POSIX_SOURCE -D_GNU_SOURCE"
-+		;;
- 	*netbsd*)
- 		HOST_OS=netbsd
- 		CPPFLAGS="$CPPFLAGS -D_OPENBSD_SOURCE"
-@@ -11981,6 +11988,14 @@
-   HOST_LINUX_FALSE=
- fi
- 
-+ if test x$HOST_OS = xmidipix; then
-+  HOST_MIDIPIX_TRUE=
-+  HOST_MIDIPIX_FALSE='#'
-+else
-+  HOST_MIDIPIX_TRUE='#'
-+  HOST_MIDIPIX_FALSE=
-+fi
-+
-  if test x$HOST_OS = xnetbsd; then
-   HOST_NETBSD_TRUE=
-   HOST_NETBSD_FALSE='#'
-@@ -13422,6 +13437,10 @@
-   as_fn_error $? "conditional \"HOST_LINUX\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
-+if test -z "${HOST_MIDIPIX_TRUE}" && test -z "${HOST_MIDIPIX_FALSE}"; then
-+  as_fn_error $? "conditional \"HOST_MIDIPIX\" was never defined.
-+Usually this means the macro was only invoked conditionally." "$LINENO" 5
-+fi
- if test -z "${HOST_NETBSD_TRUE}" && test -z "${HOST_NETBSD_FALSE}"; then
-   as_fn_error $? "conditional \"HOST_NETBSD\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
 --- libressl-2.2.6/crypto/compat/arc4random.h.orig	2015-10-15 23:18:44.000000000 +0200
 +++ libressl-2.2.6/crypto/compat/arc4random.h	2016-02-12 17:19:40.815245600 +0100
 @@ -12,7 +12,7 @@
@@ -203,3 +154,77 @@
  #include <endian.h>
  
  #elif defined(__sun) || defined(_AIX) || defined(__hpux)
+--- libressl-2.2.6/configure.orig	2016-01-28 18:18:06.000000000 +0000
++++ libressl-2.2.6/configure	2016-02-23 13:25:30.689963257 +0000
+@@ -690,6 +690,8 @@
+ HOST_NETBSD_TRUE
+ HOST_LINUX_FALSE
+ HOST_LINUX_TRUE
++HOST_MIDIPIX_FALSE
++HOST_MIDIPIX_TRUE
+ HOST_HPUX_FALSE
+ HOST_HPUX_TRUE
+ HOST_FREEBSD_FALSE
+@@ -10824,7 +10826,7 @@
+   ;;
+ 
+ # This must be glibc/ELF.
+-linux* | k*bsd*-gnu | kopensolaris*-gnu)
++linux* | k*bsd*-gnu | kopensolaris*-gnu | midipix*)
+   version_type=linux # correct to gnu/linux during the next big refactor
+   need_lib_prefix=no
+   need_version=no
+@@ -11902,6 +11904,11 @@
+ 		HOST_ABI=elf
+ 		CPPFLAGS="$CPPFLAGS -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_POSIX_SOURCE -D_GNU_SOURCE"
+ 		;;
++	*midipix*)
++		HOST_OS=midipix
++		HOST_ABI=pe
++		CFLAGS="$CFLAGS -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_POSIX_SOURCE -D_GNU_SOURCE"
++		;;
+ 	*netbsd*)
+ 		HOST_OS=netbsd
+ 		CPPFLAGS="$CPPFLAGS -D_OPENBSD_SOURCE"
+@@ -11981,6 +11988,14 @@
+   HOST_LINUX_FALSE=
+ fi
+ 
++ if test x$HOST_OS = xmidipix; then
++  HOST_MIDIPIX_TRUE=
++  HOST_MIDIPIX_FALSE='#'
++else
++  HOST_MIDIPIX_TRUE='#'
++  HOST_MIDIPIX_FALSE=
++fi
++
+  if test x$HOST_OS = xnetbsd; then
+   HOST_NETBSD_TRUE=
+   HOST_NETBSD_FALSE='#'
+@@ -13422,6 +13437,10 @@
+   as_fn_error $? "conditional \"HOST_LINUX\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
++if test -z "${HOST_MIDIPIX_TRUE}" && test -z "${HOST_MIDIPIX_FALSE}"; then
++  as_fn_error $? "conditional \"HOST_MIDIPIX\" was never defined.
++Usually this means the macro was only invoked conditionally." "$LINENO" 5
++fi
+ if test -z "${HOST_NETBSD_TRUE}" && test -z "${HOST_NETBSD_FALSE}"; then
+   as_fn_error $? "conditional \"HOST_NETBSD\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+@@ -15584,3 +15603,15 @@
+ $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+ fi
+ 
++# a transitional workaround...
++case $host_os in
++		midipix*)
++			cp $ac_confdir/libtool.midipix libtool || exit 2
++
++			sed -i	-e 's/@cbb_host_os@/'$host'/g' \
++				-e 's/@cbb_build_alias@/'$build_alias'/g' \
++				-e 's/@cbb_build_os@/'$build_os'/g' \
++				-e 's/@cbb_build@/'$build'/g' libtool || exit 2
++			;;
++esac
++
diff --git a/ncurses-6.0.local.patch b/ncurses-6.0.local.patch
index 2927fba3..1afa2142 100644
--- a/ncurses-6.0.local.patch
+++ b/ncurses-6.0.local.patch
@@ -19,3 +19,23 @@
  	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
  	      | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
  	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
+--- ncurses-6.0/configure.orig	2015-08-05 09:20:32.000000000 +0000
++++ ncurses-6.0/configure	2016-02-23 11:33:12.718112802 +0000
+@@ -5856,7 +5856,7 @@
+ 		LD_RPATH_OPT="-rpath "
+ 	fi
+ 	;;
+-(linux*|gnu*|k*bsd*-gnu)
++(linux*|gnu*|k*bsd*-gnu|midipix*)
+ 	LD_RPATH_OPT="-Wl,-rpath,"
+ 	;;
+ (openbsd[2-9].*|mirbsd*)
+@@ -6188,7 +6188,7 @@
+ 		fi
+ 		cf_cv_rm_so_locs=yes
+ 		;;
+-	(linux*|gnu*|k*bsd*-gnu)
++	(linux*|gnu*|k*bsd*-gnu|midipix*)
+ 		if test "$DFT_LWR_MODEL" = "shared" ; then
+ 			LOCAL_LDFLAGS="${LD_RPATH_OPT}\$(LOCAL_LIBDIR)"
+ 			LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
diff --git a/pkg.build b/pkg.build
index 0e243803..f8a3f567 100644
--- a/pkg.build
+++ b/pkg.build
@@ -115,6 +115,11 @@ if ! is_build_script_done install1; then
 			${RANLIB:+RANLIB=${RANLIB}}			\
 			DESTDIR=${PREFIX_LVL}				\
 			${PKG_INSTALL_TARGET:-install};
+	elif [ -n "${PKG_MAKEFLAGS}" ]; then
+		make	${PKG_MAKEFLAGS}				\
+			${CC:+CC=${CC}} ${CFLAGS:+"CFLAGS=${CFLAGS}"}	\
+			${LD:+LD=${LD}} ${LDFLAGS:+"LDFLAGS=${LDFLAGS}"}\
+			${PKG_INSTALL_TARGET:-install};
 	else
 		make	${PKG_MAKEFLAGS_INSTALL_EXTRA:+${PKG_MAKEFLAGS_INSTALL_EXTRA}}\
 			${MAKEFLAGS}					\
diff --git a/popt-1.16.local.patch b/popt-1.16.local.patch
deleted file mode 100644
index 8ccca2cd..00000000
--- a/popt-1.16.local.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- popt-1.16/config.sub.orig	2010-04-26 14:16:44.000000000 +0200
-+++ popt-1.16/config.sub	2016-02-12 15:51:37.738535300 +0100
-@@ -735,6 +735,9 @@
-         microblaze)
- 		basic_machine=microblaze-xilinx
- 		;;
-+	midipix)
-+		os=-midipix
-+		;;
- 	mingw32)
- 		basic_machine=i386-pc
- 		os=-mingw32
-@@ -1294,7 +1297,7 @@
- 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
- 	      | -chorusos* | -chorusrdb* | -cegcc* \
- 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
--	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
-+	      | -midipix* | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
- 	      | -uxpv* | -beos* | -mpeix* | -udk* \
- 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
- 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
diff --git a/psxscl.local.patch b/psxscl.local.patch
index 72a40bdb..a00c77b2 100644
--- a/psxscl.local.patch
+++ b/psxscl.local.patch
@@ -1,16 +1,3 @@
-diff --git a/src/init/psx_init_cwd.c b/src/init/psx_init_cwd.c
-index 924b1b8..02846ba 100644
---- a/src/init/psx_init_cwd.c
-+++ b/src/init/psx_init_cwd.c
-@@ -17,7 +17,7 @@
- #ifndef __PSX_DEFAULT_ROOT_DIRECTORY
- #define __PSX_DEFAULT_ROOT_DIRECTORY { \
- 				'\\','?','?','\\', \
--				'C',':','\\','m','i','d','i','p','i','x'}
-+				'Z',':','\\'}
- #endif
- 
- int32_t __psx_init_cwd(void)
 diff --git a/src/iofn/psx_iofn_fsdir.c b/src/iofn/psx_iofn_fsdir.c
 index 53b3380..8bdd7d8 100644
 --- a/src/iofn/psx_iofn_fsdir.c