pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/devel/libdatrie update to 0.2.12nb2
details: https://anonhg.NetBSD.org/pkgsrc/rev/7647860f2c50
branches: trunk
changeset: 444026:7647860f2c50
user: scole <scole%pkgsrc.org@localhost>
date: Fri Jan 01 21:49:39 2021 +0000
description:
update to 0.2.12nb2
- use github links
- use unsigned char patches from original author
- patch configure.ac to disable doxygen since original is troublesome on netbsd9 system
diffstat:
devel/libdatrie/Makefile | 21 ++++---
devel/libdatrie/PLIST | 3 +-
devel/libdatrie/distinfo | 12 ++--
devel/libdatrie/patches/patch-configure.ac | 63 ++++++++++++++++++++++++++
devel/libdatrie/patches/patch-tools_trietool.c | 21 --------
5 files changed, 82 insertions(+), 38 deletions(-)
diffs (163 lines):
diff -r 054f1c1d7827 -r 7647860f2c50 devel/libdatrie/Makefile
--- a/devel/libdatrie/Makefile Fri Jan 01 20:46:19 2021 +0000
+++ b/devel/libdatrie/Makefile Fri Jan 01 21:49:39 2021 +0000
@@ -1,24 +1,27 @@
-# $NetBSD: Makefile,v 1.20 2020/07/30 01:56:16 scole Exp $
+# $NetBSD: Makefile,v 1.21 2021/01/01 21:49:39 scole Exp $
DISTNAME= libdatrie-0.2.12
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= devel
-MASTER_SITES= http://linux.thai.net/pub/thailinux/software/libthai/
-MASTER_SITES+= ftp://linux.thai.net/pub/ThaiLinux/software/libthai/
-EXTRACT_SUFX= .tar.xz
+MASTER_SITES= ${MASTER_SITE_GITHUB:=tlwg/}
+GITHUB_TAG= f1479aaab1b877f305297bdb12fadc280a48cdd6
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= https://linux.thai.net/~thep/datrie/datrie.html
COMMENT= Implementation of Double-Array Trie
LICENSE= gnu-lgpl-v2.1
-USE_LIBTOOL= yes
-USE_TOOLS+= pkg-config
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --disable-doxygen-doc
+USE_LIBTOOL= yes
+GNU_CONFIGURE= yes
+USE_LANGUAGES= c c++
+USE_TOOLS= gmake gm4 pkg-config sh aclocal autoconf autoreconf automake
+
CONFIGURE_ENV+= ICONV_LIBS=${BUILDLINK_LDADD.iconv:Q}
PKGCONFIG_OVERRIDE+= datrie-0.2.pc.in
TEST_TARGET= check
+pre-configure:
+ cd ${WRKSRC} && autoreconf -fi
+
.include "../../converters/libiconv/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 054f1c1d7827 -r 7647860f2c50 devel/libdatrie/PLIST
--- a/devel/libdatrie/PLIST Fri Jan 01 20:46:19 2021 +0000
+++ b/devel/libdatrie/PLIST Fri Jan 01 21:49:39 2021 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2018/02/23 15:02:14 adam Exp $
+@comment $NetBSD: PLIST,v 1.5 2021/01/01 21:49:39 scole Exp $
bin/trietool
bin/trietool-0.2
include/datrie/alpha-map.h
@@ -9,4 +9,3 @@
lib/pkgconfig/datrie-0.2.pc
man/man1/trietool-0.2.1
man/man1/trietool.1
-share/doc/libdatrie/README.migration
diff -r 054f1c1d7827 -r 7647860f2c50 devel/libdatrie/distinfo
--- a/devel/libdatrie/distinfo Fri Jan 01 20:46:19 2021 +0000
+++ b/devel/libdatrie/distinfo Fri Jan 01 21:49:39 2021 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.12 2020/07/30 01:56:16 scole Exp $
+$NetBSD: distinfo,v 1.13 2021/01/01 21:49:39 scole Exp $
-SHA1 (libdatrie-0.2.12.tar.xz) = 8516d3c86e05338d3cd3ce0421181d66709dba18
-RMD160 (libdatrie-0.2.12.tar.xz) = 8e29779b2f850830f9d2bb720cf21adc768333fd
-SHA512 (libdatrie-0.2.12.tar.xz) = 7cf17859331d6111679e2c6fe0fa256abb13187b0b1116c8225f066281ab852f847a0d2d0d42b9604faf1d56290909fe3386362e34ed5bd1109516dffa2775a1
-Size (libdatrie-0.2.12.tar.xz) = 310236 bytes
-SHA1 (patch-tools_trietool.c) = 638eee9ec4a22284f442a742e4cd3428c74d67e1
+SHA1 (libdatrie-0.2.12-f1479aaab1b877f305297bdb12fadc280a48cdd6.tar.gz) = a262c74d234933c6d0606fe63289becc70fba39b
+RMD160 (libdatrie-0.2.12-f1479aaab1b877f305297bdb12fadc280a48cdd6.tar.gz) = bb97e91bf811e918298f9a31e9d142dee3501a1d
+SHA512 (libdatrie-0.2.12-f1479aaab1b877f305297bdb12fadc280a48cdd6.tar.gz) =
777f49fd0bb3f7a0f1dc3ef8b4eb311bd812cc86ec0f2283027e4e5709063643dc8bbbca19d315a2d64742116d6186c51483e6d6b706bcc3ed5776774710e564
+Size (libdatrie-0.2.12-f1479aaab1b877f305297bdb12fadc280a48cdd6.tar.gz) = 106144 bytes
+SHA1 (patch-configure.ac) = 1c2d874a5206c0546960d5003bee04705e7ad0f3
diff -r 054f1c1d7827 -r 7647860f2c50 devel/libdatrie/patches/patch-configure.ac
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/libdatrie/patches/patch-configure.ac Fri Jan 01 21:49:39 2021 +0000
@@ -0,0 +1,63 @@
+$NetBSD: patch-configure.ac,v 1.1 2021/01/01 21:49:39 scole Exp $
+
+Remove git hub versioning info and manually disable doxygen
+
+--- configure.ac.orig 2020-12-30 16:33:35.000000000 +0000
++++ configure.ac
+@@ -2,9 +2,7 @@
+ # Process this file with autoconf to produce a configure script.
+
+ AC_PREREQ(2.59)
+-AC_INIT(libdatrie,
+- m4_esyscmd([build-aux/git-version-gen]),
+- [https://github.com/tlwg/libdatrie/issues])
++AC_INIT([libdatrie], [0.2.12nb2])
+ AC_CONFIG_SRCDIR([datrie/trie.h])
+ AC_CONFIG_HEADER([config.h])
+ AC_CONFIG_AUX_DIR(build-aux)
+@@ -103,24 +101,28 @@ AC_CHECK_HEADERS([limits.h stdlib.h stdi
+ AC_C_CONST
+ AC_TYPE_SIZE_T
+
++# xxx disable doxygen manually. my netbsd9 system gets errors trying
++# to parse this
++enable_doxygen_doc="no"
++
+ dnl Disable doc generation with doxygen option
+-AC_ARG_ENABLE(doxygen-doc,
+- [AC_HELP_STRING([--disable-doxygen-doc],
+- [disable document generation with doxygen])],
+- , enable_doxygen_doc="yes")
+-
+-if test "x$enable_doxygen_doc" = "xyes"; then
+- AC_CHECK_PROG(DOXYGEN,doxygen,doxygen,no)
+- if test "x$DOXYGEN" = "xno"; then
+- enable_doxygen_doc="no"
+- else
+- AC_MSG_CHECKING([doxygen >= $DOXYGEN_REQ_VER])
+- DOXYGEN_VER=$($DOXYGEN --version)
+- AX_COMPARE_VERSION([$DOXYGEN_VER],[ge],[DOXYGEN_REQ_VER],
+- [AC_MSG_RESULT([$DOXYGEN_VER, yes])],
+- [AC_MSG_RESULT([$DOXYGEN_VER, no, documentation disabled]); enable_doxygen_doc="no"])
+- fi
+-fi
++dnl AC_ARG_ENABLE(doxygen-doc,
++dnl [AC_HELP_STRING([--disable-doxygen-doc],
++dnl [disable document generation with doxygen])],
++dnl , enable_doxygen_doc="yes")
++
++dnl if test "x$enable_doxygen_doc" = "xyes"; then
++dnl AC_CHECK_PROG(DOXYGEN,doxygen,doxygen,no)
++dnl if test "x$DOXYGEN" = "xno"; then
++dnl enable_doxygen_doc="no"
++dnl else
++dnl AC_MSG_CHECKING([doxygen >= $DOXYGEN_REQ_VER])
++dnl DOXYGEN_VER=$($DOXYGEN --version)
++dnl AX_COMPARE_VERSION([$DOXYGEN_VER],[ge],[DOXYGEN_REQ_VER],
++dnl [AC_MSG_RESULT([$DOXYGEN_VER, yes])],
++dnl [AC_MSG_RESULT([$DOXYGEN_VER, no, documentation disabled]); enable_doxygen_doc="no"])
++dnl fi
++dnl fi
+
+ dnl where to install the doxygen-generated HTML doc
+ AC_ARG_WITH(html-docdir,
diff -r 054f1c1d7827 -r 7647860f2c50 devel/libdatrie/patches/patch-tools_trietool.c
--- a/devel/libdatrie/patches/patch-tools_trietool.c Fri Jan 01 20:46:19 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-$NetBSD: patch-tools_trietool.c,v 1.1 2020/07/30 01:56:16 scole Exp $
-
-Use unsigned-char cast with isspace
-
---- tools/trietool.c.orig 2018-06-06 08:39:34.000000000 +0000
-+++ tools/trietool.c
-@@ -614,12 +614,12 @@ string_trim (char *s)
- char *p;
-
- /* skip leading white spaces */
-- while (*s && isspace (*s))
-+ while (*s && isspace ((unsigned char)*s))
- ++s;
-
- /* trim trailing white spaces */
- p = s + strlen (s) - 1;
-- while (isspace (*p))
-+ while (isspace ((unsigned char)*p))
- --p;
- *++p = '\0';
-
Home |
Main Index |
Thread Index |
Old Index