openbsd/xenocara
1
0
Fork 0
mirror of https://github.com/openbsd/xenocara.git synced 2025-12-10 03:08:56 +00:00
Code Issues Projects Releases Wiki Activity

Update to xserver 1.20.5. Tested by jsg@

Browse Source
This commit is contained in:
matthieu
2019-07-27 07:57:06 +00:00
parent 14e30ce507
commit a77e9959f3
723 changed files with 37176 additions and 23951 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
xserver/manpages.am
View File

@@ -16,23 +16,39 @@ EXTRA_DIST = $(appman_PRE) $(driverman_PRE) $(fileman_PRE)
CLEANFILES = $(appman_DATA) $(driverman_DATA) $(fileman_DATA)
SUFFIXES = .$(APP_MAN_SUFFIX) .$(DRIVER_MAN_SUFFIX) .$(FILE_MAN_SUFFIX) .man
# xorg-macros.m4 has these bracketed by double underscores, but meson
# wants ats.
MAN_SUBSTS += -e 's|@vendorversion@|"$(PACKAGE_STRING)" "$(XORG_MAN_PAGE)"|' \
-e 's|@xorgversion@|"$(PACKAGE_STRING)" "$(XORG_MAN_PAGE)"|' \
-e 's|@xservername@|Xorg|g' \
-e 's|@xconfigfile@|xorg.conf|g' \
-e 's|@projectroot@|$(prefix)|g' \
-e 's|@apploaddir@|$(appdefaultdir)|g' \
-e 's|@appmansuffix@|$(APP_MAN_SUFFIX)|g' \
-e 's|@drivermansuffix@|$(DRIVER_MAN_SUFFIX)|g' \
-e 's|@adminmansuffix@|$(ADMIN_MAN_SUFFIX)|g' \
-e 's|@libmansuffix@|$(LIB_MAN_SUFFIX)|g' \
-e 's|@miscmansuffix@|$(MISC_MAN_SUFFIX)|g' \
-e 's|@filemansuffix@|$(FILE_MAN_SUFFIX)|g'
# Add server specific man pages string substitution from XORG_MANPAGE_SECTIONS
# 's|/,|/, |g' will add a space to help font path formatting
MAN_SUBSTS += -e 's|__logdir__|$(logdir)|g' \
-e 's|__datadir__|$(datadir)|g' \
-e 's|__mandir__|$(mandir)|g' \
-e 's|__sysconfdir__|$(sysconfdir)|g' \
-e 's|__xconfigdir__|$(__XCONFIGDIR__)|g' \
-e 's|__xkbdir__|$(XKB_BASE_DIRECTORY)|g' \
-e 's|__XKB_DFLT_RULES__|$(XKB_DFLT_RULES)|g' \
-e 's|__XKB_DFLT_MODEL__|$(XKB_DFLT_MODEL)|g' \
-e 's|__XKB_DFLT_LAYOUT__|$(XKB_DFLT_LAYOUT)|g' \
-e 's|__XKB_DFLT_VARIANT__|$(XKB_DFLT_VARIANT)|g' \
-e 's|__XKB_DFLT_OPTIONS__|$(XKB_DFLT_OPTIONS)|g' \
-e 's|__bundle_id_prefix__|$(BUNDLE_ID_PREFIX)|g' \
-e 's|__modulepath__|$(DEFAULT_MODULE_PATH)|g' \
-e 's|__suid_wrapper_dir__|$(SUID_WRAPPER_DIR)|g' \
-e 's|__default_font_path__|$(COMPILEDDEFAULTFONTPATH)|g' \
MAN_SUBSTS += -e 's|[@]logdir[@]|$(logdir)|g' \
-e 's|[@]datadir[@]|$(datadir)|g' \
-e 's|[@]mandir[@]|$(mandir)|g' \
-e 's|[@]sysconfdir[@]|$(sysconfdir)|g' \
-e 's|[@]xconfigdir[@]|$(XCONFIGDIR)|g' \
-e 's|[@]xkbdir[@]|$(XKB_BASE_DIRECTORY)|g' \
-e 's|[@]XKB_DFLT_RULES[@]|$(XKB_DFLT_RULES)|g' \
-e 's|[@]XKB_DFLT_MODEL[@]|$(XKB_DFLT_MODEL)|g' \
-e 's|[@]XKB_DFLT_LAYOUT[@]|$(XKB_DFLT_LAYOUT)|g' \
-e 's|[@]XKB_DFLT_VARIANT[@]|$(XKB_DFLT_VARIANT)|g' \
-e 's|[@]XKB_DFLT_OPTIONS[@]|$(XKB_DFLT_OPTIONS)|g' \
-e 's|[@]bundle_id_prefix[@]|$(BUNDLE_ID_PREFIX)|g' \
-e 's|[@]modulepath[@]|$(DEFAULT_MODULE_PATH)|g' \
-e 's|[@]suid_wrapper_dir[@]|$(SUID_WRAPPER_DIR)|g' \
-e 's|[@]default_font_path[@]|$(COMPILEDDEFAULTFONTPATH)|g' \
-e '\|$(COMPILEDDEFAULTFONTPATH)| s|/,|/, |g'
.man.$(APP_MAN_SUFFIX):