From e3958cc5c2ddab02aec13397e084de3be342f909 Mon Sep 17 00:00:00 2001 From: Steve Price Date: Fri, 16 Nov 2001 01:38:20 +0000 Subject: [PATCH] Update to version 2001.11.08. PR: 31870 Submitted by: maintainer --- emulators/wine-devel/Makefile | 6 +---- emulators/wine-devel/distinfo | 2 +- emulators/wine-devel/files/patch-gf | 35 ----------------------------- emulators/wine-devel/pkg-message | 4 ---- emulators/wine-devel/pkg-plist | 17 ++++++++++++-- emulators/wine/Makefile | 6 +---- emulators/wine/distinfo | 2 +- emulators/wine/files/patch-gf | 35 ----------------------------- emulators/wine/pkg-message | 4 ---- emulators/wine/pkg-plist | 17 ++++++++++++-- 10 files changed, 34 insertions(+), 94 deletions(-) delete mode 100644 emulators/wine-devel/files/patch-gf delete mode 100644 emulators/wine/files/patch-gf diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile index 6993fbc5ff70..e37c061154a8 100644 --- a/emulators/wine-devel/Makefile +++ b/emulators/wine-devel/Makefile @@ -7,7 +7,7 @@ # PORTNAME= wine -PORTVERSION= 2001.08.24 +PORTVERSION= 2001.11.08 CATEGORIES= emulators MASTER_SITES= ${MASTER_SITE_SUNSITE} MASTER_SITE_SUBDIR= ALPHA/wine/development @@ -15,10 +15,6 @@ DISTNAME= Wine-${PORTVERSION:S/.//g} MAINTAINER= pfeifer@dbai.tuwien.ac.at -# This port has not been upgraded to 2001.10.04 because that snapshots does -# not work as well as the previous ones -- it builds, but then hangs while -# running several applicatinos. (This has already been fixed in Wine CVS.) - WRKSRC= ${WRKDIR}/wine-${PORTVERSION:S/.//g} GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-opengl diff --git a/emulators/wine-devel/distinfo b/emulators/wine-devel/distinfo index 5c6aaa11948f..bb5647a10ec8 100644 --- a/emulators/wine-devel/distinfo +++ b/emulators/wine-devel/distinfo @@ -1 +1 @@ -MD5 (Wine-20010824.tar.gz) = 95692d6539a756162a8bccb782ed4e14 +MD5 (Wine-20011108.tar.gz) = 390670df1d631c23057feb83d4a7eb8c diff --git a/emulators/wine-devel/files/patch-gf b/emulators/wine-devel/files/patch-gf deleted file mode 100644 index e6812e84a683..000000000000 --- a/emulators/wine-devel/files/patch-gf +++ /dev/null @@ -1,35 +0,0 @@ -Index: dlls/wininet/ftp.c -=================================================================== -RCS file: /home/wine/wine/dlls/wininet/ftp.c,v -retrieving revision 1.18 -diff -u -3 -p -r1.18 ftp.c ---- dlls/wininet/ftp.c 2001/08/24 19:13:36 1.18 -+++ dlls/wininet/ftp.c 2001/08/26 09:02:47 -@@ -21,12 +21,6 @@ - #endif - #include - #include --#ifdef HAVE_NETINET_IN_SYSTM_H --# include --#endif --#ifdef HAVE_NETINET_IP_H --# include --#endif - - #include "winbase.h" - #include "wingdi.h" -Index: dlls/wininet/internet.h -=================================================================== -RCS file: /home/wine/wine/dlls/wininet/internet.h,v -retrieving revision 1.5 -diff -u -3 -p -r1.5 internet.h ---- dlls/wininet/internet.h 2001/08/24 19:13:36 1.5 -+++ dlls/wininet/internet.h 2001/08/26 09:02:49 -@@ -6,6 +6,7 @@ - # include - #endif - #ifdef HAVE_NETINET_IN_H -+# include - # include - #endif - diff --git a/emulators/wine-devel/pkg-message b/emulators/wine-devel/pkg-message index 6ef21543ecb5..98e386f7f19d 100644 --- a/emulators/wine-devel/pkg-message +++ b/emulators/wine-devel/pkg-message @@ -9,7 +9,3 @@ 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 do not know how to use the ports system to have it fetch and extract the source, have a look at .) - -This port has not been upgraded to 2001.10.04 because that snapshots does -not work as well as the previous ones -- it builds, but then hangs while -running several applications. (This has already been fixed in Wine CVS.) diff --git a/emulators/wine-devel/pkg-plist b/emulators/wine-devel/pkg-plist index bfa9936723c2..b1cbcf9c825a 100644 --- a/emulators/wine-devel/pkg-plist +++ b/emulators/wine-devel/pkg-plist @@ -1,6 +1,5 @@ bin/dosmod bin/function_grep.pl -bin/specmaker bin/fnt2bdf bin/wine bin/winebuild @@ -62,6 +61,7 @@ include/wine/mmreg.h include/wine/mmsystem.h include/wine/msacm.h include/wine/msacmdlg.h +include/wine/nb30.h include/wine/nspapi.h include/wine/ntsecapi.h include/wine/oaidl.h @@ -75,7 +75,6 @@ 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 @@ -90,6 +89,7 @@ include/wine/rpcdce.h include/wine/rpcdcep.h include/wine/rpcndr.h include/wine/rpcnterr.h +include/wine/rpcproxy.h include/wine/servprov.h include/wine/setupapi.h include/wine/shellapi.h @@ -133,6 +133,7 @@ include/wine/winuser.h include/wine/winver.h include/wine/wownt32.h include/wine/wnaspi32.h +include/wine/ws2spi.h include/wine/wshisotp.h include/wine/wsipx.h include/wine/wtypes.h @@ -145,6 +146,7 @@ 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/process.h include/wine/msvcrt/search.h @@ -178,6 +180,7 @@ 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_ksproperty.h include/wine/wine/obj_marshal.h include/wine/wine/obj_misc.h include/wine/wine/obj_moniker.h @@ -212,6 +215,7 @@ lib/wine/reg/regRestorer.pl %%PORTDOCS%%share/doc/wine/README.debugger %%PORTDOCS%%share/doc/wine/README.regapi lib/wine/libadvapi32.so +lib/wine/libavicap32.so lib/wine/libavifil32.so lib/wine/libavifile.so lib/wine/libcomctl32.so @@ -223,6 +227,7 @@ lib/wine/libcrtdll.so lib/wine/libdciman32.so lib/wine/libddeml.so lib/wine/libddraw.so +lib/wine/libdevenum.so lib/wine/libdinput.so lib/wine/libdispdib.so lib/wine/libdisplay.so @@ -241,6 +246,7 @@ lib/wine/libkernel32.so lib/wine/libkeyboard.so lib/wine/liblz32.so lib/wine/liblzexpand.so +lib/wine/libmapi32.so lib/wine/libmcianim.drv.so lib/wine/libmciavi.drv.so lib/wine/libmcicda.drv.so @@ -253,10 +259,14 @@ lib/wine/libmpr.so lib/wine/libmsacm.drv.so lib/wine/libmsacm.so lib/wine/libmsacm32.so +lib/wine/libmsdmo.so +lib/wine/libmsimg32.so lib/wine/libmsnet32.so +lib/wine/libmsrle32.so lib/wine/libmsvcrt.so lib/wine/libmsvfw32.so lib/wine/libmsvideo.so +lib/wine/libnetapi32.so lib/wine/libntdll.so lib/wine/libodbc32.so lib/wine/libole2.so @@ -274,6 +284,7 @@ lib/wine/libolepro32.so lib/wine/libolesvr.so lib/wine/libolesvr32.so lib/wine/libpsapi.so +lib/wine/libqcap.so lib/wine/libquartz.so lib/wine/librasapi16.so lib/wine/librasapi32.so @@ -288,6 +299,7 @@ lib/wine/libshell32.so lib/wine/libshfolder.so lib/wine/libshlwapi.so lib/wine/libsound.so +lib/wine/libsti.so lib/wine/libstorage.so lib/wine/libstress.so lib/wine/libsystem.so @@ -295,6 +307,7 @@ lib/wine/libtapi32.so lib/wine/libtoolhelp.so lib/wine/libttydrv.so lib/wine/libtypelib.so +lib/wine/liburl.so lib/wine/liburlmon.so lib/wine/libuser.so lib/wine/libuser32.so diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile index 6993fbc5ff70..e37c061154a8 100644 --- a/emulators/wine/Makefile +++ b/emulators/wine/Makefile @@ -7,7 +7,7 @@ # PORTNAME= wine -PORTVERSION= 2001.08.24 +PORTVERSION= 2001.11.08 CATEGORIES= emulators MASTER_SITES= ${MASTER_SITE_SUNSITE} MASTER_SITE_SUBDIR= ALPHA/wine/development @@ -15,10 +15,6 @@ DISTNAME= Wine-${PORTVERSION:S/.//g} MAINTAINER= pfeifer@dbai.tuwien.ac.at -# This port has not been upgraded to 2001.10.04 because that snapshots does -# not work as well as the previous ones -- it builds, but then hangs while -# running several applicatinos. (This has already been fixed in Wine CVS.) - WRKSRC= ${WRKDIR}/wine-${PORTVERSION:S/.//g} GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-opengl diff --git a/emulators/wine/distinfo b/emulators/wine/distinfo index 5c6aaa11948f..bb5647a10ec8 100644 --- a/emulators/wine/distinfo +++ b/emulators/wine/distinfo @@ -1 +1 @@ -MD5 (Wine-20010824.tar.gz) = 95692d6539a756162a8bccb782ed4e14 +MD5 (Wine-20011108.tar.gz) = 390670df1d631c23057feb83d4a7eb8c diff --git a/emulators/wine/files/patch-gf b/emulators/wine/files/patch-gf deleted file mode 100644 index e6812e84a683..000000000000 --- a/emulators/wine/files/patch-gf +++ /dev/null @@ -1,35 +0,0 @@ -Index: dlls/wininet/ftp.c -=================================================================== -RCS file: /home/wine/wine/dlls/wininet/ftp.c,v -retrieving revision 1.18 -diff -u -3 -p -r1.18 ftp.c ---- dlls/wininet/ftp.c 2001/08/24 19:13:36 1.18 -+++ dlls/wininet/ftp.c 2001/08/26 09:02:47 -@@ -21,12 +21,6 @@ - #endif - #include - #include --#ifdef HAVE_NETINET_IN_SYSTM_H --# include --#endif --#ifdef HAVE_NETINET_IP_H --# include --#endif - - #include "winbase.h" - #include "wingdi.h" -Index: dlls/wininet/internet.h -=================================================================== -RCS file: /home/wine/wine/dlls/wininet/internet.h,v -retrieving revision 1.5 -diff -u -3 -p -r1.5 internet.h ---- dlls/wininet/internet.h 2001/08/24 19:13:36 1.5 -+++ dlls/wininet/internet.h 2001/08/26 09:02:49 -@@ -6,6 +6,7 @@ - # include - #endif - #ifdef HAVE_NETINET_IN_H -+# include - # include - #endif - diff --git a/emulators/wine/pkg-message b/emulators/wine/pkg-message index 6ef21543ecb5..98e386f7f19d 100644 --- a/emulators/wine/pkg-message +++ b/emulators/wine/pkg-message @@ -9,7 +9,3 @@ 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 do not know how to use the ports system to have it fetch and extract the source, have a look at .) - -This port has not been upgraded to 2001.10.04 because that snapshots does -not work as well as the previous ones -- it builds, but then hangs while -running several applications. (This has already been fixed in Wine CVS.) diff --git a/emulators/wine/pkg-plist b/emulators/wine/pkg-plist index bfa9936723c2..b1cbcf9c825a 100644 --- a/emulators/wine/pkg-plist +++ b/emulators/wine/pkg-plist @@ -1,6 +1,5 @@ bin/dosmod bin/function_grep.pl -bin/specmaker bin/fnt2bdf bin/wine bin/winebuild @@ -62,6 +61,7 @@ include/wine/mmreg.h include/wine/mmsystem.h include/wine/msacm.h include/wine/msacmdlg.h +include/wine/nb30.h include/wine/nspapi.h include/wine/ntsecapi.h include/wine/oaidl.h @@ -75,7 +75,6 @@ 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 @@ -90,6 +89,7 @@ include/wine/rpcdce.h include/wine/rpcdcep.h include/wine/rpcndr.h include/wine/rpcnterr.h +include/wine/rpcproxy.h include/wine/servprov.h include/wine/setupapi.h include/wine/shellapi.h @@ -133,6 +133,7 @@ include/wine/winuser.h include/wine/winver.h include/wine/wownt32.h include/wine/wnaspi32.h +include/wine/ws2spi.h include/wine/wshisotp.h include/wine/wsipx.h include/wine/wtypes.h @@ -145,6 +146,7 @@ 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/process.h include/wine/msvcrt/search.h @@ -178,6 +180,7 @@ 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_ksproperty.h include/wine/wine/obj_marshal.h include/wine/wine/obj_misc.h include/wine/wine/obj_moniker.h @@ -212,6 +215,7 @@ lib/wine/reg/regRestorer.pl %%PORTDOCS%%share/doc/wine/README.debugger %%PORTDOCS%%share/doc/wine/README.regapi lib/wine/libadvapi32.so +lib/wine/libavicap32.so lib/wine/libavifil32.so lib/wine/libavifile.so lib/wine/libcomctl32.so @@ -223,6 +227,7 @@ lib/wine/libcrtdll.so lib/wine/libdciman32.so lib/wine/libddeml.so lib/wine/libddraw.so +lib/wine/libdevenum.so lib/wine/libdinput.so lib/wine/libdispdib.so lib/wine/libdisplay.so @@ -241,6 +246,7 @@ lib/wine/libkernel32.so lib/wine/libkeyboard.so lib/wine/liblz32.so lib/wine/liblzexpand.so +lib/wine/libmapi32.so lib/wine/libmcianim.drv.so lib/wine/libmciavi.drv.so lib/wine/libmcicda.drv.so @@ -253,10 +259,14 @@ lib/wine/libmpr.so lib/wine/libmsacm.drv.so lib/wine/libmsacm.so lib/wine/libmsacm32.so +lib/wine/libmsdmo.so +lib/wine/libmsimg32.so lib/wine/libmsnet32.so +lib/wine/libmsrle32.so lib/wine/libmsvcrt.so lib/wine/libmsvfw32.so lib/wine/libmsvideo.so +lib/wine/libnetapi32.so lib/wine/libntdll.so lib/wine/libodbc32.so lib/wine/libole2.so @@ -274,6 +284,7 @@ lib/wine/libolepro32.so lib/wine/libolesvr.so lib/wine/libolesvr32.so lib/wine/libpsapi.so +lib/wine/libqcap.so lib/wine/libquartz.so lib/wine/librasapi16.so lib/wine/librasapi32.so @@ -288,6 +299,7 @@ lib/wine/libshell32.so lib/wine/libshfolder.so lib/wine/libshlwapi.so lib/wine/libsound.so +lib/wine/libsti.so lib/wine/libstorage.so lib/wine/libstress.so lib/wine/libsystem.so @@ -295,6 +307,7 @@ lib/wine/libtapi32.so lib/wine/libtoolhelp.so lib/wine/libttydrv.so lib/wine/libtypelib.so +lib/wine/liburl.so lib/wine/liburlmon.so lib/wine/libuser.so lib/wine/libuser32.so