4 files changed, 81 insertions, 78 deletions

diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index 6a528ba91d81..3fb711b7b49e 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	wine
-PORTVERSION=	2001.12.26
+PORTVERSION=	2002.01.22
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	ALPHA/wine/development
diff --git a/emulators/wine/distinfo b/emulators/wine/distinfo
index d2dc4315205c..7ee22251219d 100644
--- a/emulators/wine/distinfo
+++ b/emulators/wine/distinfo
@@ -1 +1 @@
-MD5 (Wine-20011226.tar.gz) = 695a7322a6701a41ffc4d80e762a34b7
+MD5 (Wine-20020122.tar.gz) = 80d6f68330cd52b99789397aaa9b33b4
diff --git a/emulators/wine/files/patch-gb b/emulators/wine/files/patch-gb
index f4f61092aa7d..559fe154cc53 100644
--- a/emulators/wine/files/patch-gb
+++ b/emulators/wine/files/patch-gb
@@ -1,10 +1,10 @@
---- Makefile.in.old	Tue Jul 18 18:36:26 2000
-+++ Makefile.in	Tue Jul 18 18:36:36 2000
-@@ -147,7 +147,6 @@
+--- Makefile.in.orig	Wed Jan 23 13:32:44 2002
++++ Makefile.in	Wed Jan 23 13:32:53 2002
+@@ -87,7 +87,6 @@ wine: dlls $(EMUOBJS)
+ install:: all $(INSTALLSUBDIRS:%=%/__install__)
  	[ -d $(bindir) ] || $(MKDIR) $(bindir)
  	$(INSTALL_PROGRAM) wine $(bindir)/wine
- 	$(INSTALL_PROGRAM) loader/dos/dosmod $(bindir)/dosmod
 -	-$(LDCONFIG)
  
  uninstall:: $(INSTALLSUBDIRS:%=%/__uninstall__)
- 	cd $(libdir) && $(RM) libwine.a libwine.so libwine.so.$(SOVERSION)
+ 	cd $(bindir) && $(RM) wine
diff --git a/emulators/wine/pkg-plist b/emulators/wine/pkg-plist
index 534796042c8c..1be04cdf8705 100644
--- a/emulators/wine/pkg-plist
+++ b/emulators/wine/pkg-plist
@@ -1,11 +1,13 @@
-bin/dosmod
-bin/function_grep.pl
 bin/fnt2bdf
+bin/function_grep.pl
+bin/regSet.sh
 bin/wine
 bin/winebuild
 bin/wineclipsrv
-bin/winedbg.so
+bin/wineconsole
+bin/wineconsole.so
 bin/winedbg
+bin/winedbg.so
 bin/winedump
 bin/winelauncher
 bin/winemaker
@@ -13,7 +15,6 @@ bin/wineserver
 bin/wineshelllink
 bin/wmc
 bin/wrc
-bin/regSet.sh
 @unexec if cmp -s %D/etc/wine.conf %D/etc/wine.conf.sample; then rm -f %D/etc/wine.conf; fi
 etc/wine.conf.sample
 include/wine/amaudio.h
@@ -62,6 +63,33 @@ include/wine/mmreg.h
 include/wine/mmsystem.h
 include/wine/msacm.h
 include/wine/msacmdlg.h
+include/wine/msvcrt/conio.h
+include/wine/msvcrt/crtdbg.h
+include/wine/msvcrt/ctype.h
+include/wine/msvcrt/direct.h
+include/wine/msvcrt/dos.h
+include/wine/msvcrt/eh.h
+include/wine/msvcrt/fcntl.h
+include/wine/msvcrt/io.h
+include/wine/msvcrt/locale.h
+include/wine/msvcrt/malloc.h
+include/wine/msvcrt/mbctype.h
+include/wine/msvcrt/mbstring.h
+include/wine/msvcrt/process.h
+include/wine/msvcrt/search.h
+include/wine/msvcrt/setjmp.h
+include/wine/msvcrt/share.h
+include/wine/msvcrt/stddef.h
+include/wine/msvcrt/stdio.h
+include/wine/msvcrt/stdlib.h
+include/wine/msvcrt/string.h
+include/wine/msvcrt/sys/stat.h
+include/wine/msvcrt/sys/timeb.h
+include/wine/msvcrt/sys/types.h
+include/wine/msvcrt/sys/utime.h
+include/wine/msvcrt/time.h
+include/wine/msvcrt/wchar.h
+include/wine/msvcrt/wctype.h
 include/wine/nb30.h
 include/wine/nspapi.h
 include/wine/ntsecapi.h
@@ -116,57 +144,7 @@ include/wine/wincrypt.h
 include/wine/windef.h
 include/wine/windows.h
 include/wine/windowsx.h
-include/wine/winerror.h
-include/wine/wingdi.h
-include/wine/wininet.h
-include/wine/winioctl.h
-include/wine/winnetwk.h
-include/wine/winnls.h
-include/wine/winnt.h
-include/wine/winreg.h
-include/wine/winres.h
-include/wine/winresrc.h
-include/wine/winsock.h
-include/wine/winsock2.h
-include/wine/winspool.h
-include/wine/winsvc.h
-include/wine/winuser.h
-include/wine/winver.h
-include/wine/wownt32.h
-include/wine/wnaspi32.h
-include/wine/ws2spi.h
-include/wine/ws2tcpip.h
-include/wine/wshisotp.h
-include/wine/wsipx.h
-include/wine/wtypes.h
-include/wine/zmouse.h
-include/wine/msvcrt/conio.h
-include/wine/msvcrt/crtdbg.h
-include/wine/msvcrt/ctype.h
-include/wine/msvcrt/direct.h
-include/wine/msvcrt/dos.h
-include/wine/msvcrt/eh.h
-include/wine/msvcrt/fcntl.h
-include/wine/msvcrt/io.h
-include/wine/msvcrt/locale.h
-include/wine/msvcrt/malloc.h
-include/wine/msvcrt/mbctype.h
-include/wine/msvcrt/mbstring.h
-include/wine/msvcrt/process.h
-include/wine/msvcrt/search.h
-include/wine/msvcrt/setjmp.h
-include/wine/msvcrt/share.h
-include/wine/msvcrt/stddef.h
-include/wine/msvcrt/stdio.h
-include/wine/msvcrt/stdlib.h
-include/wine/msvcrt/string.h
-include/wine/msvcrt/time.h
-include/wine/msvcrt/wchar.h
-include/wine/msvcrt/wctype.h
-include/wine/msvcrt/sys/stat.h
-include/wine/msvcrt/sys/timeb.h
-include/wine/msvcrt/sys/types.h
-include/wine/msvcrt/sys/utime.h
+include/wine/wine/debug.h
 include/wine/wine/exception.h
 include/wine/wine/icmpapi.h
 include/wine/wine/ipexport.h
@@ -208,18 +186,31 @@ include/wine/wine/obj_shellview.h
 include/wine/wine/obj_storage.h
 include/wine/wine/obj_webbrowser.h
 include/wine/wine/unicode.h
-lib/wine/winedefault.reg
+include/wine/winerror.h
+include/wine/wingdi.h
+include/wine/wininet.h
+include/wine/winioctl.h
+include/wine/winnetwk.h
+include/wine/winnls.h
+include/wine/winnt.h
+include/wine/winreg.h
+include/wine/winres.h
+include/wine/winresrc.h
+include/wine/winsock.h
+include/wine/winsock2.h
+include/wine/winspool.h
+include/wine/winsvc.h
+include/wine/winuser.h
+include/wine/winver.h
+include/wine/wnaspi32.h
+include/wine/wownt32.h
+include/wine/ws2spi.h
+include/wine/ws2tcpip.h
+include/wine/wshisotp.h
+include/wine/wsipx.h
+include/wine/wtypes.h
+include/wine/zmouse.h
 lib/wine/bug_report.pl
-lib/wine/reg/regFixer.pl
-lib/wine/reg/regRestorer.pl
-%%PORTDOCS%%share/doc/wine/ANNOUNCE
-%%PORTDOCS%%share/doc/wine/AUTHORS
-%%PORTDOCS%%share/doc/wine/LICENSE
-%%PORTDOCS%%share/doc/wine/WARRANTY
-%%PORTDOCS%%share/doc/wine/README
-%%PORTDOCS%%share/doc/wine/psdrv.reg
-%%PORTDOCS%%share/doc/wine/README.debugger
-%%PORTDOCS%%share/doc/wine/README.regapi
 lib/wine/libadvapi32.so
 lib/wine/libavicap32.so
 lib/wine/libavifil32.so
@@ -230,6 +221,7 @@ lib/wine/libcomm.so
 lib/wine/libcommdlg.so
 lib/wine/libcompobj.so
 lib/wine/libcrtdll.so
+lib/wine/libcrypt32.so
 lib/wine/libdciman32.so
 lib/wine/libddeml.so
 lib/wine/libddraw.so
@@ -342,18 +334,29 @@ lib/wine/libwinmm.so
 lib/wine/libwinnls.so
 lib/wine/libwinnls32.so
 lib/wine/libwinsock.so
-lib/wine/libwintrust.so
-lib/wine/libws2_32.so
 lib/wine/libwinspool.drv.so
+lib/wine/libwintrust.so
 lib/wine/libwnaspi32.so
 lib/wine/libwow32.so
 lib/wine/libwprocs.so
+lib/wine/libws2_32.so
 lib/wine/libwsock32.so
 lib/wine/libx11drv.so
+lib/wine/reg/regFixer.pl
+lib/wine/reg/regRestorer.pl
+lib/wine/winedefault.reg
+%%PORTDOCS%%share/doc/wine/ANNOUNCE
+%%PORTDOCS%%share/doc/wine/AUTHORS
+%%PORTDOCS%%share/doc/wine/LICENSE
+%%PORTDOCS%%share/doc/wine/README
+%%PORTDOCS%%share/doc/wine/README.debugger
+%%PORTDOCS%%share/doc/wine/README.regapi
+%%PORTDOCS%%share/doc/wine/WARRANTY
+%%PORTDOCS%%share/doc/wine/psdrv.reg
+%%PORTDOCS%%@dirrm share/doc/wine
+@dirrm lib/wine/reg
+@dirrm lib/wine
 @dirrm include/wine/msvcrt/sys
 @dirrm include/wine/msvcrt
 @dirrm include/wine/wine
 @dirrm include/wine
-@dirrm lib/wine/reg
-%%PORTDOCS%%@dirrm share/doc/wine
-@dirrm lib/wine