Update the Wine port to version 2002.07.10.

Approved by:	obrien (mentor)

8 files changed, 26 insertions, 28 deletions

diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile
index d82af3f827c0..d2a4f01bbbce 100644
--- a/emulators/wine-devel/Makefile
+++ b/emulators/wine-devel/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	wine
-PORTVERSION=	2002.06.05
+PORTVERSION=	2002.07.10
 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 2fdc674b622a..084c78f2b547 100644
--- a/emulators/wine-devel/distinfo
+++ b/emulators/wine-devel/distinfo
@@ -1 +1 @@
-MD5 (Wine-20020605.tar.gz) = 416ca5a002a3286953afc77bee20a9da
+MD5 (Wine-20020710.tar.gz) = 51cb48fbebd4d61b01d7cbb95de33d4c
diff --git a/emulators/wine-devel/files/patch-gb b/emulators/wine-devel/files/patch-gb
index b4d2e44fd710..6b7a9ac0b3b5 100644
--- a/emulators/wine-devel/files/patch-gb
+++ b/emulators/wine-devel/files/patch-gb
@@ -1,10 +1,10 @@
-*** 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) $@
+*** Makefile.in.orig	Thu Jul 11 10:36:16 2002
+--- Makefile.in	Thu Jul 11 10:36:38 2002
+*************** install-lib:: $(INSTALLLIBSUBDIRS:%=%/__
+*** 87,104 ****
+  install-dev:: $(INSTALLDEVSUBDIRS:%=%/__install__)
   
-  install:: all $(SUBDIRS:%=%/__install__)
+  install::
 - 	-$(LDCONFIG)
 - 	@if test -n "`LANG=C $(LDD) $(bindir)/wine|grep not.found`";	\
 - 	then								\
@@ -18,6 +18,6 @@
 - 		echo "*************************************************" ; \
 - 	fi
   
-  uninstall:: $(SUBDIRS:%=%/__uninstall__)
+  .PHONY: install-lib install-dev
   
---- 72,77 ----
+--- 87,92 ----
diff --git a/emulators/wine-devel/pkg-plist b/emulators/wine-devel/pkg-plist
index b355d849c3f5..d374869fdff6 100644
--- a/emulators/wine-devel/pkg-plist
+++ b/emulators/wine-devel/pkg-plist
@@ -1,5 +1,3 @@
-bin/expand
-bin/fnt2bdf
 bin/function_grep.pl
 bin/notepad
 bin/progman
@@ -241,11 +239,13 @@ lib/wine/compobj.dll.so
 lib/wine/control.exe.so
 lib/wine/crtdll.dll.so
 lib/wine/crypt32.dll.so
+lib/wine/d3d8.dll.so
 lib/wine/dciman32.dll.so
 lib/wine/ddeml.dll.so
 lib/wine/ddraw.dll.so
 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/dplay.dll.so
@@ -275,8 +275,6 @@ lib/wine/libwine_tsx11.so.1
 lib/wine/libwine_unicode.so
 lib/wine/libwine_unicode.so.1
 lib/wine/libwine_uuid.a
-lib/wine/libwinspool.drv.so
-lib/wine/libx11drv.dll.so
 lib/wine/lz32.dll.so
 lib/wine/lzexpand.dll.so
 lib/wine/mapi32.dll.so
@@ -368,6 +366,7 @@ lib/wine/win32s16.dll.so
 lib/wine/win87em.dll.so
 lib/wine/winaspi.dll.so
 lib/wine/windebug.dll.so
+lib/wine/winealsa.drv.so
 lib/wine/winearts.drv.so
 lib/wine/wineconsole.exe.so
 lib/wine/winedbg.exe.so
diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index d82af3f827c0..d2a4f01bbbce 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	wine
-PORTVERSION=	2002.06.05
+PORTVERSION=	2002.07.10
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	ALPHA/wine/development
diff --git a/emulators/wine/distinfo b/emulators/wine/distinfo
index 2fdc674b622a..084c78f2b547 100644
--- a/emulators/wine/distinfo
+++ b/emulators/wine/distinfo
@@ -1 +1 @@
-MD5 (Wine-20020605.tar.gz) = 416ca5a002a3286953afc77bee20a9da
+MD5 (Wine-20020710.tar.gz) = 51cb48fbebd4d61b01d7cbb95de33d4c
diff --git a/emulators/wine/files/patch-gb b/emulators/wine/files/patch-gb
index b4d2e44fd710..6b7a9ac0b3b5 100644
--- a/emulators/wine/files/patch-gb
+++ b/emulators/wine/files/patch-gb
@@ -1,10 +1,10 @@
-*** 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) $@
+*** Makefile.in.orig	Thu Jul 11 10:36:16 2002
+--- Makefile.in	Thu Jul 11 10:36:38 2002
+*************** install-lib:: $(INSTALLLIBSUBDIRS:%=%/__
+*** 87,104 ****
+  install-dev:: $(INSTALLDEVSUBDIRS:%=%/__install__)
   
-  install:: all $(SUBDIRS:%=%/__install__)
+  install::
 - 	-$(LDCONFIG)
 - 	@if test -n "`LANG=C $(LDD) $(bindir)/wine|grep not.found`";	\
 - 	then								\
@@ -18,6 +18,6 @@
 - 		echo "*************************************************" ; \
 - 	fi
   
-  uninstall:: $(SUBDIRS:%=%/__uninstall__)
+  .PHONY: install-lib install-dev
   
---- 72,77 ----
+--- 87,92 ----
diff --git a/emulators/wine/pkg-plist b/emulators/wine/pkg-plist
index b355d849c3f5..d374869fdff6 100644
--- a/emulators/wine/pkg-plist
+++ b/emulators/wine/pkg-plist
@@ -1,5 +1,3 @@
-bin/expand
-bin/fnt2bdf
 bin/function_grep.pl
 bin/notepad
 bin/progman
@@ -241,11 +239,13 @@ lib/wine/compobj.dll.so
 lib/wine/control.exe.so
 lib/wine/crtdll.dll.so
 lib/wine/crypt32.dll.so
+lib/wine/d3d8.dll.so
 lib/wine/dciman32.dll.so
 lib/wine/ddeml.dll.so
 lib/wine/ddraw.dll.so
 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/dplay.dll.so
@@ -275,8 +275,6 @@ lib/wine/libwine_tsx11.so.1
 lib/wine/libwine_unicode.so
 lib/wine/libwine_unicode.so.1
 lib/wine/libwine_uuid.a
-lib/wine/libwinspool.drv.so
-lib/wine/libx11drv.dll.so
 lib/wine/lz32.dll.so
 lib/wine/lzexpand.dll.so
 lib/wine/mapi32.dll.so
@@ -368,6 +366,7 @@ lib/wine/win32s16.dll.so
 lib/wine/win87em.dll.so
 lib/wine/winaspi.dll.so
 lib/wine/windebug.dll.so
+lib/wine/winealsa.drv.so
 lib/wine/winearts.drv.so
 lib/wine/wineconsole.exe.so
 lib/wine/winedbg.exe.so