devel/mingw32-bin-msvcrt: update r4.0.3.1.a4.0.3.1 and support staging

- update to r4.0.3.1.a4.0.3.1
- support staging

PR:		187231
Submitted by:	Naram Qashat <cyberbotx@cyberbotx.com> (maintainer)

4 files changed, 25 insertions, 31 deletions

diff --git a/devel/mingw32-bin-msvcrt/Makefile b/devel/mingw32-bin-msvcrt/Makefile
index 316177bbf77..3a6263327b2 100644
--- a/devel/mingw32-bin-msvcrt/Makefile
+++ b/devel/mingw32-bin-msvcrt/Makefile
@@ -2,23 +2,25 @@
 # $FreeBSD$
 
 PORTNAME=	bin-msvcrt
-PORTVERSION=	r${RUNTIMEVERSION}.a${APIVERSION:S/-/./}
+PORTVERSION=	r${RUNTIMEVERSION:S/-/./}.a${APIVERSION:S/-/./}
 CATEGORIES=	devel
-MASTER_SITES=	SF/mingw/MinGW/Base/mingw-rt/mingwrt-${RUNTIMEVERSION}:runtime \
+MASTER_SITES=	SF/mingw/MinGW/Base/mingw-rt/mingwrt-${RUNTIMEVERSION:C/-.*$//}:runtime \
 		SF/mingw/MinGW/Base/w32api/w32api-${APIVERSION:C/-.*$//}:api
 PKGNAMEPREFIX=	mingw32-
-DISTFILES=	mingwrt-${RUNTIMEVERSION}-mingw32-dev${EXTRACT_SUFX}:runtime \
-		mingwrt-${RUNTIMEVERSION}-mingw32-dll${EXTRACT_SUFX}:runtime \
-		w32api-${APIVERSION}-mingw32-dev${EXTRACT_SUFX:S/.gz$/.lzma/}:api
+DISTFILES=	mingwrt-${RUNTIMEVERSION}-mingw32-dev.tar.lzma:runtime \
+		mingwrt-${RUNTIMEVERSION}-mingw32-dll.tar.lzma:runtime \
+		w32api-${APIVERSION}-mingw32-dev.tar.lzma:api
 DIST_SUBDIR=	mingw
 
 MAINTAINER=	cyberbotx@cyberbotx.com
 COMMENT=	Headers and Libraries for Windows cross-development
 
-CONFLICTS=	mingw-bin-msvcrt-*
+CONFLICTS=	mingw-bin-msvcrt-[0-9]*
 
-RUNTIMEVERSION=	3.20
-APIVERSION=	3.17-2
+USE_XZ=		yes
+
+RUNTIMEVERSION=	4.0.3-1
+APIVERSION=	4.0.3-1
 
 NO_MTREE=	yes
 NO_WRKSUBDIR=	yes
@@ -27,8 +29,6 @@ NO_WRKSUBDIR=	yes
 MAKE_ARGS+=	INSTALL_AS_USER=yes
 .endif
 
-NO_STAGE=	yes
-
 post-extract:
 	@${CP} ${FILESDIR}/Makefile ${WRKDIR}
 
diff --git a/devel/mingw32-bin-msvcrt/distinfo b/devel/mingw32-bin-msvcrt/distinfo
index 9f4079bef49..565d864aeff 100644
--- a/devel/mingw32-bin-msvcrt/distinfo
+++ b/devel/mingw32-bin-msvcrt/distinfo
@@ -1,6 +1,6 @@
-SHA256 (mingw/mingwrt-3.20-mingw32-dev.tar.gz) = a41717c319093e2508a3034e384aaebbc0f94278f4d59d9d0681dd1c2f2828f2
-SIZE (mingw/mingwrt-3.20-mingw32-dev.tar.gz) = 883690
-SHA256 (mingw/mingwrt-3.20-mingw32-dll.tar.gz) = ad8f08d2761e4cba155d662514d8abc2cb513b533252bacccb9618ec11ed106e
-SIZE (mingw/mingwrt-3.20-mingw32-dll.tar.gz) = 16073
-SHA256 (mingw/w32api-3.17-2-mingw32-dev.tar.lzma) = 672b60779bedb13b44aa519c4378394b04fca32f926056596bd439628819090a
-SIZE (mingw/w32api-3.17-2-mingw32-dev.tar.lzma) = 1129114
+SHA256 (mingw/mingwrt-4.0.3-1-mingw32-dev.tar.lzma) = 809db2daf5a4f0bec45a8fa19b4aa3568d5a540216599ad63888535c3e2c9969
+SIZE (mingw/mingwrt-4.0.3-1-mingw32-dev.tar.lzma) = 702573
+SHA256 (mingw/mingwrt-4.0.3-1-mingw32-dll.tar.lzma) = be84358ef0d60f2cc04b80ee8533d69e28271387ea49f33408ca5a5ca8911711
+SIZE (mingw/mingwrt-4.0.3-1-mingw32-dll.tar.lzma) = 13106
+SHA256 (mingw/w32api-4.0.3-1-mingw32-dev.tar.lzma) = 2d58147218f92a1a1b6a04938920d46a89dc42513d84ede4c195a03c1e27bf11
+SIZE (mingw/w32api-4.0.3-1-mingw32-dev.tar.lzma) = 2318880
diff --git a/devel/mingw32-bin-msvcrt/files/Makefile b/devel/mingw32-bin-msvcrt/files/Makefile
index adca4322c31..7a72ca578dc 100644
--- a/devel/mingw32-bin-msvcrt/files/Makefile
+++ b/devel/mingw32-bin-msvcrt/files/Makefile
@@ -3,12 +3,11 @@
 all:
 
 install:
-	mkdir -p ${PREFIX}/bin
+	mkdir -p ${DESTDIR}${PREFIX}/bin
 .if defined(INSTALL_AS_USER)
-	install -c -m 0755 bin/mingwm10.dll ${PREFIX}/bin
+	install -c -m 0755 bin/mingwm10.dll ${DESTDIR}${PREFIX}/bin
 .else
-	install -c -g wheel -o root -m 0755 bin/mingwm10.dll ${PREFIX}/bin
-.endif	
-	mkdir -p ${PREFIX}/mingw32
-	cp -R lib include ${PREFIX}/mingw32
-
+	install -c -g wheel -o root -m 0755 bin/mingwm10.dll ${DESTDIR}${PREFIX}/bin
+.endif
+	mkdir -p ${DESTDIR}${PREFIX}/mingw32
+	cp -R lib include ${DESTDIR}${PREFIX}/mingw32
diff --git a/devel/mingw32-bin-msvcrt/pkg-plist b/devel/mingw32-bin-msvcrt/pkg-plist
index 28b70e1d2fb..45f39e34824 100644
--- a/devel/mingw32-bin-msvcrt/pkg-plist
+++ b/devel/mingw32-bin-msvcrt/pkg-plist
@@ -8,8 +8,6 @@ mingw32/include/aclapi.h
 mingw32/include/aclui.h
 mingw32/include/adsprop.h
 mingw32/include/afxres.h
-mingw32/include/amaudio.h
-mingw32/include/amvideo.h
 mingw32/include/assert.h
 mingw32/include/audevcod.h
 mingw32/include/aviriff.h
@@ -173,7 +171,7 @@ mingw32/include/gdiplus/gdipluspixelformats.h
 mingw32/include/gdiplus/gdiplusstringformat.h
 mingw32/include/gdiplus/gdiplustypes.h
 mingw32/include/getopt.h
-mingw32/include/gmon.h
+mingw32/include/glob.h
 mingw32/include/httpext.h
 mingw32/include/icm.h
 mingw32/include/idispids.h
@@ -308,6 +306,7 @@ mingw32/include/schannel.h
 mingw32/include/schnlsp.h
 mingw32/include/scrnsave.h
 mingw32/include/sddl.h
+mingw32/include/sdkddkver.h
 mingw32/include/search.h
 mingw32/include/secext.h
 mingw32/include/security.h
@@ -320,6 +319,7 @@ mingw32/include/shldisp.h
 mingw32/include/shlguid.h
 mingw32/include/shlobj.h
 mingw32/include/shlwapi.h
+mingw32/include/shobjidl.h
 mingw32/include/signal.h
 mingw32/include/snmp.h
 mingw32/include/specstrings.h
@@ -406,13 +406,10 @@ mingw32/lib/CRT_fp10.o
 mingw32/lib/CRT_fp8.o
 mingw32/lib/CRT_noglob.o
 mingw32/lib/binmode.o
-mingw32/lib/crt1.o
 mingw32/lib/crt2.o
 mingw32/lib/crtmt.o
 mingw32/lib/crtst.o
-mingw32/lib/dllcrt1.o
 mingw32/lib/dllcrt2.o
-mingw32/lib/gcrt1.o
 mingw32/lib/gcrt2.o
 mingw32/lib/libaclui.a
 mingw32/lib/libadvapi32.a
@@ -422,10 +419,8 @@ mingw32/lib/libavifil32.a
 mingw32/lib/libbthprops.a
 mingw32/lib/libcap.a
 mingw32/lib/libcfgmgr32.a
-mingw32/lib/libcoldname.a
 mingw32/lib/libcomctl32.a
 mingw32/lib/libcomdlg32.a
-mingw32/lib/libcrtdll.a
 mingw32/lib/libcrypt32.a
 mingw32/lib/libctl3d32.a
 mingw32/lib/libd3d8.a