diff --git a/Makefile b/Makefile index d28f3f6d2..c48f1530d 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.77 2016/11/19 14:22:05 tb Exp $ +# $OpenBSD: Makefile,v 1.78 2020/04/28 07:04:49 matthieu Exp $ .include .include @@ -14,7 +14,6 @@ SUBDIR= proto font/util data/bitmaps lib app data \ .ifndef NOFONTS SUBDIR+= font .endif -SUBDIR+= distrib/notes NOOBJ= diff --git a/distrib/notes/Makefile b/distrib/notes/Makefile deleted file mode 100644 index 1bfdfb8e5..000000000 --- a/distrib/notes/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# $OpenBSD: Makefile,v 1.7 2014/07/12 12:32:45 matthieu Exp $ - -FILE= README.${MACHINE} - -all: ${FILE}.generated - -${FILE}.generated: ${FILE} m4.common - m4 ${.CURDIR}/m4.common ${.CURDIR}/${FILE} > ${FILE}.generated - -install: ${FILE}.generated - ${INSTALL_DATA} ${FILE}.generated ${DESTDIR}/usr/X11R6/README - -clean: - rm -f *.generated - -distclean: clean - -includes: - @echo No includes here. - -.include diff --git a/distrib/notes/README.alpha b/distrib/notes/README.alpha deleted file mode 100644 index 0d48ae634..000000000 --- a/distrib/notes/README.alpha +++ /dev/null @@ -1,8 +0,0 @@ -Post-installation instructions for X.Org on OpenBSD/alpha ---------------------------------------------------------- - -There is no X server for alpha. Only userland X. - -problem_blurb - -$OpenBSD: README.alpha,v 1.4 2011/02/19 19:51:53 matthieu Exp $ diff --git a/distrib/notes/README.amd64 b/distrib/notes/README.amd64 deleted file mode 100644 index 9f6c7d38b..000000000 --- a/distrib/notes/README.amd64 +++ /dev/null @@ -1,32 +0,0 @@ -Post-installation instructions for X.Org on OpenBSD/amd64 ---------------------------------------------------------- - -Conventions used in this document: - - somename(1) implies that "somename" is a program, and there is a - manual page available in section 1 of the manual pages for further - reading, viewed by typing "man 1 somename". - -1. Start either xenodm(1) or startx(1). - - a. Start xenodm(1), the X display manager by activating xenodm in - /etc/rc.conf.local(8): - - # rcctl enable xenodm - - b. Start startx(1) from a console shell. It is the X script that starts - the X server and a few X applications, including a window manager. - -2. If needed, Create the configuration file for your server. - - For many users of X.Org's servers, an xorg.conf file is not needed, - X, will automatically detect and use your hardware. - - For the few cases where your hardware is not properly autodetected - or supported or not supported as you wish, you will have to create - a configuration file. - - See Xorg(1) and xorg.conf(5) for details. - -problem_blurb - -$OpenBSD: README.amd64,v 1.12 2017/02/27 21:16:05 matthieu Exp $ diff --git a/distrib/notes/README.arm64 b/distrib/notes/README.arm64 deleted file mode 100644 index d5c17fe7f..000000000 --- a/distrib/notes/README.arm64 +++ /dev/null @@ -1,9 +0,0 @@ -Post-installation instructions for X.Org on OpenBSD/arm64 ----------------------------------------------------------- - -There is no X server for arm64. Only userland X. - -problem_blurb - -$OpenBSD: README.arm64,v 1.1 2017/02/03 04:34:10 jsg Exp $ - diff --git a/distrib/notes/README.armv7 b/distrib/notes/README.armv7 deleted file mode 100644 index cc84efb97..000000000 --- a/distrib/notes/README.armv7 +++ /dev/null @@ -1,9 +0,0 @@ -Post-installation instructions for X.Org on OpenBSD/armv7 ----------------------------------------------------------- - -There is no X server for armv7. Only userland X. - -problem_blurb - -$OpenBSD: README.armv7,v 1.1 2013/09/09 13:38:33 patrick Exp $ - diff --git a/distrib/notes/README.hppa b/distrib/notes/README.hppa deleted file mode 100644 index 37fb608f0..000000000 --- a/distrib/notes/README.hppa +++ /dev/null @@ -1,8 +0,0 @@ -Post-installation instructions for X.Org on OpenBSD/hppa --------------------------------------------------------- - -There is no X server for hppa. Only userland X. - -problem_blurb - -$OpenBSD: README.hppa,v 1.1.1.1 2006/11/27 11:25:45 matthieu Exp $ diff --git a/distrib/notes/README.i386 b/distrib/notes/README.i386 deleted file mode 100644 index dbcc9f7fc..000000000 --- a/distrib/notes/README.i386 +++ /dev/null @@ -1,32 +0,0 @@ -Post-installation instructions for X.Org on OpenBSD/i386 --------------------------------------------------------- - -Conventions used in this document: - - somename(1) implies that "somename" is a program, and there is a - manual page available in section 1 of the manual pages for further - reading, viewed by typing "man 1 somename". - -1. Start either xenodm(1) or startx(1). - - a. Start xenodm(1), the X display manager by activating xenodm in - /etc/rc.conf.local(8): - - # rcctl enable xenodm - - b. Start startx(1) from a console shell. It is the X script that starts - the X server and a few X applications, including a window manager. - -2. If needed, Create the configuration file for your server. - - For many users of X.Org's servers, an xorg.conf file is not needed, - X, will automatically detect and use your hardware. - - For the few cases where your hardware is not properly autodetected - or supported or not supported as you wish, you will have to create - a configuration file. - - See Xorg(1) and xorg.conf(5) for details. - -problem_blurb - -$OpenBSD: README.i386,v 1.12 2017/02/27 21:16:05 matthieu Exp $ diff --git a/distrib/notes/README.landisk b/distrib/notes/README.landisk deleted file mode 100644 index 94076f60a..000000000 --- a/distrib/notes/README.landisk +++ /dev/null @@ -1,8 +0,0 @@ -Post-installation instructions for X.Org on OpenBSD/landisk ------------------------------------------------------------ - -There is no X server for landisk. Only userland X. - -problem_blurb - -$OpenBSD: README.landisk,v 1.1 2007/05/12 10:24:28 matthieu Exp $ diff --git a/distrib/notes/README.loongson b/distrib/notes/README.loongson deleted file mode 100644 index 94270ca83..000000000 --- a/distrib/notes/README.loongson +++ /dev/null @@ -1,21 +0,0 @@ -Post-installation instructions for X.Org on OpenBSD/loongson ------------------------------------------------------------- - -OpenBSD use the X.Org X server on loongson. - -Currently, the X server is supported on the Lemote Yeelong and EMTEC -Gdium Liberty netbooks with a smfb(4) frame buffer. The wsfb driver -provides an unaccelerated frame buffer for use with the X server. - -No xorg.conf is needed in this configuration, unless you want to -change default options. - -To start xenodm, the X display manager, activate the xenodm_flags -option in /etc/rc.conf.local(8). You will need to disable the console -getty in /etc/ttys. - -Alternatively, you can log in at the console and run `startx'. - -problem_blurb - -$OpenBSD: README.loongson,v 1.5 2017/02/26 16:39:22 matthieu Exp $ diff --git a/distrib/notes/README.luna88k b/distrib/notes/README.luna88k deleted file mode 100644 index 1632ecb1b..000000000 --- a/distrib/notes/README.luna88k +++ /dev/null @@ -1,20 +0,0 @@ -Post-installation instructions for X.Org on OpenBSD/luna88k ------------------------------------------------------------ - -OpenBSD use the X.Org X server on luna88k. - -An unaccelerated frame buffer driver, wsfb, is provided for all frame -buffers, but currently only supports monochrome mode. - -No xorg.conf is needed in this configuration, unless you want to -change default options. - -To start xenodm, the X display manager, activate the xenodm_flags -option in /etc/rc.conf.local(8). You will need to disable the console -getty in /etc/ttys. - -Alternatively, you can log in on console and use `startx'. - -problem_blurb - -$OpenBSD: README.luna88k,v 1.4 2017/02/26 16:39:22 matthieu Exp $ diff --git a/distrib/notes/README.macppc b/distrib/notes/README.macppc deleted file mode 100644 index eed434b72..000000000 --- a/distrib/notes/README.macppc +++ /dev/null @@ -1,83 +0,0 @@ -Post-installation instructions for X.Org on OpenBSD/macppc ----------------------------------------------------------- - -OpenBSD uses the X.Org X server on macppc. - -Accelerated drivers -------------------- - -For many users of X.Org's servers, an xorg.conf file is not needed, -simply start X, and it will automatically detect and use your -hardware. If your hardware is not properly autodetected or supported -or not supported as you wish, you will have to create a configuration -file. - -The 'r128' and 'ati' drivers are currently known to work on the -machines with ATI Rage 128 or Radeon cards. The 'nv' driver works for -machines with nVidia cards, although some modes may experience -problems. - -You need to set machdep.allowaperture to 2 in /etc/sysctl.conf in -order to be able to use the X.Org accelerated drivers. - - -Unaccelerated, framebuffer driver ---------------------------------- - -The wsfb driver uses whatever graphics mode the console is set to -(by Mac OS) as a dumb unaccelerated framebuffer in 8 bits per pixel. -You should be able to use 'startx' or xenodm to start X without further -configuration. - -Mousekeys (Or how to deal with a One Button Mouse) --------------------------------------------------- - -Using the mousekeys feature of Xorg, it is possible to emulate -button2 and button3, since Apple does not seem to build hardware with -them. Other mouse operations can also be emulated using the keyboard. -To see the default key mappings, look at -/usr/X11R6/share/X11/xkb/compat/mousekeys. -These are not enabled by default. It is necessary to bind a key to -the Pointer_EnableKeys action. For the PBG4 a good setting for -this is using the Enter key next to or near the space bar (US keymap). -This can be bound by using the following xmodmap command. --- -xmodmap -e "keysym Mode_switch = Mode_switch Pointer_EnableKeys" --- -With xmodmap above run, {:--:} (not return) will -toggle the Pointer_EnableKeys mode allowing the key to be -used either as a mouse action or as the real key. - -For other keyboards/setups, both "Mode_switch" strings in the xmodmap -command can be changed to another key. xev(1) can be used to determine -the name associated with a key. - -The following is a diff to the mousekeys file which simplifies -mousekey usage on the PBG4, It could be used with other keyboards, -this is not specific to the PBG4. It changes the default mousekey -behavior of the keypad 0 and keypad Decimal (period) to act as mouse -button 2 and mouse button 3 respectively. - ---- mousekeys.orig Tue Feb 7 20:27:31 2012 -+++ mousekeys Tue Feb 7 21:10:47 2012 -@@ -101,14 +101,14 @@ - }; - - interpret KP_0 { -- action = LockPointerButton(button=default,affect=lock); -+ action= PointerButton(button=2); - }; - interpret KP_Insert { - action = LockPointerButton(button=default,affect=lock); - }; - - interpret KP_Decimal { -- action = LockPointerButton(button=default,affect=unlock); -+ action= PointerButton(button=3); - }; - interpret KP_Delete { - action = LockPointerButton(button=default,affect=unlock); - -problem_blurb - -$OpenBSD: README.macppc,v 1.12 2017/02/26 16:39:22 matthieu Exp $ diff --git a/distrib/notes/README.octeon b/distrib/notes/README.octeon deleted file mode 100644 index 03783975a..000000000 --- a/distrib/notes/README.octeon +++ /dev/null @@ -1,8 +0,0 @@ -Post-installation instructions for X.Org on OpenBSD/octeon ----------------------------------------------------------- - -There is no X server for octeon. Only userland X. - -problem_blurb - -$OpenBSD: README.octeon,v 1.1 2013/08/17 16:57:33 bcallah Exp $ diff --git a/distrib/notes/README.sgi b/distrib/notes/README.sgi deleted file mode 100644 index b087788e3..000000000 --- a/distrib/notes/README.sgi +++ /dev/null @@ -1,21 +0,0 @@ -Post-installation instructions for X.Org on OpenBSD/sgi -------------------------------------------------------- - -OpenBSD use the X.Org X server on sgi. - -Currently, the X server is only supported on SGI O2 workstations with a gbe(4) -frame buffer. The wsfb driver provides an unaccelerated frame buffer for use -with the X server. - -No xorg.conf is needed in this configuration, unless you want to -change default options. - -To start xenodm, the X display manager, activate the xenodm_flags -option in /etc/rc.conf.local(8). You will need to disable the console -getty in /etc/ttys. - -Alternatively, you can log in at the console and run `startx'. - -problem_blurb - -$OpenBSD: README.sgi,v 1.7 2017/02/26 16:39:22 matthieu Exp $ diff --git a/distrib/notes/README.sparc64 b/distrib/notes/README.sparc64 deleted file mode 100644 index 6cff41adf..000000000 --- a/distrib/notes/README.sparc64 +++ /dev/null @@ -1,100 +0,0 @@ -Post-installation instructions for X.Org on OpenBSD/sparc64 ------------------------------------------------------------ - -Contents --------- - Single, unaccelerated display - Single, accelerated display - Dual, unaccelerated display - -Single, unaccelerated display ------------------------------ -This setup is by far the easiest to configure and is supported on just -about every machine OpenBSD/sparc64 runs on (both PCI and SBus based -machines). These setup do not require any configuration file. - -To use xenodm from rc.conf.local(8), it is necessary to disable -/dev/console in /etc/ttys, change the 'status' of /dev/console to -'off'. - -Single, accelerated display ---------------------------- -Accelerated access to the framebuffer is supported on machines with -PCI VGA or UPA Creator framebuffers. -To use a PCI VGA framebuffer, retrieve the PCI bus, device and function -of the video card, eg: - - blade$ dmesg | grep vgafb - vgafb0 at pci0 dev 19 function 0 "ATI Rage XL" rev 0x27 - wsdisplay0 at vgafb0: console (std, sun emulation), using wskbd0 - -The framebuffer is on bus 0, device 19, function 0. Now, create -/etc/X11/xorg.conf, with the following content (replace 0:19:0 with the -bus:dev:func of the framebuffer): - - Section "Device" - Identifier "Card0" - BusID "PCI:0:19:0" - Option "composite_sync" "True" - # Use the following option on Blade-100 - # Option "reference_clock" "29.5MHz" - EndSection - - Section "Monitor" - Identifier "Monitor0" - HorizSync 31.5-70 - VertRefresh 50-90 - EndSection - - Section "Screen" - Identifier "Screen0" - Device "Card0" - Monitor "Monitor0" - EndSection - -See xorg.conf(5) for more options. You may want to replace the frequency -ranges in the "Monitor" section with the actual ranges supported by -your monitor. - -For UPA Creator framebuffers, the device will be automatically detected -and you don't need to have an xorg.conf file. - -Dual, unaccelerated display ---------------------------- -Dual-headed displays are only supported on machines with SBus framebuffers. -These configurations will require a configuration file. -Create /etc/X11/xorg.conf, with these two sections for each framebuffer: - - Section "Device" - Identifier "Wsdisplay0" - Driver "wsfb" - Option "device" "/dev/ttyC0" - EndSection - - Section "Screen" - Identifier "Screen0" - Device "Wsdisplay0" - EndSection - -This example is for the first screen. For the others, increment the -"Wsdisplay" and "Screen" numbers, and change the device to /dev/ttyD0 -for the second display, /dev/ttyE0 for the third, and so on. - -Then, you'll need to create a ServerLayout section describing all the -displays and their location relative to the first, as in: - - Section "ServerLayout" - Identifier "wsfb" - Screen 0 "Screen0" - Screen 1 "Screen1" RightOf "Screen0" - EndSection - -See xorg.conf(5) for more options. - -To use xenodm from rc.conf.local(8), it is necessary to disable -/dev/console in /etc/ttys, change the 'status' of /dev/console to -'off'. - -problem_blurb - -$OpenBSD: README.sparc64,v 1.12 2017/02/26 16:39:22 matthieu Exp $ diff --git a/distrib/notes/m4.common b/distrib/notes/m4.common deleted file mode 100644 index 48d2beb15..000000000 --- a/distrib/notes/m4.common +++ /dev/null @@ -1,8 +0,0 @@ -dnl $OpenBSD: m4.common,v 1.7 2012/07/22 18:55:01 matthieu Exp $ -dnl -changequote(`{:-',`-:}')dnl -dnl -define({:-XOrgVersion-:},{:-7.7-:})dnl -dnl -define({:-problem_blurb-:},{:--:})dnl -dnl