Update port to 2000.08.21.

This breaks the port (hopefully temporarily) for CURRENT, but it is
verified to work in both, RELENG_3 and RELENG_4.
It also corrects problems with RELENG_3, which is more important
than CURRENT.

PR:		20951
Submitted by:	Gerald Pfeifer <pfeifer@dbai.tuwien.ac.at>
Furthermore:	James McNaughton <jtm63@enteract.com> submitted
		PR 21147, which is solved with this commit, and tested
		this version on RELENG_3

10 files changed, 266 insertions, 72 deletions

diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile
index 0f56c5d0349d..4e9a325adad9 100644
--- a/emulators/wine-devel/Makefile
+++ b/emulators/wine-devel/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	wine
-PORTVERSION=	2000.08.01
+PORTVERSION=	2000.08.21
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	ALPHA/wine/development
@@ -60,8 +60,6 @@ post-configure:
 post-build:
 	cd ${WRKSRC}/programs/regapi && ${MAKE}
 	${SED} '1s/bash/sh/;s-\./\(reg.*\.pl\)-'${PREFIX}/lib/wine/reg/'\1-' <${WRKSRC}/programs/regapi/regSet.sh >${WRKDIR}/regSet.sh
-	${SED} 's-\(Change directory to \)<dirs to wine>/tools$$-\1your program'"'"'s dir (or wherever you need to be to run it)-;s-\./\(bug_report\.pl\)-'${PREFIX}/lib/wine/'\1-' <${WRKSRC}/documentation/bugreports >${WRKDIR}/bugreports
-	${SED} 's-\(look at the file \)<dirs to wine>/wine.ini-\1'${PREFIX}/etc/wine.conf.sample- <${WRKSRC}/documentation/config >${WRKDIR}/config
 
 do-install:
 	cd ${WRKSRC} && ${MAKE} install
@@ -72,22 +70,13 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/documentation/wine.man ${PREFIX}/man/man1/wine.1
 	${INSTALL_DATA} ${WRKSRC}/documentation/wine.conf.man ${PREFIX}/man/man5/wine.conf.5
 	-@${MKDIR} ${PREFIX}/lib/wine/documentation ${PREFIX}/lib/wine/reg 2>/dev/null
-	${INSTALL_DATA} ${WRKDIR}/bugreports ${WRKDIR}/config \
+	${INSTALL_DATA} \
 		${WRKSRC}/README \
 		${WRKSRC}/ANNOUNCE \
 		${WRKSRC}/AUTHORS \
 		${WRKSRC}/LICENSE \
 		${WRKSRC}/WARRANTY \
-		${WRKSRC}/documentation/cdrom-labels \
-		${WRKSRC}/documentation/debugging \
-		${WRKSRC}/documentation/dlls \
-		${WRKSRC}/documentation/fonts \
-		${WRKSRC}/documentation/ioport-trace-hints \
-		${WRKSRC}/documentation/no-windows \
-		${WRKSRC}/documentation/printing \
-		${WRKSRC}/documentation/psdriver \
 		${WRKSRC}/documentation/psdrv.reg \
-		${WRKSRC}/documentation/ttfserver \
 		${PREFIX}/lib/wine/documentation
 	${INSTALL_DATA} ${WRKSRC}/debugger/README \
 		${PREFIX}/lib/wine/documentation/README.debugger
diff --git a/emulators/wine-devel/distinfo b/emulators/wine-devel/distinfo
index f3b7800afcb3..42b4509e3b2b 100644
--- a/emulators/wine-devel/distinfo
+++ b/emulators/wine-devel/distinfo
@@ -1 +1 @@
-MD5 (Wine-20000801.tar.gz) = 70c70a580b0a9ce072759629b87af4d4
+MD5 (Wine-20000821.tar.gz) = 6a335fe05a573dfd7ce919fc5da3b7b5
diff --git a/emulators/wine-devel/files/patch-gd b/emulators/wine-devel/files/patch-gd
index 41acbbab4675..fcba3c077b49 100644
--- a/emulators/wine-devel/files/patch-gd
+++ b/emulators/wine-devel/files/patch-gd
@@ -1,11 +1,3 @@
---- include/ttydrv.h~	Thu Mar 30 21:26:44 2000
-+++ include/ttydrv.h	Sat Jun 17 00:03:21 2000
-@@ -11,4 +11,5 @@
- #ifdef HAVE_NCURSES_H
- # include <ncurses.h>
-+# undef trace
- #elif defined(HAVE_CURSES_H)
- # include <curses.h>
 --- console/ncurses.c~	Sat Jun 17 01:39:59 2000
 +++ console/ncurses.c	Sat Jun 17 01:34:56 2000
 @@ -30,4 +30,5 @@
diff --git a/emulators/wine-devel/pkg-message b/emulators/wine-devel/pkg-message
index 57ba125a1327..48ae6938bf4e 100644
--- a/emulators/wine-devel/pkg-message
+++ b/emulators/wine-devel/pkg-message
@@ -10,6 +10,4 @@ but the others are only useful in conjunction with the rest of the
 source tree, and then you can as well look at them there.  (If you
 just installed this as a package and don't know how to use the ports
 system to have it fetch and extract the source for you have a look at
-http://www.freebsd.org/handbook/ports.html .  In short:
-cd /usr/ports/emulators/wine && make configure )
-
+<http://www.freebsd.org/handbook/ports.html>.)
diff --git a/emulators/wine-devel/pkg-plist b/emulators/wine-devel/pkg-plist
index 23dd619434b6..c2bdbd78b60d 100644
--- a/emulators/wine-devel/pkg-plist
+++ b/emulators/wine-devel/pkg-plist
@@ -5,10 +5,138 @@ bin/winedbg
 bin/wineserver
 bin/regSet.sh
 etc/wine.conf.sample
+include/wine/basetsd.h
+include/wine/cderr.h
+include/wine/commctrl.h
+include/wine/commdlg.h
+include/wine/compobj.h
+include/wine/d3d.h
+include/wine/d3dcaps.h
+include/wine/d3dtypes.h
+include/wine/dde.h
+include/wine/ddeml.h
+include/wine/ddraw.h
+include/wine/digitalv.h
+include/wine/dinput.h
+include/wine/dispdib.h
+include/wine/dlgs.h
+include/wine/docobj.h
+include/wine/dplay.h
+include/wine/dplobby.h
+include/wine/dsound.h
+include/wine/guiddef.h
+include/wine/imagehlp.h
+include/wine/imm.h
+include/wine/initguid.h
+include/wine/instance.h
+include/wine/lmcons.h
+include/wine/lzexpand.h
+include/wine/mapidefs.h
+include/wine/mmreg.h
+include/wine/mmsystem.h
+include/wine/msacm.h
+include/wine/ntsecapi.h
+include/wine/oaidl.h
+include/wine/objbase.h
+include/wine/objidl.h
+include/wine/ocidl.h
+include/wine/ole2.h
+include/wine/ole2ver.h
+include/wine/oleauto.h
+include/wine/olectl.h
+include/wine/oledlg.h
+include/wine/oleidl.h
+include/wine/poppack.h
+include/wine/prsht.h
+include/wine/psapi.h
+include/wine/pshpack1.h
+include/wine/pshpack2.h
+include/wine/pshpack4.h
+include/wine/pshpack8.h
+include/wine/queue.h
+include/wine/ras.h
+include/wine/regstr.h
+include/wine/richedit.h
+include/wine/rpc.h
+include/wine/servprov.h
+include/wine/shellapi.h
+include/wine/shlguid.h
+include/wine/shlobj.h
+include/wine/shlwapi.h
+include/wine/sql.h
+include/wine/sqlext.h
+include/wine/sqltypes.h
+include/wine/storage.h
+include/wine/tapi.h
+include/wine/tlhelp32.h
+include/wine/unknwn.h
+include/wine/urlmon.h
+include/wine/ver.h
+include/wine/vfw.h
+include/wine/winbase.h
+include/wine/wincon.h
+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/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/wtypes.h
+include/wine/wine/exception.h
+include/wine/wine/icmpapi.h
+include/wine/wine/ipexport.h
+include/wine/wine/obj_base.h
+include/wine/wine/obj_cache.h
+include/wine/wine/obj_channel.h
+include/wine/wine/obj_clientserver.h
+include/wine/wine/obj_commdlgbrowser.h
+include/wine/wine/obj_connection.h
+include/wine/wine/obj_contextmenu.h
+include/wine/wine/obj_control.h
+include/wine/wine/obj_dataobject.h
+include/wine/wine/obj_dockingwindowframe.h
+include/wine/wine/obj_dragdrop.h
+include/wine/wine/obj_enumidlist.h
+include/wine/wine/obj_errorinfo.h
+include/wine/wine/obj_extracticon.h
+include/wine/wine/obj_inplace.h
+include/wine/wine/obj_marshal.h
+include/wine/wine/obj_misc.h
+include/wine/wine/obj_moniker.h
+include/wine/wine/obj_oleaut.h
+include/wine/wine/obj_olefont.h
+include/wine/wine/obj_oleobj.h
+include/wine/wine/obj_oleundo.h
+include/wine/wine/obj_oleview.h
+include/wine/wine/obj_picture.h
+include/wine/wine/obj_property.h
+include/wine/wine/obj_propertystorage.h
+include/wine/wine/obj_queryassociations.h
+include/wine/wine/obj_shellbrowser.h
+include/wine/wine/obj_shellextinit.h
+include/wine/wine/obj_shellfolder.h
+include/wine/wine/obj_shelllink.h
+include/wine/wine/obj_shellview.h
+include/wine/wine/obj_storage.h
+include/wine/wine/port.h
+include/wine/wine/undocshell.h
+include/wine/wine/unicode.h
+include/wine/wine/w32skrnl.h
+include/wine/wine/winestring.h
 lib/wine/README.patch
 lib/wine/patch-3.3-sys-sigtrap
 lib/wine/winedefault.reg
@@ -20,18 +148,7 @@ lib/wine/documentation/AUTHORS
 lib/wine/documentation/LICENSE
 lib/wine/documentation/WARRANTY
 lib/wine/documentation/README
-lib/wine/documentation/bugreports
-lib/wine/documentation/cdrom-labels
-lib/wine/documentation/config
-lib/wine/documentation/debugging
-lib/wine/documentation/dlls
-lib/wine/documentation/fonts
-lib/wine/documentation/ioport-trace-hints
-lib/wine/documentation/no-windows
-lib/wine/documentation/printing
-lib/wine/documentation/psdriver
 lib/wine/documentation/psdrv.reg
-lib/wine/documentation/ttfserver
 lib/wine/documentation/README.debugger
 lib/wine/documentation/README.regapi
 lib/wine/libadvapi32.so
@@ -203,6 +320,7 @@ lib/wine/libwsock32.so
 lib/wine/libwsock32.so.1
 lib/wine/libx11drv.so
 lib/wine/libx11drv.so.1
+@dirrm include/wine/wine
 @dirrm include/wine
 @dirrm lib/wine/reg
 @dirrm lib/wine/documentation
diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index 0f56c5d0349d..4e9a325adad9 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	wine
-PORTVERSION=	2000.08.01
+PORTVERSION=	2000.08.21
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	ALPHA/wine/development
@@ -60,8 +60,6 @@ post-configure:
 post-build:
 	cd ${WRKSRC}/programs/regapi && ${MAKE}
 	${SED} '1s/bash/sh/;s-\./\(reg.*\.pl\)-'${PREFIX}/lib/wine/reg/'\1-' <${WRKSRC}/programs/regapi/regSet.sh >${WRKDIR}/regSet.sh
-	${SED} 's-\(Change directory to \)<dirs to wine>/tools$$-\1your program'"'"'s dir (or wherever you need to be to run it)-;s-\./\(bug_report\.pl\)-'${PREFIX}/lib/wine/'\1-' <${WRKSRC}/documentation/bugreports >${WRKDIR}/bugreports
-	${SED} 's-\(look at the file \)<dirs to wine>/wine.ini-\1'${PREFIX}/etc/wine.conf.sample- <${WRKSRC}/documentation/config >${WRKDIR}/config
 
 do-install:
 	cd ${WRKSRC} && ${MAKE} install
@@ -72,22 +70,13 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/documentation/wine.man ${PREFIX}/man/man1/wine.1
 	${INSTALL_DATA} ${WRKSRC}/documentation/wine.conf.man ${PREFIX}/man/man5/wine.conf.5
 	-@${MKDIR} ${PREFIX}/lib/wine/documentation ${PREFIX}/lib/wine/reg 2>/dev/null
-	${INSTALL_DATA} ${WRKDIR}/bugreports ${WRKDIR}/config \
+	${INSTALL_DATA} \
 		${WRKSRC}/README \
 		${WRKSRC}/ANNOUNCE \
 		${WRKSRC}/AUTHORS \
 		${WRKSRC}/LICENSE \
 		${WRKSRC}/WARRANTY \
-		${WRKSRC}/documentation/cdrom-labels \
-		${WRKSRC}/documentation/debugging \
-		${WRKSRC}/documentation/dlls \
-		${WRKSRC}/documentation/fonts \
-		${WRKSRC}/documentation/ioport-trace-hints \
-		${WRKSRC}/documentation/no-windows \
-		${WRKSRC}/documentation/printing \
-		${WRKSRC}/documentation/psdriver \
 		${WRKSRC}/documentation/psdrv.reg \
-		${WRKSRC}/documentation/ttfserver \
 		${PREFIX}/lib/wine/documentation
 	${INSTALL_DATA} ${WRKSRC}/debugger/README \
 		${PREFIX}/lib/wine/documentation/README.debugger
diff --git a/emulators/wine/distinfo b/emulators/wine/distinfo
index f3b7800afcb3..42b4509e3b2b 100644
--- a/emulators/wine/distinfo
+++ b/emulators/wine/distinfo
@@ -1 +1 @@
-MD5 (Wine-20000801.tar.gz) = 70c70a580b0a9ce072759629b87af4d4
+MD5 (Wine-20000821.tar.gz) = 6a335fe05a573dfd7ce919fc5da3b7b5
diff --git a/emulators/wine/files/patch-gd b/emulators/wine/files/patch-gd
index 41acbbab4675..fcba3c077b49 100644
--- a/emulators/wine/files/patch-gd
+++ b/emulators/wine/files/patch-gd
@@ -1,11 +1,3 @@
---- include/ttydrv.h~	Thu Mar 30 21:26:44 2000
-+++ include/ttydrv.h	Sat Jun 17 00:03:21 2000
-@@ -11,4 +11,5 @@
- #ifdef HAVE_NCURSES_H
- # include <ncurses.h>
-+# undef trace
- #elif defined(HAVE_CURSES_H)
- # include <curses.h>
 --- console/ncurses.c~	Sat Jun 17 01:39:59 2000
 +++ console/ncurses.c	Sat Jun 17 01:34:56 2000
 @@ -30,4 +30,5 @@
diff --git a/emulators/wine/pkg-message b/emulators/wine/pkg-message
index 57ba125a1327..48ae6938bf4e 100644
--- a/emulators/wine/pkg-message
+++ b/emulators/wine/pkg-message
@@ -10,6 +10,4 @@ but the others are only useful in conjunction with the rest of the
 source tree, and then you can as well look at them there.  (If you
 just installed this as a package and don't know how to use the ports
 system to have it fetch and extract the source for you have a look at
-http://www.freebsd.org/handbook/ports.html .  In short:
-cd /usr/ports/emulators/wine && make configure )
-
+<http://www.freebsd.org/handbook/ports.html>.)
diff --git a/emulators/wine/pkg-plist b/emulators/wine/pkg-plist
index 23dd619434b6..c2bdbd78b60d 100644
--- a/emulators/wine/pkg-plist
+++ b/emulators/wine/pkg-plist
@@ -5,10 +5,138 @@ bin/winedbg
 bin/wineserver
 bin/regSet.sh
 etc/wine.conf.sample
+include/wine/basetsd.h
+include/wine/cderr.h
+include/wine/commctrl.h
+include/wine/commdlg.h
+include/wine/compobj.h
+include/wine/d3d.h
+include/wine/d3dcaps.h
+include/wine/d3dtypes.h
+include/wine/dde.h
+include/wine/ddeml.h
+include/wine/ddraw.h
+include/wine/digitalv.h
+include/wine/dinput.h
+include/wine/dispdib.h
+include/wine/dlgs.h
+include/wine/docobj.h
+include/wine/dplay.h
+include/wine/dplobby.h
+include/wine/dsound.h
+include/wine/guiddef.h
+include/wine/imagehlp.h
+include/wine/imm.h
+include/wine/initguid.h
+include/wine/instance.h
+include/wine/lmcons.h
+include/wine/lzexpand.h
+include/wine/mapidefs.h
+include/wine/mmreg.h
+include/wine/mmsystem.h
+include/wine/msacm.h
+include/wine/ntsecapi.h
+include/wine/oaidl.h
+include/wine/objbase.h
+include/wine/objidl.h
+include/wine/ocidl.h
+include/wine/ole2.h
+include/wine/ole2ver.h
+include/wine/oleauto.h
+include/wine/olectl.h
+include/wine/oledlg.h
+include/wine/oleidl.h
+include/wine/poppack.h
+include/wine/prsht.h
+include/wine/psapi.h
+include/wine/pshpack1.h
+include/wine/pshpack2.h
+include/wine/pshpack4.h
+include/wine/pshpack8.h
+include/wine/queue.h
+include/wine/ras.h
+include/wine/regstr.h
+include/wine/richedit.h
+include/wine/rpc.h
+include/wine/servprov.h
+include/wine/shellapi.h
+include/wine/shlguid.h
+include/wine/shlobj.h
+include/wine/shlwapi.h
+include/wine/sql.h
+include/wine/sqlext.h
+include/wine/sqltypes.h
+include/wine/storage.h
+include/wine/tapi.h
+include/wine/tlhelp32.h
+include/wine/unknwn.h
+include/wine/urlmon.h
+include/wine/ver.h
+include/wine/vfw.h
+include/wine/winbase.h
+include/wine/wincon.h
+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/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/wtypes.h
+include/wine/wine/exception.h
+include/wine/wine/icmpapi.h
+include/wine/wine/ipexport.h
+include/wine/wine/obj_base.h
+include/wine/wine/obj_cache.h
+include/wine/wine/obj_channel.h
+include/wine/wine/obj_clientserver.h
+include/wine/wine/obj_commdlgbrowser.h
+include/wine/wine/obj_connection.h
+include/wine/wine/obj_contextmenu.h
+include/wine/wine/obj_control.h
+include/wine/wine/obj_dataobject.h
+include/wine/wine/obj_dockingwindowframe.h
+include/wine/wine/obj_dragdrop.h
+include/wine/wine/obj_enumidlist.h
+include/wine/wine/obj_errorinfo.h
+include/wine/wine/obj_extracticon.h
+include/wine/wine/obj_inplace.h
+include/wine/wine/obj_marshal.h
+include/wine/wine/obj_misc.h
+include/wine/wine/obj_moniker.h
+include/wine/wine/obj_oleaut.h
+include/wine/wine/obj_olefont.h
+include/wine/wine/obj_oleobj.h
+include/wine/wine/obj_oleundo.h
+include/wine/wine/obj_oleview.h
+include/wine/wine/obj_picture.h
+include/wine/wine/obj_property.h
+include/wine/wine/obj_propertystorage.h
+include/wine/wine/obj_queryassociations.h
+include/wine/wine/obj_shellbrowser.h
+include/wine/wine/obj_shellextinit.h
+include/wine/wine/obj_shellfolder.h
+include/wine/wine/obj_shelllink.h
+include/wine/wine/obj_shellview.h
+include/wine/wine/obj_storage.h
+include/wine/wine/port.h
+include/wine/wine/undocshell.h
+include/wine/wine/unicode.h
+include/wine/wine/w32skrnl.h
+include/wine/wine/winestring.h
 lib/wine/README.patch
 lib/wine/patch-3.3-sys-sigtrap
 lib/wine/winedefault.reg
@@ -20,18 +148,7 @@ lib/wine/documentation/AUTHORS
 lib/wine/documentation/LICENSE
 lib/wine/documentation/WARRANTY
 lib/wine/documentation/README
-lib/wine/documentation/bugreports
-lib/wine/documentation/cdrom-labels
-lib/wine/documentation/config
-lib/wine/documentation/debugging
-lib/wine/documentation/dlls
-lib/wine/documentation/fonts
-lib/wine/documentation/ioport-trace-hints
-lib/wine/documentation/no-windows
-lib/wine/documentation/printing
-lib/wine/documentation/psdriver
 lib/wine/documentation/psdrv.reg
-lib/wine/documentation/ttfserver
 lib/wine/documentation/README.debugger
 lib/wine/documentation/README.regapi
 lib/wine/libadvapi32.so
@@ -203,6 +320,7 @@ lib/wine/libwsock32.so
 lib/wine/libwsock32.so.1
 lib/wine/libx11drv.so
 lib/wine/libx11drv.so.1
+@dirrm include/wine/wine
 @dirrm include/wine
 @dirrm lib/wine/reg
 @dirrm lib/wine/documentation