diff options
| -rw-r--r-- | emulators/wine-devel/Makefile | 1 | ||||
| -rw-r--r-- | emulators/wine-devel/files/README.patch | 32 | ||||
| -rw-r--r-- | emulators/wine-devel/pkg-message | 4 | ||||
| -rw-r--r-- | emulators/wine-devel/pkg-plist | 1 | ||||
| -rw-r--r-- | emulators/wine/Makefile | 1 | ||||
| -rw-r--r-- | emulators/wine/files/README.patch | 32 | ||||
| -rw-r--r-- | emulators/wine/pkg-message | 4 | ||||
| -rw-r--r-- | emulators/wine/pkg-plist | 1 |
8 files changed, 14 insertions, 62 deletions
diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile index ac76de7..0f56c5d 100644 --- a/emulators/wine-devel/Makefile +++ b/emulators/wine-devel/Makefile @@ -101,7 +101,6 @@ do-install: ${PREFIX}/lib/wine/reg ${INSTALL_DATA} ${FILESDIR}/README.patch \ ${FILESDIR}/patch-3.3-sys-sigtrap \ - ${FILESDIR}/patch-3.3-sys-fsgs \ ${PREFIX}/lib/wine ${INSTALL_DATA} ${WRKSRC}/winedefault.reg ${PREFIX}/lib/wine ${ECHO} diff --git a/emulators/wine-devel/files/README.patch b/emulators/wine-devel/files/README.patch index 4ed3bf4..bfa3c61 100644 --- a/emulators/wine-devel/files/README.patch +++ b/emulators/wine-devel/files/README.patch @@ -1,38 +1,20 @@ -Here are some patches for FreeBSD's kernel that are necessary for wine -(well not strictly _necessary_ but without them parts of it won't work.) +Here are some patches for FreeBSD's kernel that are necessary for Wine +(Well not strictly _necessary_ but without them parts of it won't work). They unfortunately didn't make it into the base distribution in time for the 3.3 release code freeze... patch-3.3-sys-sigtrap: stop wine's SIGTRAP handler from being called in the sigreturn syscall, -causing problems for wine's internal debugger. (it would still +causing problems for wine's internal debugger. (It would still correctly show a crash backtrace but all commands that use single- stepping failed.) -patch-3.3-sys-fsgs: -always set/use the sc_fs and sc_gs entries in the sigcontext struct, -making -stable behave the same as -current there. this should finally -allow signal handling of a wine that was built on -stable to correctly -run on -current too. The corresponding wine change is in the port in -patches/patch-af, it is also in wine's CVS tree now, so that file will -disappear when the port is updated after the next wine release. -(this one was MFC'd Nov 15 1999, so you only need it if you're running a -system from the -stable branch older than that, like a 3.3-RELEASE. If you -happen to try to apply it when its already there patch(1) should complain -`Reversed (or previously applied) patch detected! Assume -R? [y]', -just hit ^C then...) - Apply as follows: (cd /usr/src/sys && patch ) <patch-3.3-sys-sigtrap -And if you don't already have it: - - (cd /usr/src/sys && patch ) <patch-3.3-sys-fsgs - -then build a new kernel. (don't forget to include the options USER_LDT, -SYSVSHM, SYSVSEM, and SYSVMSG, wine needs these.) +and build a new kernel. (Don't forget to include the options USER_LDT, +SYSVSHM, SYSVSEM, and SYSVMSG which are required by Wine.) --current users: -The sigtrap patch looks like it could also apply to -current but i haven't -tried. And the fs/gs patch of course already is in -current. +4.x users: The sigtrap patch looks like it could also apply to 4.x but I +haven't tried. diff --git a/emulators/wine-devel/pkg-message b/emulators/wine-devel/pkg-message index 974b666..57ba125 100644 --- a/emulators/wine-devel/pkg-message +++ b/emulators/wine-devel/pkg-message @@ -3,10 +3,6 @@ options USER_LDT, SYSVSHM, SYSVSEM, and SYSVMSG. Before you do that, you may want to apply the patches in %%PREFIX%%/lib/wine to your kernel sources, see the README.patch there. -(Note: if you already installed the patches from the 991031 version of -this port and you're not tracking -stable or your -stable is older than -Nov 15 1999: there is a new patch you need, patch-3.3-sys-fsgs) - And the port now also installs some of wine's doc files which describe additional things that are not in the manual pages, see %%PREFIX%%/lib/wine/documentation. There are more in the source tree diff --git a/emulators/wine-devel/pkg-plist b/emulators/wine-devel/pkg-plist index e369936..23dd619 100644 --- a/emulators/wine-devel/pkg-plist +++ b/emulators/wine-devel/pkg-plist @@ -11,7 +11,6 @@ include/wine/wingdi.h include/wine/winuser.h lib/wine/README.patch lib/wine/patch-3.3-sys-sigtrap -lib/wine/patch-3.3-sys-fsgs lib/wine/winedefault.reg lib/wine/bug_report.pl lib/wine/reg/regFixer.pl diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile index ac76de7..0f56c5d 100644 --- a/emulators/wine/Makefile +++ b/emulators/wine/Makefile @@ -101,7 +101,6 @@ do-install: ${PREFIX}/lib/wine/reg ${INSTALL_DATA} ${FILESDIR}/README.patch \ ${FILESDIR}/patch-3.3-sys-sigtrap \ - ${FILESDIR}/patch-3.3-sys-fsgs \ ${PREFIX}/lib/wine ${INSTALL_DATA} ${WRKSRC}/winedefault.reg ${PREFIX}/lib/wine ${ECHO} diff --git a/emulators/wine/files/README.patch b/emulators/wine/files/README.patch index 4ed3bf4..bfa3c61 100644 --- a/emulators/wine/files/README.patch +++ b/emulators/wine/files/README.patch @@ -1,38 +1,20 @@ -Here are some patches for FreeBSD's kernel that are necessary for wine -(well not strictly _necessary_ but without them parts of it won't work.) +Here are some patches for FreeBSD's kernel that are necessary for Wine +(Well not strictly _necessary_ but without them parts of it won't work). They unfortunately didn't make it into the base distribution in time for the 3.3 release code freeze... patch-3.3-sys-sigtrap: stop wine's SIGTRAP handler from being called in the sigreturn syscall, -causing problems for wine's internal debugger. (it would still +causing problems for wine's internal debugger. (It would still correctly show a crash backtrace but all commands that use single- stepping failed.) -patch-3.3-sys-fsgs: -always set/use the sc_fs and sc_gs entries in the sigcontext struct, -making -stable behave the same as -current there. this should finally -allow signal handling of a wine that was built on -stable to correctly -run on -current too. The corresponding wine change is in the port in -patches/patch-af, it is also in wine's CVS tree now, so that file will -disappear when the port is updated after the next wine release. -(this one was MFC'd Nov 15 1999, so you only need it if you're running a -system from the -stable branch older than that, like a 3.3-RELEASE. If you -happen to try to apply it when its already there patch(1) should complain -`Reversed (or previously applied) patch detected! Assume -R? [y]', -just hit ^C then...) - Apply as follows: (cd /usr/src/sys && patch ) <patch-3.3-sys-sigtrap -And if you don't already have it: - - (cd /usr/src/sys && patch ) <patch-3.3-sys-fsgs - -then build a new kernel. (don't forget to include the options USER_LDT, -SYSVSHM, SYSVSEM, and SYSVMSG, wine needs these.) +and build a new kernel. (Don't forget to include the options USER_LDT, +SYSVSHM, SYSVSEM, and SYSVMSG which are required by Wine.) --current users: -The sigtrap patch looks like it could also apply to -current but i haven't -tried. And the fs/gs patch of course already is in -current. +4.x users: The sigtrap patch looks like it could also apply to 4.x but I +haven't tried. diff --git a/emulators/wine/pkg-message b/emulators/wine/pkg-message index 974b666..57ba125 100644 --- a/emulators/wine/pkg-message +++ b/emulators/wine/pkg-message @@ -3,10 +3,6 @@ options USER_LDT, SYSVSHM, SYSVSEM, and SYSVMSG. Before you do that, you may want to apply the patches in %%PREFIX%%/lib/wine to your kernel sources, see the README.patch there. -(Note: if you already installed the patches from the 991031 version of -this port and you're not tracking -stable or your -stable is older than -Nov 15 1999: there is a new patch you need, patch-3.3-sys-fsgs) - And the port now also installs some of wine's doc files which describe additional things that are not in the manual pages, see %%PREFIX%%/lib/wine/documentation. There are more in the source tree diff --git a/emulators/wine/pkg-plist b/emulators/wine/pkg-plist index e369936..23dd619 100644 --- a/emulators/wine/pkg-plist +++ b/emulators/wine/pkg-plist @@ -11,7 +11,6 @@ include/wine/wingdi.h include/wine/winuser.h lib/wine/README.patch lib/wine/patch-3.3-sys-sigtrap -lib/wine/patch-3.3-sys-fsgs lib/wine/winedefault.reg lib/wine/bug_report.pl lib/wine/reg/regFixer.pl |
