From e618151be99bf9443856ef223762fe32177cd64a Mon Sep 17 00:00:00 2001 From: schwarze Date: Sun, 5 May 2019 23:27:58 +0000 Subject: [PATCH] put fonts.7 and drm*.3 into the install sets; patch from Nathanael Rensen , minimally tweaked by me; OK matthieu@ --- distrib/sets/lists/xbase/md.alpha | 6 ++++++ distrib/sets/lists/xbase/md.amd64 | 6 ++++++ distrib/sets/lists/xbase/md.arm64 | 6 ++++++ distrib/sets/lists/xbase/md.armv7 | 6 ++++++ distrib/sets/lists/xbase/md.hppa | 6 ++++++ distrib/sets/lists/xbase/md.i386 | 6 ++++++ distrib/sets/lists/xbase/md.landisk | 6 ++++++ distrib/sets/lists/xbase/md.loongson | 6 ++++++ distrib/sets/lists/xbase/md.macppc | 6 ++++++ distrib/sets/lists/xbase/md.octeon | 6 ++++++ distrib/sets/lists/xbase/md.sgi | 6 ++++++ distrib/sets/lists/xbase/md.socppc | 6 ++++++ distrib/sets/lists/xbase/md.sparc64 | 6 ++++++ distrib/sets/lists/xshare/mi | 1 + doc/xorg-docs/Makefile.bsd-wrapper | 4 ++-- lib/libdrm/Makefile.bsd-wrapper | 4 ++-- 16 files changed, 83 insertions(+), 4 deletions(-) diff --git a/distrib/sets/lists/xbase/md.alpha b/distrib/sets/lists/xbase/md.alpha index 0457a311c..12746eb89 100644 --- a/distrib/sets/lists/xbase/md.alpha +++ b/distrib/sets/lists/xbase/md.alpha @@ -187,6 +187,12 @@ ./usr/X11R6/man/man3/XF86VidModeSwitchToMode.3 ./usr/X11R6/man/man3/XF86VidModeValidateModeLine.3 ./usr/X11R6/man/man3/XFree86-DGA.3 +./usr/X11R6/man/man3/drmAvailable.3 +./usr/X11R6/man/man3/drmHandleEvent.3 +./usr/X11R6/man/man3/drmModeGetResources.3 +./usr/X11R6/man/man7/drm-kms.7 +./usr/X11R6/man/man7/drm-memory.7 +./usr/X11R6/man/man7/drm.7 ./usr/X11R6/share/libdrm/amdgpu.ids ./var/cache/fontconfig/0f0db7876307790c19e1f91eb9095080-le64.cache-7 ./var/cache/fontconfig/1487dd4aecf3164c4a11193169052443-le64.cache-7 diff --git a/distrib/sets/lists/xbase/md.amd64 b/distrib/sets/lists/xbase/md.amd64 index 9625dd413..b4b84e72b 100644 --- a/distrib/sets/lists/xbase/md.amd64 +++ b/distrib/sets/lists/xbase/md.amd64 @@ -360,6 +360,12 @@ ./usr/X11R6/man/man3/XF86VidModeSwitchToMode.3 ./usr/X11R6/man/man3/XF86VidModeValidateModeLine.3 ./usr/X11R6/man/man3/XFree86-DGA.3 +./usr/X11R6/man/man3/drmAvailable.3 +./usr/X11R6/man/man3/drmHandleEvent.3 +./usr/X11R6/man/man3/drmModeGetResources.3 +./usr/X11R6/man/man7/drm-kms.7 +./usr/X11R6/man/man7/drm-memory.7 +./usr/X11R6/man/man7/drm.7 ./usr/X11R6/share/libdrm/amdgpu.ids ./var/cache/fontconfig/0f0db7876307790c19e1f91eb9095080-le64.cache-7 ./var/cache/fontconfig/1487dd4aecf3164c4a11193169052443-le64.cache-7 diff --git a/distrib/sets/lists/xbase/md.arm64 b/distrib/sets/lists/xbase/md.arm64 index af221536b..c754dbb1e 100644 --- a/distrib/sets/lists/xbase/md.arm64 +++ b/distrib/sets/lists/xbase/md.arm64 @@ -357,6 +357,12 @@ ./usr/X11R6/man/man3/XF86VidModeSwitchToMode.3 ./usr/X11R6/man/man3/XF86VidModeValidateModeLine.3 ./usr/X11R6/man/man3/XFree86-DGA.3 +./usr/X11R6/man/man3/drmAvailable.3 +./usr/X11R6/man/man3/drmHandleEvent.3 +./usr/X11R6/man/man3/drmModeGetResources.3 +./usr/X11R6/man/man7/drm-kms.7 +./usr/X11R6/man/man7/drm-memory.7 +./usr/X11R6/man/man7/drm.7 ./usr/X11R6/share/libdrm/amdgpu.ids ./var/cache/fontconfig/0f0db7876307790c19e1f91eb9095080-le64.cache-7 ./var/cache/fontconfig/1487dd4aecf3164c4a11193169052443-le64.cache-7 diff --git a/distrib/sets/lists/xbase/md.armv7 b/distrib/sets/lists/xbase/md.armv7 index a270c222c..c959aa3d3 100644 --- a/distrib/sets/lists/xbase/md.armv7 +++ b/distrib/sets/lists/xbase/md.armv7 @@ -356,6 +356,12 @@ ./usr/X11R6/man/man3/XF86VidModeSwitchToMode.3 ./usr/X11R6/man/man3/XF86VidModeValidateModeLine.3 ./usr/X11R6/man/man3/XFree86-DGA.3 +./usr/X11R6/man/man3/drmAvailable.3 +./usr/X11R6/man/man3/drmHandleEvent.3 +./usr/X11R6/man/man3/drmModeGetResources.3 +./usr/X11R6/man/man7/drm-kms.7 +./usr/X11R6/man/man7/drm-memory.7 +./usr/X11R6/man/man7/drm.7 ./usr/X11R6/share/libdrm/amdgpu.ids ./var/cache/fontconfig/0f0db7876307790c19e1f91eb9095080-le32d8.cache-7 ./var/cache/fontconfig/1487dd4aecf3164c4a11193169052443-le32d8.cache-7 diff --git a/distrib/sets/lists/xbase/md.hppa b/distrib/sets/lists/xbase/md.hppa index 036031a32..2471e3cd3 100644 --- a/distrib/sets/lists/xbase/md.hppa +++ b/distrib/sets/lists/xbase/md.hppa @@ -267,6 +267,12 @@ ./usr/X11R6/lib/pkgconfig/xf86driproto.pc ./usr/X11R6/man/man1/glxgears.1 ./usr/X11R6/man/man1/glxinfo.1 +./usr/X11R6/man/man3/drmAvailable.3 +./usr/X11R6/man/man3/drmHandleEvent.3 +./usr/X11R6/man/man3/drmModeGetResources.3 +./usr/X11R6/man/man7/drm-kms.7 +./usr/X11R6/man/man7/drm-memory.7 +./usr/X11R6/man/man7/drm.7 ./var/cache/fontconfig/0fe0af1d5898cfe43064332244d1dc15-be32d8.cache-7 ./var/cache/fontconfig/1bd20f0f0c9d7d1d5fd55b69fcc2b3a3-be32d8.cache-7 ./var/cache/fontconfig/2cee944125173ffd13126fb55c9a0dc1-be32d8.cache-7 diff --git a/distrib/sets/lists/xbase/md.i386 b/distrib/sets/lists/xbase/md.i386 index 3febc1cc7..7e22fb0c9 100644 --- a/distrib/sets/lists/xbase/md.i386 +++ b/distrib/sets/lists/xbase/md.i386 @@ -360,6 +360,12 @@ ./usr/X11R6/man/man3/XF86VidModeSwitchToMode.3 ./usr/X11R6/man/man3/XF86VidModeValidateModeLine.3 ./usr/X11R6/man/man3/XFree86-DGA.3 +./usr/X11R6/man/man3/drmAvailable.3 +./usr/X11R6/man/man3/drmHandleEvent.3 +./usr/X11R6/man/man3/drmModeGetResources.3 +./usr/X11R6/man/man7/drm-kms.7 +./usr/X11R6/man/man7/drm-memory.7 +./usr/X11R6/man/man7/drm.7 ./usr/X11R6/share/libdrm/amdgpu.ids ./var/cache/fontconfig/0f0db7876307790c19e1f91eb9095080-le32d8.cache-7 ./var/cache/fontconfig/1487dd4aecf3164c4a11193169052443-le32d8.cache-7 diff --git a/distrib/sets/lists/xbase/md.landisk b/distrib/sets/lists/xbase/md.landisk index b764d3a37..82ff07e8c 100644 --- a/distrib/sets/lists/xbase/md.landisk +++ b/distrib/sets/lists/xbase/md.landisk @@ -155,6 +155,12 @@ ./usr/X11R6/man/man3/XF86VidModeSwitchMode.3 ./usr/X11R6/man/man3/XF86VidModeSwitchToMode.3 ./usr/X11R6/man/man3/XF86VidModeValidateModeLine.3 +./usr/X11R6/man/man3/drmAvailable.3 +./usr/X11R6/man/man3/drmHandleEvent.3 +./usr/X11R6/man/man3/drmModeGetResources.3 +./usr/X11R6/man/man7/drm-kms.7 +./usr/X11R6/man/man7/drm-memory.7 +./usr/X11R6/man/man7/drm.7 ./var/cache/fontconfig/0f0db7876307790c19e1f91eb9095080-le32d8.cache-7 ./var/cache/fontconfig/1487dd4aecf3164c4a11193169052443-le32d8.cache-7 ./var/cache/fontconfig/49aa604a5ac92994756d3008e408245c-le32d8.cache-7 diff --git a/distrib/sets/lists/xbase/md.loongson b/distrib/sets/lists/xbase/md.loongson index 4fb3f915a..e29d29692 100644 --- a/distrib/sets/lists/xbase/md.loongson +++ b/distrib/sets/lists/xbase/md.loongson @@ -345,6 +345,12 @@ ./usr/X11R6/man/man3/XF86VidModeSwitchToMode.3 ./usr/X11R6/man/man3/XF86VidModeValidateModeLine.3 ./usr/X11R6/man/man3/XFree86-DGA.3 +./usr/X11R6/man/man3/drmAvailable.3 +./usr/X11R6/man/man3/drmHandleEvent.3 +./usr/X11R6/man/man3/drmModeGetResources.3 +./usr/X11R6/man/man7/drm-kms.7 +./usr/X11R6/man/man7/drm-memory.7 +./usr/X11R6/man/man7/drm.7 ./usr/X11R6/share/libdrm/amdgpu.ids ./var/cache/fontconfig/0f0db7876307790c19e1f91eb9095080-le64.cache-7 ./var/cache/fontconfig/1487dd4aecf3164c4a11193169052443-le64.cache-7 diff --git a/distrib/sets/lists/xbase/md.macppc b/distrib/sets/lists/xbase/md.macppc index 9c42bd7cc..1e0e8a8a0 100644 --- a/distrib/sets/lists/xbase/md.macppc +++ b/distrib/sets/lists/xbase/md.macppc @@ -349,6 +349,12 @@ ./usr/X11R6/man/man3/XF86VidModeSwitchToMode.3 ./usr/X11R6/man/man3/XF86VidModeValidateModeLine.3 ./usr/X11R6/man/man3/XFree86-DGA.3 +./usr/X11R6/man/man3/drmAvailable.3 +./usr/X11R6/man/man3/drmHandleEvent.3 +./usr/X11R6/man/man3/drmModeGetResources.3 +./usr/X11R6/man/man7/drm-kms.7 +./usr/X11R6/man/man7/drm-memory.7 +./usr/X11R6/man/man7/drm.7 ./usr/X11R6/share/libdrm/amdgpu.ids ./var/cache/fontconfig/0fe0af1d5898cfe43064332244d1dc15-be32d8.cache-7 ./var/cache/fontconfig/1bd20f0f0c9d7d1d5fd55b69fcc2b3a3-be32d8.cache-7 diff --git a/distrib/sets/lists/xbase/md.octeon b/distrib/sets/lists/xbase/md.octeon index 046fa1fcf..8f50ecd8e 100644 --- a/distrib/sets/lists/xbase/md.octeon +++ b/distrib/sets/lists/xbase/md.octeon @@ -187,6 +187,12 @@ ./usr/X11R6/man/man3/XF86VidModeSwitchToMode.3 ./usr/X11R6/man/man3/XF86VidModeValidateModeLine.3 ./usr/X11R6/man/man3/XFree86-DGA.3 +./usr/X11R6/man/man3/drmAvailable.3 +./usr/X11R6/man/man3/drmHandleEvent.3 +./usr/X11R6/man/man3/drmModeGetResources.3 +./usr/X11R6/man/man7/drm-kms.7 +./usr/X11R6/man/man7/drm-memory.7 +./usr/X11R6/man/man7/drm.7 ./usr/X11R6/share/libdrm/amdgpu.ids ./var/cache/fontconfig/0fe0af1d5898cfe43064332244d1dc15-be64.cache-7 ./var/cache/fontconfig/1bd20f0f0c9d7d1d5fd55b69fcc2b3a3-be64.cache-7 diff --git a/distrib/sets/lists/xbase/md.sgi b/distrib/sets/lists/xbase/md.sgi index ec4bdfe4c..2f8579e77 100644 --- a/distrib/sets/lists/xbase/md.sgi +++ b/distrib/sets/lists/xbase/md.sgi @@ -344,6 +344,12 @@ ./usr/X11R6/man/man3/XF86VidModeSwitchToMode.3 ./usr/X11R6/man/man3/XF86VidModeValidateModeLine.3 ./usr/X11R6/man/man3/XFree86-DGA.3 +./usr/X11R6/man/man3/drmAvailable.3 +./usr/X11R6/man/man3/drmHandleEvent.3 +./usr/X11R6/man/man3/drmModeGetResources.3 +./usr/X11R6/man/man7/drm-kms.7 +./usr/X11R6/man/man7/drm-memory.7 +./usr/X11R6/man/man7/drm.7 ./usr/X11R6/share/libdrm/amdgpu.ids ./var/cache/fontconfig/0fe0af1d5898cfe43064332244d1dc15-be64.cache-7 ./var/cache/fontconfig/1bd20f0f0c9d7d1d5fd55b69fcc2b3a3-be64.cache-7 diff --git a/distrib/sets/lists/xbase/md.socppc b/distrib/sets/lists/xbase/md.socppc index b457a3431..1a218965b 100644 --- a/distrib/sets/lists/xbase/md.socppc +++ b/distrib/sets/lists/xbase/md.socppc @@ -344,6 +344,12 @@ ./usr/X11R6/man/man3/XF86VidModeSwitchToMode.3 ./usr/X11R6/man/man3/XF86VidModeValidateModeLine.3 ./usr/X11R6/man/man3/XFree86-DGA.3 +./usr/X11R6/man/man3/drmAvailable.3 +./usr/X11R6/man/man3/drmHandleEvent.3 +./usr/X11R6/man/man3/drmModeGetResources.3 +./usr/X11R6/man/man7/drm-kms.7 +./usr/X11R6/man/man7/drm-memory.7 +./usr/X11R6/man/man7/drm.7 ./usr/X11R6/share/libdrm/amdgpu.ids ./var/cache/fontconfig/0fe0af1d5898cfe43064332244d1dc15-be32d8.cache-7 ./var/cache/fontconfig/1bd20f0f0c9d7d1d5fd55b69fcc2b3a3-be32d8.cache-7 diff --git a/distrib/sets/lists/xbase/md.sparc64 b/distrib/sets/lists/xbase/md.sparc64 index ec4c72259..d47ca2487 100644 --- a/distrib/sets/lists/xbase/md.sparc64 +++ b/distrib/sets/lists/xbase/md.sparc64 @@ -350,6 +350,12 @@ ./usr/X11R6/man/man3/XF86VidModeSwitchToMode.3 ./usr/X11R6/man/man3/XF86VidModeValidateModeLine.3 ./usr/X11R6/man/man3/XFree86-DGA.3 +./usr/X11R6/man/man3/drmAvailable.3 +./usr/X11R6/man/man3/drmHandleEvent.3 +./usr/X11R6/man/man3/drmModeGetResources.3 +./usr/X11R6/man/man7/drm-kms.7 +./usr/X11R6/man/man7/drm-memory.7 +./usr/X11R6/man/man7/drm.7 ./usr/X11R6/share/libdrm/amdgpu.ids ./var/cache/fontconfig/0fe0af1d5898cfe43064332244d1dc15-be64.cache-7 ./var/cache/fontconfig/1bd20f0f0c9d7d1d5fd55b69fcc2b3a3-be64.cache-7 diff --git a/distrib/sets/lists/xshare/mi b/distrib/sets/lists/xshare/mi index 9842d0b7e..972cdd987 100644 --- a/distrib/sets/lists/xshare/mi +++ b/distrib/sets/lists/xshare/mi @@ -2983,6 +2983,7 @@ ./usr/X11R6/man/man7/XOrgFoundation.7 ./usr/X11R6/man/man7/XProjectTeam.7 ./usr/X11R6/man/man7/Xsecurity.7 +./usr/X11R6/man/man7/fonts.7 ./usr/X11R6/man/man7/xkeyboard-config.7 ./usr/X11R6/share/X11/XErrorDB ./usr/X11R6/share/X11/locale diff --git a/doc/xorg-docs/Makefile.bsd-wrapper b/doc/xorg-docs/Makefile.bsd-wrapper index b3560cbe7..075b2b6c0 100644 --- a/doc/xorg-docs/Makefile.bsd-wrapper +++ b/doc/xorg-docs/Makefile.bsd-wrapper @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.bsd-wrapper,v 1.4 2019/05/02 19:12:04 schwarze Exp $ +# $OpenBSD: Makefile.bsd-wrapper,v 1.5 2019/05/05 23:27:58 schwarze Exp $ CONFIGURE_ARGS += --without-fop --without-xmlto @@ -7,7 +7,7 @@ MDOCS = general/fonts/fonts beforeinstall: .for n in ${MDOCS} ${INSTALL} ${INSTALL_COPY} -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} \ - ${.CURDIR}/${n}.7 ${MANDIR}7 + ${.CURDIR}/${n}.7 ${DESTDIR}${MANDIR}7 .endfor # maintainer target, not used duing build or install diff --git a/lib/libdrm/Makefile.bsd-wrapper b/lib/libdrm/Makefile.bsd-wrapper index cbc6ca454..f8ab4ba0c 100644 --- a/lib/libdrm/Makefile.bsd-wrapper +++ b/lib/libdrm/Makefile.bsd-wrapper @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.bsd-wrapper,v 1.20 2019/05/02 19:12:05 schwarze Exp $ +# $OpenBSD: Makefile.bsd-wrapper,v 1.21 2019/05/05 23:27:58 schwarze Exp $ SHARED_LIBS= drm 7.7 drm_radeon 4.0 drm_intel 5.4 \ drm_amdgpu 1.8 drm_nouveau 3.0 @@ -9,7 +9,7 @@ MDOCS= drmAvailable 3 drmHandleEvent 3 drmModeGetResources 3 \ beforeinstall: .for n s in ${MDOCS} ${INSTALL} ${INSTALL_COPY} -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} \ - ${.CURDIR}/man/${n}.${s} ${MANDIR}${s} + ${.CURDIR}/man/${n}.${s} ${DESTDIR}${MANDIR}${s} .endfor # maintainer target, not used duing build or install