Update to the 2002.06.05 version of Wine. Once again, lots of files have

moved.

Approved by:	obrien (mentor)

8 files changed, 116 insertions, 58 deletions

diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile
index f2fa0b8e61dc..e86a806afb61 100644
--- a/emulators/wine-devel/Makefile
+++ b/emulators/wine-devel/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	wine
-PORTVERSION=	2002.05.09
+PORTVERSION=	2002.06.05
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	ALPHA/wine/development
diff --git a/emulators/wine-devel/distinfo b/emulators/wine-devel/distinfo
index 8e40204581c9..2fdc674b622a 100644
--- a/emulators/wine-devel/distinfo
+++ b/emulators/wine-devel/distinfo
@@ -1 +1 @@
-MD5 (Wine-20020509.tar.gz) = 5d636433a54c6252635d2f2c58f10590
+MD5 (Wine-20020605.tar.gz) = 416ca5a002a3286953afc77bee20a9da
diff --git a/emulators/wine-devel/files/patch-gb b/emulators/wine-devel/files/patch-gb
index b139c468ecc3..b4d2e44fd710 100644
--- a/emulators/wine-devel/files/patch-gb
+++ b/emulators/wine-devel/files/patch-gb
@@ -1,10 +1,23 @@
---- Makefile.in.orig	Thu Feb 28 22:43:46 2002
-+++ Makefile.in	Sat Mar  9 10:48:45 2002
-@@ -89,7 +89,6 @@ install_wine:
- 	$(INSTALL_PROGRAM) wine $(bindir)/wine
- 
- install:: all install_wine $(INSTALLSUBDIRS:%=%/__install__)
--	-$(LDCONFIG)
- 
- uninstall:: $(INSTALLSUBDIRS:%=%/__uninstall__)
- 	cd $(bindir) && $(RM) wine
+*** Makefile.in.orig	Thu Jun  6 13:16:17 2002
+--- Makefile.in	Thu Jun  6 13:17:00 2002
+*************** wine: $(WINEWRAPPER)
+*** 72,89 ****
+  	$(RM) $@ && $(LN_S) $(WINEWRAPPER) $@
+  
+  install:: all $(SUBDIRS:%=%/__install__)
+- 	-$(LDCONFIG)
+- 	@if test -n "`LANG=C $(LDD) $(bindir)/wine|grep not.found`";	\
+- 	then								\
+- 		echo "*************************************************" ; \
+- 		echo "*************************************************" ; \
+- 		echo "The installed Wine libraries will not be found!" ; \
+- 		echo "You can either:" ; 				\
+- 		echo "   Add the line '$(libdir)' to /etc/ld.so.conf" ;	\
+- 		echo '   export LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$(libdir)' ; \
+- 		echo "*************************************************" ; \
+- 		echo "*************************************************" ; \
+- 	fi
+  
+  uninstall:: $(SUBDIRS:%=%/__uninstall__)
+  
+--- 72,77 ----
diff --git a/emulators/wine-devel/pkg-plist b/emulators/wine-devel/pkg-plist
index a30d97ac041b..7ab712316dae 100644
--- a/emulators/wine-devel/pkg-plist
+++ b/emulators/wine-devel/pkg-plist
@@ -1,40 +1,27 @@
-bin/control
-bin/control.so
+bin/expand
 bin/fnt2bdf
 bin/function_grep.pl
 bin/notepad
-bin/notepad.so
 bin/progman
-bin/progman.so
 bin/regSet.sh
 bin/regedit
-bin/regedit.so
 bin/regsvr32
-bin/regsvr32.so
 bin/uninstaller
-bin/uninstaller.so
 bin/wcmd
-bin/wcmd.so
 bin/wine
 bin/winebuild
 bin/wineclipsrv
 bin/wineconsole
-bin/wineconsole.so
 bin/winedbg
-bin/winedbg.so
 bin/winedump
+bin/winefile
 bin/winelauncher
 bin/winemaker
 bin/winemine
-bin/winemine.so
 bin/winepath
-bin/winepath.so
 bin/wineserver
 bin/wineshelllink
 bin/winhelp
-bin/winhelp.so
-bin/winver
-bin/winver.so
 bin/wmc
 bin/wrc
 @unexec if cmp -s %D/etc/wine.conf %D/etc/wine.conf.sample; then rm -f %D/etc/wine.conf; fi
@@ -115,6 +102,7 @@ include/wine/msvcrt/sys/utime.h
 include/wine/msvcrt/time.h
 include/wine/msvcrt/wchar.h
 include/wine/msvcrt/wctype.h
+include/wine/mswsock.h
 include/wine/nb30.h
 include/wine/nspapi.h
 include/wine/ntsecapi.h
@@ -235,16 +223,22 @@ include/wine/wshisotp.h
 include/wine/wsipx.h
 include/wine/wtypes.h
 include/wine/zmouse.h
-lib/wine/bug_report.pl
 lib/wine/advapi32.dll.so
 lib/wine/avicap32.dll.so
 lib/wine/avifil32.dll.so
 lib/wine/avifile.dll.so
+lib/wine/aviinfo.exe.so
+lib/wine/aviplay.exe.so
+lib/wine/bug_report.pl
+lib/wine/clock.exe.so
+lib/wine/cmdlgtst.exe.so
+lib/wine/comcat.dll.so
 lib/wine/comctl32.dll.so
 lib/wine/comdlg32.dll.so
 lib/wine/comm.dll.so
 lib/wine/commdlg.dll.so
 lib/wine/compobj.dll.so
+lib/wine/control.exe.so
 lib/wine/crtdll.dll.so
 lib/wine/crypt32.dll.so
 lib/wine/dciman32.dll.so
@@ -257,8 +251,10 @@ lib/wine/display.dll.so
 lib/wine/dplay.dll.so
 lib/wine/dplayx.dll.so
 lib/wine/dsound.dll.so
+lib/wine/expand.exe.so
 lib/wine/gdi.exe.so
 lib/wine/gdi32.dll.so
+lib/wine/icinfo.exe.so
 lib/wine/icmp.dll.so
 lib/wine/imaadp32.acm.so
 lib/wine/imagehlp.dll.so
@@ -296,8 +292,9 @@ lib/wine/mpr.dll.so
 lib/wine/msacm.drv.so
 lib/wine/msacm.dll.so
 lib/wine/msacm32.dll.so
+lib/wine/msadp32.acm.so
 lib/wine/msdmo.dll.so
-lib/wine/msg711.drv.so
+lib/wine/msg711.acm.so
 lib/wine/msimg32.dll.so
 lib/wine/msisys.ocx.so
 lib/wine/msnet32.dll.so
@@ -307,6 +304,7 @@ lib/wine/msvcrt20.dll.so
 lib/wine/msvfw32.dll.so
 lib/wine/msvideo.dll.so
 lib/wine/netapi32.dll.so
+lib/wine/notepad.exe.so
 lib/wine/ntdll.dll.so
 lib/wine/odbc32.dll.so
 lib/wine/ole2.dll.so
@@ -323,11 +321,17 @@ lib/wine/oledlg.dll.so
 lib/wine/olepro32.dll.so
 lib/wine/olesvr.dll.so
 lib/wine/olesvr32.dll.so
+lib/wine/osversioncheck.exe.so
+lib/wine/progman.exe.so
 lib/wine/psapi.dll.so
 lib/wine/qcap.dll.so
 lib/wine/quartz.dll.so
 lib/wine/rasapi16.dll.so
 lib/wine/rasapi32.dll.so
+lib/wine/regapi.exe.so
+lib/wine/regedit.exe.so
+lib/wine/regsvr32.exe.so
+lib/wine/regtest.exe.so
 lib/wine/riched32.dll.so
 lib/wine/rpcrt4.dll.so
 lib/wine/serialui.dll.so
@@ -349,24 +353,35 @@ lib/wine/toolhelp.dll.so
 lib/wine/ttydrv.dll.so
 lib/wine/twain_32.dll.so
 lib/wine/typelib.dll.so
+lib/wine/uninstaller.exe.so
 lib/wine/url.dll.so
 lib/wine/urlmon.dll.so
 lib/wine/user.exe.so
 lib/wine/user32.dll.so
 lib/wine/ver.dll.so
 lib/wine/version.dll.so
+lib/wine/view.exe.so
 lib/wine/w32skrnl.dll.so
 lib/wine/w32sys.dll.so
+lib/wine/wcmd.exe.so
 lib/wine/win32s16.dll.so
 lib/wine/win87em.dll.so
 lib/wine/winaspi.dll.so
 lib/wine/windebug.dll.so
 lib/wine/winearts.drv.so
+lib/wine/wineconsole.exe.so
+lib/wine/winedbg.exe.so
 lib/wine/winedos.dll.so
+lib/wine/winefile.exe.so
+lib/wine/winemine.exe.so
+lib/wine/winemp3.acm.so
 lib/wine/wineoss.drv.so
+lib/wine/winepath.exe.so
 lib/wine/wineps.dll.so
 lib/wine/wineps16.dll.so
+lib/wine/winetest.exe.so
 lib/wine/wing.dll.so
+lib/wine/winhelp.exe.so
 lib/wine/wininet.dll.so
 lib/wine/winmm.dll.so
 lib/wine/winnls.dll.so
@@ -374,6 +389,7 @@ lib/wine/winnls32.dll.so
 lib/wine/winsock.dll.so
 lib/wine/winspool.drv.so
 lib/wine/wintrust.dll.so
+lib/wine/winver.exe.so
 lib/wine/wnaspi32.dll.so
 lib/wine/wow32.dll.so
 lib/wine/wprocs.dll.so
diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index f2fa0b8e61dc..e86a806afb61 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	wine
-PORTVERSION=	2002.05.09
+PORTVERSION=	2002.06.05
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	ALPHA/wine/development
diff --git a/emulators/wine/distinfo b/emulators/wine/distinfo
index 8e40204581c9..2fdc674b622a 100644
--- a/emulators/wine/distinfo
+++ b/emulators/wine/distinfo
@@ -1 +1 @@
-MD5 (Wine-20020509.tar.gz) = 5d636433a54c6252635d2f2c58f10590
+MD5 (Wine-20020605.tar.gz) = 416ca5a002a3286953afc77bee20a9da
diff --git a/emulators/wine/files/patch-gb b/emulators/wine/files/patch-gb
index b139c468ecc3..b4d2e44fd710 100644
--- a/emulators/wine/files/patch-gb
+++ b/emulators/wine/files/patch-gb
@@ -1,10 +1,23 @@
---- Makefile.in.orig	Thu Feb 28 22:43:46 2002
-+++ Makefile.in	Sat Mar  9 10:48:45 2002
-@@ -89,7 +89,6 @@ install_wine:
- 	$(INSTALL_PROGRAM) wine $(bindir)/wine
- 
- install:: all install_wine $(INSTALLSUBDIRS:%=%/__install__)
--	-$(LDCONFIG)
- 
- uninstall:: $(INSTALLSUBDIRS:%=%/__uninstall__)
- 	cd $(bindir) && $(RM) wine
+*** Makefile.in.orig	Thu Jun  6 13:16:17 2002
+--- Makefile.in	Thu Jun  6 13:17:00 2002
+*************** wine: $(WINEWRAPPER)
+*** 72,89 ****
+  	$(RM) $@ && $(LN_S) $(WINEWRAPPER) $@
+  
+  install:: all $(SUBDIRS:%=%/__install__)
+- 	-$(LDCONFIG)
+- 	@if test -n "`LANG=C $(LDD) $(bindir)/wine|grep not.found`";	\
+- 	then								\
+- 		echo "*************************************************" ; \
+- 		echo "*************************************************" ; \
+- 		echo "The installed Wine libraries will not be found!" ; \
+- 		echo "You can either:" ; 				\
+- 		echo "   Add the line '$(libdir)' to /etc/ld.so.conf" ;	\
+- 		echo '   export LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$(libdir)' ; \
+- 		echo "*************************************************" ; \
+- 		echo "*************************************************" ; \
+- 	fi
+  
+  uninstall:: $(SUBDIRS:%=%/__uninstall__)
+  
+--- 72,77 ----
diff --git a/emulators/wine/pkg-plist b/emulators/wine/pkg-plist
index a30d97ac041b..7ab712316dae 100644
--- a/emulators/wine/pkg-plist
+++ b/emulators/wine/pkg-plist
@@ -1,40 +1,27 @@
-bin/control
-bin/control.so
+bin/expand
 bin/fnt2bdf
 bin/function_grep.pl
 bin/notepad
-bin/notepad.so
 bin/progman
-bin/progman.so
 bin/regSet.sh
 bin/regedit
-bin/regedit.so
 bin/regsvr32
-bin/regsvr32.so
 bin/uninstaller
-bin/uninstaller.so
 bin/wcmd
-bin/wcmd.so
 bin/wine
 bin/winebuild
 bin/wineclipsrv
 bin/wineconsole
-bin/wineconsole.so
 bin/winedbg
-bin/winedbg.so
 bin/winedump
+bin/winefile
 bin/winelauncher
 bin/winemaker
 bin/winemine
-bin/winemine.so
 bin/winepath
-bin/winepath.so
 bin/wineserver
 bin/wineshelllink
 bin/winhelp
-bin/winhelp.so
-bin/winver
-bin/winver.so
 bin/wmc
 bin/wrc
 @unexec if cmp -s %D/etc/wine.conf %D/etc/wine.conf.sample; then rm -f %D/etc/wine.conf; fi
@@ -115,6 +102,7 @@ include/wine/msvcrt/sys/utime.h
 include/wine/msvcrt/time.h
 include/wine/msvcrt/wchar.h
 include/wine/msvcrt/wctype.h
+include/wine/mswsock.h
 include/wine/nb30.h
 include/wine/nspapi.h
 include/wine/ntsecapi.h
@@ -235,16 +223,22 @@ include/wine/wshisotp.h
 include/wine/wsipx.h
 include/wine/wtypes.h
 include/wine/zmouse.h
-lib/wine/bug_report.pl
 lib/wine/advapi32.dll.so
 lib/wine/avicap32.dll.so
 lib/wine/avifil32.dll.so
 lib/wine/avifile.dll.so
+lib/wine/aviinfo.exe.so
+lib/wine/aviplay.exe.so
+lib/wine/bug_report.pl
+lib/wine/clock.exe.so
+lib/wine/cmdlgtst.exe.so
+lib/wine/comcat.dll.so
 lib/wine/comctl32.dll.so
 lib/wine/comdlg32.dll.so
 lib/wine/comm.dll.so
 lib/wine/commdlg.dll.so
 lib/wine/compobj.dll.so
+lib/wine/control.exe.so
 lib/wine/crtdll.dll.so
 lib/wine/crypt32.dll.so
 lib/wine/dciman32.dll.so
@@ -257,8 +251,10 @@ lib/wine/display.dll.so
 lib/wine/dplay.dll.so
 lib/wine/dplayx.dll.so
 lib/wine/dsound.dll.so
+lib/wine/expand.exe.so
 lib/wine/gdi.exe.so
 lib/wine/gdi32.dll.so
+lib/wine/icinfo.exe.so
 lib/wine/icmp.dll.so
 lib/wine/imaadp32.acm.so
 lib/wine/imagehlp.dll.so
@@ -296,8 +292,9 @@ lib/wine/mpr.dll.so
 lib/wine/msacm.drv.so
 lib/wine/msacm.dll.so
 lib/wine/msacm32.dll.so
+lib/wine/msadp32.acm.so
 lib/wine/msdmo.dll.so
-lib/wine/msg711.drv.so
+lib/wine/msg711.acm.so
 lib/wine/msimg32.dll.so
 lib/wine/msisys.ocx.so
 lib/wine/msnet32.dll.so
@@ -307,6 +304,7 @@ lib/wine/msvcrt20.dll.so
 lib/wine/msvfw32.dll.so
 lib/wine/msvideo.dll.so
 lib/wine/netapi32.dll.so
+lib/wine/notepad.exe.so
 lib/wine/ntdll.dll.so
 lib/wine/odbc32.dll.so
 lib/wine/ole2.dll.so
@@ -323,11 +321,17 @@ lib/wine/oledlg.dll.so
 lib/wine/olepro32.dll.so
 lib/wine/olesvr.dll.so
 lib/wine/olesvr32.dll.so
+lib/wine/osversioncheck.exe.so
+lib/wine/progman.exe.so
 lib/wine/psapi.dll.so
 lib/wine/qcap.dll.so
 lib/wine/quartz.dll.so
 lib/wine/rasapi16.dll.so
 lib/wine/rasapi32.dll.so
+lib/wine/regapi.exe.so
+lib/wine/regedit.exe.so
+lib/wine/regsvr32.exe.so
+lib/wine/regtest.exe.so
 lib/wine/riched32.dll.so
 lib/wine/rpcrt4.dll.so
 lib/wine/serialui.dll.so
@@ -349,24 +353,35 @@ lib/wine/toolhelp.dll.so
 lib/wine/ttydrv.dll.so
 lib/wine/twain_32.dll.so
 lib/wine/typelib.dll.so
+lib/wine/uninstaller.exe.so
 lib/wine/url.dll.so
 lib/wine/urlmon.dll.so
 lib/wine/user.exe.so
 lib/wine/user32.dll.so
 lib/wine/ver.dll.so
 lib/wine/version.dll.so
+lib/wine/view.exe.so
 lib/wine/w32skrnl.dll.so
 lib/wine/w32sys.dll.so
+lib/wine/wcmd.exe.so
 lib/wine/win32s16.dll.so
 lib/wine/win87em.dll.so
 lib/wine/winaspi.dll.so
 lib/wine/windebug.dll.so
 lib/wine/winearts.drv.so
+lib/wine/wineconsole.exe.so
+lib/wine/winedbg.exe.so
 lib/wine/winedos.dll.so
+lib/wine/winefile.exe.so
+lib/wine/winemine.exe.so
+lib/wine/winemp3.acm.so
 lib/wine/wineoss.drv.so
+lib/wine/winepath.exe.so
 lib/wine/wineps.dll.so
 lib/wine/wineps16.dll.so
+lib/wine/winetest.exe.so
 lib/wine/wing.dll.so
+lib/wine/winhelp.exe.so
 lib/wine/wininet.dll.so
 lib/wine/winmm.dll.so
 lib/wine/winnls.dll.so
@@ -374,6 +389,7 @@ lib/wine/winnls32.dll.so
 lib/wine/winsock.dll.so
 lib/wine/winspool.drv.so
 lib/wine/wintrust.dll.so
+lib/wine/winver.exe.so
 lib/wine/wnaspi32.dll.so
 lib/wine/wow32.dll.so
 lib/wine/wprocs.dll.so