CVS commit: pkgsrc/textproc/hfstospell

["Makoto Fujiwara" <mef%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   mef
Date:           Fri Jan 15 14:33:52 UTC 2021

Modified Files:
        pkgsrc/textproc/hfstospell: distinfo
        pkgsrc/textproc/hfstospell/patches: patch-configure

Log Message:
(textproc/hfstospell) fix patch stage problem after autoconf updated to 2.70

This package has pre-patch configure. Since autoconf updated, patch should
be adjusted.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/textproc/hfstospell/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/textproc/hfstospell/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/textproc/hfstospell/distinfo
diff -u pkgsrc/textproc/hfstospell/distinfo:1.3 pkgsrc/textproc/hfstospell/distinfo:1.4
--- pkgsrc/textproc/hfstospell/distinfo:1.3     Thu Oct 15 19:22:23 2020
+++ pkgsrc/textproc/hfstospell/distinfo Fri Jan 15 14:33:52 2021
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.3 2020/10/15 19:22:23 bsiegert Exp $
+$NetBSD: distinfo,v 1.4 2021/01/15 14:33:52 mef Exp $
 
 SHA1 (hfstospell-0.5.2.tar.gz) = 658813a5a8fc6eff8e9c143c104dec725dc5e891
 RMD160 (hfstospell-0.5.2.tar.gz) = eb1ffe240f9c11aa09453d2dff48e316a087d208
 SHA512 (hfstospell-0.5.2.tar.gz) = 307aff3aec91ac6ffed3ebabdc2baa1a6e913431f57a80a0d0254be57fbd72e28d7592c35e0d72e5979f7e0b4c585f11b8eb91183b0877f9670a9cd5206c0140
 Size (hfstospell-0.5.2.tar.gz) = 152115 bytes
-SHA1 (patch-configure) = 5424cfe46d254db820da8cc1a05e443125623572
+SHA1 (patch-configure) = a6a4aa1180ba97808014bfff2760375b5f077c89

Index: pkgsrc/textproc/hfstospell/patches/patch-configure
diff -u pkgsrc/textproc/hfstospell/patches/patch-configure:1.1 pkgsrc/textproc/hfstospell/patches/patch-configure:1.2
--- pkgsrc/textproc/hfstospell/patches/patch-configure:1.1      Thu May 14 19:04:51 2020
+++ pkgsrc/textproc/hfstospell/patches/patch-configure  Fri Jan 15 14:33:52 2021
@@ -1,20 +1,21 @@
-$NetBSD: patch-configure,v 1.1 2020/05/14 19:04:51 joerg Exp $
+$NetBSD: patch-configure,v 1.2 2021/01/15 14:33:52 mef Exp $
 
 Let's not force C++20 when the libxml++ dependency can't deal with it.
 
---- configure.orig     2018-10-15 11:35:17.000000000 +0000
-+++ configure
-@@ -18472,14 +18472,14 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS 
+--- configure.orig     2021-01-15 23:14:58.236623702 +0900
++++ configure  2021-01-15 23:22:01.601329062 +0900
+@@ -19482,15 +19482,15 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS 
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
  
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C++ compiler accepts -std=c++20" >&5
--$as_echo_n "checking whether C++ compiler accepts -std=c++20... " >&6; }
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C++ compiler accepts -std=c++14" >&5
-+$as_echo_n "checking whether C++ compiler accepts -std=c++14... " >&6; }
- if ${ax_cv_check_cxxflags___std_cpp20+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
+-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C++ compiler accepts -std=c++20" >&5
+-printf %s "checking whether C++ compiler accepts -std=c++20... " >&6; }
++{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C++ compiler accepts -std=c++14" >&5
++printf %s "checking whether C++ compiler accepts -std=c++14... " >&6; }
+ if test ${ax_cv_check_cxxflags___std_cpp20+y}
+ then :
+   printf %s "(cached) " >&6
+ else $as_nop
  
    ax_check_save_flags=$CXXFLAGS
 -  CXXFLAGS="$CXXFLAGS  -std=c++20"
@@ -22,26 +23,27 @@ Let's not force C++20 when the libxml++ 
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
-@@ -18502,7 +18502,7 @@ fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cxxflags___std_cpp20" >&5
- $as_echo "$ax_cv_check_cxxflags___std_cpp20" >&6; }
- if test x"$ax_cv_check_cxxflags___std_cpp20" = xyes; then :
+@@ -19515,7 +19515,7 @@ fi
+ printf "%s\n" "$ax_cv_check_cxxflags___std_cpp20" >&6; }
+ if test x"$ax_cv_check_cxxflags___std_cpp20" = xyes
+ then :
 -  CXXFLAGS="$CXXFLAGS -std=c++20"
 +  CXXFLAGS="$CXXFLAGS -std=c++14"
- else
+ else $as_nop
  
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C++ compiler accepts -std=c++2a" >&5
-@@ -18538,14 +18538,14 @@ if test x"$ax_cv_check_cxxflags___std_cp
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C++ compiler accepts -std=c++2a" >&5
+@@ -19554,15 +19554,15 @@ then :
    CXXFLAGS="$CXXFLAGS -std=c++2a"
- else
+ else $as_nop
  
--  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C++ compiler accepts -std=c++17" >&5
--$as_echo_n "checking whether C++ compiler accepts -std=c++17... " >&6; }
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C++ compiler accepts -std=c++14" >&5
-+$as_echo_n "checking whether C++ compiler accepts -std=c++14... " >&6; }
- if ${ax_cv_check_cxxflags___std_cpp17+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
+-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C++ compiler accepts -std=c++17" >&5
+-printf %s "checking whether C++ compiler accepts -std=c++17... " >&6; }
++  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C++ compiler accepts -std=c++14" >&5
++printf %s "checking whether C++ compiler accepts -std=c++14... " >&6; }
+ if test ${ax_cv_check_cxxflags___std_cpp17+y}
+ then :
+   printf %s "(cached) " >&6
+ else $as_nop
  
    ax_check_save_flags=$CXXFLAGS
 -  CXXFLAGS="$CXXFLAGS  -std=c++17"
@@ -49,34 +51,21 @@ Let's not force C++20 when the libxml++ 
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
-@@ -18568,17 +18568,17 @@ fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cxxflags___std_cpp17" >&5
- $as_echo "$ax_cv_check_cxxflags___std_cpp17" >&6; }
- if test x"$ax_cv_check_cxxflags___std_cpp17" = xyes; then :
+@@ -19587,7 +19587,7 @@ fi
+ printf "%s\n" "$ax_cv_check_cxxflags___std_cpp17" >&6; }
+ if test x"$ax_cv_check_cxxflags___std_cpp17" = xyes
+ then :
 -  CXXFLAGS="$CXXFLAGS -std=c++17"
 +  CXXFLAGS="$CXXFLAGS -std=c++14"
- else
+ else $as_nop
  
--   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C++ compiler accepts -std=c++1z" >&5
--$as_echo_n "checking whether C++ compiler accepts -std=c++1z... " >&6; }
-+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C++ compiler accepts -std=c++14" >&5
-+$as_echo_n "checking whether C++ compiler accepts -std=c++14... " >&6; }
- if ${ax_cv_check_cxxflags___std_cpp1z+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
- 
-   ax_check_save_flags=$CXXFLAGS
--  CXXFLAGS="$CXXFLAGS  -std=c++1z"
-+  CXXFLAGS="$CXXFLAGS  -std=c++14"
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
-@@ -18601,7 +18601,7 @@ fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cxxflags___std_cpp1z" >&5
- $as_echo "$ax_cv_check_cxxflags___std_cpp1z" >&6; }
- if test x"$ax_cv_check_cxxflags___std_cpp1z" = xyes; then :
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C++ compiler accepts -std=c++1z" >&5
+@@ -19623,7 +19623,7 @@ fi
+ printf "%s\n" "$ax_cv_check_cxxflags___std_cpp1z" >&6; }
+ if test x"$ax_cv_check_cxxflags___std_cpp1z" = xyes
+ then :
 -  CXXFLAGS="$CXXFLAGS -std=c++1z"
 +  CXXFLAGS="$CXXFLAGS -std=c++14"
- else
+ else $as_nop
  
-     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C++ compiler accepts -std=c++14" >&5
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C++ compiler accepts -std=c++14" >&5