Use pkg-config to find libXft, not xft-config, as xft-config has

disappeared from recent libXft. Fixes the native X build.

(XXX: will this break the build for really old libXft? Does this need
to learn to use both?)

3 files changed, 42 insertions, 4 deletions

diff --git a/x11/efltk/distinfo b/x11/efltk/distinfo
index 2d09fda78d0..b4bfc61d1e2 100644
--- a/x11/efltk/distinfo
+++ b/x11/efltk/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2011/10/02 03:44:10 dholland Exp $
+$NetBSD: distinfo,v 1.8 2011/10/09 06:40:38 dholland Exp $
 
 SHA1 (efltk-2.0.5.tar.bz2) = 26f7124b384d0bfe3d28a73cbdf0111432b08d99
 RMD160 (efltk-2.0.5.tar.bz2) = 7efa711d0df8a01ee402e1866286265d294778e8
@@ -10,7 +10,8 @@ SHA1 (patch-ad) = 41911884bc0eaa6a4de869b90d62c9ee27d1908b
 SHA1 (patch-ae) = 45f32b9d098736443a3d9b405b6fe17da624d9fc
 SHA1 (patch-af) = 2fe44ea57e0579dcfa43ba597e52161c70f67efd
 SHA1 (patch-ag) = 29799b2b0aeffbca82dbc98cb1e06eb62a7e595a
-SHA1 (patch-ah) = 63bacecefa0cece0cbcbf229c886231f2907c0a8
+SHA1 (patch-ah) = 32768bef3acc3e19b151fbfb87ad63d34cd2ec09
+SHA1 (patch-configure_in) = 4d5fad7b0b89e80f6a4e4958a3bdc3c6de572bd5
 SHA1 (patch-efltk_Fl__Flags_h) = 589ea469042b1271cc9591680f55db6858025db2
 SHA1 (patch-efltk_Fl__Int__List_h) = 766ae82ee67a90def27e0882b815e918b8cc6ca3
 SHA1 (patch-efltk_Fl__Text__Buffer.h) = 16eb6b48d0f06ac0f2074a0b61a782db7757663e
diff --git a/x11/efltk/patches/patch-ah b/x11/efltk/patches/patch-ah
index 02b4b7ff17c..b83b5b3b78f 100644
--- a/x11/efltk/patches/patch-ah
+++ b/x11/efltk/patches/patch-ah
@@ -1,7 +1,25 @@
-$NetBSD: patch-ah,v 1.2 2006/03/08 11:29:50 joerg Exp $
+$NetBSD: patch-ah,v 1.3 2011/10/09 06:40:38 dholland Exp $
 
---- configure.orig	2006-02-18 14:10:57.000000000 +0000
+- use pkg-config to find libXft, not xft-config, as xft-config has
+disappeared from recent libXft. (XXX: will this break the build for
+really old libXft? Does this need to learn to use both?)
+
+- use proper pthreads. (warning: this change is not reflected in
+the configure.in patch)
+
+--- configure.orig	2005-04-29 16:31:42.000000000 +0000
 +++ configure
+@@ -5513,8 +5513,8 @@ if test "${enable_xft+set}" = set; then
+ #define USE_XFT 1
+ _ACEOF
+ 
+-	LDLIBS="$LDLIBS `xft-config --libs`"
+-        CXXFLAGS="$CXXFLAGS `xft-config --cflags`"
++	LDLIBS="$LDLIBS `pkg-config --libs xft`"
++        CXXFLAGS="$CXXFLAGS `pkg-config --cflags xft`"
+ fi
+ fi;
+ 
 @@ -8295,13 +8295,13 @@ if test $ac_cv_lib_c_pthread_create = ye
    \
       have_pthread=yes
diff --git a/x11/efltk/patches/patch-configure_in b/x11/efltk/patches/patch-configure_in
new file mode 100644
index 00000000000..c3bea7ac4d9
--- /dev/null
+++ b/x11/efltk/patches/patch-configure_in
@@ -0,0 +1,19 @@
+$NetBSD: patch-configure_in,v 1.1 2011/10/09 06:40:38 dholland Exp $
+
+- use pkg-config to find libXft, not xft-config, as xft-config has
+disappeared from recent libXft. (XXX: will this break the build for
+really old libXft? Does this need to learn to use both?)
+
+--- configure.in~	2005-04-29 16:13:18.000000000 +0000
++++ configure.in
+@@ -147,8 +147,8 @@ fi])
+ 
+ AC_ARG_ENABLE(xft, [  --enable-xft            enable XWindow XFT extension],[if eval "test x$enable_xft = xyes"; then
+ 	AC_DEFINE(USE_XFT)
+-	LDLIBS="$LDLIBS `xft-config --libs`"
+-        CXXFLAGS="$CXXFLAGS `xft-config --cflags`"
++	LDLIBS="$LDLIBS `pkg-config --libs xft`"
++        CXXFLAGS="$CXXFLAGS `pkg-config --cflags xft`"
+ fi])
+ 
+ AC_ARG_ENABLE(debug, [  --enable-debug          compile with debug rather than optimized],[if eval "test x$enable_debug = xyes"; then