head 1.2; access; symbols pkgsrc-2026Q1:1.2.0.58 pkgsrc-2026Q1-base:1.2 pkgsrc-2025Q4:1.2.0.56 pkgsrc-2025Q4-base:1.2 pkgsrc-2025Q3:1.2.0.54 pkgsrc-2025Q3-base:1.2 pkgsrc-2025Q2:1.2.0.52 pkgsrc-2025Q2-base:1.2 pkgsrc-2025Q1:1.2.0.50 pkgsrc-2025Q1-base:1.2 pkgsrc-2024Q4:1.2.0.48 pkgsrc-2024Q4-base:1.2 pkgsrc-2024Q3:1.2.0.46 pkgsrc-2024Q3-base:1.2 pkgsrc-2024Q2:1.2.0.44 pkgsrc-2024Q2-base:1.2 pkgsrc-2024Q1:1.2.0.42 pkgsrc-2024Q1-base:1.2 pkgsrc-2023Q4:1.2.0.40 pkgsrc-2023Q4-base:1.2 pkgsrc-2023Q3:1.2.0.38 pkgsrc-2023Q3-base:1.2 pkgsrc-2023Q2:1.2.0.36 pkgsrc-2023Q2-base:1.2 pkgsrc-2023Q1:1.2.0.34 pkgsrc-2023Q1-base:1.2 pkgsrc-2022Q4:1.2.0.32 pkgsrc-2022Q4-base:1.2 pkgsrc-2022Q3:1.2.0.30 pkgsrc-2022Q3-base:1.2 pkgsrc-2022Q2:1.2.0.28 pkgsrc-2022Q2-base:1.2 pkgsrc-2022Q1:1.2.0.26 pkgsrc-2022Q1-base:1.2 pkgsrc-2021Q4:1.2.0.24 pkgsrc-2021Q4-base:1.2 pkgsrc-2021Q3:1.2.0.22 pkgsrc-2021Q3-base:1.2 pkgsrc-2021Q2:1.2.0.20 pkgsrc-2021Q2-base:1.2 pkgsrc-2021Q1:1.2.0.18 pkgsrc-2021Q1-base:1.2 pkgsrc-2020Q4:1.2.0.16 pkgsrc-2020Q4-base:1.2 pkgsrc-2020Q3:1.2.0.14 pkgsrc-2020Q3-base:1.2 pkgsrc-2020Q2:1.2.0.12 pkgsrc-2020Q2-base:1.2 pkgsrc-2020Q1:1.2.0.8 pkgsrc-2020Q1-base:1.2 pkgsrc-2019Q4:1.2.0.10 pkgsrc-2019Q4-base:1.2 pkgsrc-2019Q3:1.2.0.6 pkgsrc-2019Q3-base:1.2 pkgsrc-2019Q2:1.2.0.4 pkgsrc-2019Q2-base:1.2 pkgsrc-2019Q1:1.2.0.2 pkgsrc-2019Q1-base:1.2 pkgsrc-2018Q4:1.1.0.2 pkgsrc-2018Q4-base:1.1; locks; strict; comment @# @; 1.2 date 2019.03.06.08.19.15; author gutteridge; state Exp; branches; next 1.1; commitid clIqLpONz4rFqheB; 1.1 date 2018.11.16.19.01.25; author bsiegert; state Exp; branches; next ; commitid 7hXJaAt1olKfwc0B; desc @@ 1.2 log @pluma: reflect revised patch-configure Missed in previous update. Ride update. @ text @$NetBSD: patch-configure,v 1.1 2018/11/16 19:01:25 bsiegert Exp $ Allow use of enchant-2. --- configure.orig 2018-03-25 08:39:40.000000000 +0000 +++ configure @@@@ -14382,7 +14382,7 @@@@ $as_echo "#define ENABLE_GVFS_METADATA 1 fi -ENCHANT_REQUIRED=1.6.0 +ENCHANT_REQUIRED=2.0.0 ISO_CODES_REQUIRED=0.35 # Check whether --enable-spell was given. @ 1.1 log @Port pluma to use enchant2, bump revision. @ text @d1 1 a1 1 $NetBSD$ d11 1 a11 1 -ENCHANT_REQUIRED=1.2.0 a15 44 @@@@ -14404,12 +14404,12 @@@@ if test -n "$ENCHANT_CFLAGS"; then pkg_cv_ENCHANT_CFLAGS="$ENCHANT_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"enchant >= \$ENCHANT_REQUIRED\""; } >&5 - ($PKG_CONFIG --exists --print-errors "enchant >= $ENCHANT_REQUIRED") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"enchant-2 >= \$ENCHANT_REQUIRED\""; } >&5 + ($PKG_CONFIG --exists --print-errors "enchant-2 >= $ENCHANT_REQUIRED") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_ENCHANT_CFLAGS=`$PKG_CONFIG --cflags "enchant >= $ENCHANT_REQUIRED" 2>/dev/null` + pkg_cv_ENCHANT_CFLAGS=`$PKG_CONFIG --cflags "enchant-2 >= $ENCHANT_REQUIRED" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@@@ -14421,12 +14421,12 @@@@ if test -n "$ENCHANT_LIBS"; then pkg_cv_ENCHANT_LIBS="$ENCHANT_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"enchant >= \$ENCHANT_REQUIRED\""; } >&5 - ($PKG_CONFIG --exists --print-errors "enchant >= $ENCHANT_REQUIRED") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"enchant-2 >= \$ENCHANT_REQUIRED\""; } >&5 + ($PKG_CONFIG --exists --print-errors "enchant-2 >= $ENCHANT_REQUIRED") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_ENCHANT_LIBS=`$PKG_CONFIG --libs "enchant >= $ENCHANT_REQUIRED" 2>/dev/null` + pkg_cv_ENCHANT_LIBS=`$PKG_CONFIG --libs "enchant-2 >= $ENCHANT_REQUIRED" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@@@ -14447,9 +14447,9 @@@@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - ENCHANT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "enchant >= $ENCHANT_REQUIRED" 2>&1` + ENCHANT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "enchant-2 >= $ENCHANT_REQUIRED" 2>&1` else - ENCHANT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "enchant >= $ENCHANT_REQUIRED" 2>&1` + ENCHANT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "enchant-2 >= $ENCHANT_REQUIRED" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$ENCHANT_PKG_ERRORS" >&5 @