Andreas Wacknitz
2023-04-07 dfa714d3f5dcf3f4392aae92785691e4d3e24b49
idzebra: update to 2.2.7 and drop 32 bit

5 files modified
120 ■■■■ changed files
components/text/idzebra/Makefile 41 ●●●●● patch | view | raw | blame | history
components/text/idzebra/idzebra.p5m 29 ●●●● patch | view | raw | blame | history
components/text/idzebra/manifests/sample-manifest.p5m 34 ●●●●● patch | view | raw | blame | history
components/text/idzebra/pkg5 3 ●●●● patch | view | raw | blame | history
components/text/idzebra/test/results-all.master 13 ●●●● patch | view | raw | blame | history
components/text/idzebra/Makefile
@@ -12,15 +12,16 @@
#
# Copyright 2016 Alexander Pyhalov
#
BUILD_BITS=    64_and_32
BUILD_BITS=    64
USE_DEFAULT_TEST_TRANSFORMS= yes
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME= idzebra
COMPONENT_VERSION= 2.2.3
COMPONENT_VERSION= 2.2.7
COMPONENT_SUMMARY= idzebra - text indexing and retrieval engine
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
COMPONENT_ARCHIVE_HASH=    sha256:85ade449d161d97df47d4a8910a53a5ea3bd5e3598b6189d86fc8986a8effea4
COMPONENT_ARCHIVE_HASH=    sha256:b465ffeb060f507316e6cfc20ebd46022472076d0d4e96ef7dab63e798066420
COMPONENT_ARCHIVE_URL=    https://ftp.indexdata.com/pub/zebra/$(COMPONENT_ARCHIVE)
COMPONENT_PROJECT_URL=    https://www.indexdata.com/resources/software/zebra/
COMPONENT_FMRI= text/idzebra
@@ -35,33 +36,16 @@
COMPONENT_PREP_ACTION = ( cd $(@D) && autoreconf -fi )
CONFIGURE_OPTIONS += --enable-static=no
# Without this tests fail
unexport SHELLOPTS
COMPONENT_TEST_MASTER = $(COMPONENT_TEST_RESULTS_DIR)/results-all.master
COMPONENT_TEST_TRANSFORMS += \
    '-n ' \
    '-e "/TOTAL:/p" ' \
    '-e "/SKIP:/p" ' \
    '-e "/PASS:/p" ' \
    '-e "/FAIL:/p" ' \
    '-e "/ERROR:/p" '
# Remove trailing -2.0 from apps:
COMPONENT_POST_INSTALL_ACTION.32 = \
    ( cd $(PROTO_DIR)/usr/bin/$(MACH32) && \
      $(MV) ./idzebra-config-2.0 ./idzebra-config && \
      $(MV) ./zebraidx-2.0 ./zebraidx && \
      $(MV) ./zebrasrv-2.0 ./zebrasrv )
COMPONENT_POST_INSTALL_ACTION.64 = \
    ( cd $(PROTO_DIR)/usr/bin && \
      $(MV) ./idzebra-config-2.0 ./idzebra-config && \
      $(MV) ./zebraidx-2.0 ./zebraidx && \
      $(MV) ./zebrasrv-2.0 ./zebrasrv )
# Manually added build dependencies
REQUIRED_PACKAGES += runtime/tcl-8
COMPONENT_POST_INSTALL_ACTION = ( \
    cd $(PROTO_DIR)/usr/bin && \
    $(MV) ./idzebra-config-2.0 ./idzebra-config && \
    $(MV) ./zebraidx-2.0 ./zebraidx && \
    $(MV) ./zebrasrv-2.0 ./zebrasrv )
# Auto-generated dependencies
REQUIRED_PACKAGES += compress/bzip2
@@ -70,6 +54,7 @@
REQUIRED_PACKAGES += library/libxml2
REQUIRED_PACKAGES += library/libxslt
REQUIRED_PACKAGES += library/zlib
REQUIRED_PACKAGES += runtime/perl-534
REQUIRED_PACKAGES += runtime/perl
REQUIRED_PACKAGES += runtime/tcl-8
REQUIRED_PACKAGES += shell/ksh93
REQUIRED_PACKAGES += system/library
components/text/idzebra/idzebra.p5m
@@ -14,6 +14,7 @@
#
set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.human-version value=$(HUMAN_VERSION)
set name=pkg.summary value="$(COMPONENT_SUMMARY)"
set name=info.classification value="$(COMPONENT_CLASSIFICATION)"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
@@ -24,17 +25,6 @@
<transform file path=usr/share/idzebra-2.0/examples/(.+)$ -> set action.hash usr/share/idzebra-2.0-examples/%<\1> >
# Drop 32-bit binaries
<transform file path=.*/bin/$(MACH32)/.+ -> drop>
file usr/share/man/man1/idzebra-config-2.0.1 path=usr/share/man/man1/idzebra-config.1
file usr/share/man/man1/zebraidx-2.0.1 path=usr/share/man/man1/zebraidx.1
file usr/share/man/man8/zebrasrv-2.0.8 path=usr/share/man/man8/zebrasrv.8
file path=usr/bin/$(MACH32)/idzebra-abs2dom
file path=usr/bin/$(MACH32)/idzebra-config
file path=usr/bin/$(MACH32)/zebraidx
file path=usr/bin/$(MACH32)/zebrasrv
file path=usr/bin/idzebra-abs2dom
file path=usr/bin/idzebra-config
file path=usr/bin/zebraidx
@@ -65,17 +55,6 @@
link path=usr/lib/$(MACH64)/libidzebra-2.0.so.0 target=libidzebra-2.0.so.0.0.2
file path=usr/lib/$(MACH64)/libidzebra-2.0.so.0.0.2
file path=usr/lib/$(MACH64)/pkgconfig/zebra.pc
file path=usr/lib/idzebra-2.0/modules/mod-alvis.so
file path=usr/lib/idzebra-2.0/modules/mod-dom.so
file path=usr/lib/idzebra-2.0/modules/mod-grs-marc.so
file path=usr/lib/idzebra-2.0/modules/mod-grs-regx.so
file path=usr/lib/idzebra-2.0/modules/mod-grs-xml.so
file path=usr/lib/idzebra-2.0/modules/mod-safari.so
file path=usr/lib/idzebra-2.0/modules/mod-text.so
link path=usr/lib/libidzebra-2.0.so target=libidzebra-2.0.so.0.0.2
link path=usr/lib/libidzebra-2.0.so.0 target=libidzebra-2.0.so.0.0.2
file path=usr/lib/libidzebra-2.0.so.0.0.2
file path=usr/lib/pkgconfig/zebra.pc
file path=usr/share/aclocal/idzebra-2.0.m4
file path=usr/share/doc/idzebra-2.0/administration-extended-services.html
file path=usr/share/doc/idzebra-2.0/administration-ranking.html
@@ -274,3 +253,9 @@
file path=usr/share/idzebra-2.0/tab/words-icu-da.xml
file path=usr/share/idzebra-2.0/tab/words-icu.xml
file path=usr/share/man/man1/idzebra-abs2dom.1
file path=usr/share/man/man1/idzebra-config-2.0.1
link path=usr/share/man/man1/idzebra-config.1 target=idzebra-config-2.0.1
file path=usr/share/man/man1/zebraidx-2.0.1
link path=usr/share/man/man1/zebraidx.1 target=zebraidx-2.0.1
file path=usr/share/man/man8/zebrasrv-2.0.8
link path=usr/share/man/man8/zebrasrv.8 target=zebrasrv-2.0.8
components/text/idzebra/manifests/sample-manifest.p5m
@@ -10,10 +10,11 @@
#
#
# Copyright 2022 <contributor>
# Copyright 2023 <contributor>
#
set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.human-version value=$(HUMAN_VERSION)
set name=pkg.summary value="$(COMPONENT_SUMMARY)"
set name=info.classification value="$(COMPONENT_CLASSIFICATION)"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
@@ -22,10 +23,6 @@
license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)'
file path=usr/bin/$(MACH32)/idzebra-abs2dom
file path=usr/bin/$(MACH32)/idzebra-config
file path=usr/bin/$(MACH32)/zebraidx
file path=usr/bin/$(MACH32)/zebrasrv
file path=usr/bin/idzebra-abs2dom
file path=usr/bin/idzebra-config
file path=usr/bin/zebraidx
@@ -45,44 +42,17 @@
file path=usr/include/idzebra-2.0/idzebra/snippet.h
file path=usr/include/idzebra-2.0/idzebra/util.h
file path=usr/include/idzebra-2.0/idzebra/version.h
file path=usr/lib/$(MACH64)/idzebra-2.0/modules/mod-alvis.a
file path=usr/lib/$(MACH64)/idzebra-2.0/modules/mod-alvis.so
file path=usr/lib/$(MACH64)/idzebra-2.0/modules/mod-dom.a
file path=usr/lib/$(MACH64)/idzebra-2.0/modules/mod-dom.so
file path=usr/lib/$(MACH64)/idzebra-2.0/modules/mod-grs-marc.a
file path=usr/lib/$(MACH64)/idzebra-2.0/modules/mod-grs-marc.so
file path=usr/lib/$(MACH64)/idzebra-2.0/modules/mod-grs-regx.a
file path=usr/lib/$(MACH64)/idzebra-2.0/modules/mod-grs-regx.so
file path=usr/lib/$(MACH64)/idzebra-2.0/modules/mod-grs-xml.a
file path=usr/lib/$(MACH64)/idzebra-2.0/modules/mod-grs-xml.so
file path=usr/lib/$(MACH64)/idzebra-2.0/modules/mod-safari.a
file path=usr/lib/$(MACH64)/idzebra-2.0/modules/mod-safari.so
file path=usr/lib/$(MACH64)/idzebra-2.0/modules/mod-text.a
file path=usr/lib/$(MACH64)/idzebra-2.0/modules/mod-text.so
file path=usr/lib/$(MACH64)/libidzebra-2.0.a
link path=usr/lib/$(MACH64)/libidzebra-2.0.so target=libidzebra-2.0.so.0.0.2
link path=usr/lib/$(MACH64)/libidzebra-2.0.so.0 target=libidzebra-2.0.so.0.0.2
file path=usr/lib/$(MACH64)/libidzebra-2.0.so.0.0.2
file path=usr/lib/$(MACH64)/pkgconfig/zebra.pc
file path=usr/lib/idzebra-2.0/modules/mod-alvis.a
file path=usr/lib/idzebra-2.0/modules/mod-alvis.so
file path=usr/lib/idzebra-2.0/modules/mod-dom.a
file path=usr/lib/idzebra-2.0/modules/mod-dom.so
file path=usr/lib/idzebra-2.0/modules/mod-grs-marc.a
file path=usr/lib/idzebra-2.0/modules/mod-grs-marc.so
file path=usr/lib/idzebra-2.0/modules/mod-grs-regx.a
file path=usr/lib/idzebra-2.0/modules/mod-grs-regx.so
file path=usr/lib/idzebra-2.0/modules/mod-grs-xml.a
file path=usr/lib/idzebra-2.0/modules/mod-grs-xml.so
file path=usr/lib/idzebra-2.0/modules/mod-safari.a
file path=usr/lib/idzebra-2.0/modules/mod-safari.so
file path=usr/lib/idzebra-2.0/modules/mod-text.a
file path=usr/lib/idzebra-2.0/modules/mod-text.so
file path=usr/lib/libidzebra-2.0.a
link path=usr/lib/libidzebra-2.0.so target=libidzebra-2.0.so.0.0.2
link path=usr/lib/libidzebra-2.0.so.0 target=libidzebra-2.0.so.0.0.2
file path=usr/lib/libidzebra-2.0.so.0.0.2
file path=usr/lib/pkgconfig/zebra.pc
file path=usr/share/aclocal/idzebra-2.0.m4
file path=usr/share/doc/idzebra-2.0/administration-extended-services.html
file path=usr/share/doc/idzebra-2.0/administration-ranking.html
components/text/idzebra/pkg5
@@ -1,13 +1,12 @@
{
    "dependencies": [
        "SUNWcs",
        "compress/bzip2",
        "database/yaz",
        "library/expat",
        "library/libxml2",
        "library/libxslt",
        "library/zlib",
        "runtime/perl-534",
        "runtime/perl",
        "runtime/tcl-8",
        "shell/ksh93",
        "system/library"
components/text/idzebra/test/results-all.master
@@ -29,8 +29,9 @@
# XPASS: 0
# ERROR: 0
PASS: scantest
# TOTAL: 1
# PASS:  1
PASS: inserttest
# TOTAL: 2
# PASS:  2
# SKIP:  0
# XFAIL: 0
# FAIL:  0
@@ -106,14 +107,6 @@
# XPASS: 0
# ERROR: 0
PASS: t1
# TOTAL: 1
# PASS:  1
# SKIP:  0
# XFAIL: 0
# FAIL:  0
# XPASS: 0
# ERROR: 0
PASS: testall.sh
# TOTAL: 1
# PASS:  1
# SKIP:  0