CVS commit: pkgsrc/editors/pluma/patches

["David H. Gutteridge" <gutteridge%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gutteridge
Date:           Wed Mar  6 08:19:15 UTC 2019

Modified Files:
        pkgsrc/editors/pluma/patches: patch-configure

Log Message:
pluma: reflect revised patch-configure

Missed in previous update. Ride update.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/editors/pluma/patches/patch-configure

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/editors/pluma/patches/patch-configure
diff -u pkgsrc/editors/pluma/patches/patch-configure:1.1 pkgsrc/editors/pluma/patches/patch-configure:1.2
--- pkgsrc/editors/pluma/patches/patch-configure:1.1    Fri Nov 16 19:01:25 2018
+++ pkgsrc/editors/pluma/patches/patch-configure        Wed Mar  6 08:19:15 2019
@@ -1,4 +1,4 @@
-$NetBSD: patch-configure,v 1.1 2018/11/16 19:01:25 bsiegert Exp $
+$NetBSD: patch-configure,v 1.2 2019/03/06 08:19:15 gutteridge Exp $
 
 Allow use of enchant-2.
 
@@ -8,52 +8,8 @@ Allow use of enchant-2.
  fi
  
  
--ENCHANT_REQUIRED=1.2.0
+-ENCHANT_REQUIRED=1.6.0
 +ENCHANT_REQUIRED=2.0.0
  ISO_CODES_REQUIRED=0.35
  
  # Check whether --enable-spell was given.
-@@ -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