Update to the 20031016 snapshot of Wine after we skipped the previous one

which was completely broken on FreeBSD.
Simplify post-build as I moved some part upstream and require GCC 3.3 as
GCC 2.95 suffers from all sorts of threading/libraries issues. (GCC 3.2
also seems fine, but the ports collection requires us to request a concrete
version.)

6 files changed, 62 insertions, 74 deletions

diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile
index 55c391e8f975..36fd389d552d 100644
--- a/emulators/wine-devel/Makefile
+++ b/emulators/wine-devel/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	wine
-PORTVERSION=	20030813
-PORTREVISION=	1
+PORTVERSION=	20031016
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	ALPHA/wine/development
@@ -28,6 +27,7 @@ ONLY_FOR_ARCHS=	i386
 USE_XPM=	yes
 USE_BISON=	yes
 USE_GMAKE=	yes
+USE_GCC=	3.3
 USE_REINPLACE=	yes
 
 .include <bsd.port.pre.mk>
@@ -60,8 +60,8 @@ post-configure:
 	cd ${WRKSRC} && make depend
 
 post-build:
-	#cd ${WRKSRC}/programs/regapi && ${GMAKE}
-	${SED} '1s/bash/sh/;s-\./\(reg.*\.pl\)-'${PREFIX}/lib/wine/reg/'\1-' <${WRKSRC}/programs/regapi/regSet.sh >${WRKDIR}/regSet.sh
+	${SED} 's-\./\(reg.*\.pl\)-'${PREFIX}/lib/wine/reg/'\1-' \
+		${WRKSRC}/programs/regapi/regSet.sh > ${WRKDIR}/regSet.sh
 
 do-install:
 	cd ${WRKSRC} && ${GMAKE} install
diff --git a/emulators/wine-devel/distinfo b/emulators/wine-devel/distinfo
index 0e49cb3b9193..89197d0d7142 100644
--- a/emulators/wine-devel/distinfo
+++ b/emulators/wine-devel/distinfo
@@ -1 +1 @@
-MD5 (Wine-20030813.tar.gz) = 0953ccebc491227411d35e0fbe388547
+MD5 (Wine-20031016.tar.gz) = 67eed2fb7a86d805ec8fc4bcf7a04254
diff --git a/emulators/wine-devel/pkg-plist b/emulators/wine-devel/pkg-plist
index a4d59e31acbc..cf216d590ee3 100644
--- a/emulators/wine-devel/pkg-plist
+++ b/emulators/wine-devel/pkg-plist
@@ -34,32 +34,6 @@ etc/wine.conf.sample
 include/wine/debug.h
 include/wine/exception.h
 include/wine/library.h
-include/wine/obj_cache.h
-include/wine/obj_comcat.h
-include/wine/obj_commdlgbrowser.h
-include/wine/obj_connection.h
-include/wine/obj_contextmenu.h
-include/wine/obj_control.h
-include/wine/obj_dockingwindowframe.h
-include/wine/obj_dragdrop.h
-include/wine/obj_dragdrophelper.h
-include/wine/obj_enumguid.h
-include/wine/obj_enumidlist.h
-include/wine/obj_extracticon.h
-include/wine/obj_inplace.h
-include/wine/obj_olefont.h
-include/wine/obj_oleobj.h
-include/wine/obj_oleundo.h
-include/wine/obj_oleview.h
-include/wine/obj_picture.h
-include/wine/obj_property.h
-include/wine/obj_serviceprovider.h
-include/wine/obj_shellbrowser.h
-include/wine/obj_shellextinit.h
-include/wine/obj_shellfolder.h
-include/wine/obj_shelllink.h
-include/wine/obj_shellview.h
-include/wine/obj_webbrowser.h
 include/wine/unicode.h
 include/wine/msvcrt/conio.h
 include/wine/msvcrt/crtdbg.h
@@ -71,8 +45,10 @@ include/wine/msvcrt/eh.h
 include/wine/msvcrt/errno.h
 include/wine/msvcrt/fcntl.h
 include/wine/msvcrt/io.h
+include/wine/msvcrt/limits.h
 include/wine/msvcrt/locale.h
 include/wine/msvcrt/malloc.h
+include/wine/msvcrt/math.h
 include/wine/msvcrt/mbctype.h
 include/wine/msvcrt/mbstring.h
 include/wine/msvcrt/process.h
@@ -101,6 +77,7 @@ include/wine/windows/basetsd.h
 include/wine/windows/cderr.h
 include/wine/windows/cguid.h
 include/wine/windows/comcat.h
+include/wine/windows/comcat.idl
 include/wine/windows/commctrl.h
 include/wine/windows/commdlg.h
 include/wine/windows/compobj.h
@@ -142,6 +119,7 @@ include/wine/windows/dmusicf.h
 include/wine/windows/dmusici.h
 include/wine/windows/dmusics.h
 include/wine/windows/docobj.h
+include/wine/windows/docobj.idl
 include/wine/windows/dpaddr.h
 include/wine/windows/dplay.h
 include/wine/windows/dplay8.h
@@ -152,6 +130,8 @@ include/wine/windows/dsdriver.h
 include/wine/windows/dsound.h
 include/wine/windows/dyngraph.idl
 include/wine/windows/excpt.h
+include/wine/windows/exdisp.h
+include/wine/windows/exdisp.idl
 include/wine/windows/fci.h
 include/wine/windows/fdi.h
 include/wine/windows/guiddef.h
@@ -171,6 +151,7 @@ include/wine/windows/lmapibuf.h
 include/wine/windows/lmbrowsr.h
 include/wine/windows/lmcons.h
 include/wine/windows/lmerr.h
+include/wine/windows/lmstats.h
 include/wine/windows/lmwksta.h
 include/wine/windows/lzexpand.h
 include/wine/windows/mapi.h
@@ -204,12 +185,14 @@ include/wine/windows/objbase.h
 include/wine/windows/objidl.h
 include/wine/windows/objidl.idl
 include/wine/windows/ocidl.h
+include/wine/windows/ocidl.idl
 include/wine/windows/ole2.h
 include/wine/windows/ole2ver.h
 include/wine/windows/oleauto.h
 include/wine/windows/olectl.h
 include/wine/windows/oledlg.h
 include/wine/windows/oleidl.h
+include/wine/windows/oleidl.idl
 include/wine/windows/pktdef.h
 include/wine/windows/poppack.h
 include/wine/windows/prsht.h
@@ -229,11 +212,16 @@ include/wine/windows/rpcndr.h
 include/wine/windows/rpcnterr.h
 include/wine/windows/rpcproxy.h
 include/wine/windows/servprov.h
+include/wine/windows/servprov.idl
 include/wine/windows/setupapi.h
 include/wine/windows/shellapi.h
 include/wine/windows/shlguid.h
 include/wine/windows/shlobj.h
 include/wine/windows/shlwapi.h
+include/wine/windows/shobjidl.h
+include/wine/windows/shobjidl.idl
+include/wine/windows/shtypes.h
+include/wine/windows/shtypes.idl
 include/wine/windows/sipbase.h
 include/wine/windows/sql.h
 include/wine/windows/sqlext.h
@@ -244,10 +232,13 @@ include/wine/windows/strmif.idl
 include/wine/windows/tapi.h
 include/wine/windows/tchar.h
 include/wine/windows/tlhelp32.h
+include/wine/windows/tmschema.h
 include/wine/windows/unknwn.h
 include/wine/windows/unknwn.idl
 include/wine/windows/urlmon.h
+include/wine/windows/urlmon.idl
 include/wine/windows/uuids.h
+include/wine/windows/uxtheme.h
 include/wine/windows/ver.h
 include/wine/windows/vfw.h
 include/wine/windows/vfwmsgs.h
@@ -285,7 +276,6 @@ include/wine/windows/wsipx.h
 include/wine/windows/wtypes.h
 include/wine/windows/wtypes.idl
 include/wine/windows/zmouse.h
-lib/libntdll.dll.so
 lib/libwine.so
 lib/libwine.so.1
 lib/libwine_unicode.so
@@ -303,7 +293,7 @@ lib/wine/clock.exe.so
 lib/wine/comcat.dll.so
 lib/wine/comctl32.dll.so
 lib/wine/comdlg32.dll.so
-lib/wine/comm.dll.so
+lib/wine/comm.drv.so
 lib/wine/commdlg.dll.so
 lib/wine/compobj.dll.so
 lib/wine/control.exe.so
@@ -323,7 +313,7 @@ lib/wine/devenum.dll.so
 lib/wine/dinput.dll.so
 lib/wine/dinput8.dll.so
 lib/wine/dispdib.dll.so
-lib/wine/display.dll.so
+lib/wine/display.drv.so
 lib/wine/dmband.dll.so
 lib/wine/dmcompos.dll.so
 lib/wine/dmime.dll.so
@@ -349,7 +339,7 @@ lib/wine/imm32.dll.so
 lib/wine/iphlpapi.dll.so
 lib/wine/joystick.drv.so
 lib/wine/kernel32.dll.so
-lib/wine/keyboard.dll.so
+lib/wine/keyboard.drv.so
 lib/wine/krnl386.exe.so
 lib/wine/libadvapi32.def
 lib/wine/libavicap32.def
@@ -380,6 +370,7 @@ lib/wine/libdmsynth.def
 lib/wine/libdmusic.def
 lib/wine/libdmusic32.def
 lib/wine/libdpnhpast.def
+lib/wine/libmshtml.def
 lib/wine/libmsvcrtd.def
 lib/wine/libdplay.def
 lib/wine/libdplayx.def
@@ -435,6 +426,7 @@ lib/wine/libtwain_32.def
 lib/wine/liburl.def
 lib/wine/liburlmon.def
 lib/wine/libuser32.def
+lib/wine/libuxtheme.def
 lib/wine/libversion.def
 lib/wine/libw32skrnl.def
 lib/wine/libwinedos.def
@@ -460,7 +452,7 @@ lib/wine/mciseq.drv.so
 lib/wine/mciwave.drv.so
 lib/wine/midimap.drv.so
 lib/wine/mmsystem.dll.so
-lib/wine/mouse.dll.so
+lib/wine/mouse.drv.so
 lib/wine/mpr.dll.so
 lib/wine/msacm.drv.so
 lib/wine/msacm.dll.so
@@ -468,6 +460,7 @@ lib/wine/msacm32.dll.so
 lib/wine/msadp32.acm.so
 lib/wine/msdmo.dll.so
 lib/wine/msg711.acm.so
+lib/wine/mshtml.dll.so
 lib/wine/msi.dll.so
 lib/wine/msimg32.dll.so
 lib/wine/msisys.ocx.so
@@ -525,7 +518,7 @@ lib/wine/start.exe.so
 lib/wine/sti.dll.so
 lib/wine/storage.dll.so
 lib/wine/stress.dll.so
-lib/wine/system.dll.so
+lib/wine/system.drv.so
 lib/wine/tapi32.dll.so
 lib/wine/toolhelp.dll.so
 lib/wine/ttydrv.dll.so
@@ -536,6 +529,7 @@ lib/wine/url.dll.so
 lib/wine/urlmon.dll.so
 lib/wine/user.exe.so
 lib/wine/user32.dll.so
+lib/wine/uxtheme.dll.so
 lib/wine/ver.dll.so
 lib/wine/version.dll.so
 lib/wine/w32skrnl.dll.so
diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index 55c391e8f975..36fd389d552d 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	wine
-PORTVERSION=	20030813
-PORTREVISION=	1
+PORTVERSION=	20031016
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	ALPHA/wine/development
@@ -28,6 +27,7 @@ ONLY_FOR_ARCHS=	i386
 USE_XPM=	yes
 USE_BISON=	yes
 USE_GMAKE=	yes
+USE_GCC=	3.3
 USE_REINPLACE=	yes
 
 .include <bsd.port.pre.mk>
@@ -60,8 +60,8 @@ post-configure:
 	cd ${WRKSRC} && make depend
 
 post-build:
-	#cd ${WRKSRC}/programs/regapi && ${GMAKE}
-	${SED} '1s/bash/sh/;s-\./\(reg.*\.pl\)-'${PREFIX}/lib/wine/reg/'\1-' <${WRKSRC}/programs/regapi/regSet.sh >${WRKDIR}/regSet.sh
+	${SED} 's-\./\(reg.*\.pl\)-'${PREFIX}/lib/wine/reg/'\1-' \
+		${WRKSRC}/programs/regapi/regSet.sh > ${WRKDIR}/regSet.sh
 
 do-install:
 	cd ${WRKSRC} && ${GMAKE} install
diff --git a/emulators/wine/distinfo b/emulators/wine/distinfo
index 0e49cb3b9193..89197d0d7142 100644
--- a/emulators/wine/distinfo
+++ b/emulators/wine/distinfo
@@ -1 +1 @@
-MD5 (Wine-20030813.tar.gz) = 0953ccebc491227411d35e0fbe388547
+MD5 (Wine-20031016.tar.gz) = 67eed2fb7a86d805ec8fc4bcf7a04254
diff --git a/emulators/wine/pkg-plist b/emulators/wine/pkg-plist
index a4d59e31acbc..cf216d590ee3 100644
--- a/emulators/wine/pkg-plist
+++ b/emulators/wine/pkg-plist
@@ -34,32 +34,6 @@ etc/wine.conf.sample
 include/wine/debug.h
 include/wine/exception.h
 include/wine/library.h
-include/wine/obj_cache.h
-include/wine/obj_comcat.h
-include/wine/obj_commdlgbrowser.h
-include/wine/obj_connection.h
-include/wine/obj_contextmenu.h
-include/wine/obj_control.h
-include/wine/obj_dockingwindowframe.h
-include/wine/obj_dragdrop.h
-include/wine/obj_dragdrophelper.h
-include/wine/obj_enumguid.h
-include/wine/obj_enumidlist.h
-include/wine/obj_extracticon.h
-include/wine/obj_inplace.h
-include/wine/obj_olefont.h
-include/wine/obj_oleobj.h
-include/wine/obj_oleundo.h
-include/wine/obj_oleview.h
-include/wine/obj_picture.h
-include/wine/obj_property.h
-include/wine/obj_serviceprovider.h
-include/wine/obj_shellbrowser.h
-include/wine/obj_shellextinit.h
-include/wine/obj_shellfolder.h
-include/wine/obj_shelllink.h
-include/wine/obj_shellview.h
-include/wine/obj_webbrowser.h
 include/wine/unicode.h
 include/wine/msvcrt/conio.h
 include/wine/msvcrt/crtdbg.h
@@ -71,8 +45,10 @@ include/wine/msvcrt/eh.h
 include/wine/msvcrt/errno.h
 include/wine/msvcrt/fcntl.h
 include/wine/msvcrt/io.h
+include/wine/msvcrt/limits.h
 include/wine/msvcrt/locale.h
 include/wine/msvcrt/malloc.h
+include/wine/msvcrt/math.h
 include/wine/msvcrt/mbctype.h
 include/wine/msvcrt/mbstring.h
 include/wine/msvcrt/process.h
@@ -101,6 +77,7 @@ include/wine/windows/basetsd.h
 include/wine/windows/cderr.h
 include/wine/windows/cguid.h
 include/wine/windows/comcat.h
+include/wine/windows/comcat.idl
 include/wine/windows/commctrl.h
 include/wine/windows/commdlg.h
 include/wine/windows/compobj.h
@@ -142,6 +119,7 @@ include/wine/windows/dmusicf.h
 include/wine/windows/dmusici.h
 include/wine/windows/dmusics.h
 include/wine/windows/docobj.h
+include/wine/windows/docobj.idl
 include/wine/windows/dpaddr.h
 include/wine/windows/dplay.h
 include/wine/windows/dplay8.h
@@ -152,6 +130,8 @@ include/wine/windows/dsdriver.h
 include/wine/windows/dsound.h
 include/wine/windows/dyngraph.idl
 include/wine/windows/excpt.h
+include/wine/windows/exdisp.h
+include/wine/windows/exdisp.idl
 include/wine/windows/fci.h
 include/wine/windows/fdi.h
 include/wine/windows/guiddef.h
@@ -171,6 +151,7 @@ include/wine/windows/lmapibuf.h
 include/wine/windows/lmbrowsr.h
 include/wine/windows/lmcons.h
 include/wine/windows/lmerr.h
+include/wine/windows/lmstats.h
 include/wine/windows/lmwksta.h
 include/wine/windows/lzexpand.h
 include/wine/windows/mapi.h
@@ -204,12 +185,14 @@ include/wine/windows/objbase.h
 include/wine/windows/objidl.h
 include/wine/windows/objidl.idl
 include/wine/windows/ocidl.h
+include/wine/windows/ocidl.idl
 include/wine/windows/ole2.h
 include/wine/windows/ole2ver.h
 include/wine/windows/oleauto.h
 include/wine/windows/olectl.h
 include/wine/windows/oledlg.h
 include/wine/windows/oleidl.h
+include/wine/windows/oleidl.idl
 include/wine/windows/pktdef.h
 include/wine/windows/poppack.h
 include/wine/windows/prsht.h
@@ -229,11 +212,16 @@ include/wine/windows/rpcndr.h
 include/wine/windows/rpcnterr.h
 include/wine/windows/rpcproxy.h
 include/wine/windows/servprov.h
+include/wine/windows/servprov.idl
 include/wine/windows/setupapi.h
 include/wine/windows/shellapi.h
 include/wine/windows/shlguid.h
 include/wine/windows/shlobj.h
 include/wine/windows/shlwapi.h
+include/wine/windows/shobjidl.h
+include/wine/windows/shobjidl.idl
+include/wine/windows/shtypes.h
+include/wine/windows/shtypes.idl
 include/wine/windows/sipbase.h
 include/wine/windows/sql.h
 include/wine/windows/sqlext.h
@@ -244,10 +232,13 @@ include/wine/windows/strmif.idl
 include/wine/windows/tapi.h
 include/wine/windows/tchar.h
 include/wine/windows/tlhelp32.h
+include/wine/windows/tmschema.h
 include/wine/windows/unknwn.h
 include/wine/windows/unknwn.idl
 include/wine/windows/urlmon.h
+include/wine/windows/urlmon.idl
 include/wine/windows/uuids.h
+include/wine/windows/uxtheme.h
 include/wine/windows/ver.h
 include/wine/windows/vfw.h
 include/wine/windows/vfwmsgs.h
@@ -285,7 +276,6 @@ include/wine/windows/wsipx.h
 include/wine/windows/wtypes.h
 include/wine/windows/wtypes.idl
 include/wine/windows/zmouse.h
-lib/libntdll.dll.so
 lib/libwine.so
 lib/libwine.so.1
 lib/libwine_unicode.so
@@ -303,7 +293,7 @@ lib/wine/clock.exe.so
 lib/wine/comcat.dll.so
 lib/wine/comctl32.dll.so
 lib/wine/comdlg32.dll.so
-lib/wine/comm.dll.so
+lib/wine/comm.drv.so
 lib/wine/commdlg.dll.so
 lib/wine/compobj.dll.so
 lib/wine/control.exe.so
@@ -323,7 +313,7 @@ lib/wine/devenum.dll.so
 lib/wine/dinput.dll.so
 lib/wine/dinput8.dll.so
 lib/wine/dispdib.dll.so
-lib/wine/display.dll.so
+lib/wine/display.drv.so
 lib/wine/dmband.dll.so
 lib/wine/dmcompos.dll.so
 lib/wine/dmime.dll.so
@@ -349,7 +339,7 @@ lib/wine/imm32.dll.so
 lib/wine/iphlpapi.dll.so
 lib/wine/joystick.drv.so
 lib/wine/kernel32.dll.so
-lib/wine/keyboard.dll.so
+lib/wine/keyboard.drv.so
 lib/wine/krnl386.exe.so
 lib/wine/libadvapi32.def
 lib/wine/libavicap32.def
@@ -380,6 +370,7 @@ lib/wine/libdmsynth.def
 lib/wine/libdmusic.def
 lib/wine/libdmusic32.def
 lib/wine/libdpnhpast.def
+lib/wine/libmshtml.def
 lib/wine/libmsvcrtd.def
 lib/wine/libdplay.def
 lib/wine/libdplayx.def
@@ -435,6 +426,7 @@ lib/wine/libtwain_32.def
 lib/wine/liburl.def
 lib/wine/liburlmon.def
 lib/wine/libuser32.def
+lib/wine/libuxtheme.def
 lib/wine/libversion.def
 lib/wine/libw32skrnl.def
 lib/wine/libwinedos.def
@@ -460,7 +452,7 @@ lib/wine/mciseq.drv.so
 lib/wine/mciwave.drv.so
 lib/wine/midimap.drv.so
 lib/wine/mmsystem.dll.so
-lib/wine/mouse.dll.so
+lib/wine/mouse.drv.so
 lib/wine/mpr.dll.so
 lib/wine/msacm.drv.so
 lib/wine/msacm.dll.so
@@ -468,6 +460,7 @@ lib/wine/msacm32.dll.so
 lib/wine/msadp32.acm.so
 lib/wine/msdmo.dll.so
 lib/wine/msg711.acm.so
+lib/wine/mshtml.dll.so
 lib/wine/msi.dll.so
 lib/wine/msimg32.dll.so
 lib/wine/msisys.ocx.so
@@ -525,7 +518,7 @@ lib/wine/start.exe.so
 lib/wine/sti.dll.so
 lib/wine/storage.dll.so
 lib/wine/stress.dll.so
-lib/wine/system.dll.so
+lib/wine/system.drv.so
 lib/wine/tapi32.dll.so
 lib/wine/toolhelp.dll.so
 lib/wine/ttydrv.dll.so
@@ -536,6 +529,7 @@ lib/wine/url.dll.so
 lib/wine/urlmon.dll.so
 lib/wine/user.exe.so
 lib/wine/user32.dll.so
+lib/wine/uxtheme.dll.so
 lib/wine/ver.dll.so
 lib/wine/version.dll.so
 lib/wine/w32skrnl.dll.so