[oi-dev] Fwd: [PATCH:xorg-macros] Update check for manpage section numbers to not rely on Solaris version

[Aurélien Larcher]

On Sun, Nov 5, 2017 at 1:38 AM, Alan Coopersmith <
alan.coopersmith at oracle.com> wrote:

> I believe this patch should not break you, and should in fact make it
> easier for
> you to decide whether or not to follow our lead in reverting from the SysV
> man
> page sections to the classic Bell Labs/BSD ones that everyone else uses,
> but I've only tested on Solaris 11.3 & 11.4, not OI or any other illumos
> distros,
> so let me know if it breaks for you.
>
> It should apply to the upstream git repo from
> git://anongit.freedesktop.org/xorg/util/macros
> which OI packages via https://github.com/OpenIndiana
> /oi-userland/tree/oi/hipster/components/x11/util-macros
>

Thank you Alan for the heads-up, I will test next week.
Kind regards

Aurelien



>
>         -alan-
>
>
> ---------- Forwarded message ----------
> From: Alan Coopersmith <alan.coopersmith at oracle.com>
> To: xorg-devel at lists.x.org
> Cc:
> Bcc:
> Date: Sat, 4 Nov 2017 17:33:56 -0700
> Subject: [PATCH:macros] Update check for manpage section numbers to not
> rely on Solaris version
> Check for a specific file instead of a specific set of versions from
> uname, to cope with manpage section alignment coming to 11.4 instead
> of 12.0.
>
> Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
> ---
>  xorg-macros.m4.in | 31 +++++++++++++++++++------------
>  1 file changed, 19 insertions(+), 12 deletions(-)
>
> diff --git a/xorg-macros.m4.in b/xorg-macros.m4.in
> index 7935426..efce888 100644
> --- a/xorg-macros.m4.in
> +++ b/xorg-macros.m4.in
> @@ -114,6 +114,17 @@ AC_DEFUN([XORG_MANPAGE_SECTIONS],[
>  AC_REQUIRE([AC_CANONICAL_HOST])
>  AC_REQUIRE([AC_PROG_SED])
>
> +case $host_os in
> +    solaris*)
> +        # Solaris 2.0 - 11.3 use SysV man page section numbers, so we
> +        # check for a man page file found in later versions that use
> +        # traditional section numbers instead
> +        AC_CHECK_FILE([/usr/share/man/man7/attributes.7],
> +                [SYSV_MAN_SECTIONS=false], [SYSV_MAN_SECTIONS=true])
> +        ;;
> +    *) SYSV_MAN_SECTIONS=false ;;
> +esac
> +
>  if test x$APP_MAN_SUFFIX = x    ; then
>      APP_MAN_SUFFIX=1
>  fi
> @@ -129,9 +140,8 @@ if test x$LIB_MAN_DIR = x    ; then
>  fi
>
>  if test x$FILE_MAN_SUFFIX = x    ; then
> -    case $host_os in
> -       # Solaris 2.0 - 11 use SysV man page sections
> -       solaris2.?|solaris2.1[[01]])    FILE_MAN_SUFFIX=4  ;;
> +    case $SYSV_MAN_SECTIONS in
> +       true)                           FILE_MAN_SUFFIX=4  ;;
>         *)                              FILE_MAN_SUFFIX=5  ;;
>      esac
>  fi
> @@ -140,9 +150,8 @@ if test x$FILE_MAN_DIR = x    ; then
>  fi
>
>  if test x$MISC_MAN_SUFFIX = x    ; then
> -    case $host_os in
> -       # Solaris 2.0 - 11 use SysV man page sections
> -       solaris2.?|solaris2.1[[01]])    MISC_MAN_SUFFIX=5  ;;
> +    case $SYSV_MAN_SECTIONS in
> +       true)                           MISC_MAN_SUFFIX=5  ;;
>         *)                              MISC_MAN_SUFFIX=7  ;;
>      esac
>  fi
> @@ -151,9 +160,8 @@ if test x$MISC_MAN_DIR = x    ; then
>  fi
>
>  if test x$DRIVER_MAN_SUFFIX = x    ; then
> -    case $host_os in
> -       # Solaris 2.0 - 11 use SysV man page sections
> -       solaris2.?|solaris2.1[[01]])    DRIVER_MAN_SUFFIX=7  ;;
> +    case $SYSV_MAN_SECTIONS in
> +       true)                           DRIVER_MAN_SUFFIX=7  ;;
>         *)                              DRIVER_MAN_SUFFIX=4  ;;
>      esac
>  fi
> @@ -162,9 +170,8 @@ if test x$DRIVER_MAN_DIR = x    ; then
>  fi
>
>  if test x$ADMIN_MAN_SUFFIX = x    ; then
> -    case $host_os in
> -       # Solaris 2.0 - 11 use SysV man page sections
> -       solaris2.?|solaris2.1[[01]])    ADMIN_MAN_SUFFIX=1m ;;
> +    case $SYSV_MAN_SECTIONS in
> +       true)                           ADMIN_MAN_SUFFIX=1m ;;
>         *)                              ADMIN_MAN_SUFFIX=8  ;;
>      esac
>  fi
> --
> 2.13.0
>
> _______________________________________________
> xorg-devel at lists.x.org: X.Org development
> Archives: http://lists.x.org/archives/xorg-devel
> Info: https://lists.x.org/mailman/listinfo/xorg-devel
> _______________________________________________
> oi-dev mailing list
> oi-dev at openindiana.org
> https://openindiana.org/mailman/listinfo/oi-dev
>



-- 
---
Praise the Caffeine embeddings
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://openindiana.org/pipermail/oi-dev/attachments/20171105/8cce2727/attachment-0005.html>