svn commit: r424123 - in head/deskutils: py-spice-gtk spice-gtk spice-gtk/files

[Tijl Coosemans]

On Mon, 17 Oct 2016 12:03:44 -0500 John Marino <freebsd.contact at marino.st> wrote:
> On 10/17/2016 12:01, Mathieu Arnold wrote:
>> Le 17/10/2016 à 18:31, John Marino a écrit :  
>>> On 10/17/2016 11:28, Mathieu Arnold wrote:  
>>>> Le 17/10/2016 à 18:26, John Marino a écrit :  
>>>>> On 10/17/2016 11:20, Mathieu Arnold wrote:  
>>>>>> Le 17/10/2016 à 17:55, John Marino a écrit :  
>>>>>>> On 10/17/2016 10:52, Mathieu Arnold wrote:  
>>>>>>>> Le 17/10/2016 à 17:15, John Marino a écrit :  
>>>>>>>>>   Apparently USES=pathfix and USES=autoreconf can't be used
>>>>>>>>> together, so
>>>>>>>>>   the pkgconfig directory is now passed via MAKE_ARGS  
>>>>>>>>
>>>>>>>> That is mostly not true. What usage makes it so that they do not
>>>>>>>> work
>>>>>>>> together ?  
>>>>>>>
>>>>>>> The results suggest that "${WRKSRC}/configure" was modified, then
>>>>>>> autoreconf regenerated ${WRKSRC}/configure afterwards so that the
>>>>>>> pkgconfig path change was reverted.
>>>>>>>
>>>>>>> That's why I had to replace pathfix with MAKE_ARGS.  
>>>>>>
>>>>>> No, USES=pathfix changes the content of PATHFIX_MAKEFILEIN, which by
>>>>>> default, is Makefile.in. It won't change configure unless you set
>>>>>> PATHFIX_MAKEFILEIN=configure.
>>>>>>  
>>>>>
>>>>> Well, I didn't add MAKE_ARGS for fun.
>>>>> After adding USES+=autoreconf, the build broke.  pathfix was still in
>>>>> place.  You can reproduce by adding pathfix back before "python" and
>>>>> commenting out the new MAKE_ARGS line I added and check with
>>>>> "check-plist"   It's easy to confirm.  
>>>>
>>>> I never said your fix did not work or was not right, I said USES=pathfix
>>>> won't touch configure.
>>>>  
>>>
>>> Ah, that's the issue.  I misspoke.  I didn't mean "configure", I mean
>>> the Makefile all along.  So you agree in this case pathfix and
>>> autoreconf aren't compatible, right?  
>>
>> Not at all, if the file patched was Makefile.in, set
>> PATHFIX_MAKEFILEIN=Makefile.am and it will work.  
> 
> Okay, thanks, I learned something.
> I think the current approach is cleaner anyway though.

Allow me to repeat what I said barely two weeks ago:

Can't we just use lib/pkgconfig already?  Having to patch every port
to move it to libdata/pkgconfig is pointless extra work with zero benefit.
Nobody cares that these files are in libdata.

All it takes is this patch and then all pkgconfig hacks can gradually
disappear over time.

--- devel/pkgconf/Makefile      (revision 424106)
+++ devel/pkgconf/Makefile      (working copy)
@@ -16,7 +16,7 @@ GNU_CONFIGURE=        yes
 INSTALL_TARGET=        install-strip
 USE_LDCONFIG=  yes
 TEST_TARGET=   check
-CONFIGURE_ARGS=        --with-pkg-config-dir=${PREFIX}/libdata/pkgconfig:/usr/libdata/pkgconfig \
+CONFIGURE_ARGS=        --with-pkg-config-dir=${PREFIX}/lib/pkgconfig:${PREFIX}/libdata/pkgconfig:/usr/libdata/pkgconfig \
                --with-system-libdir=/usr/lib \
                --with-system-includedir=/usr/include
 MAKE_ARGS=     MANDIR="${MAN1PREFIX}/man/man1"