kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update to the 20040121 snapshot of Wine (which now include two of our local

Browse source 
hacks).  Fix a INSTALL_AS_USER problem by generating $PREFIX/etc in any case.
This commit is contained in:
Gerald Pfeifer 2004-01-25 19:03:03 +00:00
parent 28be86e0f7
commit fd4da51265
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=99109
10 changed files with 34 additions and 86 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
emulators/wine-devel/Makefile
View file

@ -7,8 +7,7 @@
#
PORTNAME= wine
PORTVERSION= 20031212
PORTREVISION= 2
PORTVERSION= 20040121
CATEGORIES= emulators
MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= ALPHA/wine/development
@ -59,6 +58,7 @@ post-configure:
do-install:
cd ${WRKSRC} && ${GMAKE} install
-@${MKDIR} ${PREFIX}/etc
${INSTALL_DATA} ${WRKSRC}/documentation/samples/config ${PREFIX}/etc/wine.conf.sample
[ -f ${PREFIX}/etc/wine.conf ] \
|| ${INSTALL_DATA} ${PREFIX}/etc/wine.conf.sample ${PREFIX}/etc/wine.conf

2
emulators/wine-devel/distinfo
View file

@ -1 +1 @@
MD5 (Wine-20031212.tar.gz) = eaac8e7f9864d4c4069cfb2b202e22a5
MD5 (Wine-20040121.tar.gz) = 33cf9c11e5208175bad540c0e822183e

24
emulators/wine-devel/files/patch-dlls::winmm::wineoss::audio.c
View file

@ -1,24 +0,0 @@
Index: dlls/winmm/wineoss/audio.c
===================================================================
RCS file: /home/wine/wine/dlls/winmm/wineoss/audio.c,v
retrieving revision 1.108
diff -u -3 -p -r1.108 audio.c
--- dlls/winmm/wineoss/audio.c 12 Dec 2003 05:55:26 -0000 1.108
+++ dlls/winmm/wineoss/audio.c 28 Dec 2003 12:46:50 -0000
@@ -544,10 +544,15 @@ static BOOL OSS_WaveOutInit(OSS_DEVICE*
strncpy(ossdev->out_caps.szPname, info.name, sizeof(info.name));
TRACE("%s\n", ossdev->ds_desc.szDesc);
} else {
- ERR("%s: can't read info!\n", ossdev->mixer_name);
+ ERR("%s: cannot read SOUND_MIXER_INFO!\n", ossdev->mixer_name);
+#ifndef __FreeBSD__
+ /* FreeBSD up to at least 5.2 provides this ioctl, but does
+ * implement it properly, so ignore errors on that platform.
+ */
OSS_CloseDevice(ossdev);
close(mixer);
return FALSE;
+#endif
}
} else {
ERR("%s: %s\n", ossdev->mixer_name , strerror( errno ));

16
emulators/wine-devel/files/patch-loader::kthread.c
View file

@ -1,16 +0,0 @@
Index: loader/kthread.c
===================================================================
RCS file: /home/wine/wine/loader/kthread.c,v
retrieving revision 1.2
diff -u -3 -p -r1.2 kthread.c
--- loader/kthread.c 9 Nov 2003 01:25:23 -0000 1.2
+++ loader/kthread.c 25 Dec 2003 18:24:15 -0000
@@ -300,7 +300,7 @@ int wine_pthread_create_thread( struct w
"ret;\n"
"1:\n\t" /* parent -> caller thread */
"addl $8,%%esp" :
- : "r" (sp), "g" (SYS_rfork), "g" (RFPROC | RFMEM)
+ : "r" (sp), "g" (SYS_rfork), "g" (RFPROC | RFMEM | RFTHREAD)
: "eax", "edx");
return 0;
}

14
emulators/wine-devel/pkg-plist
View file

@ -8,6 +8,7 @@ bin/wcmd
bin/widl
bin/wine
bin/wineboot
bin/winebrowser
bin/winebuild
bin/winecfg
bin/wineclipsrv
@ -99,6 +100,7 @@ include/wine/windows/d3dtypes.h
include/wine/windows/d3dvec.inl
include/wine/windows/d3dx8core.h
include/wine/windows/dbghelp.h
include/wine/windows/dbt.h
include/wine/windows/dde.h
include/wine/windows/ddeml.h
include/wine/windows/ddraw.h
@ -109,6 +111,7 @@ include/wine/windows/dinput.h
include/wine/windows/dispdib.h
include/wine/windows/dlgs.h
include/wine/windows/dls1.h
include/wine/windows/dls2.h
include/wine/windows/dmdls.h
include/wine/windows/dmerror.h
include/wine/windows/dmo.h
@ -137,6 +140,7 @@ include/wine/windows/exdisp.idl
include/wine/windows/fci.h
include/wine/windows/fdi.h
include/wine/windows/guiddef.h
include/wine/windows/icm.h
include/wine/windows/icmpapi.h
include/wine/windows/imagehlp.h
include/wine/windows/imm.h
@ -168,6 +172,7 @@ include/wine/windows/mmreg.h
include/wine/windows/mmsystem.h
include/wine/windows/msacm.h
include/wine/windows/msacmdlg.h
include/wine/windows/msacmdrv.h
include/wine/windows/msi.h
include/wine/windows/msiquery.h
include/wine/windows/mssip.h
@ -331,10 +336,12 @@ lib/wine/dpnhpast.dll.so
lib/wine/dplay.dll.so
lib/wine/dplayx.dll.so
lib/wine/dsound.dll.so
lib/wine/dswave.dll.so
lib/wine/expand.exe.so
lib/wine/gdi.exe.so
lib/wine/gdi32.dll.so
lib/wine/glut32.dll.so
lib/wine/iccvid.dll.so
lib/wine/icinfo.exe.so
lib/wine/icmp.dll.so
lib/wine/imaadp32.acm.so
@ -383,8 +390,10 @@ lib/wine/libmsvcrtd.def
lib/wine/libdplay.def
lib/wine/libdplayx.def
lib/wine/libdsound.def
lib/wine/libdswave.def
lib/wine/libgdi32.def
lib/wine/libglu32.def
lib/wine/libiccvid.def
lib/wine/libicmp.def
lib/wine/libimagehlp.def
lib/wine/libimm32.def
@ -401,9 +410,11 @@ lib/wine/libmsnet32.def
lib/wine/libmsrle32.def
lib/wine/libmsvcrt.def
lib/wine/libmsvcrt20.def
lib/wine/libmsvcrt40.def
lib/wine/libmsvfw32.def
lib/wine/libmswsock.def
lib/wine/libnetapi32.def
lib/wine/libnewdev.def
lib/wine/libntdll.def
lib/wine/libodbc32.def
lib/wine/libole32.def
@ -478,11 +489,13 @@ lib/wine/msnet32.dll.so
lib/wine/msrle32.dll.so
lib/wine/msvcrt.dll.so
lib/wine/msvcrt20.dll.so
lib/wine/msvcrt40.dll.so
lib/wine/msvcrtd.dll.so
lib/wine/msvfw32.dll.so
lib/wine/msvideo.dll.so
lib/wine/mswsock.dll.so
lib/wine/netapi32.dll.so
lib/wine/newdev.dll.so
lib/wine/notepad.exe.so
lib/wine/ntdll.dll.so
lib/wine/odbc32.dll.so
@ -553,6 +566,7 @@ lib/wine/winealsa.drv.so
lib/wine/winearts.drv.so
lib/wine/wineaudioio.drv.so
lib/wine/wineboot.exe.so
lib/wine/winebrowser.exe.so
lib/wine/winecfg.exe.so
lib/wine/wineconsole.exe.so
lib/wine/wined3d.dll.so

4
emulators/wine/Makefile
View file

@ -7,8 +7,7 @@
#
PORTNAME= wine
PORTVERSION= 20031212
PORTREVISION= 2
PORTVERSION= 20040121
CATEGORIES= emulators
MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= ALPHA/wine/development
@ -59,6 +58,7 @@ post-configure:
do-install:
cd ${WRKSRC} && ${GMAKE} install
-@${MKDIR} ${PREFIX}/etc
${INSTALL_DATA} ${WRKSRC}/documentation/samples/config ${PREFIX}/etc/wine.conf.sample
[ -f ${PREFIX}/etc/wine.conf ] \
|| ${INSTALL_DATA} ${PREFIX}/etc/wine.conf.sample ${PREFIX}/etc/wine.conf

2
emulators/wine/distinfo
View file

@ -1 +1 @@
MD5 (Wine-20031212.tar.gz) = eaac8e7f9864d4c4069cfb2b202e22a5
MD5 (Wine-20040121.tar.gz) = 33cf9c11e5208175bad540c0e822183e

24
emulators/wine/files/patch-dlls::winmm::wineoss::audio.c
View file

@ -1,24 +0,0 @@
Index: dlls/winmm/wineoss/audio.c
===================================================================
RCS file: /home/wine/wine/dlls/winmm/wineoss/audio.c,v
retrieving revision 1.108
diff -u -3 -p -r1.108 audio.c
--- dlls/winmm/wineoss/audio.c 12 Dec 2003 05:55:26 -0000 1.108
+++ dlls/winmm/wineoss/audio.c 28 Dec 2003 12:46:50 -0000
@@ -544,10 +544,15 @@ static BOOL OSS_WaveOutInit(OSS_DEVICE*
strncpy(ossdev->out_caps.szPname, info.name, sizeof(info.name));
TRACE("%s\n", ossdev->ds_desc.szDesc);
} else {
- ERR("%s: can't read info!\n", ossdev->mixer_name);
+ ERR("%s: cannot read SOUND_MIXER_INFO!\n", ossdev->mixer_name);
+#ifndef __FreeBSD__
+ /* FreeBSD up to at least 5.2 provides this ioctl, but does
+ * implement it properly, so ignore errors on that platform.
+ */
OSS_CloseDevice(ossdev);
close(mixer);
return FALSE;
+#endif
}
} else {
ERR("%s: %s\n", ossdev->mixer_name , strerror( errno ));

16
emulators/wine/files/patch-loader::kthread.c
View file

@ -1,16 +0,0 @@
Index: loader/kthread.c
===================================================================
RCS file: /home/wine/wine/loader/kthread.c,v
retrieving revision 1.2
diff -u -3 -p -r1.2 kthread.c
--- loader/kthread.c 9 Nov 2003 01:25:23 -0000 1.2
+++ loader/kthread.c 25 Dec 2003 18:24:15 -0000
@@ -300,7 +300,7 @@ int wine_pthread_create_thread( struct w
"ret;\n"
"1:\n\t" /* parent -> caller thread */
"addl $8,%%esp" :
- : "r" (sp), "g" (SYS_rfork), "g" (RFPROC | RFMEM)
+ : "r" (sp), "g" (SYS_rfork), "g" (RFPROC | RFMEM | RFTHREAD)
: "eax", "edx");
return 0;
}

14
emulators/wine/pkg-plist
View file

@ -8,6 +8,7 @@ bin/wcmd
bin/widl
bin/wine
bin/wineboot
bin/winebrowser
bin/winebuild
bin/winecfg
bin/wineclipsrv
@ -99,6 +100,7 @@ include/wine/windows/d3dtypes.h
include/wine/windows/d3dvec.inl
include/wine/windows/d3dx8core.h
include/wine/windows/dbghelp.h
include/wine/windows/dbt.h
include/wine/windows/dde.h
include/wine/windows/ddeml.h
include/wine/windows/ddraw.h
@ -109,6 +111,7 @@ include/wine/windows/dinput.h
include/wine/windows/dispdib.h
include/wine/windows/dlgs.h
include/wine/windows/dls1.h
include/wine/windows/dls2.h
include/wine/windows/dmdls.h
include/wine/windows/dmerror.h
include/wine/windows/dmo.h
@ -137,6 +140,7 @@ include/wine/windows/exdisp.idl
include/wine/windows/fci.h
include/wine/windows/fdi.h
include/wine/windows/guiddef.h
include/wine/windows/icm.h
include/wine/windows/icmpapi.h
include/wine/windows/imagehlp.h
include/wine/windows/imm.h
@ -168,6 +172,7 @@ include/wine/windows/mmreg.h
include/wine/windows/mmsystem.h
include/wine/windows/msacm.h
include/wine/windows/msacmdlg.h
include/wine/windows/msacmdrv.h
include/wine/windows/msi.h
include/wine/windows/msiquery.h
include/wine/windows/mssip.h
@ -331,10 +336,12 @@ lib/wine/dpnhpast.dll.so
lib/wine/dplay.dll.so
lib/wine/dplayx.dll.so
lib/wine/dsound.dll.so
lib/wine/dswave.dll.so
lib/wine/expand.exe.so
lib/wine/gdi.exe.so
lib/wine/gdi32.dll.so
lib/wine/glut32.dll.so
lib/wine/iccvid.dll.so
lib/wine/icinfo.exe.so
lib/wine/icmp.dll.so
lib/wine/imaadp32.acm.so
@ -383,8 +390,10 @@ lib/wine/libmsvcrtd.def
lib/wine/libdplay.def
lib/wine/libdplayx.def
lib/wine/libdsound.def
lib/wine/libdswave.def
lib/wine/libgdi32.def
lib/wine/libglu32.def
lib/wine/libiccvid.def
lib/wine/libicmp.def
lib/wine/libimagehlp.def
lib/wine/libimm32.def
@ -401,9 +410,11 @@ lib/wine/libmsnet32.def
lib/wine/libmsrle32.def
lib/wine/libmsvcrt.def
lib/wine/libmsvcrt20.def
lib/wine/libmsvcrt40.def
lib/wine/libmsvfw32.def
lib/wine/libmswsock.def
lib/wine/libnetapi32.def
lib/wine/libnewdev.def
lib/wine/libntdll.def
lib/wine/libodbc32.def
lib/wine/libole32.def
@ -478,11 +489,13 @@ lib/wine/msnet32.dll.so
lib/wine/msrle32.dll.so
lib/wine/msvcrt.dll.so
lib/wine/msvcrt20.dll.so
lib/wine/msvcrt40.dll.so
lib/wine/msvcrtd.dll.so
lib/wine/msvfw32.dll.so
lib/wine/msvideo.dll.so
lib/wine/mswsock.dll.so
lib/wine/netapi32.dll.so
lib/wine/newdev.dll.so
lib/wine/notepad.exe.so
lib/wine/ntdll.dll.so
lib/wine/odbc32.dll.so
@ -553,6 +566,7 @@ lib/wine/winealsa.drv.so
lib/wine/winearts.drv.so
lib/wine/wineaudioio.drv.so
lib/wine/wineboot.exe.so
lib/wine/winebrowser.exe.so
lib/wine/winecfg.exe.so
lib/wine/wineconsole.exe.so
lib/wine/wined3d.dll.so