NetBSD-Bugs archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Re: xsrc/58104 (When building x11, awk (not ${TOOL_AWK}) is used for PACKAGE_VERSION)



The following reply was made to PR xsrc/58104; it has been noted by GNATS.

From: Kouichi Hashikawa <hashikaw%mail.ru@localhost>
To: gnats-bugs%netbsd.org@localhost
Cc: xsrc-manager%netbsd.org@localhost, gnats-admin%netbsd.org@localhost, netbsd-bugs%netbsd.org@localhost
Subject: Re: xsrc/58104 (When building x11, awk (not ${TOOL_AWK}) is used for PACKAGE_VERSION)
Date: Wed, 3 Apr 2024 21:10:56 +0900

 --Apple-Mail-564113F2-2506-49B1-9DA1-18E32EB8E76B
 Content-Type: text/plain;
 	charset=utf-8
 Content-Transfer-Encoding: quoted-printable
 
 Thank you for applying the patch.
 Please pull-up to release branch.
 
 And, when ${TOOL_AWK} dumps core (but, less times than platform=E2=80=99s aw=
 k), then I use ${TOOL_GREP} before ${TOOL_AWK} as following.
 
 
 --- src/external/mit/xorg/xorg-pkg-ver.mk-110    2018-05-31 18:31:39.0000000=
 00=20
 +0900
 +++ src/external/mit/xorg/xorg-pkg-ver.mk    2024-03-31 22:52:57.865845014 +=
 0900
 @@ -11,46 +11,50 @@
 
 .if exists(${X11SRCDIR.${XORG_PKG_VER_PROG}}/configure)
 XORG_PKG_PACKAGE_VERSION!=3D \
 +    ${TOOL_GREP} ^PACKAGE_VERSION=3D ${X11SRCDIR.${XORG_PKG_VER_PROG}}/conf=
 igure=20
 |    \
    ${TOOL_AWK} -F=3D '/^PACKAGE_VERSION=3D/ {            \
         match($$2, "([0-9]+\\.)+[0-9]+");            \
         version =3D substr($$2, RSTART, RLENGTH);        \
         print version;                    \
         exit 0;                        \
 -    }' ${X11SRCDIR.${XORG_PKG_VER_PROG}}/configure
 +    }'
 .if !empty(XORG_PKG_PACKAGE_VERSION)
 CPPFLAGS+=3D    -DPACKAGE_VERSION=3D\"${XORG_PKG_PACKAGE_VERSION:Q}\"
 CPPFLAGS+=3D    -DVERSION=3D\"${XORG_PKG_PACKAGE_VERSION:q}\"
 .endif
 
 XORG_PKG_PACKAGE_STRING!=3D \
 +    ${TOOL_GREP} ^PACKAGE_STRING=3D ${X11SRCDIR.${XORG_PKG_VER_PROG}}/confi=
 gure=20
 |    \
    ${TOOL_AWK} -F=3D '/^PACKAGE_STRING=3D/ {            \
         match($$2, "[-_a-zA-Z]+[    ]+([0-9]+\\.)+[0-9]+");    \
         string =3D substr($$2, RSTART, RLENGTH);        \
         print string;                    \
         exit 0;                        \
 -    }' ${X11SRCDIR.${XORG_PKG_VER_PROG}}/configure
 +    }'
 .if !empty(XORG_PKG_PACKAGE_STRING)
 CPPFLAGS+=3D    -DPACKAGE_STRING=3D\"${XORG_PKG_PACKAGE_STRING:Q}\"
 .endif
 
 XORG_PKG_PACKAGE_NAME!=3D \
 +    ${TOOL_GREP} ^PACKAGE_NAME=3D ${X11SRCDIR.${XORG_PKG_VER_PROG}}/configu=
 re |    \
    ${TOOL_AWK} -F=3D '/^PACKAGE_NAME=3D/ {            \
         match($$2, "[-_a-zA-Z0-9]+");            \
         name =3D substr($$2, RSTART, RLENGTH);        \
         print name;                    \
         exit 0;                        \
 -    }' ${X11SRCDIR.${XORG_PKG_VER_PROG}}/configure
 +    }'
 .if !empty(XORG_PKG_PACKAGE_NAME)
 CPPFLAGS+=3D    -DPACKAGE_NAME=3D\"${XORG_PKG_PACKAGE_NAME:Q}\"
 .endif
 
 XORG_PKG_RELEASE_DATE!=3D \
 +    ${TOOL_GREP} ^RELEASE_DATE=3D ${X11SRCDIR.${XORG_PKG_VER_PROG}}/configu=
 re |    \
    ${TOOL_AWK} -F=3D '/^RELEASE_DATE=3D/ {            \
         match($$2, "[-_a-zA-Z0-9]+");            \
         name =3D substr($$2, RSTART, RLENGTH);        \
         print name;                    \
         exit 0;                        \
 -    }' ${X11SRCDIR.${XORG_PKG_VER_PROG}}/configure
 +    }'
 .if !empty(XORG_PKG_RELEASE_DATE)
 CPPFLAGS+=3D    -DRELEASE_DATE=3D\"${XORG_PKG_RELEASE_DATE:Q}\"
 .endif
 --- src/share/mk/bsd.x11.mk-114525    2023-12-01 12:32:41.555622511 +0900
 +++ src/share/mk/bsd.x11.mk    2024-03-31 23:31:32.244541090 +0900
 @@ -274,8 +274,9 @@
    if [ -n '${PKGCONFIG_VERSION.${.PREFIX}}' ]; then \
        _pkg_version=3D'${PKGCONFIG_VERSION.${.PREFIX}}'; \
    else \
 -        _pkg_version=3D$$(${PRINT_PACKAGE_VERSION} \
 -            ${PKGDIST.${.PREFIX}}/configure); \
 +        _pkg_version=3D$$(${TOOL_GREP} ^PACKAGE_VERSION=3D \
 +            ${PKGDIST.${.PREFIX}}/configure |    \
 +            ${PRINT_PACKAGE_VERSION});    \
    fi; \
    ${TOOL_SED} \
        ${PKGCONFIG_SED_FLAGS} \
 
 --=20
 Kouichi Hashikawa=
 
 --Apple-Mail-564113F2-2506-49B1-9DA1-18E32EB8E76B
 Content-Type: text/html;
 	charset=utf-8
 Content-Transfer-Encoding: quoted-printable
 
 <html><head><meta http-equiv=3D"content-type" content=3D"text/html; charset=3D=
 utf-8"></head><body dir=3D"auto"><div><font color=3D"#000000"><span style=3D=
 "caret-color: rgb(0, 0, 0); -webkit-text-size-adjust: auto;">Thank you for a=
 pplying the patch.</span></font></div><div><font color=3D"#000000"><span sty=
 le=3D"caret-color: rgb(0, 0, 0); -webkit-text-size-adjust: auto;">Please pul=
 l-up to release branch.</span></font></div><div><font color=3D"#000000"><spa=
 n style=3D"caret-color: rgb(0, 0, 0); -webkit-text-size-adjust: auto;"><br><=
 /span></font></div><div><font color=3D"#000000"><span style=3D"caret-color: r=
 gb(0, 0, 0); -webkit-text-size-adjust: auto;">And, when ${TOOL_AWK} dumps co=
 re (but, less times than platform=E2=80=99s awk), then I use ${TOOL_GREP} be=
 fore ${TOOL_AWK} as following.</span></font></div><span style=3D"-webkit-tex=
 t-size-adjust: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);"><div><=
 span style=3D"-webkit-text-size-adjust: auto; caret-color: rgb(0, 0, 0); col=
 or: rgb(0, 0, 0);"><br></span></div><div><span style=3D"-webkit-text-size-ad=
 just: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);"><br></span></di=
 v>--- src/external/mit/xorg/xorg-pkg-ver.mk-110 &nbsp; &nbsp;2018-05-31 18:3=
 1:39.000000000&nbsp;</span><br style=3D"-webkit-text-size-adjust: auto; care=
 t-color: rgb(0, 0, 0); color: rgb(0, 0, 0);"><span style=3D"-webkit-text-siz=
 e-adjust: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);">+0900</span=
 ><br style=3D"-webkit-text-size-adjust: auto; caret-color: rgb(0, 0, 0); col=
 or: rgb(0, 0, 0);"><span style=3D"-webkit-text-size-adjust: auto; caret-colo=
 r: rgb(0, 0, 0); color: rgb(0, 0, 0);">+++ src/external/mit/xorg/xorg-pkg-ve=
 r.mk &nbsp; &nbsp;2024-03-31 22:52:57.865845014 +0900</span><br style=3D"-we=
 bkit-text-size-adjust: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);=
 "><span style=3D"-webkit-text-size-adjust: auto; caret-color: rgb(0, 0, 0); c=
 olor: rgb(0, 0, 0);">@@ -11,46 +11,50 @@</span><br style=3D"-webkit-text-siz=
 e-adjust: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);"><span style=
 =3D"-webkit-text-size-adjust: auto; caret-color: rgb(0, 0, 0); color: rgb(0,=
  0, 0);"></span><br style=3D"-webkit-text-size-adjust: auto; caret-color: rg=
 b(0, 0, 0); color: rgb(0, 0, 0);"><span style=3D"-webkit-text-size-adjust: a=
 uto; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);">.if exists(${X11SRCDIR=
 .${XORG_PKG_VER_PROG}}/configure)</span><br style=3D"-webkit-text-size-adjus=
 t: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);"><span style=3D"-we=
 bkit-text-size-adjust: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);=
 ">XORG_PKG_PACKAGE_VERSION!=3D \</span><br style=3D"-webkit-text-size-adjust=
 : auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);"><span style=3D"-web=
 kit-text-size-adjust: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);"=
 >+ &nbsp; &nbsp;${TOOL_GREP} ^PACKAGE_VERSION=3D ${X11SRCDIR.${XORG_PKG_VER_=
 PROG}}/configure&nbsp;</span><br style=3D"-webkit-text-size-adjust: auto; ca=
 ret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);"><span style=3D"-webkit-text-s=
 ize-adjust: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);">| &nbsp; &=
 nbsp;\</span><br style=3D"-webkit-text-size-adjust: auto; caret-color: rgb(0=
 , 0, 0); color: rgb(0, 0, 0);"><span style=3D"-webkit-text-size-adjust: auto=
 ; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);">&nbsp; &nbsp;${TOOL_AWK} -=
 F=3D '/^PACKAGE_VERSION=3D/ { &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;\</sp=
 an><br style=3D"-webkit-text-size-adjust: auto; caret-color: rgb(0, 0, 0); c=
 olor: rgb(0, 0, 0);"><span style=3D"-webkit-text-size-adjust: auto; caret-co=
 lor: rgb(0, 0, 0); color: rgb(0, 0, 0);">&nbsp; &nbsp; &nbsp;&nbsp;&nbsp;&nb=
 sp;match($$2, "([0-9]+\\.)+[0-9]+"); &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbs=
 p;\</span><br style=3D"-webkit-text-size-adjust: auto; caret-color: rgb(0, 0=
 , 0); color: rgb(0, 0, 0);"><span style=3D"-webkit-text-size-adjust: auto; c=
 aret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);">&nbsp; &nbsp; &nbsp;&nbsp;&n=
 bsp;&nbsp;version =3D substr($$2, RSTART, RLENGTH); &nbsp; &nbsp; &nbsp; &nb=
 sp;\</span><br style=3D"-webkit-text-size-adjust: auto; caret-color: rgb(0, 0=
 , 0); color: rgb(0, 0, 0);"><span style=3D"-webkit-text-size-adjust: auto; c=
 aret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);">&nbsp; &nbsp; &nbsp;&nbsp;&n=
 bsp;&nbsp;print version; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &n=
 bsp; &nbsp; &nbsp;\</span><br style=3D"-webkit-text-size-adjust: auto; caret=
 -color: rgb(0, 0, 0); color: rgb(0, 0, 0);"><span style=3D"-webkit-text-size=
 -adjust: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);">&nbsp; &nbsp=
 ; &nbsp;&nbsp;&nbsp;&nbsp;exit 0; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &=
 nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;\</span><br style=3D"-webkit-text-si=
 ze-adjust: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);"><span styl=
 e=3D"-webkit-text-size-adjust: auto; caret-color: rgb(0, 0, 0); color: rgb(0=
 , 0, 0);">- &nbsp; &nbsp;}' ${X11SRCDIR.${XORG_PKG_VER_PROG}}/configure</spa=
 n><br style=3D"-webkit-text-size-adjust: auto; caret-color: rgb(0, 0, 0); co=
 lor: rgb(0, 0, 0);"><span style=3D"-webkit-text-size-adjust: auto; caret-col=
 or: rgb(0, 0, 0); color: rgb(0, 0, 0);">+ &nbsp; &nbsp;}'</span><br style=3D=
 "-webkit-text-size-adjust: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0,=
  0);"><span style=3D"-webkit-text-size-adjust: auto; caret-color: rgb(0, 0, 0=
 ); color: rgb(0, 0, 0);">.if !empty(XORG_PKG_PACKAGE_VERSION)</span><br styl=
 e=3D"-webkit-text-size-adjust: auto; caret-color: rgb(0, 0, 0); color: rgb(0=
 , 0, 0);"><span style=3D"-webkit-text-size-adjust: auto; caret-color: rgb(0,=
  0, 0); color: rgb(0, 0, 0);">CPPFLAGS+=3D &nbsp; &nbsp;-DPACKAGE_VERSION=3D=
 \"${XORG_PKG_PACKAGE_VERSION:Q}\"</span><br style=3D"-webkit-text-size-adjus=
 t: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);"><span style=3D"-we=
 bkit-text-size-adjust: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);=
 ">CPPFLAGS+=3D &nbsp; &nbsp;-DVERSION=3D\"${XORG_PKG_PACKAGE_VERSION:q}\"</s=
 pan><br style=3D"-webkit-text-size-adjust: auto; caret-color: rgb(0, 0, 0); c=
 olor: rgb(0, 0, 0);"><span style=3D"-webkit-text-size-adjust: auto; caret-co=
 lor: rgb(0, 0, 0); color: rgb(0, 0, 0);">.endif</span><br style=3D"-webkit-t=
 ext-size-adjust: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);"><spa=
 n style=3D"-webkit-text-size-adjust: auto; caret-color: rgb(0, 0, 0); color:=
  rgb(0, 0, 0);"></span><br style=3D"-webkit-text-size-adjust: auto; caret-co=
 lor: rgb(0, 0, 0); color: rgb(0, 0, 0);"><span style=3D"-webkit-text-size-ad=
 just: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);">XORG_PKG_PACKAG=
 E_STRING!=3D \</span><br style=3D"-webkit-text-size-adjust: auto; caret-colo=
 r: rgb(0, 0, 0); color: rgb(0, 0, 0);"><span style=3D"-webkit-text-size-adju=
 st: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);">+ &nbsp; &nbsp;${=
 TOOL_GREP} ^PACKAGE_STRING=3D ${X11SRCDIR.${XORG_PKG_VER_PROG}}/configure&nb=
 sp;</span><br style=3D"-webkit-text-size-adjust: auto; caret-color: rgb(0, 0=
 , 0); color: rgb(0, 0, 0);"><span style=3D"-webkit-text-size-adjust: auto; c=
 aret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);">| &nbsp; &nbsp;\</span><br s=
 tyle=3D"-webkit-text-size-adjust: auto; caret-color: rgb(0, 0, 0); color: rg=
 b(0, 0, 0);"><span style=3D"-webkit-text-size-adjust: auto; caret-color: rgb=
 (0, 0, 0); color: rgb(0, 0, 0);">&nbsp; &nbsp;${TOOL_AWK} -F=3D '/^PACKAGE_S=
 TRING=3D/ { &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;\</span><br style=3D"-w=
 ebkit-text-size-adjust: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0)=
 ;"><span style=3D"-webkit-text-size-adjust: auto; caret-color: rgb(0, 0, 0);=
  color: rgb(0, 0, 0);">&nbsp; &nbsp; &nbsp;&nbsp;&nbsp;&nbsp;match($$2, "[-_=
 a-zA-Z]+[ &nbsp; &nbsp;]+([0-9]+\\.)+[0-9]+"); &nbsp; &nbsp;\</span><br styl=
 e=3D"-webkit-text-size-adjust: auto; caret-color: rgb(0, 0, 0); color: rgb(0=
 , 0, 0);"><span style=3D"-webkit-text-size-adjust: auto; caret-color: rgb(0,=
  0, 0); color: rgb(0, 0, 0);">&nbsp; &nbsp; &nbsp;&nbsp;&nbsp;&nbsp;string =3D=
  substr($$2, RSTART, RLENGTH); &nbsp; &nbsp; &nbsp; &nbsp;\</span><br style=3D=
 "-webkit-text-size-adjust: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0,=
  0);"><span style=3D"-webkit-text-size-adjust: auto; caret-color: rgb(0, 0, 0=
 ); color: rgb(0, 0, 0);">&nbsp; &nbsp; &nbsp;&nbsp;&nbsp;&nbsp;print string;=
  &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;\</spa=
 n><br style=3D"-webkit-text-size-adjust: auto; caret-color: rgb(0, 0, 0); co=
 lor: rgb(0, 0, 0);"><span style=3D"-webkit-text-size-adjust: auto; caret-col=
 or: rgb(0, 0, 0); color: rgb(0, 0, 0);">&nbsp; &nbsp; &nbsp;&nbsp;&nbsp;&nbs=
 p;exit 0; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nb=
 sp; &nbsp; &nbsp;\</span><br style=3D"-webkit-text-size-adjust: auto; caret-=
 color: rgb(0, 0, 0); color: rgb(0, 0, 0);"><span style=3D"-webkit-text-size-=
 adjust: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);">- &nbsp; &nbs=
 p;}' ${X11SRCDIR.${XORG_PKG_VER_PROG}}/configure</span><br style=3D"-webkit-=
 text-size-adjust: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);"><sp=
 an style=3D"-webkit-text-size-adjust: auto; caret-color: rgb(0, 0, 0); color=
 : rgb(0, 0, 0);">+ &nbsp; &nbsp;}'</span><br style=3D"-webkit-text-size-adju=
 st: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);"><span style=3D"-w=
 ebkit-text-size-adjust: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0)=
 ;">.if !empty(XORG_PKG_PACKAGE_STRING)</span><br style=3D"-webkit-text-size-=
 adjust: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);"><span style=3D=
 "-webkit-text-size-adjust: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0,=
  0);">CPPFLAGS+=3D &nbsp; &nbsp;-DPACKAGE_STRING=3D\"${XORG_PKG_PACKAGE_STRI=
 NG:Q}\"</span><br style=3D"-webkit-text-size-adjust: auto; caret-color: rgb(=
 0, 0, 0); color: rgb(0, 0, 0);"><span style=3D"-webkit-text-size-adjust: aut=
 o; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);">.endif</span><br style=3D=
 "-webkit-text-size-adjust: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0,=
  0);"><span style=3D"-webkit-text-size-adjust: auto; caret-color: rgb(0, 0, 0=
 ); color: rgb(0, 0, 0);"></span><br style=3D"-webkit-text-size-adjust: auto;=
  caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);"><span style=3D"-webkit-tex=
 t-size-adjust: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);">XORG_P=
 KG_PACKAGE_NAME!=3D \</span><br style=3D"-webkit-text-size-adjust: auto; car=
 et-color: rgb(0, 0, 0); color: rgb(0, 0, 0);"><span style=3D"-webkit-text-si=
 ze-adjust: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);">+ &nbsp; &=
 nbsp;${TOOL_GREP} ^PACKAGE_NAME=3D ${X11SRCDIR.${XORG_PKG_VER_PROG}}/configu=
 re | &nbsp; &nbsp;\</span><br style=3D"-webkit-text-size-adjust: auto; caret=
 -color: rgb(0, 0, 0); color: rgb(0, 0, 0);"><span style=3D"-webkit-text-size=
 -adjust: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);">&nbsp; &nbsp=
 ;${TOOL_AWK} -F=3D '/^PACKAGE_NAME=3D/ { &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &=
 nbsp;\</span><br style=3D"-webkit-text-size-adjust: auto; caret-color: rgb(0=
 , 0, 0); color: rgb(0, 0, 0);"><span style=3D"-webkit-text-size-adjust: auto=
 ; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);">&nbsp; &nbsp; &nbsp;&nbsp=
 ;&nbsp;&nbsp;match($$2, "[-_a-zA-Z0-9]+"); &nbsp; &nbsp; &nbsp; &nbsp; &nbsp=
 ; &nbsp;\</span><br style=3D"-webkit-text-size-adjust: auto; caret-color: rg=
 b(0, 0, 0); color: rgb(0, 0, 0);"><span style=3D"-webkit-text-size-adjust: a=
 uto; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);">&nbsp; &nbsp; &nbsp;&n=
 bsp;&nbsp;&nbsp;name =3D substr($$2, RSTART, RLENGTH); &nbsp; &nbsp; &nbsp; &=
 nbsp;\</span><br style=3D"-webkit-text-size-adjust: auto; caret-color: rgb(0=
 , 0, 0); color: rgb(0, 0, 0);"><span style=3D"-webkit-text-size-adjust: auto=
 ; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);">&nbsp; &nbsp; &nbsp;&nbsp=
 ;&nbsp;&nbsp;print name; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &n=
 bsp; &nbsp; &nbsp;\</span><br style=3D"-webkit-text-size-adjust: auto; caret=
 -color: rgb(0, 0, 0); color: rgb(0, 0, 0);"><span style=3D"-webkit-text-size=
 -adjust: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);">&nbsp; &nbsp=
 ; &nbsp;&nbsp;&nbsp;&nbsp;exit 0; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &=
 nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;\</span><br style=3D"-webkit-text-si=
 ze-adjust: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);"><span styl=
 e=3D"-webkit-text-size-adjust: auto; caret-color: rgb(0, 0, 0); color: rgb(0=
 , 0, 0);">- &nbsp; &nbsp;}' ${X11SRCDIR.${XORG_PKG_VER_PROG}}/configure</spa=
 n><br style=3D"-webkit-text-size-adjust: auto; caret-color: rgb(0, 0, 0); co=
 lor: rgb(0, 0, 0);"><span style=3D"-webkit-text-size-adjust: auto; caret-col=
 or: rgb(0, 0, 0); color: rgb(0, 0, 0);">+ &nbsp; &nbsp;}'</span><br style=3D=
 "-webkit-text-size-adjust: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0,=
  0);"><span style=3D"-webkit-text-size-adjust: auto; caret-color: rgb(0, 0, 0=
 ); color: rgb(0, 0, 0);">.if !empty(XORG_PKG_PACKAGE_NAME)</span><br style=3D=
 "-webkit-text-size-adjust: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0,=
  0);"><span style=3D"-webkit-text-size-adjust: auto; caret-color: rgb(0, 0, 0=
 ); color: rgb(0, 0, 0);">CPPFLAGS+=3D &nbsp; &nbsp;-DPACKAGE_NAME=3D\"${XORG=
 _PKG_PACKAGE_NAME:Q}\"</span><br style=3D"-webkit-text-size-adjust: auto; ca=
 ret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);"><span style=3D"-webkit-text-s=
 ize-adjust: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);">.endif</s=
 pan><br style=3D"-webkit-text-size-adjust: auto; caret-color: rgb(0, 0, 0); c=
 olor: rgb(0, 0, 0);"><span style=3D"-webkit-text-size-adjust: auto; caret-co=
 lor: rgb(0, 0, 0); color: rgb(0, 0, 0);"></span><br style=3D"-webkit-text-si=
 ze-adjust: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);"><span styl=
 e=3D"-webkit-text-size-adjust: auto; caret-color: rgb(0, 0, 0); color: rgb(0=
 , 0, 0);">XORG_PKG_RELEASE_DATE!=3D \</span><br style=3D"-webkit-text-size-a=
 djust: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);"><span style=3D=
 "-webkit-text-size-adjust: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0,=
  0);">+ &nbsp; &nbsp;${TOOL_GREP} ^RELEASE_DATE=3D ${X11SRCDIR.${XORG_PKG_VE=
 R_PROG}}/configure | &nbsp; &nbsp;\</span><br style=3D"-webkit-text-size-adj=
 ust: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);"><span style=3D"-=
 webkit-text-size-adjust: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0=
 );">&nbsp; &nbsp;${TOOL_AWK} -F=3D '/^RELEASE_DATE=3D/ { &nbsp; &nbsp; &nbsp=
 ; &nbsp; &nbsp; &nbsp;\</span><br style=3D"-webkit-text-size-adjust: auto; c=
 aret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);"><span style=3D"-webkit-text-=
 size-adjust: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);">&nbsp; &=
 nbsp; &nbsp;&nbsp;&nbsp;&nbsp;match($$2, "[-_a-zA-Z0-9]+"); &nbsp; &nbsp; &n=
 bsp; &nbsp; &nbsp; &nbsp;\</span><br style=3D"-webkit-text-size-adjust: auto=
 ; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);"><span style=3D"-webkit-te=
 xt-size-adjust: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);">&nbsp=
 ; &nbsp; &nbsp;&nbsp;&nbsp;&nbsp;name =3D substr($$2, RSTART, RLENGTH); &nbs=
 p; &nbsp; &nbsp; &nbsp;\</span><br style=3D"-webkit-text-size-adjust: auto; c=
 aret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);"><span style=3D"-webkit-text-=
 size-adjust: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);">&nbsp; &=
 nbsp; &nbsp;&nbsp;&nbsp;&nbsp;print name; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;=
  &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;\</span><br style=3D"-webkit-text-size-ad=
 just: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);"><span style=3D"=
 -webkit-text-size-adjust: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0=
 );">&nbsp; &nbsp; &nbsp;&nbsp;&nbsp;&nbsp;exit 0; &nbsp; &nbsp; &nbsp; &nbsp=
 ; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;\</span><br style=3D=
 "-webkit-text-size-adjust: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0,=
  0);"><span style=3D"-webkit-text-size-adjust: auto; caret-color: rgb(0, 0, 0=
 ); color: rgb(0, 0, 0);">- &nbsp; &nbsp;}' ${X11SRCDIR.${XORG_PKG_VER_PROG}}=
 /configure</span><br style=3D"-webkit-text-size-adjust: auto; caret-color: r=
 gb(0, 0, 0); color: rgb(0, 0, 0);"><span style=3D"-webkit-text-size-adjust: a=
 uto; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);">+ &nbsp; &nbsp;}'</spa=
 n><br style=3D"-webkit-text-size-adjust: auto; caret-color: rgb(0, 0, 0); co=
 lor: rgb(0, 0, 0);"><span style=3D"-webkit-text-size-adjust: auto; caret-col=
 or: rgb(0, 0, 0); color: rgb(0, 0, 0);">.if !empty(XORG_PKG_RELEASE_DATE)</s=
 pan><br style=3D"-webkit-text-size-adjust: auto; caret-color: rgb(0, 0, 0); c=
 olor: rgb(0, 0, 0);"><span style=3D"-webkit-text-size-adjust: auto; caret-co=
 lor: rgb(0, 0, 0); color: rgb(0, 0, 0);">CPPFLAGS+=3D &nbsp; &nbsp;-DRELEASE=
 _DATE=3D\"${XORG_PKG_RELEASE_DATE:Q}\"</span><br style=3D"-webkit-text-size-=
 adjust: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);"><span style=3D=
 "-webkit-text-size-adjust: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0,=
  0);">.endif</span><br style=3D"-webkit-text-size-adjust: auto; caret-color:=
  rgb(0, 0, 0); color: rgb(0, 0, 0);"><span style=3D"-webkit-text-size-adjust=
 : auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);">--- src/share/mk/bs=
 d.x11.mk-114525 &nbsp; &nbsp;2023-12-01 12:32:41.555622511 +0900</span><br s=
 tyle=3D"-webkit-text-size-adjust: auto; caret-color: rgb(0, 0, 0); color: rg=
 b(0, 0, 0);"><span style=3D"-webkit-text-size-adjust: auto; caret-color: rgb=
 (0, 0, 0); color: rgb(0, 0, 0);">+++ src/share/mk/bsd.x11.mk &nbsp; &nbsp;20=
 24-03-31 23:31:32.244541090 +0900</span><br style=3D"-webkit-text-size-adjus=
 t: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);"><span style=3D"-we=
 bkit-text-size-adjust: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);=
 ">@@ -274,8 +274,9 @@</span><br style=3D"-webkit-text-size-adjust: auto; car=
 et-color: rgb(0, 0, 0); color: rgb(0, 0, 0);"><span style=3D"-webkit-text-si=
 ze-adjust: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);">&nbsp; &nb=
 sp;if [ -n '${PKGCONFIG_VERSION.${.PREFIX}}' ]; then \</span><br style=3D"-w=
 ebkit-text-size-adjust: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0)=
 ;"><span style=3D"-webkit-text-size-adjust: auto; caret-color: rgb(0, 0, 0);=
  color: rgb(0, 0, 0);">&nbsp; &nbsp; &nbsp; &nbsp;_pkg_version=3D'${PKGCONFI=
 G_VERSION.${.PREFIX}}'; \</span><br style=3D"-webkit-text-size-adjust: auto;=
  caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);"><span style=3D"-webkit-tex=
 t-size-adjust: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);">&nbsp;=
  &nbsp;else \</span><br style=3D"-webkit-text-size-adjust: auto; caret-color=
 : rgb(0, 0, 0); color: rgb(0, 0, 0);"><span style=3D"-webkit-text-size-adjus=
 t: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);">- &nbsp; &nbsp; &n=
 bsp; &nbsp;_pkg_version=3D$$(${PRINT_PACKAGE_VERSION} \</span><br style=3D"-=
 webkit-text-size-adjust: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0=
 );"><span style=3D"-webkit-text-size-adjust: auto; caret-color: rgb(0, 0, 0)=
 ; color: rgb(0, 0, 0);">- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;&nbsp;&nbsp;${PK=
 GDIST.${.PREFIX}}/configure); \</span><br style=3D"-webkit-text-size-adjust:=
  auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);"><span style=3D"-webk=
 it-text-size-adjust: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);">=
 + &nbsp; &nbsp; &nbsp; &nbsp;_pkg_version=3D$$(${TOOL_GREP} ^PACKAGE_VERSION=
 =3D \</span><br style=3D"-webkit-text-size-adjust: auto; caret-color: rgb(0,=
  0, 0); color: rgb(0, 0, 0);"><span style=3D"-webkit-text-size-adjust: auto;=
  caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);">+ &nbsp; &nbsp; &nbsp; &nb=
 sp; &nbsp;&nbsp;&nbsp;${PKGDIST.${.PREFIX}}/configure | &nbsp; &nbsp;\</span=
 ><br style=3D"-webkit-text-size-adjust: auto; caret-color: rgb(0, 0, 0); col=
 or: rgb(0, 0, 0);"><span style=3D"-webkit-text-size-adjust: auto; caret-colo=
 r: rgb(0, 0, 0); color: rgb(0, 0, 0);">+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;&=
 nbsp;&nbsp;${PRINT_PACKAGE_VERSION}); &nbsp; &nbsp;\</span><br style=3D"-web=
 kit-text-size-adjust: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);"=
 ><span style=3D"-webkit-text-size-adjust: auto; caret-color: rgb(0, 0, 0); c=
 olor: rgb(0, 0, 0);">&nbsp; &nbsp;fi; \</span><br style=3D"-webkit-text-size=
 -adjust: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);"><span style=3D=
 "-webkit-text-size-adjust: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0,=
  0);">&nbsp; &nbsp;${TOOL_SED} \</span><br style=3D"-webkit-text-size-adjust=
 : auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);"><span style=3D"-web=
 kit-text-size-adjust: auto; caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);"=
 >&nbsp; &nbsp; &nbsp; &nbsp;${PKGCONFIG_SED_FLAGS} \</span><br><br><div dir=3D=
 "ltr"><span style=3D"background-color: rgba(255, 255, 255, 0);">--&nbsp;</sp=
 an><div><span style=3D"background-color: rgba(255, 255, 255, 0);">Kouichi Ha=
 shikawa</span></div></div></body></html>=
 
 --Apple-Mail-564113F2-2506-49B1-9DA1-18E32EB8E76B--
 



Home | Main Index | Thread Index | Old Index