[pkgsrc/trunk]: pkgsrc/textproc/swath - Use github home URL now

[scole <scole%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/48a4971c26ed
branches:  trunk
changeset: 436978:48a4971c26ed
user:      scole <scole%pkgsrc.org@localhost>
date:      Thu Aug 13 16:22:40 2020 +0000

description:
- Use github home URL now
- Github changes from author to fix NetBSD's missing wcpcpy & wcpncpy

diffstat:

 textproc/swath/Makefile                        |  13 +++-
 textproc/swath/distinfo                        |  12 ++--
 textproc/swath/patches/patch-configure.ac      |  17 ++++++
 textproc/swath/patches/patch-src_filterrtf.cpp |  68 --------------------------
 4 files changed, 31 insertions(+), 79 deletions(-)

diffs (141 lines):

diff -r c56b4d696c00 -r 48a4971c26ed textproc/swath/Makefile
--- a/textproc/swath/Makefile   Thu Aug 13 15:29:56 2020 +0000
+++ b/textproc/swath/Makefile   Thu Aug 13 16:22:40 2020 +0000
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.7 2020/07/30 02:13:56 scole Exp $
+# $NetBSD: Makefile,v 1.8 2020/08/13 16:22:40 scole Exp $
 #
 
 DISTNAME=      swath-0.6.1
+PKGREVISION=   1
 CATEGORIES=    textproc
-MASTER_SITES=  ftp://linux.thai.net/pub/ThaiLinux/software/swath/
-MASTER_SITES+= http://linux.thai.net/pub/ThaiLinux/software/swath/
-EXTRACT_SUFX=  .tar.xz
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=tlwg/}
+GITHUB_TAG=    f5b0a9b804cc3f4a3d40f2de3d54a99d1c0a5643
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://linux.thai.net/projects/thailatex
@@ -15,7 +15,10 @@
 GNU_CONFIGURE= yes
 USE_LIBTOOL=   yes
 USE_LANGUAGES= c c++
-USE_TOOLS+=    gmake pkg-config
+USE_TOOLS=     gmake pkg-config sh aclocal autoconf automake
+
+pre-configure:
+       cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${SH} ./autogen.sh
 
 .include "../../devel/libdatrie/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r c56b4d696c00 -r 48a4971c26ed textproc/swath/distinfo
--- a/textproc/swath/distinfo   Thu Aug 13 15:29:56 2020 +0000
+++ b/textproc/swath/distinfo   Thu Aug 13 16:22:40 2020 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.4 2020/07/30 02:13:56 scole Exp $
+$NetBSD: distinfo,v 1.5 2020/08/13 16:22:40 scole Exp $
 
-SHA1 (swath-0.6.1.tar.xz) = a2c8ce01401220e36c4a9280a1791045382b38c5
-RMD160 (swath-0.6.1.tar.xz) = 4aaca89c33a0b4c84878ada6f4909dfc706ed45f
-SHA512 (swath-0.6.1.tar.xz) = 26f97dffe95ebb2089df54660992a22b3dd36fb3710daae49eea0f6b4de4f3de29f5ebed889dab314aba6f36da34a694baa2909bd2581c9c9293120c91c5c62b
-Size (swath-0.6.1.tar.xz) = 613236 bytes
-SHA1 (patch-src_filterrtf.cpp) = 58bdce561267080937300bded096c6b935afb47e
+SHA1 (swath-0.6.1-f5b0a9b804cc3f4a3d40f2de3d54a99d1c0a5643.tar.gz) = c14a6eb1d56a5b497a2b952a51a927cef7e99f7d
+RMD160 (swath-0.6.1-f5b0a9b804cc3f4a3d40f2de3d54a99d1c0a5643.tar.gz) = 3206eadd1f63a648ea0bb52bd4be5d9fe8fe598b
+SHA512 (swath-0.6.1-f5b0a9b804cc3f4a3d40f2de3d54a99d1c0a5643.tar.gz) = 75cd5409024a883ca393753ba39814be6a9a4d025aab8cc29a4d121564397a7ea1d294288dfa27077f3d8d3d075cd20b089e8cff85ce33e31e305874c1040151
+Size (swath-0.6.1-f5b0a9b804cc3f4a3d40f2de3d54a99d1c0a5643.tar.gz) = 594203 bytes
+SHA1 (patch-configure.ac) = 5938ef5fc87e3a7353f5c2a7777e97c7aa4088f4
diff -r c56b4d696c00 -r 48a4971c26ed textproc/swath/patches/patch-configure.ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/textproc/swath/patches/patch-configure.ac Thu Aug 13 16:22:40 2020 +0000
@@ -0,0 +1,17 @@
+$NetBSD: patch-configure.ac,v 1.1 2020/08/13 16:22:40 scole Exp $
+
+Remove git hub versioning info
+
+--- configure.ac.orig  2020-08-06 11:27:39.000000000 +0000
++++ configure.ac
+@@ -2,9 +2,7 @@ dnl Process this file with autoconf to p
+ 
+ AC_PREREQ(2.50)
+ 
+-AC_INIT(swath,
+-        m4_esyscmd([build-aux/git-version-gen]),
+-        [https://github.com/tlwg/swath/issues])
++AC_INIT([swath], [0.6.1nb1])
+ AC_CONFIG_SRCDIR([src/wordseg.cpp])
+ AC_CONFIG_MACRO_DIR([m4])
+ AC_CONFIG_LIBOBJ_DIR([lib])
diff -r c56b4d696c00 -r 48a4971c26ed textproc/swath/patches/patch-src_filterrtf.cpp
--- a/textproc/swath/patches/patch-src_filterrtf.cpp    Thu Aug 13 15:29:56 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,68 +0,0 @@
-$NetBSD: patch-src_filterrtf.cpp,v 1.1 2020/07/30 02:13:56 scole Exp $
-
-Use wchar functions available on NetBSD
-
---- src/filterrtf.cpp.orig     2018-08-14 05:33:16.000000000 +0000
-+++ src/filterrtf.cpp
-@@ -3,6 +3,7 @@
- //////////////////////////////////////////////////////////////////////
- #include <string.h>
- #include <ctype.h>
-+#include <wchar.h>
- #include <wctype.h>
- #include "filterrtf.h"
- #include "conv/utf8.h"
-@@ -109,7 +110,7 @@ FilterRTF::GetNextToken (wchar_t* token,
-     {
-       *thaiFlag = isThaiUni (strbuff[0]);
-       nCopy = min<int> (tokenSz - 1, wcslen (strbuff));
--      token = wcpncpy (token, strbuff, nCopy);
-+      token = wcsncpy (token, strbuff, nCopy);
-       *token = 0;
-       tokenSz -= nCopy;
-       wmemmove (strbuff, strbuff + nCopy, wcslen (strbuff + nCopy) + 1);
-@@ -155,7 +156,7 @@ FilterRTF::GetNextToken (wchar_t* token,
-                     int len = strlen (rtfToken.getVal());
-                     if (len + 2 <= tokenSz - 1)
-                       {
--                        token = wcpcpy (token, L"\\u");
-+                        token = wcscpy (token, L"\\u");
-                         token = Ascii2WcsCopy (token, rtfToken.getVal());
-                         tokenSz -= len + 2;
-                       }
-@@ -177,7 +178,7 @@ FilterRTF::GetNextToken (wchar_t* token,
-                       int len = strlen (rtfToken.getVal());
-                       if (len + 2 <= tokenSz - 1)
-                         {
--                          token = wcpcpy (token, L"\\'");
-+                          token = wcscpy (token, L"\\'");
-                           token = Ascii2WcsCopy (token, rtfToken.getVal());
-                           tokenSz -= len + 2;
-                         }
-@@ -251,7 +252,7 @@ thai_flag_determined:
-                 else
-                   {
-                     // non-Thai text is found -> prepare to stop
--                    wchar_t* p = wcpcpy (strbuff, L"\\u");
-+                    wchar_t* p = wcscpy (strbuff, L"\\u");
-                     Ascii2WcsCopy (p, rtfToken.getVal());
-                     isCopySkipBytes = true;
-                   }
-@@ -339,7 +340,7 @@ thai_flag_determined:
-                     int len = strlen (rtfToken.getVal());
-                     if (len + 2 <= tokenSz - 1)
-                       {
--                        token = wcpcpy (token, L"\\u");
-+                        token = wcscpy (token, L"\\u");
-                         token = Ascii2WcsCopy (token, rtfToken.getVal());
-                         tokenSz -= len + 2;
-                       }
-@@ -359,7 +360,7 @@ thai_flag_determined:
-                       int len = strlen (rtfToken.getVal());
-                       if (len + 2 <= tokenSz - 1)
-                         {
--                          token = wcpcpy (token, L"\\'");
-+                          token = wcscpy (token, L"\\'");
-                           token = Ascii2WcsCopy (token, rtfToken.getVal());
-                           tokenSz -= len + 2;
-                         }