Re: CVS commit: pkgsrc/devel/pango

[Amitai Schlair <schmonz%schmonz.com@localhost>]

On Sun, Feb 24, 2013 at 12:53 PM, Thomas Klausner <wiz%netbsd.org@localhost> 
wrote:

> On Sun, Feb 24, 2013 at 03:58:17PM +0000, Amitai Schlair wrote:
>> Module Name:  pkgsrc
>> Committed By: schmonz
>> Date:         Sun Feb 24 15:58:16 UTC 2013
>>
>> Modified Files:
>>       pkgsrc/devel/pango: Makefile
>>
>> Log Message:
>> On OS X 10.6.8, configure finds the native xft and builds against
>> it; judging by the PLIST, that's unintended. Tell configure to stop.
>
> Well, then please only do that for OS X -- this commit broke NetBSD:

Nuts, I'd been grepping the wrong PLIST altogether. Sorry about the
mistake. OS X is happy with this diff (both with and without the x11
option). Can you verify for NetBSD and commit if so?

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/devel/pango/Makefile,v
retrieving revision 1.177
diff -u -r1.177 Makefile
--- Makefile    24 Feb 2013 15:58:16 -0000      1.177
+++ Makefile    24 Feb 2013 18:17:32 -0000
@@ -21,7 +21,6 @@
 USE_TOOLS+=            gmake pkg-config
 GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --sysconfdir=${PREFIX}/libdata
-CONFIGURE_ARGS+=       --without-xft
 # Carbon has been obsoleted; force turning it off
 #CONFIGURE_ENV+=               ac_cv_header_Carbon_Carbon_h=no

@@ -49,8 +48,6 @@

 .if ${OPSYS} == "Darwin"
 PLIST.coretext=                yes
-.else
-BUILDLINK_API_DEPENDS.Xft2+=   Xft2>=2.1.7nb3
 .endif

 BUILDLINK_API_DEPENDS.glib2+=  glib2>=2.32.1
Index: options.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/pango/options.mk,v
retrieving revision 1.11
diff -u -r1.11 options.mk
--- options.mk  3 Feb 2012 22:03:34 -0000       1.11
+++ options.mk  24 Feb 2013 18:17:32 -0000
@@ -15,6 +15,7 @@
 # fix for pangox.pc
 CONFIGURE_ENV+=                
X_EXTRA_LIBS=${COMPILER_RPATH_FLAG}${X11BASE}/lib
 PLIST.x11=             yes
+BUILDLINK_API_DEPENDS.Xft2+=   Xft2>=2.1.7nb3
 .include "../../x11/libXft/buildlink3.mk"
 .include "../../x11/libXrender/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
@@ -22,6 +23,7 @@
 .include "../../x11/libXt/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=       --without-x
+CONFIGURE_ARGS+=       --without-xft
 .endif

 ###