summaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
authorscole <scole@pkgsrc.org>2021-01-29 18:33:09 +0000
committerscole <scole@pkgsrc.org>2021-01-29 18:33:09 +0000
commit93e356ad22aca1dd5fdefeb3d70542ab192ae65d (patch)
tree022a20c5ced41b620d7e41b9e102452160bc428d /devel
parentcd0b75a759a5bc5743fbe1d02e76956093f26376 (diff)
downloadpkgsrc-93e356ad22aca1dd5fdefeb3d70542ab192ae65d.tar.gz
libdatrie 0.2.13 Released
@thep thep released this Jan 29, 2021 Fix wrong key listing in byte trie (Issue #9, Thanks @legale for the report.) Fix cross-compiling issue caused by AC_FUNC_MALLOC (Issue #11, Thanks @vmchale for the report.) Fix isspace() arg problem on NetBSD. (Personal mail, Thanks Sean for the report; PR #8, Thanks @obache for an individual pull request.) Fix some documentations. Really use TRIE_CHAR_TERM in TrieChar string termination. Changing TRIE_CHAR_TERM definition now won't break the code. Fix Windows build issue by avoiding <unistd.h> include. (Partially addressing PR #15, Thanks @fanc999 for first raising this.) [New APIs] Add serialization of the trie into memory buffer. (PR #12, Thanks @KOLANICH for the contribution.)
Diffstat (limited to 'devel')
-rw-r--r--devel/libdatrie/Makefile21
-rw-r--r--devel/libdatrie/buildlink3.mk5
-rw-r--r--devel/libdatrie/distinfo11
-rw-r--r--devel/libdatrie/patches/patch-configure.ac63
4 files changed, 15 insertions, 85 deletions
diff --git a/devel/libdatrie/Makefile b/devel/libdatrie/Makefile
index f3f8fc9cf3b..b1aca469086 100644
--- a/devel/libdatrie/Makefile
+++ b/devel/libdatrie/Makefile
@@ -1,27 +1,22 @@
-# $NetBSD: Makefile,v 1.21 2021/01/01 21:49:39 scole Exp $
+# $NetBSD: Makefile,v 1.22 2021/01/29 18:33:09 scole Exp $
-DISTNAME= libdatrie-0.2.12
-PKGREVISION= 2
+DISTNAME= libdatrie-0.2.13
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_GITHUB:=tlwg/}
-GITHUB_TAG= f1479aaab1b877f305297bdb12fadc280a48cdd6
+MASTER_SITES= https://linux.thai.net/pub/thailinux/software/libthai/
+EXTRACT_SUFX= .tar.xz
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= https://linux.thai.net/~thep/datrie/datrie.html
COMMENT= Implementation of Double-Array Trie
LICENSE= gnu-lgpl-v2.1
-USE_LIBTOOL= yes
-GNU_CONFIGURE= yes
-USE_LANGUAGES= c c++
-USE_TOOLS= gmake gm4 pkg-config sh aclocal autoconf autoreconf automake
-
+USE_LIBTOOL= yes
+USE_TOOLS+= pkg-config
+GNU_CONFIGURE= yes
+CONFIGURE_ARGS+= --disable-doxygen-doc
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 --git a/devel/libdatrie/buildlink3.mk b/devel/libdatrie/buildlink3.mk
index 37e609f9e02..437ec48ca88 100644
--- a/devel/libdatrie/buildlink3.mk
+++ b/devel/libdatrie/buildlink3.mk
@@ -1,12 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.5 2018/01/07 13:04:05 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2021/01/29 18:33:09 scole Exp $
BUILDLINK_TREE+= libdatrie
.if !defined(LIBDATRIE_BUILDLINK3_MK)
LIBDATRIE_BUILDLINK3_MK:=
-BUILDLINK_API_DEPENDS.libdatrie+= libdatrie>=0.2.0
-BUILDLINK_ABI_DEPENDS.libdatrie+= libdatrie>=0.2.7.1
+BUILDLINK_API_DEPENDS.libdatrie+= libdatrie>=0.2.13
BUILDLINK_PKGSRCDIR.libdatrie?= ../../devel/libdatrie
.endif # LIBDATRIE_BUILDLINK3_MK
diff --git a/devel/libdatrie/distinfo b/devel/libdatrie/distinfo
index df011e1678e..809d65e22cc 100644
--- a/devel/libdatrie/distinfo
+++ b/devel/libdatrie/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.13 2021/01/01 21:49:39 scole Exp $
+$NetBSD: distinfo,v 1.14 2021/01/29 18:33:09 scole Exp $
-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
+SHA1 (libdatrie-0.2.13.tar.xz) = ff3d30605fdc9a226e7acde8de3752125b3a8791
+RMD160 (libdatrie-0.2.13.tar.xz) = ecc5608111427f537e0f1b825275a191f3080eca
+SHA512 (libdatrie-0.2.13.tar.xz) = db3c879d825ead5871c12ef3a06bb093cb1708a6e7e20775eaf82356af9dd6ad54c6b5cabbe1773f2494d3dfa2426528fdd49441038b6294b70ccb1a3d90099a
+Size (libdatrie-0.2.13.tar.xz) = 314072 bytes
diff --git a/devel/libdatrie/patches/patch-configure.ac b/devel/libdatrie/patches/patch-configure.ac
deleted file mode 100644
index 387596211f8..00000000000
--- a/devel/libdatrie/patches/patch-configure.ac
+++ /dev/null
@@ -1,63 +0,0 @@
-$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,