pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/textproc/enchant2 enchant2: update to 2.2.4.
details: https://anonhg.NetBSD.org/pkgsrc/rev/70dbf4ced557
branches: trunk
changeset: 335610:70dbf4ced557
user: wiz <wiz%pkgsrc.org@localhost>
date: Sun Jun 23 09:46:51 2019 +0000
description:
enchant2: update to 2.2.4.
Changes not documented.
diffstat:
textproc/enchant2/Makefile | 18 +--
textproc/enchant2/PLIST.Darwin | 1 +
textproc/enchant2/distinfo | 14 +-
textproc/enchant2/patches/patch-tests_Makefile.am | 29 ------
textproc/enchant2/patches/patch-tests_Makefile.in | 29 ------
textproc/enchant2/patches/patch-tests_enchant__providers_Makefile.am | 39 --------
textproc/enchant2/patches/patch-tests_enchant__providers_Makefile.in | 47 ----------
7 files changed, 14 insertions(+), 163 deletions(-)
diffs (223 lines):
diff -r 388ad22a1ab7 -r 70dbf4ced557 textproc/enchant2/Makefile
--- a/textproc/enchant2/Makefile Sun Jun 23 09:42:16 2019 +0000
+++ b/textproc/enchant2/Makefile Sun Jun 23 09:46:51 2019 +0000
@@ -1,9 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2018/11/22 15:06:09 nia Exp $
-#
+# $NetBSD: Makefile,v 1.5 2019/06/23 09:46:51 wiz Exp $
-DISTNAME= enchant-2.2.3
-PKGNAME= enchant2-2.2.3
-PKGREVISION= 1
+DISTNAME= enchant-2.2.4
+PKGNAME= ${DISTNAME:S/enchant/enchant2/}
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_GITHUB:=AbiWord/}
GITHUB_PROJECT= enchant
@@ -31,16 +29,16 @@
CONFIGURE_ARGS+= --without-uspell
CONFIGURE_ARGS+= --without-voikko
-# XXX: needs unittest-cpp as a test dependency
-#TEST_TARGET= check
+# Status as of 2.2.4:
+# FAILURE: 230 out of 425 tests failed (390 failures).
+TEST_TARGET= check
post-install:
cd ${DESTDIR}${PREFIX}/share && ${MV} enchant/enchant.ordering examples/enchant.ordering
-
.include "options.mk"
.include "../../devel/glib2/buildlink3.mk"
-#BUILDLINK_DEPMETHOD.unittest-cpp= build # XXX: for tests
-#.include "../../wip/unittest-cpp/buildlink3.mk"
+BUILDLINK_DEPMETHOD.unittest-cpp= build # XXX: for tests
+.include "../../devel/unittest-cpp/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 388ad22a1ab7 -r 70dbf4ced557 textproc/enchant2/PLIST.Darwin
--- a/textproc/enchant2/PLIST.Darwin Sun Jun 23 09:42:16 2019 +0000
+++ b/textproc/enchant2/PLIST.Darwin Sun Jun 23 09:46:51 2019 +0000
@@ -1,1 +1,2 @@
+@comment $NetBSD: PLIST.Darwin,v 1.2 2019/06/23 09:46:51 wiz Exp $
lib/enchant-2/enchant_applespell.la
diff -r 388ad22a1ab7 -r 70dbf4ced557 textproc/enchant2/distinfo
--- a/textproc/enchant2/distinfo Sun Jun 23 09:42:16 2019 +0000
+++ b/textproc/enchant2/distinfo Sun Jun 23 09:46:51 2019 +0000
@@ -1,10 +1,6 @@
-$NetBSD: distinfo,v 1.1 2018/11/01 09:36:47 bsiegert Exp $
+$NetBSD: distinfo,v 1.2 2019/06/23 09:46:51 wiz Exp $
-SHA1 (enchant-2.2.3.tar.gz) = 181d5563d282af0f30c7ab68c5d432271b6fd11e
-RMD160 (enchant-2.2.3.tar.gz) = 87ac76b00ed54d47d246b0938d493d2a82180de6
-SHA512 (enchant-2.2.3.tar.gz) = abde9d6fec25edff694570455fd4c6e8e2e2c41a6b133bbb31a344761137a354cc1c655e53374cf712bf311c3732dc721e9ffd2dc933d78ec8ccf224350635d6
-Size (enchant-2.2.3.tar.gz) = 957451 bytes
-SHA1 (patch-tests_Makefile.am) = 32474d4a5cba8657d7bf4bcd1fdaa5969e7c4e35
-SHA1 (patch-tests_Makefile.in) = 68ee795e4f55d3d982a6f255ec67e87d84058068
-SHA1 (patch-tests_enchant__providers_Makefile.am) = 70b0b9dfbc32526900a9cb55b8016b6ee7032f26
-SHA1 (patch-tests_enchant__providers_Makefile.in) = 52b5022231a09cfa770b2de389e8a8d6e3774c21
+SHA1 (enchant-2.2.4.tar.gz) = 73a99a80619066c1e005f09a56e534f23707a962
+RMD160 (enchant-2.2.4.tar.gz) = 22312179c16420b67e3865af0a24fab4cdef86a2
+SHA512 (enchant-2.2.4.tar.gz) = 3860f04e276e1afa8969041b3f57411136d6b96ecf90996cdb122739e87be432f12219d2635c29d2e7ef3f2eeb366013026b6f8327a9749ffbc3a1dfafb4b870
+Size (enchant-2.2.4.tar.gz) = 953026 bytes
diff -r 388ad22a1ab7 -r 70dbf4ced557 textproc/enchant2/patches/patch-tests_Makefile.am
--- a/textproc/enchant2/patches/patch-tests_Makefile.am Sun Jun 23 09:42:16 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-$NetBSD: patch-tests_Makefile.am,v 1.1 2018/11/01 09:36:47 bsiegert Exp $
-
-Avoid possible `rm -rf' of the entire file system when running `make check':
-
- <https://github.com/AbiWord/enchant/pull/203>
-
---- tests/Makefile.am.orig 2018-02-04 17:01:08.000000000 +0000
-+++ tests/Makefile.am
-@@ -1,11 +1,7 @@
- SUBDIRS = enchant_providers
-
- # Get libdir suffix
--if GNU_MAKE
--libdir_subdir=$(shell echo "$(libdir)" | sed -e 's|^$(exec_prefix)/||' | sed -e 's|^/||')
--else
- libdir_subdir=lib
--endif
-
- AM_CPPFLAGS = -I$(top_srcdir)/src $(ENCHANT_CFLAGS) -DENCHANT_MAJOR_VERSION=\"@ENCHANT_MAJOR_VERSION@\"
-
-@@ -33,7 +29,7 @@ $(LIBENCHANT_COPY): $(top_builddir)/src/
- $(MAKE) libenchant-copy
-
- libenchant-copy:
-- rm -rf $(libdir_subdir)/
-+ rm -rf $(libdir_subdir)
- $(MKDIR_P) $(libdir_subdir)/enchant-@ENCHANT_MAJOR_VERSION@
- cp -r $(top_builddir)/src/@objdir@ $(libdir_subdir)/
- cp $(top_builddir)/src/libenchant-@ENCHANT_MAJOR_VERSION@.la $(libdir_subdir)/
diff -r 388ad22a1ab7 -r 70dbf4ced557 textproc/enchant2/patches/patch-tests_Makefile.in
--- a/textproc/enchant2/patches/patch-tests_Makefile.in Sun Jun 23 09:42:16 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-$NetBSD: patch-tests_Makefile.in,v 1.1 2018/11/01 09:36:47 bsiegert Exp $
-
-Avoid possible `rm -rf' of the entire file system when running `make check'.
-
- <https://github.com/AbiWord/enchant/pull/203>
-
---- tests/Makefile.in.orig 2018-02-04 17:01:19.000000000 +0000
-+++ tests/Makefile.in
-@@ -1017,10 +1017,9 @@ top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- SUBDIRS = enchant_providers
--@GNU_MAKE_FALSE@libdir_subdir = lib
-
- # Get libdir suffix
--@GNU_MAKE_TRUE@libdir_subdir = $(shell echo "$(libdir)" | sed -e 's|^$(exec_prefix)/||' | sed -e 's|^/||')
-+libdir_subdir = lib
- AM_CPPFLAGS = -I$(top_srcdir)/src $(ENCHANT_CFLAGS) -DENCHANT_MAJOR_VERSION=\"@ENCHANT_MAJOR_VERSION@\"
- ENCHANT_CONFIG_DIR = config
- AM_TESTS_ENVIRONMENT = \
-@@ -2284,7 +2283,7 @@ $(LIBENCHANT_COPY): $(top_builddir)/src/
- $(MAKE) libenchant-copy
-
- libenchant-copy:
-- rm -rf $(libdir_subdir)/
-+ rm -rf $(libdir_subdir)
- $(MKDIR_P) $(libdir_subdir)/enchant-@ENCHANT_MAJOR_VERSION@
- cp -r $(top_builddir)/src/@objdir@ $(libdir_subdir)/
- cp $(top_builddir)/src/libenchant-@ENCHANT_MAJOR_VERSION@.la $(libdir_subdir)/
diff -r 388ad22a1ab7 -r 70dbf4ced557 textproc/enchant2/patches/patch-tests_enchant__providers_Makefile.am
--- a/textproc/enchant2/patches/patch-tests_enchant__providers_Makefile.am Sun Jun 23 09:42:16 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-$NetBSD: patch-tests_enchant__providers_Makefile.am,v 1.1 2018/11/01 09:36:47 bsiegert Exp $
-
-Avoid possible `rm -rf' of the entire file system when running `make check'.
-
- <https://github.com/AbiWord/enchant/pull/203>
-
---- tests/enchant_providers/Makefile.am.orig 2018-02-04 17:01:08.000000000 +0000
-+++ tests/enchant_providers/Makefile.am
-@@ -1,11 +1,7 @@
- # FIXME: common up with tests/Makefile.am
-
- # Get libdir suffix
--if GNU_MAKE
--libdir_subdir=$(shell echo "$(libdir)" | sed -e 's|^$(exec_prefix)/||' | sed -e 's|^/||')
--else
- libdir_subdir=lib
--endif
-
- AM_CPPFLAGS = -I$(top_srcdir)/src $(ENCHANT_CFLAGS)
-
-@@ -28,15 +24,17 @@ $(LIBENCHANT_COPY): $(top_builddir)/src/
- $(MAKE) libenchant-copy
-
- libenchant-copy:
-- rm -rf $(libdir_subdir)/
-+ rm -rf $(libdir_subdir)
- $(MKDIR_P) $(libdir_subdir)/enchant-@ENCHANT_MAJOR_VERSION@
- cp -r $(top_builddir)/src/@objdir@ $(libdir_subdir)/
- cp $(top_builddir)/src/libenchant-@ENCHANT_MAJOR_VERSION@.la $(libdir_subdir)/
-
-+if WITH_APPLESPELL
- APPLESPELL_CONFIG = config/AppleSpell.config
- $(APPLESPELL_CONFIG): $(top_srcdir)/providers/AppleSpell.config
- $(MKDIR_P) config
- cp $< config/
-+endif
-
- LDADD = $(LIBENCHANT_COPY) $(ENCHANT_LIBS)
- LIBADD = $(LIBENCHANT_COPY)
diff -r 388ad22a1ab7 -r 70dbf4ced557 textproc/enchant2/patches/patch-tests_enchant__providers_Makefile.in
--- a/textproc/enchant2/patches/patch-tests_enchant__providers_Makefile.in Sun Jun 23 09:42:16 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-$NetBSD: patch-tests_enchant__providers_Makefile.in,v 1.1 2018/11/01 09:36:47 bsiegert Exp $
-
-Avoid possible `rm -rf' of the entire file system when running `make check'.
-
- <https://github.com/AbiWord/enchant/pull/203>
-
---- tests/enchant_providers/Makefile.in.orig 2018-02-04 17:01:19.000000000 +0000
-+++ tests/enchant_providers/Makefile.in
-@@ -901,10 +901,9 @@ target_alias = @target_alias@
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--@GNU_MAKE_FALSE@libdir_subdir = lib
-
- # Get libdir suffix
--@GNU_MAKE_TRUE@libdir_subdir = $(shell echo "$(libdir)" | sed -e 's|^$(exec_prefix)/||' | sed -e 's|^/||')
-+libdir_subdir = lib
- AM_CPPFLAGS = -I$(top_srcdir)/src $(ENCHANT_CFLAGS)
- ENCHANT_CONFIG_DIR = config
- AM_TESTS_ENVIRONMENT = \
-@@ -916,7 +915,7 @@ AM_TESTS_ENVIRONMENT = \
-
- DISTCLEANFILES = *@shlibext@
- LIBENCHANT_COPY = $(builddir)/$(libdir_subdir)/libenchant-@ENCHANT_MAJOR_VERSION@.la
--APPLESPELL_CONFIG = config/AppleSpell.config
-+@WITH_APPLESPELL_TRUE@APPLESPELL_CONFIG = config/AppleSpell.config
- LDADD = $(LIBENCHANT_COPY) $(ENCHANT_LIBS)
- LIBADD = $(LIBENCHANT_COPY)
- DEPS = $(LIBENCHANT_COPY)
-@@ -1551,13 +1550,13 @@ $(LIBENCHANT_COPY): $(top_builddir)/src/
- $(MAKE) libenchant-copy
-
- libenchant-copy:
-- rm -rf $(libdir_subdir)/
-+ rm -rf $(libdir_subdir)
- $(MKDIR_P) $(libdir_subdir)/enchant-@ENCHANT_MAJOR_VERSION@
- cp -r $(top_builddir)/src/@objdir@ $(libdir_subdir)/
- cp $(top_builddir)/src/libenchant-@ENCHANT_MAJOR_VERSION@.la $(libdir_subdir)/
--$(APPLESPELL_CONFIG): $(top_srcdir)/providers/AppleSpell.config
-- $(MKDIR_P) config
-- cp $< config/
-+@WITH_APPLESPELL_TRUE@$(APPLESPELL_CONFIG): $(top_srcdir)/providers/AppleSpell.config
-+@WITH_APPLESPELL_TRUE@ $(MKDIR_P) config
-+@WITH_APPLESPELL_TRUE@ cp $< config/
-
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
Home |
Main Index |
Thread Index |
Old Index