14 files changed, 74 insertions, 76 deletions

diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile
index c591c655c5c7..0d4a57020738 100644
--- a/emulators/wine-devel/Makefile
+++ b/emulators/wine-devel/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	wine
-PORTVERSION=	2000.12.02
+PORTVERSION=	2001.01.12
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	ALPHA/wine/development
@@ -25,7 +25,7 @@ MAN1=		wine.1 winemaker.1 wmc.1 wrc.1
 MAN5=		wine.conf.5
 ONLY_FOR_ARCHS=	i386
 USE_XPM=	yes
-USE_MESA=	yes
+#USE_MESA=	yes
 USE_GMAKE=	yes
 
 .if !defined(NDEBUG)
@@ -45,7 +45,7 @@ pre-extract:
 .endif
 
 post-patch:
-.for D in ./ ../library ../unicode advapi32 avifil32 comctl32 commdlg crtdll dciman32 ddraw dinput dplay dplayx dsound gdi icmp imagehlp imm32 kernel lzexpand mpr msacm msnet32 msvideo odbc32 ole32 oleaut32 olecli oledlg olepro32 olesvr opengl32 psapi rasapi32 richedit rpcrt4 serialui setupapi shell32 shfolder shlwapi tapi32 ttydrv urlmon user version win32s winaspi wineps wininet winmm winmm/joystick winmm/mcianim winmm/mciavi winmm/mcicda winmm/mciseq winmm/mciwave winmm/midimap winmm/wavemap winmm/wineoss winsock winspool wow32 wsock32 x11drv
+.for D in ./ ../library ../tsx11 ../unicode advapi32 avifil32 comctl32 commdlg crtdll dciman32 ddraw dinput dplay dplayx dsound gdi icmp imagehlp imm32 kernel lzexpand mpr msacm msnet32 msvideo odbc32 ole32 oleaut32 olecli oledlg olepro32 olesvr opengl32 psapi rasapi32 richedit rpcrt4 serialui setupapi shell32 shfolder shlwapi tapi32 ttydrv urlmon user version win32s winaspi wineps wininet winmm winmm/joystick winmm/mcianim winmm/mciavi winmm/mcicda winmm/mciseq winmm/mciwave winmm/midimap winmm/wavemap winmm/wineoss winsock winspool wow32 wsock32 x11drv
 	@${PERL} -pi.sofix -e 's/SOVERSION = 1.0/SOVERSION = 1/g' \
 		${WRKSRC}/dlls/${D}/Makefile.in
 .endfor
@@ -60,9 +60,9 @@ post-build:
 do-install:
 	cd ${WRKSRC} && ${GMAKE} install
 	${INSTALL_SCRIPT} ${WRKDIR}/regSet.sh ${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/wine.ini ${PREFIX}/etc/wine.conf.sample
+	${INSTALL_DATA} ${WRKSRC}/documentation/samples/config ${PREFIX}/etc/wine.conf.sample
 	[ -f ${PREFIX}/etc/wine.conf ] \
-		|| ${INSTALL_DATA} ${WRKSRC}/wine.ini ${PREFIX}/etc/wine.conf
+		|| ${INSTALL_DATA} ${PREFIX}/etc/wine.conf.sample ${PREFIX}/etc/wine.conf
 	${INSTALL_DATA} ${WRKSRC}/documentation/wine.man ${PREFIX}/man/man1/wine.1
 	${INSTALL_DATA} ${WRKSRC}/documentation/wine.conf.man ${PREFIX}/man/man5/wine.conf.5
 .if !defined(NOPORTDOCS)
diff --git a/emulators/wine-devel/distinfo b/emulators/wine-devel/distinfo
index 857e5b744ad6..e573e945fcae 100644
--- a/emulators/wine-devel/distinfo
+++ b/emulators/wine-devel/distinfo
@@ -1 +1 @@
-MD5 (Wine-20001202.tar.gz) = 22b4ecd23fc8ac3196eeb97e3a43b7df
+MD5 (Wine-20010112.tar.gz) = d1556c8111d1af18ee74674b55ee70c1
diff --git a/emulators/wine-devel/files/patch-ad b/emulators/wine-devel/files/patch-ad
index d309001ef307..cd20229e2cab 100644
--- a/emulators/wine-devel/files/patch-ad
+++ b/emulators/wine-devel/files/patch-ad
@@ -1,27 +1,12 @@
-*** wine.ini.orig	Sun Oct 31 03:23:49 1999
---- wine.ini	Sat Nov 13 13:36:18 1999
-***************
-*** 107,117 ****
-  
-  [serialports]
-! Com1=/dev/ttyS0
-! Com2=/dev/ttyS1
-  Com3=/dev/modem,38400
-  Com4=/dev/modem
-  
-  [parallelports]
-! Lpt1=/dev/lp0
-  
-  [spooler]
---- 107,117 ----
-  
-  [serialports]
-! Com1=/dev/ttyd0
-! Com2=/dev/ttyd1
-  Com3=/dev/modem,38400
-  Com4=/dev/modem
-  
-  [parallelports]
-! Lpt1=/dev/lpt0
-  
-  [spooler]
+--- documentation/samples/config	Thu Jan 11 01:57:36 2001
++++ documentation/samples/config	Sat Jan 13 15:29:39 2001
+@@ -146,7 +146,7 @@ WINE REGISTRY Version 2
+ 
+ [serialports]
+-"Com1" = "/dev/ttyS0"
+-"Com2" = "/dev/ttyS1"
+-"Com3" = "/dev/ttyS2"
++"Com1" = "/dev/ttyd0"
++"Com2" = "/dev/ttyd1"
++"Com3" = "/dev/ttyd2"
+ "Com4" = "/dev/modem"
diff --git a/emulators/wine-devel/files/patch-gf b/emulators/wine-devel/files/patch-gf
index b2a7d4644c89..056ed29cb05d 100644
--- a/emulators/wine-devel/files/patch-gf
+++ b/emulators/wine-devel/files/patch-gf
@@ -8,4 +8,3 @@
  #include "winsock.h"
 
  /* proper 4-byte packing */
-
diff --git a/emulators/wine-devel/pkg-comment b/emulators/wine-devel/pkg-comment
index 2b65a24a221f..37128b3f1550 100644
--- a/emulators/wine-devel/pkg-comment
+++ b/emulators/wine-devel/pkg-comment
@@ -1 +1 @@
-MS-Windows 3.1/95/NT emulator for Unix (Alpha release)
+MS Windows 3.1/95/98/NT/2000 emulator for Unix
diff --git a/emulators/wine-devel/pkg-descr b/emulators/wine-devel/pkg-descr
index 17fe9d8f2368..d897db485bc0 100644
--- a/emulators/wine-devel/pkg-descr
+++ b/emulators/wine-devel/pkg-descr
@@ -1,6 +1,6 @@
 Wine is a Windows emulator running under Unix on i386 (and higher) CPUs.
-It is still Alpha quality; i.e. don't expect it to run your typical large 
-MS-Windows application package, but it is definitely on its way ...
+It is still alpha quality, so do not expect it to run your typical large 
+MS Windows application package, but it is definitely on its way...
 
 To use Wine, your kernel must be rebuilt with the following lines added
 to your kernel config file (/sys/i386/conf/<YourMachine>):
@@ -13,6 +13,6 @@ options		SYSVMSG
 Wine relies on the configuration file /usr/local/etc/wine.conf to
 contain valid assignments of Unix directories to DOS drive letters,
 and for certain other options (see "man wine" for details).
-You will most probably have to to edit it, after the install ...
+You will most probably have to to edit it, after the install...
 
 WWW: http://www.winehq.com/
diff --git a/emulators/wine-devel/pkg-plist b/emulators/wine-devel/pkg-plist
index d2f8ad287a9f..540d78e83f98 100644
--- a/emulators/wine-devel/pkg-plist
+++ b/emulators/wine-devel/pkg-plist
@@ -42,11 +42,14 @@ include/wine/initguid.h
 include/wine/instance.h
 include/wine/lmcons.h
 include/wine/lzexpand.h
+include/wine/mapi.h
 include/wine/mapidefs.h
 include/wine/mcx.h
 include/wine/mmreg.h
 include/wine/mmsystem.h
 include/wine/msacm.h
+include/wine/msacmdlg.h
+include/wine/nspapi.h
 include/wine/ntsecapi.h
 include/wine/oaidl.h
 include/wine/objbase.h
@@ -59,6 +62,7 @@ include/wine/olectl.h
 include/wine/oledlg.h
 include/wine/oleidl.h
 include/wine/poppack.h
+include/wine/process.h
 include/wine/prsht.h
 include/wine/psapi.h
 include/wine/pshpack1.h
@@ -111,6 +115,8 @@ include/wine/winuser.h
 include/wine/winver.h
 include/wine/wownt32.h
 include/wine/wnaspi32.h
+include/wine/wshisotp.h
+include/wine/wsipx.h
 include/wine/wtypes.h
 include/wine/zmouse.h
 include/wine/wine/exception.h
@@ -187,6 +193,7 @@ lib/wine/libgdi.so
 lib/wine/libgdi32.so
 lib/wine/libicmp.so
 lib/wine/libimagehlp.so
+lib/wine/libimm.so
 lib/wine/libimm32.so
 lib/wine/libjoystick.drv.so
 lib/wine/libkernel.so
@@ -207,6 +214,7 @@ lib/wine/libmsacm.drv.so
 lib/wine/libmsacm.so
 lib/wine/libmsacm32.so
 lib/wine/libmsnet32.so
+lib/wine/libmsvcrt.so
 lib/wine/libmsvfw32.so
 lib/wine/libmsvideo.so
 lib/wine/libntdll.so
@@ -233,6 +241,7 @@ lib/wine/librpcrt4.so
 lib/wine/libserialui.so
 lib/wine/libsetupapi.so
 lib/wine/libsetupx.so
+lib/wine/libshdocvw.so
 lib/wine/libshell.so
 lib/wine/libshell32.so
 lib/wine/libshfolder.so
@@ -258,14 +267,20 @@ lib/wine/libwinaspi.so
 lib/wine/libwindebug.so
 lib/wine/libwine.so
 lib/wine/libwine.so.1
+lib/wine/libwine_tsx11.so
+lib/wine/libwine_tsx11.so.1
 lib/wine/libwine_unicode.so
 lib/wine/libwine_unicode.so.1
+lib/wine/libwine_uuid.a
+lib/wine/libwinedos.so
 lib/wine/libwineoss.drv.so
 lib/wine/libwineps.so
 lib/wine/libwineps16.so
 lib/wine/libwing.so
 lib/wine/libwininet.so
 lib/wine/libwinmm.so
+lib/wine/libwinnls.so
+lib/wine/libwinnls32.so
 lib/wine/libwinsock.so
 lib/wine/libws2_32.so
 lib/wine/libwinspool.drv.so
diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index c591c655c5c7..0d4a57020738 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	wine
-PORTVERSION=	2000.12.02
+PORTVERSION=	2001.01.12
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	ALPHA/wine/development
@@ -25,7 +25,7 @@ MAN1=		wine.1 winemaker.1 wmc.1 wrc.1
 MAN5=		wine.conf.5
 ONLY_FOR_ARCHS=	i386
 USE_XPM=	yes
-USE_MESA=	yes
+#USE_MESA=	yes
 USE_GMAKE=	yes
 
 .if !defined(NDEBUG)
@@ -45,7 +45,7 @@ pre-extract:
 .endif
 
 post-patch:
-.for D in ./ ../library ../unicode advapi32 avifil32 comctl32 commdlg crtdll dciman32 ddraw dinput dplay dplayx dsound gdi icmp imagehlp imm32 kernel lzexpand mpr msacm msnet32 msvideo odbc32 ole32 oleaut32 olecli oledlg olepro32 olesvr opengl32 psapi rasapi32 richedit rpcrt4 serialui setupapi shell32 shfolder shlwapi tapi32 ttydrv urlmon user version win32s winaspi wineps wininet winmm winmm/joystick winmm/mcianim winmm/mciavi winmm/mcicda winmm/mciseq winmm/mciwave winmm/midimap winmm/wavemap winmm/wineoss winsock winspool wow32 wsock32 x11drv
+.for D in ./ ../library ../tsx11 ../unicode advapi32 avifil32 comctl32 commdlg crtdll dciman32 ddraw dinput dplay dplayx dsound gdi icmp imagehlp imm32 kernel lzexpand mpr msacm msnet32 msvideo odbc32 ole32 oleaut32 olecli oledlg olepro32 olesvr opengl32 psapi rasapi32 richedit rpcrt4 serialui setupapi shell32 shfolder shlwapi tapi32 ttydrv urlmon user version win32s winaspi wineps wininet winmm winmm/joystick winmm/mcianim winmm/mciavi winmm/mcicda winmm/mciseq winmm/mciwave winmm/midimap winmm/wavemap winmm/wineoss winsock winspool wow32 wsock32 x11drv
 	@${PERL} -pi.sofix -e 's/SOVERSION = 1.0/SOVERSION = 1/g' \
 		${WRKSRC}/dlls/${D}/Makefile.in
 .endfor
@@ -60,9 +60,9 @@ post-build:
 do-install:
 	cd ${WRKSRC} && ${GMAKE} install
 	${INSTALL_SCRIPT} ${WRKDIR}/regSet.sh ${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/wine.ini ${PREFIX}/etc/wine.conf.sample
+	${INSTALL_DATA} ${WRKSRC}/documentation/samples/config ${PREFIX}/etc/wine.conf.sample
 	[ -f ${PREFIX}/etc/wine.conf ] \
-		|| ${INSTALL_DATA} ${WRKSRC}/wine.ini ${PREFIX}/etc/wine.conf
+		|| ${INSTALL_DATA} ${PREFIX}/etc/wine.conf.sample ${PREFIX}/etc/wine.conf
 	${INSTALL_DATA} ${WRKSRC}/documentation/wine.man ${PREFIX}/man/man1/wine.1
 	${INSTALL_DATA} ${WRKSRC}/documentation/wine.conf.man ${PREFIX}/man/man5/wine.conf.5
 .if !defined(NOPORTDOCS)
diff --git a/emulators/wine/distinfo b/emulators/wine/distinfo
index 857e5b744ad6..e573e945fcae 100644
--- a/emulators/wine/distinfo
+++ b/emulators/wine/distinfo
@@ -1 +1 @@
-MD5 (Wine-20001202.tar.gz) = 22b4ecd23fc8ac3196eeb97e3a43b7df
+MD5 (Wine-20010112.tar.gz) = d1556c8111d1af18ee74674b55ee70c1
diff --git a/emulators/wine/files/patch-ad b/emulators/wine/files/patch-ad
index d309001ef307..cd20229e2cab 100644
--- a/emulators/wine/files/patch-ad
+++ b/emulators/wine/files/patch-ad
@@ -1,27 +1,12 @@
-*** wine.ini.orig	Sun Oct 31 03:23:49 1999
---- wine.ini	Sat Nov 13 13:36:18 1999
-***************
-*** 107,117 ****
-  
-  [serialports]
-! Com1=/dev/ttyS0
-! Com2=/dev/ttyS1
-  Com3=/dev/modem,38400
-  Com4=/dev/modem
-  
-  [parallelports]
-! Lpt1=/dev/lp0
-  
-  [spooler]
---- 107,117 ----
-  
-  [serialports]
-! Com1=/dev/ttyd0
-! Com2=/dev/ttyd1
-  Com3=/dev/modem,38400
-  Com4=/dev/modem
-  
-  [parallelports]
-! Lpt1=/dev/lpt0
-  
-  [spooler]
+--- documentation/samples/config	Thu Jan 11 01:57:36 2001
++++ documentation/samples/config	Sat Jan 13 15:29:39 2001
+@@ -146,7 +146,7 @@ WINE REGISTRY Version 2
+ 
+ [serialports]
+-"Com1" = "/dev/ttyS0"
+-"Com2" = "/dev/ttyS1"
+-"Com3" = "/dev/ttyS2"
++"Com1" = "/dev/ttyd0"
++"Com2" = "/dev/ttyd1"
++"Com3" = "/dev/ttyd2"
+ "Com4" = "/dev/modem"
diff --git a/emulators/wine/files/patch-gf b/emulators/wine/files/patch-gf
index b2a7d4644c89..056ed29cb05d 100644
--- a/emulators/wine/files/patch-gf
+++ b/emulators/wine/files/patch-gf
@@ -8,4 +8,3 @@
  #include "winsock.h"
 
  /* proper 4-byte packing */
-
diff --git a/emulators/wine/pkg-comment b/emulators/wine/pkg-comment
index 2b65a24a221f..37128b3f1550 100644
--- a/emulators/wine/pkg-comment
+++ b/emulators/wine/pkg-comment
@@ -1 +1 @@
-MS-Windows 3.1/95/NT emulator for Unix (Alpha release)
+MS Windows 3.1/95/98/NT/2000 emulator for Unix
diff --git a/emulators/wine/pkg-descr b/emulators/wine/pkg-descr
index 17fe9d8f2368..d897db485bc0 100644
--- a/emulators/wine/pkg-descr
+++ b/emulators/wine/pkg-descr
@@ -1,6 +1,6 @@
 Wine is a Windows emulator running under Unix on i386 (and higher) CPUs.
-It is still Alpha quality; i.e. don't expect it to run your typical large 
-MS-Windows application package, but it is definitely on its way ...
+It is still alpha quality, so do not expect it to run your typical large 
+MS Windows application package, but it is definitely on its way...
 
 To use Wine, your kernel must be rebuilt with the following lines added
 to your kernel config file (/sys/i386/conf/<YourMachine>):
@@ -13,6 +13,6 @@ options		SYSVMSG
 Wine relies on the configuration file /usr/local/etc/wine.conf to
 contain valid assignments of Unix directories to DOS drive letters,
 and for certain other options (see "man wine" for details).
-You will most probably have to to edit it, after the install ...
+You will most probably have to to edit it, after the install...
 
 WWW: http://www.winehq.com/
diff --git a/emulators/wine/pkg-plist b/emulators/wine/pkg-plist
index d2f8ad287a9f..540d78e83f98 100644
--- a/emulators/wine/pkg-plist
+++ b/emulators/wine/pkg-plist
@@ -42,11 +42,14 @@ include/wine/initguid.h
 include/wine/instance.h
 include/wine/lmcons.h
 include/wine/lzexpand.h
+include/wine/mapi.h
 include/wine/mapidefs.h
 include/wine/mcx.h
 include/wine/mmreg.h
 include/wine/mmsystem.h
 include/wine/msacm.h
+include/wine/msacmdlg.h
+include/wine/nspapi.h
 include/wine/ntsecapi.h
 include/wine/oaidl.h
 include/wine/objbase.h
@@ -59,6 +62,7 @@ include/wine/olectl.h
 include/wine/oledlg.h
 include/wine/oleidl.h
 include/wine/poppack.h
+include/wine/process.h
 include/wine/prsht.h
 include/wine/psapi.h
 include/wine/pshpack1.h
@@ -111,6 +115,8 @@ include/wine/winuser.h
 include/wine/winver.h
 include/wine/wownt32.h
 include/wine/wnaspi32.h
+include/wine/wshisotp.h
+include/wine/wsipx.h
 include/wine/wtypes.h
 include/wine/zmouse.h
 include/wine/wine/exception.h
@@ -187,6 +193,7 @@ lib/wine/libgdi.so
 lib/wine/libgdi32.so
 lib/wine/libicmp.so
 lib/wine/libimagehlp.so
+lib/wine/libimm.so
 lib/wine/libimm32.so
 lib/wine/libjoystick.drv.so
 lib/wine/libkernel.so
@@ -207,6 +214,7 @@ lib/wine/libmsacm.drv.so
 lib/wine/libmsacm.so
 lib/wine/libmsacm32.so
 lib/wine/libmsnet32.so
+lib/wine/libmsvcrt.so
 lib/wine/libmsvfw32.so
 lib/wine/libmsvideo.so
 lib/wine/libntdll.so
@@ -233,6 +241,7 @@ lib/wine/librpcrt4.so
 lib/wine/libserialui.so
 lib/wine/libsetupapi.so
 lib/wine/libsetupx.so
+lib/wine/libshdocvw.so
 lib/wine/libshell.so
 lib/wine/libshell32.so
 lib/wine/libshfolder.so
@@ -258,14 +267,20 @@ lib/wine/libwinaspi.so
 lib/wine/libwindebug.so
 lib/wine/libwine.so
 lib/wine/libwine.so.1
+lib/wine/libwine_tsx11.so
+lib/wine/libwine_tsx11.so.1
 lib/wine/libwine_unicode.so
 lib/wine/libwine_unicode.so.1
+lib/wine/libwine_uuid.a
+lib/wine/libwinedos.so
 lib/wine/libwineoss.drv.so
 lib/wine/libwineps.so
 lib/wine/libwineps16.so
 lib/wine/libwing.so
 lib/wine/libwininet.so
 lib/wine/libwinmm.so
+lib/wine/libwinnls.so
+lib/wine/libwinnls32.so
 lib/wine/libwinsock.so
 lib/wine/libws2_32.so
 lib/wine/libwinspool.drv.so