Re: gtk? and PKGLOCALEDIR=lib

[Richard PALO <richard%netbsd.org@localhost>]

Le 22/07/15 00:31, Richard PALO a écrit :
> This mostly concerns:
>> ../../mk/platform/SCO_SV.mk:PKGLOCALEDIR?=      lib
>> ../../mk/platform/SunOS.mk:PKGLOCALEDIR?=       lib
>> ../../mk/platform/UnixWare.mk:PKGLOCALEDIR?=    lib
> 
> here in particular SunOS.
 
> Finally, I have:
>> $ ls /opt/local/share/locale/fr/LC_MESSAGES/ |wc -w
>>       26
> Do I presume correctly that *all* these should be found in '/opt/local/lib/locale' on my platform?
> 

I believe the path of least resistance, that is more bang for the effort, is the following patchset
I'm testing which will put by default USE_PKGLOCALEDIR for SunOS and will add to CONFIGURE_ARGS
'--localedir=' if not disabled.

> diff --git a/mk/configure/gnu-configure.mk b/mk/configure/gnu-configure.mk
> index 2503abe..fa1037e 100644
> --- a/mk/configure/gnu-configure.mk
> +++ b/mk/configure/gnu-configure.mk
> @@ -6,7 +6,7 @@ _PKG_VARS.gnu-configure=        GNU_CONFIGURE GNU_CONFIGURE_PREFIX \
>         SET_LIBDIR GNU_CONFIGURE_LIBSUBDIR \
>         GNU_CONFIGURE_LIBDIR GNU_CONFIGURE_INFODIR GNU_CONFIGURE_MANDIR \
>         CONFIGURE_HAS_LIBDIR CONFIGURE_HAS_MANDIR CONFIGURE_HAS_INFODIR \
> -       OVERRIDE_DIRDEPTH.configure \
> +       CONFIGURE_HAS_LOCALEDIR OVERRIDE_DIRDEPTH.configure \
>         USE_GNU_CONFIGURE_HOST
>  
>  HAS_CONFIGURE=                 defined
> @@ -83,6 +83,20 @@ GNU_CONFIGURE_MANDIR?=       ${GNU_CONFIGURE_PREFIX}/man
>  CONFIGURE_ARGS+=       --mandir=${GNU_CONFIGURE_MANDIR:Q}
>  .endif
>  
> +# PKGLOCALEDIR is the subdirectory of ${PREFIX} into which the locale
> +# specific files are installed unless the software was configured with
> +# an installation prefix other than ${PREFIX}.
> +#
> +CONFIGURE_HAS_LOCALEDIR?=   yes
> +.if ${GNU_CONFIGURE_PREFIX} == ${PREFIX}
> +GNU_CONFIGURE_LOCALEDIR?=  ${GNU_CONFIGURE_PREFIX}/${PKGLOCALEDIR}/locale
> +.else
> +GNU_CONFIGURE_LOCALEDIR?=  ${GNU_CONFIGURE_PREFIX}/locale
> +.endif
> +.if !empty(CONFIGURE_HAS_LOCALEDIR:M[yY][eE][sS])
> +CONFIGURE_ARGS+=       --localedir=${GNU_CONFIGURE_LOCALEDIR:Q}
> +.endif
> +
>  ######################################################################
>  ### configure-scripts-override (PRIVATE)
>  ######################################################################
> diff --git a/mk/platform/SunOS.mk b/mk/platform/SunOS.mk
> index 02cfde7..e183b98 100644
> --- a/mk/platform/SunOS.mk
> +++ b/mk/platform/SunOS.mk
> @@ -5,6 +5,7 @@
>  ECHO_N?=       ${ECHO} -n
>  IMAKE_MAKE?=   ${MAKE} # program which gets invoked by imake
>  PKGLOCALEDIR?= lib
> +USE_PKGLOCALEDIR?=     yes
>  PS?=           /bin/ps
>  # XXX: default from defaults/mk.conf.  Verify/correct for this platform
>  # and remove this comment.

so far, out of the 26 remnants I only need to work a bit on git-base.
The others correctly build with no other changes.

There will be some fallout where configure doesn't support --localedir such as lang/perl5.
This is how to get over that one:
> diff --git a/lang/perl5/Makefile b/lang/perl5/Makefile
> index 85187c6..e747864 100644
> --- a/lang/perl5/Makefile
> +++ b/lang/perl5/Makefile
> @@ -117,6 +117,7 @@ PERL5_API_VERS_cmd= \
>  HAS_CONFIGURE=         yes
>  CONFIGURE_SCRIPT=      ./Configure
>  CONFIGURE_ARGS+=       -sde
> +CONFIGURE_HAS_LOCALEDIR=       no
>  MAKE_ENV+=             LC_ALL="C"
>  
>  .if ${OPSYS} == "SunOS"

That is to say, I believe this is more or less ready and it would be good to push through a bulk build
to find the packages needing relax.
-- 
Richard PALO