From c0c3f60da98837885a9171562079db9d104e492c Mon Sep 17 00:00:00 2001
From: miod <miod@openbsd.org>
Date: Sun, 30 Mar 2003 12:27:55 +0000
Subject: [PATCH] Update the USER_LDT blurb to match reality; some feedback
 from espie@, ok naddy@

---
 emulators/wine/Makefile  | 11 +----------
 emulators/wine/pkg/DESCR |  7 +++----
 emulators/wine/pkg/PLIST |  4 +++-
 x11/mplayer/Makefile     | 11 +----------
 x11/mplayer/pkg/DESCR    |  6 ++++--
 x11/mplayer/pkg/PLIST    |  5 +++--
 6 files changed, 15 insertions(+), 29 deletions(-)

diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index e1ad4557140..69e3238eefd 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.25 2002/10/26 12:52:48 naddy Exp $
+# $OpenBSD: Makefile,v 1.26 2003/03/30 12:27:55 miod Exp $
 
 COMMENT=	"MS-Windows 3.1/95/NT emulator for Unix (Alpha release)"
 
@@ -23,15 +23,6 @@ WRKDIST=	${WRKDIR}/${PKGNAME}
 
 NO_REGRESS=	Yes
 
-.if !defined(NO_WARNINGS)
-pre-fetch:
-	@echo
-	@echo "  WARNING: This application requires a kernel compiled with"
-	@echo "           'option USER_LDT' for proper operation. The GENERIC"
-	@echo "           kernel does not have this option enabled by default."
-	@echo
-.endif
-
 post-configure:
 	cd ${WRKSRC} && make depend
 
diff --git a/emulators/wine/pkg/DESCR b/emulators/wine/pkg/DESCR
index b45d9431a6c..806d55a94e7 100644
--- a/emulators/wine/pkg/DESCR
+++ b/emulators/wine/pkg/DESCR
@@ -2,10 +2,9 @@ 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 ...
 
-To use Wine, your kernel must be rebuilt with the following line added
-to your kernel config file (/sys/i386/conf/<YourMachine>):
-
-options		USER_LDT
+To use Wine, you need to enable the machdep.userldt sysctl, either via
+/etc/sysctl.conf, or by entering (as root):
+    sysctl -w machdep.userldt=1
 
 Wine relies on the configuration file /etc/wine.conf to
 contain valid assignments of Unix directories to DOS drive letters,
diff --git a/emulators/wine/pkg/PLIST b/emulators/wine/pkg/PLIST
index 596947b962d..3fedef57771 100644
--- a/emulators/wine/pkg/PLIST
+++ b/emulators/wine/pkg/PLIST
@@ -1,4 +1,6 @@
-@comment $OpenBSD: PLIST,v 1.5 2002/04/07 01:54:48 naddy Exp $
+@comment $OpenBSD: PLIST,v 1.6 2003/03/30 12:27:58 miod Exp $
+@exec echo "This package may need further setup. Be sure to read the package description"
+@exec echo "carefully."
 bin/wine
 bin/dosmod
 include/wine/windows.h
diff --git a/x11/mplayer/Makefile b/x11/mplayer/Makefile
index 0a21d69d426..df534f3110d 100644
--- a/x11/mplayer/Makefile
+++ b/x11/mplayer/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.50 2003/02/19 01:06:03 pvalchev Exp $
+# $OpenBSD: Makefile,v 1.51 2003/03/30 12:27:58 miod Exp $
 
 # May not be hard to add more.
 ONLY_FOR_ARCHS=		i386 macppc sparc64
@@ -146,15 +146,6 @@ CONFIGURE_ARGS+=--disable-iconv
 .if ${FLAVOR:L:Mwin32}
 ONLY_FOR_ARCHS=i386
 
-.  if !defined(NO_WARNINGS)
-pre-fetch:
-	@echo
-	@echo "  WARNING: This application requires a kernel compiled with"
-	@echo "           'option USER_LDT' for proper operation. The GENERIC"
-	@echo "           kernel does not have this option enabled by default."
-	@echo
-.  endif
-
 RUN_DEPENDS+=	:win32-codecs-*:graphics/win32-codecs
 BUILD_DEPENDS+=	${RUN_DEPENDS}
 CONFIGURE_ARGS+=--with-win32libdir=${LOCALBASE}/lib/win32 \
diff --git a/x11/mplayer/pkg/DESCR b/x11/mplayer/pkg/DESCR
index 8bf71363a2f..5a244359784 100644
--- a/x11/mplayer/pkg/DESCR
+++ b/x11/mplayer/pkg/DESCR
@@ -37,7 +37,9 @@ Flavors:
 
   no_x11: disable audio/video output.
 
-  win32: enables win32 codecs (i386-only)  To use this flavor, your
-         kernel must be rebuilt with option USER_LDT
+  win32: enables win32 codecs (i386-only)  To use this flavor, you
+         need to enable the machdep.userldt sysctl, either via
+         /etc/sysctl.conf, or by entering (as root):
+		sysctl -w machdep.userldt=1
 
 WWW: ${HOMEPAGE}
diff --git a/x11/mplayer/pkg/PLIST b/x11/mplayer/pkg/PLIST
index 110d3033915..f1af9985d8e 100644
--- a/x11/mplayer/pkg/PLIST
+++ b/x11/mplayer/pkg/PLIST
@@ -1,5 +1,6 @@
-@comment $OpenBSD: PLIST,v 1.6 2003/02/17 14:55:34 brad Exp $
-@exec echo "This package may need further setup. Run pkg_info mplayer to find out more"
+@comment $OpenBSD: PLIST,v 1.7 2003/03/30 12:27:58 miod Exp $
+@exec echo "This package may need further setup. Run pkg_info mplayer to find out more,"
+@exec echo "and be sure to read the package description carefully."
 bin/mencoder
 bin/mplayer
 lib/mplayer/vidix/cyberblade_vid.so