head 1.2; access; symbols pkgsrc-2026Q1:1.2.0.118 pkgsrc-2026Q1-base:1.2 pkgsrc-2025Q4:1.2.0.116 pkgsrc-2025Q4-base:1.2 pkgsrc-2025Q3:1.2.0.114 pkgsrc-2025Q3-base:1.2 pkgsrc-2025Q2:1.2.0.112 pkgsrc-2025Q2-base:1.2 pkgsrc-2025Q1:1.2.0.110 pkgsrc-2025Q1-base:1.2 pkgsrc-2024Q4:1.2.0.108 pkgsrc-2024Q4-base:1.2 pkgsrc-2024Q3:1.2.0.106 pkgsrc-2024Q3-base:1.2 pkgsrc-2024Q2:1.2.0.104 pkgsrc-2024Q2-base:1.2 pkgsrc-2024Q1:1.2.0.102 pkgsrc-2024Q1-base:1.2 pkgsrc-2023Q4:1.2.0.100 pkgsrc-2023Q4-base:1.2 pkgsrc-2023Q3:1.2.0.98 pkgsrc-2023Q3-base:1.2 pkgsrc-2023Q2:1.2.0.96 pkgsrc-2023Q2-base:1.2 pkgsrc-2023Q1:1.2.0.94 pkgsrc-2023Q1-base:1.2 pkgsrc-2022Q4:1.2.0.92 pkgsrc-2022Q4-base:1.2 pkgsrc-2022Q3:1.2.0.90 pkgsrc-2022Q3-base:1.2 pkgsrc-2022Q2:1.2.0.88 pkgsrc-2022Q2-base:1.2 pkgsrc-2022Q1:1.2.0.86 pkgsrc-2022Q1-base:1.2 pkgsrc-2021Q4:1.2.0.84 pkgsrc-2021Q4-base:1.2 pkgsrc-2021Q3:1.2.0.82 pkgsrc-2021Q3-base:1.2 pkgsrc-2021Q2:1.2.0.80 pkgsrc-2021Q2-base:1.2 pkgsrc-2021Q1:1.2.0.78 pkgsrc-2021Q1-base:1.2 pkgsrc-2020Q4:1.2.0.76 pkgsrc-2020Q4-base:1.2 pkgsrc-2020Q3:1.2.0.74 pkgsrc-2020Q3-base:1.2 pkgsrc-2020Q2:1.2.0.70 pkgsrc-2020Q2-base:1.2 pkgsrc-2020Q1:1.2.0.50 pkgsrc-2020Q1-base:1.2 pkgsrc-2019Q4:1.2.0.72 pkgsrc-2019Q4-base:1.2 pkgsrc-2019Q3:1.2.0.68 pkgsrc-2019Q3-base:1.2 pkgsrc-2019Q2:1.2.0.66 pkgsrc-2019Q2-base:1.2 pkgsrc-2019Q1:1.2.0.64 pkgsrc-2019Q1-base:1.2 pkgsrc-2018Q4:1.2.0.62 pkgsrc-2018Q4-base:1.2 pkgsrc-2018Q3:1.2.0.60 pkgsrc-2018Q3-base:1.2 pkgsrc-2018Q2:1.2.0.58 pkgsrc-2018Q2-base:1.2 pkgsrc-2018Q1:1.2.0.56 pkgsrc-2018Q1-base:1.2 pkgsrc-2017Q4:1.2.0.54 pkgsrc-2017Q4-base:1.2 pkgsrc-2017Q3:1.2.0.52 pkgsrc-2017Q3-base:1.2 pkgsrc-2017Q2:1.2.0.48 pkgsrc-2017Q2-base:1.2 pkgsrc-2017Q1:1.2.0.46 pkgsrc-2017Q1-base:1.2 pkgsrc-2016Q4:1.2.0.44 pkgsrc-2016Q4-base:1.2 pkgsrc-2016Q3:1.2.0.42 pkgsrc-2016Q3-base:1.2 pkgsrc-2016Q2:1.2.0.40 pkgsrc-2016Q2-base:1.2 pkgsrc-2016Q1:1.2.0.38 pkgsrc-2016Q1-base:1.2 pkgsrc-2015Q4:1.2.0.36 pkgsrc-2015Q4-base:1.2 pkgsrc-2015Q3:1.2.0.34 pkgsrc-2015Q3-base:1.2 pkgsrc-2015Q2:1.2.0.32 pkgsrc-2015Q2-base:1.2 pkgsrc-2015Q1:1.2.0.30 pkgsrc-2015Q1-base:1.2 pkgsrc-2014Q4:1.2.0.28 pkgsrc-2014Q4-base:1.2 pkgsrc-2014Q3:1.2.0.26 pkgsrc-2014Q3-base:1.2 pkgsrc-2014Q2:1.2.0.24 pkgsrc-2014Q2-base:1.2 pkgsrc-2014Q1:1.2.0.22 pkgsrc-2014Q1-base:1.2 pkgsrc-2013Q4:1.2.0.20 pkgsrc-2013Q4-base:1.2 pkgsrc-2013Q3:1.2.0.18 pkgsrc-2013Q3-base:1.2 pkgsrc-2013Q2:1.2.0.16 pkgsrc-2013Q2-base:1.2 pkgsrc-2013Q1:1.2.0.14 pkgsrc-2013Q1-base:1.2 pkgsrc-2012Q4:1.2.0.12 pkgsrc-2012Q4-base:1.2 pkgsrc-2012Q3:1.2.0.10 pkgsrc-2012Q3-base:1.2 pkgsrc-2012Q2:1.2.0.8 pkgsrc-2012Q2-base:1.2 pkgsrc-2012Q1:1.2.0.6 pkgsrc-2012Q1-base:1.2 pkgsrc-2011Q4:1.2.0.4 pkgsrc-2011Q4-base:1.2 pkgsrc-2011Q3:1.2.0.2; locks; strict; comment @# @; 1.2 date 2011.10.09.06.48.00; author dholland; state Exp; branches 1.2.2.1; next 1.1; 1.1 date 2011.10.09.06.40.38; author dholland; state Exp; branches; next ; 1.2.2.1 date 2011.10.09.06.48.00; author tron; state dead; branches; next 1.2.2.2; 1.2.2.2 date 2011.10.11.07.35.50; author tron; state Exp; branches; next ; desc @@ 1.2 log @Vacuous commit because I think I screwed things up... @ text @$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 @ 1.2.2.1 log @file patch-configure_in was added on branch pkgsrc-2011Q3 on 2011-10-11 07:35:50 +0000 @ text @d1 19 @ 1.2.2.2 log @Pullup ticket #3546 - requested by dholland x11/efltk: build fix Revisions pulled up: - x11/efltk/Makefile 1.22 - x11/efltk/distinfo 1.8-1.9 - x11/efltk/patches/patch-ah 1.3 - x11/efltk/patches/patch-configure_in 1.1 - x11/efltk/patches/patch-efltk_Fl__Int__List_h 1.2 - x11/efltk/patches/patch-efltk_db_Fl__Params_h 1.2 - x11/efltk/patches/patch-src_widgets_Fl__Calendar_cpp 1.2 - x11/efltk/patches/patch-src_widgets_Fl__Input_cpp 1.2 - x11/efltk/patches/patch-src_widgets_Fl__Text__Editor_cpp 1.2 --- Module Name: pkgsrc Committed By: dholland Date: Sun Oct 9 06:40:39 UTC 2011 Modified Files: pkgsrc/x11/efltk: distinfo pkgsrc/x11/efltk/patches: patch-ah Added Files: pkgsrc/x11/efltk/patches: patch-configure_in Log Message: 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?) --- Module Name: pkgsrc Committed By: dholland Date: Sun Oct 9 07:00:43 UTC 2011 Modified Files: pkgsrc/x11/efltk: Makefile Log Message: Oops, forgot to add pkg-config to USE_TOOLS --- Module Name: pkgsrc Committed By: dholland Date: Tue Oct 11 00:29:41 UTC 2011 Modified Files: pkgsrc/x11/efltk: distinfo pkgsrc/x11/efltk/patches: patch-efltk_Fl__Int__List_h patch-efltk_db_Fl__Params_h patch-src_widgets_Fl__Calendar_cpp patch-src_widgets_Fl__Input_cpp patch-src_widgets_Fl__Text__Editor_cpp Log Message: PR 45258 strikes again. Really fix build this time. @ text @a0 19 $NetBSD$ - 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 @ 1.1 log @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?) @ text @d1 1 a1 1 $NetBSD$ @