Update to the 20050111 version of Wine. Since we now require FreeBSD 5.3

or later, there is no need to explicitly set WITH_GCC.

6 files changed, 16 insertions, 12 deletions

diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile
index 6f0c4b5c38dc..46436e267baa 100644
--- a/emulators/wine-devel/Makefile
+++ b/emulators/wine-devel/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	wine
-PORTVERSION=	20041201
+PORTVERSION=	20050111
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	ALPHA/wine/development
@@ -29,9 +29,6 @@ USE_GMAKE=	yes
 USE_GL=		yes
 USE_MESA=	yes	# wine/dlls/glut32/ depends on the presence of libglut.
 USE_XPM=	yes
-# GCC 3.2 also seems fine, but the ports collection requires specifying
-# a concrete version.
-USE_GCC=	3.4
 
 .include <bsd.port.pre.mk>
 
diff --git a/emulators/wine-devel/distinfo b/emulators/wine-devel/distinfo
index 604887d668fd..63ef5cf34df3 100644
--- a/emulators/wine-devel/distinfo
+++ b/emulators/wine-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (Wine-20041201.tar.gz) = f47c26c012a78a37f22ad56122402f11
-SIZE (Wine-20041201.tar.gz) = 11264647
+MD5 (Wine-20050111.tar.gz) = 33f80e2c7a228912a3ab28fc163550b3
+SIZE (Wine-20050111.tar.gz) = 11477802
diff --git a/emulators/wine-devel/pkg-plist b/emulators/wine-devel/pkg-plist
index 5a06c681cba1..9efd1c1593c1 100644
--- a/emulators/wine-devel/pkg-plist
+++ b/emulators/wine-devel/pkg-plist
@@ -87,6 +87,7 @@ include/wine/windows/axcore.idl
 include/wine/windows/axextend.idl
 include/wine/windows/basetsd.h
 include/wine/windows/cderr.h
+include/wine/windows/cfgmgr32.h
 include/wine/windows/cguid.h
 include/wine/windows/comcat.h
 include/wine/windows/comcat.idl
@@ -212,6 +213,9 @@ include/wine/windows/msacm.h
 include/wine/windows/msacmdlg.h
 include/wine/windows/msacmdrv.h
 include/wine/windows/mscat.h
+include/wine/windows/mshtmdid.h
+include/wine/windows/mshtml.h
+include/wine/windows/mshtml.idl
 include/wine/windows/msi.h
 include/wine/windows/msiquery.h
 include/wine/windows/mssip.h
@@ -312,6 +316,7 @@ include/wine/windows/wininet.h
 include/wine/windows/winioctl.h
 include/wine/windows/winnetwk.h
 include/wine/windows/winnls.h
+include/wine/windows/winnls32.h
 include/wine/windows/winnt.h
 include/wine/windows/winreg.h
 include/wine/windows/winres.h
diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index 6f0c4b5c38dc..46436e267baa 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	wine
-PORTVERSION=	20041201
+PORTVERSION=	20050111
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	ALPHA/wine/development
@@ -29,9 +29,6 @@ USE_GMAKE=	yes
 USE_GL=		yes
 USE_MESA=	yes	# wine/dlls/glut32/ depends on the presence of libglut.
 USE_XPM=	yes
-# GCC 3.2 also seems fine, but the ports collection requires specifying
-# a concrete version.
-USE_GCC=	3.4
 
 .include <bsd.port.pre.mk>
 
diff --git a/emulators/wine/distinfo b/emulators/wine/distinfo
index 604887d668fd..63ef5cf34df3 100644
--- a/emulators/wine/distinfo
+++ b/emulators/wine/distinfo
@@ -1,2 +1,2 @@
-MD5 (Wine-20041201.tar.gz) = f47c26c012a78a37f22ad56122402f11
-SIZE (Wine-20041201.tar.gz) = 11264647
+MD5 (Wine-20050111.tar.gz) = 33f80e2c7a228912a3ab28fc163550b3
+SIZE (Wine-20050111.tar.gz) = 11477802
diff --git a/emulators/wine/pkg-plist b/emulators/wine/pkg-plist
index 5a06c681cba1..9efd1c1593c1 100644
--- a/emulators/wine/pkg-plist
+++ b/emulators/wine/pkg-plist
@@ -87,6 +87,7 @@ include/wine/windows/axcore.idl
 include/wine/windows/axextend.idl
 include/wine/windows/basetsd.h
 include/wine/windows/cderr.h
+include/wine/windows/cfgmgr32.h
 include/wine/windows/cguid.h
 include/wine/windows/comcat.h
 include/wine/windows/comcat.idl
@@ -212,6 +213,9 @@ include/wine/windows/msacm.h
 include/wine/windows/msacmdlg.h
 include/wine/windows/msacmdrv.h
 include/wine/windows/mscat.h
+include/wine/windows/mshtmdid.h
+include/wine/windows/mshtml.h
+include/wine/windows/mshtml.idl
 include/wine/windows/msi.h
 include/wine/windows/msiquery.h
 include/wine/windows/mssip.h
@@ -312,6 +316,7 @@ include/wine/windows/wininet.h
 include/wine/windows/winioctl.h
 include/wine/windows/winnetwk.h
 include/wine/windows/winnls.h
+include/wine/windows/winnls32.h
 include/wine/windows/winnt.h
 include/wine/windows/winreg.h
 include/wine/windows/winres.h