3 files changed, 50 insertions, 14 deletions

diff --git a/devel/mingw32-bin-msvcrt/Makefile b/devel/mingw32-bin-msvcrt/Makefile
index bc78a84b5ff3..59dee51a5a8f 100644
--- a/devel/mingw32-bin-msvcrt/Makefile
+++ b/devel/mingw32-bin-msvcrt/Makefile
@@ -1,19 +1,15 @@
-# New ports collection makefile for: mingw32-bin-msvcrt
-# Date created:		24 Oct 2002
-# Whom:                 Lev A. Serebryakov <lev@serebryakov.spb.ru>
-#
+# Created by: Lev A. Serebryakov <lev@serebryakov.spb.ru>
 # $FreeBSD$
-#
 
 PORTNAME=	bin-msvcrt
-PORTVERSION=	r${RUNTIMEVERSION}.a${APIVERSION}
+PORTVERSION=	r${RUNTIMEVERSION}.a${APIVERSION:S/-/./}
 CATEGORIES=	devel
-MASTER_SITES=	SF/mingw/MinGW/BaseSystem/RuntimeLibrary/MinGW-RT/mingwrt-${RUNTIMEVERSION}:runtime \
-		SF/mingw/MinGW/BaseSystem/RuntimeLibrary/Win32-API/w32api-${APIVERSION}:api
+MASTER_SITES=	SF/mingw/MinGW/Base/mingw-rt/mingwrt-${RUNTIMEVERSION}: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}:api
+		w32api-${APIVERSION}-mingw32-dev${EXTRACT_SUFX:S/.gz$/.lzma/}:api
 DIST_SUBDIR=	mingw
 
 MAINTAINER=	cyberbotx@cyberbotx.com
@@ -22,7 +18,7 @@ COMMENT=	Headers and Libraries for Windows cross-development
 CONFLICTS=	mingw-bin-msvcrt-*
 
 RUNTIMEVERSION=	3.20
-APIVERSION=	3.14
+APIVERSION=	3.17-2
 
 NO_MTREE=	yes
 NO_WRKSUBDIR=	yes
@@ -31,7 +27,19 @@ NO_WRKSUBDIR=	yes
 MAKE_ARGS+=	INSTALL_AS_USER=yes
 .endif
 
+.include <bsd.port.pre.mk>
+
+.if ( (${OSVERSION} >= 900000 && ${OSVERSION} < 900012) || ${OSVERSION} < 800505 )
+EXTRACT_DEPENDS=${LOCALBASE}/bin/xz:${PORTSDIR}/archivers/xz
+EXTRACT_ONLY=	mingwrt-${RUNTIMEVERSION}-mingw32-dev${EXTRACT_SUFX} \
+		mingwrt-${RUNTIMEVERSION}-mingw32-dll${EXTRACT_SUFX}
+.endif
+
 post-extract:
 	@${CP} ${FILESDIR}/Makefile ${WRKDIR}
+.if ( (${OSVERSION} >= 900000 && ${OSVERSION} < 900012) || ${OSVERSION} < 800505 )
+	@cd ${WRKDIR} && xzcat \
+	${_DISTDIR}/w32api-${APIVERSION}-mingw32-dev.tar.lzma | ${TAR} -xf -
+.endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/devel/mingw32-bin-msvcrt/distinfo b/devel/mingw32-bin-msvcrt/distinfo
index 5475fac49e3c..9f4079bef495 100644
--- a/devel/mingw32-bin-msvcrt/distinfo
+++ b/devel/mingw32-bin-msvcrt/distinfo
@@ -2,5 +2,5 @@ SHA256 (mingw/mingwrt-3.20-mingw32-dev.tar.gz) = a41717c319093e2508a3034e384aaeb
 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.14-mingw32-dev.tar.gz) = 85639a56208b605ae58bc4dc22445d2ecdf25a33d40a5323eb139404be3cffec
-SIZE (mingw/w32api-3.14-mingw32-dev.tar.gz) = 1632830
+SHA256 (mingw/w32api-3.17-2-mingw32-dev.tar.lzma) = 672b60779bedb13b44aa519c4378394b04fca32f926056596bd439628819090a
+SIZE (mingw/w32api-3.17-2-mingw32-dev.tar.lzma) = 1129114
diff --git a/devel/mingw32-bin-msvcrt/pkg-plist b/devel/mingw32-bin-msvcrt/pkg-plist
index c469c07a7abf..28b70e1d2fb4 100644
--- a/devel/mingw32-bin-msvcrt/pkg-plist
+++ b/devel/mingw32-bin-msvcrt/pkg-plist
@@ -145,6 +145,33 @@ mingw32/include/fcntl.h
 mingw32/include/fenv.h
 mingw32/include/float.h
 mingw32/include/fltdefs.h
+mingw32/include/gdiplus.h
+mingw32/include/gdiplus/gdiplus.h
+mingw32/include/gdiplus/gdiplusbase.h
+mingw32/include/gdiplus/gdiplusbrush.h
+mingw32/include/gdiplus/gdipluscolor.h
+mingw32/include/gdiplus/gdipluscolormatrix.h
+mingw32/include/gdiplus/gdipluseffects.h
+mingw32/include/gdiplus/gdiplusenums.h
+mingw32/include/gdiplus/gdiplusflat.h
+mingw32/include/gdiplus/gdiplusgpstubs.h
+mingw32/include/gdiplus/gdiplusgraphics.h
+mingw32/include/gdiplus/gdiplusheaders.h
+mingw32/include/gdiplus/gdiplusimageattributes.h
+mingw32/include/gdiplus/gdiplusimagecodec.h
+mingw32/include/gdiplus/gdiplusimaging.h
+mingw32/include/gdiplus/gdiplusimpl.h
+mingw32/include/gdiplus/gdiplusinit.h
+mingw32/include/gdiplus/gdipluslinecaps.h
+mingw32/include/gdiplus/gdiplusmatrix.h
+mingw32/include/gdiplus/gdiplusmem.h
+mingw32/include/gdiplus/gdiplusmetafile.h
+mingw32/include/gdiplus/gdiplusmetaheader.h
+mingw32/include/gdiplus/gdipluspath.h
+mingw32/include/gdiplus/gdipluspen.h
+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/httpext.h
@@ -428,6 +455,7 @@ mingw32/lib/libdxerr9.a
 mingw32/lib/libdxguid.a
 mingw32/lib/libfaultrep.a
 mingw32/lib/libgdi32.a
+mingw32/lib/libgdiplus.a
 mingw32/lib/libglaux.a
 mingw32/lib/libglu32.a
 mingw32/lib/libgmon.a
@@ -529,7 +557,6 @@ mingw32/lib/libstrmiids.a
 mingw32/lib/libsvrapi.a
 mingw32/lib/libtapi32.a
 mingw32/lib/libtdi.a
-mingw32/lib/libth32.a
 mingw32/lib/libthunk32.a
 mingw32/lib/liburl.a
 mingw32/lib/libusbcamd.a
@@ -559,6 +586,7 @@ mingw32/lib/libwtsapi32.a
 mingw32/lib/txtmode.o
 @dirrm mingw32/include/GL
 @dirrm mingw32/include/ddk
+@dirrm mingw32/include/gdiplus
 @dirrm mingw32/include/sys
 @dirrm mingw32/include
 @dirrmtry mingw32/lib