(*) Back out previous commit due to portfreeze

      Thank you, Joe Marcus Clarke.
      Sorry, everybody.

4 files changed, 4 insertions, 33 deletions

diff --git a/devel/mingw32-bin-msvcrt/Makefile b/devel/mingw32-bin-msvcrt/Makefile
index 743834a673cb..effd455da519 100644
--- a/devel/mingw32-bin-msvcrt/Makefile
+++ b/devel/mingw32-bin-msvcrt/Makefile
@@ -18,16 +18,12 @@ DIST_SUBDIR=	mingw
 MAINTAINER=	lev@FreeBSD.org
 COMMENT=	Headers and Libraries for Windows cross-development
 
-RUNTIMEVERSION=	3.1
-APIVERSION=	2.4
+RUNTIMEVERSION=	3.0
+APIVERSION=	2.3
 
 NO_MTREE=	yes
 NO_WRKSUBDIR=	yes
 
-.if defined(INSTALL_AS_USER)
-MAKE_ARGS+=	INSTALL_AS_USER=yes
-.endif
-
 post-extract:
 	@${CP} ${FILESDIR}/Makefile ${WRKDIR}
 
diff --git a/devel/mingw32-bin-msvcrt/distinfo b/devel/mingw32-bin-msvcrt/distinfo
index 7a331169eeb3..c9ac5c85d45f 100644
--- a/devel/mingw32-bin-msvcrt/distinfo
+++ b/devel/mingw32-bin-msvcrt/distinfo
@@ -1,2 +1,2 @@
-MD5 (mingw/mingw-runtime-3.1.tar.gz) = 7c1d46737951339a174fe1b9a2182ded
-MD5 (mingw/w32api-2.4.tar.gz) = 9f9b9a7a7ef14e112924fea46b3360ce
+MD5 (mingw/mingw-runtime-3.0.tar.gz) = 50f4158d5354633926e63fe95591694a
+MD5 (mingw/w32api-2.3.tar.gz) = 31d5e495150e392ac0fe6b51011d3fa2
diff --git a/devel/mingw32-bin-msvcrt/files/Makefile b/devel/mingw32-bin-msvcrt/files/Makefile
index adca4322c310..e05fbdaf9ec6 100644
--- a/devel/mingw32-bin-msvcrt/files/Makefile
+++ b/devel/mingw32-bin-msvcrt/files/Makefile
@@ -4,11 +4,7 @@ all:
 
 install:
 	mkdir -p ${PREFIX}/bin
-.if defined(INSTALL_AS_USER)
-	install -c -m 0755 bin/mingwm10.dll ${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
 
diff --git a/devel/mingw32-bin-msvcrt/pkg-plist b/devel/mingw32-bin-msvcrt/pkg-plist
index 36382e1aec85..5e224256d48e 100644
--- a/devel/mingw32-bin-msvcrt/pkg-plist
+++ b/devel/mingw32-bin-msvcrt/pkg-plist
@@ -163,7 +163,6 @@ mingw32/include/mciavi.h
 mingw32/include/mcx.h
 mingw32/include/mem.h
 mingw32/include/memory.h
-mingw32/include/mgmtapi.h
 mingw32/include/mmsystem.h
 mingw32/include/mshtml.h
 mingw32/include/mswsock.h
@@ -172,7 +171,6 @@ mingw32/include/nddeapi.h
 mingw32/include/nspapi.h
 mingw32/include/ntdef.h
 mingw32/include/ntdll.h
-mingw32/include/ntldap.h
 mingw32/include/ntsecapi.h
 mingw32/include/ntsecpkg.h
 mingw32/include/oaidl.h
@@ -192,7 +190,6 @@ mingw32/include/oledlg.h
 mingw32/include/oleidl.h
 mingw32/include/pbt.h
 mingw32/include/poppack.h
-mingw32/include/powrprof.h
 mingw32/include/process.h
 mingw32/include/profil.h
 mingw32/include/profile.h
@@ -222,10 +219,8 @@ mingw32/include/rpcproxy.h
 mingw32/include/schannel.h
 mingw32/include/schnlsp.h
 mingw32/include/scrnsave.h
-mingw32/include/search.h
 mingw32/include/secext.h
 mingw32/include/security.h
-mingw32/include/servprov.h
 mingw32/include/setjmp.h
 mingw32/include/setupapi.h
 mingw32/include/share.h
@@ -234,7 +229,6 @@ mingw32/include/shlguid.h
 mingw32/include/shlobj.h
 mingw32/include/shlwapi.h
 mingw32/include/signal.h
-mingw32/include/snmp.h
 mingw32/include/sql.h
 mingw32/include/sqlext.h
 mingw32/include/sqltypes.h
@@ -268,13 +262,10 @@ mingw32/include/userenv.h
 mingw32/include/utime.h
 mingw32/include/values.h
 mingw32/include/varargs.h
-mingw32/include/vfw.h
 mingw32/include/w32api.h
 mingw32/include/wchar.h
 mingw32/include/wctype.h
-mingw32/include/winable.h
 mingw32/include/winbase.h
-mingw32/include/winber.h
 mingw32/include/wincon.h
 mingw32/include/wincrypt.h
 mingw32/include/windef.h
@@ -284,14 +275,12 @@ mingw32/include/winerror.h
 mingw32/include/wingdi.h
 mingw32/include/wininet.h
 mingw32/include/winioctl.h
-mingw32/include/winldap.h
 mingw32/include/winnetwk.h
 mingw32/include/winnls.h
 mingw32/include/winnt.h
 mingw32/include/winperf.h
 mingw32/include/winreg.h
 mingw32/include/winresrc.h
-mingw32/include/winsnmp.h
 mingw32/include/winsock.h
 mingw32/include/winsock2.h
 mingw32/include/winspool.h
@@ -347,7 +336,6 @@ mingw32/lib/libgmon.a
 mingw32/lib/libhal.a
 mingw32/lib/libhid.a
 mingw32/lib/libhidparse.a
-mingw32/lib/libigmpagnt.a
 mingw32/lib/libimagehlp.a
 mingw32/lib/libimm32.a
 mingw32/lib/libiphlpapi.a
@@ -368,10 +356,6 @@ mingw32/lib/libmpr.a
 mingw32/lib/libmsacm32.a
 mingw32/lib/libmsimg32.a
 mingw32/lib/libmsvcp60.a
-mingw32/lib/libmsvcr70.a
-mingw32/lib/libmsvcr70d.a
-mingw32/lib/libmsvcr71.a
-mingw32/lib/libmsvcr71d.a
 mingw32/lib/libmsvcrt.a
 mingw32/lib/libmsvcrtd.a
 mingw32/lib/libmswsock.a
@@ -383,7 +367,6 @@ mingw32/lib/libntoskrnl.a
 mingw32/lib/libodbc32.a
 mingw32/lib/libodbccp32.a
 mingw32/lib/libole32.a
-mingw32/lib/liboleacc.a
 mingw32/lib/liboleaut32.a
 mingw32/lib/libolecli32.a
 mingw32/lib/liboledlg.a
@@ -392,7 +375,6 @@ mingw32/lib/libolesvr32.a
 mingw32/lib/libopengl32.a
 mingw32/lib/libpenwin32.a
 mingw32/lib/libpkpd32.a
-mingw32/lib/libpowrprof.a
 mingw32/lib/libpsapi.a
 mingw32/lib/librapi.a
 mingw32/lib/librasapi32.a
@@ -408,7 +390,6 @@ mingw32/lib/libsetupapi.a
 mingw32/lib/libshell32.a
 mingw32/lib/libshfolder.a
 mingw32/lib/libshlwapi.a
-mingw32/lib/libsnmpapi.a
 mingw32/lib/libsvrapi.a
 mingw32/lib/libtapi32.a
 mingw32/lib/libtdi.a
@@ -430,10 +411,8 @@ mingw32/lib/libwininet.a
 mingw32/lib/libwinmm.a
 mingw32/lib/libwinspool.a
 mingw32/lib/libwinstrm.a
-mingw32/lib/libwldap32.a
 mingw32/lib/libwow32.a
 mingw32/lib/libws2_32.a
-mingw32/lib/libwsnmp32.a
 mingw32/lib/libwsock32.a
 mingw32/lib/libwst.a
 mingw32/lib/txtmode.o