Re: pkg/51360: devel/pkgconf: should handle ${X11BASE}/lib/pkgconfig

[Kimihiro Nonaka <nonakap%gmail.com@localhost>]

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

From: Kimihiro Nonaka <nonakap%gmail.com@localhost>
To: "gnats-bugs%netbsd.org@localhost" <gnats-bugs%netbsd.org@localhost>
Cc: pkg-manager%netbsd.org@localhost, "gnats-admin%netbsd.org@localhost" <gnats-admin%netbsd.org@localhost>, pkgsrc-bugs%netbsd.org@localhost
Subject: Re: pkg/51360: devel/pkgconf: should handle ${X11BASE}/lib/pkgconfig
Date: Wed, 27 Jul 2016 11:27:49 +0900

 2016-07-27 5:05 GMT+09:00 Thomas Klausner <wiz%netbsd.org@localhost>:
 
 > The following reply was made to PR pkg/51360; it has been noted by GNATS.
 >
 > From: Thomas Klausner <wiz%NetBSD.org@localhost>
 > To: NetBSD bugtracking <gnats-bugs%NetBSD.org@localhost>
 > Cc:
 > Subject: Re: pkg/51360: devel/pkgconf: should handle ${X11BASE}/lib/pkgconfig
 > Date: Tue, 26 Jul 2016 22:04:19 +0200
 >
 >  On Tue, Jul 26, 2016 at 02:30:00PM +0000, nonakap%gmail.com@localhost wrote:
 >  > >Fix:
 >  > Please add ${X11BASE}/lib/pkgconfig to --with-pkg-config-dir like devel/pkg-config.
 >
 >  Fine with me.
 >
 >  Can you do it like pkg-config/Makefile does it, or should someone else
 >  do it?
 
 Index: Makefile
 ===================================================================
 RCS file: /cvsroot/pkgsrc/devel/pkgconf/Makefile,v
 retrieving revision 1.6
 diff -u -p -r1.6 Makefile
 --- Makefile    4 Feb 2016 11:50:54 -0000    1.6
 +++ Makefile    27 Jul 2016 02:27:09 -0000
 @@ -15,12 +15,23 @@ CONFLICTS+=    pkg-config-[0-9]*
 
  WRKSRC=        ${WRKDIR}/pkgconf-1.0
 
 +.include "../../mk/bsd.prefs.mk"
 +
  GNU_CONFIGURE=    yes
 -CONFIGURE_ARGS=
 --with-pkg-config-dir=${PREFIX}/lib/pkgconfig:${PREFIX}/share/pkgconfig:/usr/lib/pkgconfig
 \
 -        --with-system-libdir=/usr/lib \
 +CONFIGURE_ARGS=    --with-system-libdir=/usr/lib \
          --with-system-includedir=/usr/include
  MAKE_FLAGS+=    MANDIR=${PREFIX}/${PKGMANDIR}/man1
 
 +PKGCONFIG_PATHS=    ${PREFIX}/lib/pkgconfig
 +PKGCONFIG_PATHS+=    ${PREFIX}/share/pkgconfig
 +PKGCONFIG_PATHS+=    /usr/lib/pkgconfig
 +
 +.if ${LOCALBASE} != ${X11BASE}
 +PKGCONFIG_PATHS+=    ${X11BASE}/lib/pkgconfig
 +.endif
 +
 +CONFIGURE_ARGS+=    --with-pkg-config-dir='${PKGCONFIG_PATHS:ts::Q}'
 +
  post-install:
      ${LN} -s ${PREFIX}/bin/pkgconf ${DESTDIR}${PREFIX}/bin/pkg-config
 
 
 Regards,
 -- 
 Kimihiro Nonaka