From 9f8f710b3ec3945ede5cf5d996c3391081d32df1 Mon Sep 17 00:00:00 2001 From: Muhammad Moinur Rahman Date: Fri, 12 Jan 2024 13:07:34 +0100 Subject: */*: Sanitize MANPREFIX for meson ports Approved by: portmgr --- x11-servers/xorg-server/Makefile | 5 +++-- x11-servers/xorg-server/pkg-plist | 22 +++++++++++----------- x11-servers/xwayland-devel/Makefile | 5 +++-- x11-servers/xwayland/Makefile | 1 + x11-servers/xwayland/pkg-plist | 4 ++-- 5 files changed, 20 insertions(+), 17 deletions(-) (limited to 'x11-servers') diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile index 2ab565a32d2c..af74ad69eaaa 100644 --- a/x11-servers/xorg-server/Makefile +++ b/x11-servers/xorg-server/Makefile @@ -1,5 +1,6 @@ PORTNAME= xorg PORTVERSION= 21.1.10 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= x11-servers MASTER_SITES= XORG/individual/xserver @@ -33,7 +34,7 @@ PLIST= PKGMESSAGE= BINARY_NAME= ${FLAVOR:C/^(.).*/\1/:tu}${FLAVOR:C/^.//} PLIST_FILES= bin/${BINARY_NAME} \ - man/man1/${BINARY_NAME}.1.gz + share/man/man1/${BINARY_NAME}.1.gz PLIST_DIRS= /var/lib/xkb /var/lib .endif @@ -131,7 +132,7 @@ post-install: post-install: ${RM} -r ${STAGEDIR}${PREFIX}/lib/xorg/protocol.txt ${RMDIR} ${STAGEDIR}${PREFIX}/lib/xorg - ${RM} ${STAGEDIR}${PREFIX}/man/man1/Xserver.1 + ${RM} ${STAGEDIR}${PREFIX}/share/man/man1/Xserver.1 ${MKDIR} -p ${STAGEDIR}/var/lib/xkb .endif diff --git a/x11-servers/xorg-server/pkg-plist b/x11-servers/xorg-server/pkg-plist index f22d7b44f7a3..d99baab25f6b 100644 --- a/x11-servers/xorg-server/pkg-plist +++ b/x11-servers/xorg-server/pkg-plist @@ -173,17 +173,17 @@ lib/xorg/protocol.txt libdata/pkgconfig/xorg-server.pc libexec/Xorg @(,,4555) libexec/Xorg.wrap -man/man1/Xorg.1.gz -man/man1/Xorg.wrap.1.gz -man/man1/Xserver.1.gz -man/man1/gtf.1.gz -man/man4/exa.4.gz -man/man4/fbdevhw.4.gz -man/man4/inputtestdrv.4.gz -man/man4/modesetting.4.gz -man/man5/Xwrapper.config.5.gz -man/man5/xorg.conf.5.gz -man/man5/xorg.conf.d.5.gz +share/man/man1/Xorg.1.gz +share/man/man1/Xorg.wrap.1.gz +share/man/man1/Xserver.1.gz +share/man/man1/gtf.1.gz +share/man/man4/exa.4.gz +share/man/man4/fbdevhw.4.gz +share/man/man4/inputtestdrv.4.gz +share/man/man4/modesetting.4.gz +share/man/man5/Xwrapper.config.5.gz +share/man/man5/xorg.conf.5.gz +share/man/man5/xorg.conf.d.5.gz share/X11/xorg.conf.d/10-quirks.conf share/X11/xorg.conf.d/20-evdev-kbd.conf share/aclocal/xorg-server.m4 diff --git a/x11-servers/xwayland-devel/Makefile b/x11-servers/xwayland-devel/Makefile index df7e8e0db325..86fa0dc29488 100644 --- a/x11-servers/xwayland-devel/Makefile +++ b/x11-servers/xwayland-devel/Makefile @@ -2,6 +2,7 @@ PORTNAME= xwayland DISTVERSIONPREFIX= xorg-server- DISTVERSION= 21.0.99.1-644 DISTVERSIONSUFFIX= -gcad42fcb0 +PORTREVISION= 1 CATEGORIES= x11-servers PKGNAMESUFFIX= -devel @@ -48,8 +49,8 @@ MESON_ARGS= -D${PORTNAME}=true \ PLIST_FILES= bin/Xwayland \ "@comment lib/xorg/protocol.txt" \ libdata/pkgconfig/xwayland.pc \ - "@comment man/man1/Xserver.1.gz" \ - man/man1/Xwayland.1.gz \ + "@comment share/man/man1/Xserver.1.gz" \ + share/man/man1/Xwayland.1.gz \ share/applications/org.freedesktop.Xwayland.desktop # Keep in sync with xorg-server diff --git a/x11-servers/xwayland/Makefile b/x11-servers/xwayland/Makefile index 81e11a262a9c..20150fe369d6 100644 --- a/x11-servers/xwayland/Makefile +++ b/x11-servers/xwayland/Makefile @@ -1,5 +1,6 @@ PORTNAME= xwayland PORTVERSION= 23.2.3 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= x11-servers MASTER_SITES= XORG/individual/xserver diff --git a/x11-servers/xwayland/pkg-plist b/x11-servers/xwayland/pkg-plist index 76fbca053230..8f0d15f6fad7 100644 --- a/x11-servers/xwayland/pkg-plist +++ b/x11-servers/xwayland/pkg-plist @@ -1,5 +1,5 @@ bin/Xwayland @comment lib/xorg/protocol.txt libdata/pkgconfig/xwayland.pc -@comment man/man1/Xserver.1.gz -man/man1/Xwayland.1.gz +@comment share/man/man1/Xserver.1.gz +share/man/man1/Xwayland.1.gz -- cgit v1.2.3