6 files changed, 20 insertions, 22 deletions

diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile
index ee2a085cefda..e495805447ba 100644
--- a/emulators/wine-devel/Makefile
+++ b/emulators/wine-devel/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	wine
-PORTVERSION=	2000.07.16
+PORTVERSION=	2000.08.01
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	ALPHA/wine/development
@@ -47,7 +47,9 @@ pre-extract:
 post-patch:
 	@${PERL} -pi.sofix -e 's/SOVERSION = 1.0/SOVERSION = 1/g' \
 		${WRKSRC}/Makefile.in
-.for F in avifil32/Makefile.in comctl32/Makefile.in commdlg/Makefile.in crtdll/Makefile.in dciman32/Makefile.in ddraw/Makefile.in dinput/Makefile.in dplay/Makefile.in dplayx/Makefile.in dsound/Makefile.in gdi/Makefile.in icmp/Makefile.in imagehlp/Makefile.in imm32/Makefile.in kernel/Makefile.in lzexpand/Makefile.in mpr/Makefile.in msacm/Makefile.in msacm32/Makefile.in msnet32/Makefile.in msvideo/Makefile.in odbc32/Makefile.in ole32/Makefile.in oleaut32/Makefile.in olecli/Makefile.in oledlg/Makefile.in olepro32/Makefile.in olesvr/Makefile.in opengl32/Makefile.in psapi/Makefile.in rasapi32/Makefile.in richedit/Makefile.in rpcrt4/Makefile.in serialui/Makefile.in setupapi/Makefile.in setupx/Makefile.in shell32/Makefile.in shfolder/Makefile.in shlwapi/Makefile.in sound/Makefile.in stress/Makefile.in tapi32/Makefile.in ttydrv/Makefile.in urlmon/Makefile.in user/Makefile.in version/Makefile.in win32s/Makefile.in win87em/Makefile.in winaspi/Makefile.in windebug/Makefile.in wineps/Makefile.in wing/Makefile.in wininet/Makefile.in winmm/Makefile.in winmm/joystick/Makefile.in winmm/mcianim/Makefile.in winmm/mciavi/Makefile.in winmm/mcicda/Makefile.in winmm/mciseq/Makefile.in winmm/mciwave/Makefile.in winmm/midimap/Makefile.in winmm/wavemap/Makefile.in winmm/wineoss/Makefile.in winsock/Makefile.in winspool/Makefile.in wow32/Makefile.in wsock32/Makefile.in x11drv/Makefile.in
+	@${PERL} -pi.sofix -e 's/SOVERSION = 1.0/SOVERSION = 1/g' \
+		${WRKSRC}/unicode/Makefile.in
+.for F in advapi32/Makefile.in avifil32/Makefile.in comctl32/Makefile.in commdlg/Makefile.in crtdll/Makefile.in dciman32/Makefile.in ddraw/Makefile.in dinput/Makefile.in dplay/Makefile.in dplayx/Makefile.in dsound/Makefile.in gdi/Makefile.in icmp/Makefile.in imagehlp/Makefile.in imm32/Makefile.in kernel/Makefile.in lzexpand/Makefile.in mpr/Makefile.in msacm/Makefile.in msacm32/Makefile.in msnet32/Makefile.in msvideo/Makefile.in odbc32/Makefile.in ole32/Makefile.in oleaut32/Makefile.in olecli/Makefile.in oledlg/Makefile.in olepro32/Makefile.in olesvr/Makefile.in opengl32/Makefile.in psapi/Makefile.in rasapi32/Makefile.in richedit/Makefile.in rpcrt4/Makefile.in serialui/Makefile.in setupapi/Makefile.in setupx/Makefile.in shell32/Makefile.in shfolder/Makefile.in shlwapi/Makefile.in sound/Makefile.in stress/Makefile.in tapi32/Makefile.in ttydrv/Makefile.in urlmon/Makefile.in user/Makefile.in version/Makefile.in win32s/Makefile.in win87em/Makefile.in winaspi/Makefile.in windebug/Makefile.in wineps/Makefile.in wing/Makefile.in wininet/Makefile.in winmm/Makefile.in winmm/joystick/Makefile.in winmm/mcianim/Makefile.in winmm/mciavi/Makefile.in winmm/mcicda/Makefile.in winmm/mciseq/Makefile.in winmm/mciwave/Makefile.in winmm/midimap/Makefile.in winmm/wavemap/Makefile.in winmm/wineoss/Makefile.in winsock/Makefile.in winspool/Makefile.in wow32/Makefile.in wsock32/Makefile.in x11drv/Makefile.in
 	@${PERL} -pi.sofix -e 's/SOVERSION = 1.0/SOVERSION = 1/g' \
 		${WRKSRC}/dlls/${F}
 .endfor
diff --git a/emulators/wine-devel/distinfo b/emulators/wine-devel/distinfo
index 0b98a7c81dcf..f3b7800afcb3 100644
--- a/emulators/wine-devel/distinfo
+++ b/emulators/wine-devel/distinfo
@@ -1 +1 @@
-MD5 (Wine-20000716.tar.gz) = 2d25bfa22e9165923d67407d64919b8c
+MD5 (Wine-20000801.tar.gz) = 70c70a580b0a9ce072759629b87af4d4
diff --git a/emulators/wine-devel/pkg-plist b/emulators/wine-devel/pkg-plist
index 7a9391046179..62d51bf3f16b 100644
--- a/emulators/wine-devel/pkg-plist
+++ b/emulators/wine-devel/pkg-plist
@@ -36,6 +36,8 @@ lib/wine/documentation/psdrv.reg
 lib/wine/documentation/ttfserver
 lib/wine/documentation/README.debugger
 lib/wine/documentation/README.regapi
+lib/wine/libadvapi32.so
+lib/wine/libadvapi32.so.1
 lib/wine/libavifil32.so
 lib/wine/libavifil32.so.1
 lib/wine/libavifile.so
@@ -100,7 +102,6 @@ lib/wine/libmpr.so.1
 lib/wine/libmsacm.drv.so
 lib/wine/libmsacm.drv.so.1
 lib/wine/libmsacm.so
-lib/wine/libmsacm.so.1
 lib/wine/libmsacm32.so
 lib/wine/libmsacm32.so.1
 lib/wine/libmsnet32.so
@@ -144,7 +145,6 @@ lib/wine/libserialui.so.1
 lib/wine/libsetupapi.so
 lib/wine/libsetupapi.so.1
 lib/wine/libsetupx.so
-lib/wine/libsetupx.so.1
 lib/wine/libshell.so
 lib/wine/libshell32.so
 lib/wine/libshell32.so.1
@@ -153,10 +153,8 @@ lib/wine/libshfolder.so.1
 lib/wine/libshlwapi.so
 lib/wine/libshlwapi.so.1
 lib/wine/libsound.so
-lib/wine/libsound.so.1
 lib/wine/libstorage.so
 lib/wine/libstress.so
-lib/wine/libstress.so.1
 lib/wine/libsystem.so
 lib/wine/libtapi32.so
 lib/wine/libtapi32.so.1
@@ -177,10 +175,8 @@ lib/wine/libw32skrnl.so.1
 lib/wine/libw32sys.so
 lib/wine/libwin32s16.so
 lib/wine/libwin87em.so
-lib/wine/libwin87em.so.1
 lib/wine/libwinaspi.so
 lib/wine/libwindebug.so
-lib/wine/libwindebug.so.1
 lib/wine/libwine.so.1
 lib/wine/libwineoss.drv.so
 lib/wine/libwineoss.drv.so.1
@@ -188,7 +184,6 @@ lib/wine/libwineps.so
 lib/wine/libwineps.so.1
 lib/wine/libwineps16.so
 lib/wine/libwing.so
-lib/wine/libwing.so.1
 lib/wine/libwininet.so
 lib/wine/libwininet.so.1
 lib/wine/libwinmm.so
@@ -196,6 +191,9 @@ lib/wine/libwinmm.so.1
 lib/wine/libwinsock.so
 lib/wine/libws2_32.so
 lib/wine/libws2_32.so.1
+lib/wine/libwine.so
+lib/wine/libwine_unicode.so
+lib/wine/libwine_unicode.so.1
 lib/wine/libwinspool.drv.so
 lib/wine/libwinspool.drv.so.1
 lib/wine/libwnaspi32.so
@@ -207,7 +205,6 @@ lib/wine/libwsock32.so
 lib/wine/libwsock32.so.1
 lib/wine/libx11drv.so
 lib/wine/libx11drv.so.1
-lib/wine/libwine.so
 @dirrm include/wine
 @dirrm lib/wine/reg
 @dirrm lib/wine/documentation
diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index ee2a085cefda..e495805447ba 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	wine
-PORTVERSION=	2000.07.16
+PORTVERSION=	2000.08.01
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	ALPHA/wine/development
@@ -47,7 +47,9 @@ pre-extract:
 post-patch:
 	@${PERL} -pi.sofix -e 's/SOVERSION = 1.0/SOVERSION = 1/g' \
 		${WRKSRC}/Makefile.in
-.for F in avifil32/Makefile.in comctl32/Makefile.in commdlg/Makefile.in crtdll/Makefile.in dciman32/Makefile.in ddraw/Makefile.in dinput/Makefile.in dplay/Makefile.in dplayx/Makefile.in dsound/Makefile.in gdi/Makefile.in icmp/Makefile.in imagehlp/Makefile.in imm32/Makefile.in kernel/Makefile.in lzexpand/Makefile.in mpr/Makefile.in msacm/Makefile.in msacm32/Makefile.in msnet32/Makefile.in msvideo/Makefile.in odbc32/Makefile.in ole32/Makefile.in oleaut32/Makefile.in olecli/Makefile.in oledlg/Makefile.in olepro32/Makefile.in olesvr/Makefile.in opengl32/Makefile.in psapi/Makefile.in rasapi32/Makefile.in richedit/Makefile.in rpcrt4/Makefile.in serialui/Makefile.in setupapi/Makefile.in setupx/Makefile.in shell32/Makefile.in shfolder/Makefile.in shlwapi/Makefile.in sound/Makefile.in stress/Makefile.in tapi32/Makefile.in ttydrv/Makefile.in urlmon/Makefile.in user/Makefile.in version/Makefile.in win32s/Makefile.in win87em/Makefile.in winaspi/Makefile.in windebug/Makefile.in wineps/Makefile.in wing/Makefile.in wininet/Makefile.in winmm/Makefile.in winmm/joystick/Makefile.in winmm/mcianim/Makefile.in winmm/mciavi/Makefile.in winmm/mcicda/Makefile.in winmm/mciseq/Makefile.in winmm/mciwave/Makefile.in winmm/midimap/Makefile.in winmm/wavemap/Makefile.in winmm/wineoss/Makefile.in winsock/Makefile.in winspool/Makefile.in wow32/Makefile.in wsock32/Makefile.in x11drv/Makefile.in
+	@${PERL} -pi.sofix -e 's/SOVERSION = 1.0/SOVERSION = 1/g' \
+		${WRKSRC}/unicode/Makefile.in
+.for F in advapi32/Makefile.in avifil32/Makefile.in comctl32/Makefile.in commdlg/Makefile.in crtdll/Makefile.in dciman32/Makefile.in ddraw/Makefile.in dinput/Makefile.in dplay/Makefile.in dplayx/Makefile.in dsound/Makefile.in gdi/Makefile.in icmp/Makefile.in imagehlp/Makefile.in imm32/Makefile.in kernel/Makefile.in lzexpand/Makefile.in mpr/Makefile.in msacm/Makefile.in msacm32/Makefile.in msnet32/Makefile.in msvideo/Makefile.in odbc32/Makefile.in ole32/Makefile.in oleaut32/Makefile.in olecli/Makefile.in oledlg/Makefile.in olepro32/Makefile.in olesvr/Makefile.in opengl32/Makefile.in psapi/Makefile.in rasapi32/Makefile.in richedit/Makefile.in rpcrt4/Makefile.in serialui/Makefile.in setupapi/Makefile.in setupx/Makefile.in shell32/Makefile.in shfolder/Makefile.in shlwapi/Makefile.in sound/Makefile.in stress/Makefile.in tapi32/Makefile.in ttydrv/Makefile.in urlmon/Makefile.in user/Makefile.in version/Makefile.in win32s/Makefile.in win87em/Makefile.in winaspi/Makefile.in windebug/Makefile.in wineps/Makefile.in wing/Makefile.in wininet/Makefile.in winmm/Makefile.in winmm/joystick/Makefile.in winmm/mcianim/Makefile.in winmm/mciavi/Makefile.in winmm/mcicda/Makefile.in winmm/mciseq/Makefile.in winmm/mciwave/Makefile.in winmm/midimap/Makefile.in winmm/wavemap/Makefile.in winmm/wineoss/Makefile.in winsock/Makefile.in winspool/Makefile.in wow32/Makefile.in wsock32/Makefile.in x11drv/Makefile.in
 	@${PERL} -pi.sofix -e 's/SOVERSION = 1.0/SOVERSION = 1/g' \
 		${WRKSRC}/dlls/${F}
 .endfor
diff --git a/emulators/wine/distinfo b/emulators/wine/distinfo
index 0b98a7c81dcf..f3b7800afcb3 100644
--- a/emulators/wine/distinfo
+++ b/emulators/wine/distinfo
@@ -1 +1 @@
-MD5 (Wine-20000716.tar.gz) = 2d25bfa22e9165923d67407d64919b8c
+MD5 (Wine-20000801.tar.gz) = 70c70a580b0a9ce072759629b87af4d4
diff --git a/emulators/wine/pkg-plist b/emulators/wine/pkg-plist
index 7a9391046179..62d51bf3f16b 100644
--- a/emulators/wine/pkg-plist
+++ b/emulators/wine/pkg-plist
@@ -36,6 +36,8 @@ lib/wine/documentation/psdrv.reg
 lib/wine/documentation/ttfserver
 lib/wine/documentation/README.debugger
 lib/wine/documentation/README.regapi
+lib/wine/libadvapi32.so
+lib/wine/libadvapi32.so.1
 lib/wine/libavifil32.so
 lib/wine/libavifil32.so.1
 lib/wine/libavifile.so
@@ -100,7 +102,6 @@ lib/wine/libmpr.so.1
 lib/wine/libmsacm.drv.so
 lib/wine/libmsacm.drv.so.1
 lib/wine/libmsacm.so
-lib/wine/libmsacm.so.1
 lib/wine/libmsacm32.so
 lib/wine/libmsacm32.so.1
 lib/wine/libmsnet32.so
@@ -144,7 +145,6 @@ lib/wine/libserialui.so.1
 lib/wine/libsetupapi.so
 lib/wine/libsetupapi.so.1
 lib/wine/libsetupx.so
-lib/wine/libsetupx.so.1
 lib/wine/libshell.so
 lib/wine/libshell32.so
 lib/wine/libshell32.so.1
@@ -153,10 +153,8 @@ lib/wine/libshfolder.so.1
 lib/wine/libshlwapi.so
 lib/wine/libshlwapi.so.1
 lib/wine/libsound.so
-lib/wine/libsound.so.1
 lib/wine/libstorage.so
 lib/wine/libstress.so
-lib/wine/libstress.so.1
 lib/wine/libsystem.so
 lib/wine/libtapi32.so
 lib/wine/libtapi32.so.1
@@ -177,10 +175,8 @@ lib/wine/libw32skrnl.so.1
 lib/wine/libw32sys.so
 lib/wine/libwin32s16.so
 lib/wine/libwin87em.so
-lib/wine/libwin87em.so.1
 lib/wine/libwinaspi.so
 lib/wine/libwindebug.so
-lib/wine/libwindebug.so.1
 lib/wine/libwine.so.1
 lib/wine/libwineoss.drv.so
 lib/wine/libwineoss.drv.so.1
@@ -188,7 +184,6 @@ lib/wine/libwineps.so
 lib/wine/libwineps.so.1
 lib/wine/libwineps16.so
 lib/wine/libwing.so
-lib/wine/libwing.so.1
 lib/wine/libwininet.so
 lib/wine/libwininet.so.1
 lib/wine/libwinmm.so
@@ -196,6 +191,9 @@ lib/wine/libwinmm.so.1
 lib/wine/libwinsock.so
 lib/wine/libws2_32.so
 lib/wine/libws2_32.so.1
+lib/wine/libwine.so
+lib/wine/libwine_unicode.so
+lib/wine/libwine_unicode.so.1
 lib/wine/libwinspool.drv.so
 lib/wine/libwinspool.drv.so.1
 lib/wine/libwnaspi32.so
@@ -207,7 +205,6 @@ lib/wine/libwsock32.so
 lib/wine/libwsock32.so.1
 lib/wine/libx11drv.so
 lib/wine/libx11drv.so.1
-lib/wine/libwine.so
 @dirrm include/wine
 @dirrm lib/wine/reg
 @dirrm lib/wine/documentation