Marcel Telka
2023-10-23 194b0517a632750b40b0a36a2207b66107d0f649
groff: fix license and dependencies

6 files modified
64 ■■■■■ changed files
components/text/groff/Makefile 14 ●●●●● patch | view | raw | blame | history
components/text/groff/groff-core.p5m 15 ●●●● patch | view | raw | blame | history
components/text/groff/groff.p5m 13 ●●●● patch | view | raw | blame | history
components/text/groff/manifests/sample-manifest.p5m 6 ●●●●● patch | view | raw | blame | history
components/text/groff/pkg5 6 ●●●● patch | view | raw | blame | history
components/text/groff/test/results-all.master 10 ●●●● patch | view | raw | blame | history
components/text/groff/Makefile
@@ -28,6 +28,7 @@
COMPONENT_NAME=        groff
COMPONENT_VERSION=    1.23.0
COMPONENT_REVISION=    1
COMPONENT_SUMMARY=    GNU troff Text Formatting
COMPONENT_PROJECT_URL=    https://www.gnu.org/software/groff/
COMPONENT_SRC=        $(COMPONENT_NAME)-$(COMPONENT_VERSION)
@@ -36,8 +37,13 @@
COMPONENT_ARCHIVE_URL=    https://ftp.gnu.org/gnu/$(COMPONENT_NAME)/$(COMPONENT_ARCHIVE)
COMPONENT_FMRI=        text/groff
COMPONENT_CLASSIFICATION=    System/Text Tools
COMPONENT_LICENSE=    GPLv2
COMPONENT_LICENSE=    GPL-3.0-only
COMPONENT_LICENSE_FILE=    COPYING
COMPONENT_FMRI.groff-core =    $(COMPONENT_FMRI)/groff-core
COMPONENT_SUMMARY.groff-core =    $(COMPONENT_SUMMARY) (core system components)
USE_DEFAULT_TEST_TRANSFORMS = yes
include $(WS_TOP)/make-rules/common.mk
@@ -49,9 +55,6 @@
COMPONENT_INSTALL_ARGS += appdefdir=/usr/X11/lib/X11/app-defaults
COMPONENT_INSTALL_ARGS += sys_tmac_prefix=/usr/share/lib/tmac/
COMPONENT_TEST_TRANSFORMER    = $(NAWK)
COMPONENT_TEST_TRANSFORMS    = "'/TOTAL|PASS|FAIL|XFAIL|SKIP|XPASS|ERROR/'"
# Manually added build dependencies
REQUIRED_PACKAGES += developer/test/dejagnu
@@ -60,14 +63,13 @@
REQUIRED_PACKAGES += print/filter/ghostscript/fonts/gnu-gs-fonts-std
# 'pnmcrop', 'pnmcut', 'pnmtopng', and 'pnmtops':
REQUIRED_PACKAGES += library/netpbm
REQUIRED_PACKAGES += library/uchardet
# Auto-generated dependencies
PERL_REQUIRED_PACKAGES += runtime/perl
REQUIRED_PACKAGES += $(GCC_RUNTIME_PKG)
REQUIRED_PACKAGES += $(GXX_RUNTIME_PKG)
REQUIRED_PACKAGES += SUNWcs
REQUIRED_PACKAGES += library/uchardet
REQUIRED_PACKAGES += runtime/perl
REQUIRED_PACKAGES += shell/bash
REQUIRED_PACKAGES += shell/ksh93
REQUIRED_PACKAGES += system/library
components/text/groff/groff-core.p5m
@@ -25,27 +25,18 @@
# Copyright (c) 2023, Andreas Wacknitz
#
set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)/groff-core@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
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="GNU troff Text Formatting (core system components)"
set name=info.classification \
    value="org.opensolaris.category.2008:System/Text Tools"
set name=pkg.summary value="$(COMPONENT_SUMMARY)"
set name=info.classification value="$(COMPONENT_CLASSIFICATION)"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)'
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
# Used by /usr/bin/grog
depend fmri=__TBD pkg.debug.depend.file=usr/gnu/bin/awk type=require
# groff-core was previously in the 'desktop' consolidation. This optional
# dependency is here to facilitate the safe transfer of the package
# to the 'userland' consolidation.
depend type=optional fmri=consolidation/desktop/desktop-incorporation@5.12-5.12.0.0.0.14.0
link path=usr/bin/gdiffmk target=../gnu/bin/diffmk facet.compat.gnulinks=true
link path=usr/bin/geqn target=../gnu/bin/eqn facet.compat.gnulinks=true
components/text/groff/groff.p5m
@@ -27,16 +27,13 @@
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="GNU troff Text Formatting"
set name=info.classification \
    value="org.opensolaris.category.2008:System/Text Tools"
set name=pkg.summary value="$(COMPONENT_SUMMARY)"
set name=info.classification value="$(COMPONENT_CLASSIFICATION)"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)'
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
depend type=require fmri=system/library/fontconfig
depend type=require fmri=system/library/freetype-2
@@ -73,13 +70,7 @@
file usr/bin/ggrn path=usr/gnu/bin/grn
file usr/bin/gindxbib path=usr/gnu/bin/indxbib
file usr/bin/grefer path=usr/gnu/bin/refer
file path=usr/lib/$(MACH64)/groff/site-tmac/an.ja.tmac
file path=usr/lib/$(MACH64)/groff/site-tmac/an.ja_JP.PCK.tmac
file path=usr/lib/$(MACH64)/groff/site-tmac/an.ja_JP.UTF-8.tmac
file path=usr/lib/$(MACH64)/groff/site-tmac/an.tmac
file path=usr/lib/$(MACH64)/groff/site-tmac/ansun.ja.tmac
file path=usr/lib/$(MACH64)/groff/site-tmac/ansun.ja_JP.PCK.tmac
file path=usr/lib/$(MACH64)/groff/site-tmac/ansun.ja_JP.UTF-8.tmac
file path=usr/lib/$(MACH64)/groff/site-tmac/ansun.tmac
file path=usr/lib/$(MACH64)/groff/site-tmac/bib.tmac
file path=usr/lib/$(MACH64)/groff/site-tmac/m.tmac
components/text/groff/manifests/sample-manifest.p5m
@@ -67,13 +67,7 @@
file path=usr/bin/tfmtodit
file path=usr/bin/xtotroff
file path=usr/lib/$(MACH64)/charset.alias
file path=usr/lib/$(MACH64)/groff/site-tmac/an.ja.tmac
file path=usr/lib/$(MACH64)/groff/site-tmac/an.ja_JP.PCK.tmac
file path=usr/lib/$(MACH64)/groff/site-tmac/an.ja_JP.UTF-8.tmac
file path=usr/lib/$(MACH64)/groff/site-tmac/an.tmac
file path=usr/lib/$(MACH64)/groff/site-tmac/ansun.ja.tmac
file path=usr/lib/$(MACH64)/groff/site-tmac/ansun.ja_JP.PCK.tmac
file path=usr/lib/$(MACH64)/groff/site-tmac/ansun.ja_JP.UTF-8.tmac
file path=usr/lib/$(MACH64)/groff/site-tmac/ansun.tmac
file path=usr/lib/$(MACH64)/groff/site-tmac/bib.tmac
file path=usr/lib/$(MACH64)/groff/site-tmac/m.tmac
components/text/groff/pkg5
@@ -5,7 +5,7 @@
        "library/netpbm",
        "library/uchardet",
        "print/filter/ghostscript/fonts/gnu-gs-fonts-std",
        "runtime/perl",
        "runtime/perl-538",
        "shell/bash",
        "shell/ksh93",
        "system/library",
@@ -19,8 +19,8 @@
        "x11/library/toolkit/libxt"
    ],
    "fmris": [
        "text/groff",
        "text/groff/groff-core"
        "text/groff/groff-core",
        "text/groff"
    ],
    "name": "groff"
}
components/text/groff/test/results-all.master
@@ -14,7 +14,7 @@
PASS: contrib/rfc1345/tests/rfc1345-smoke-test.sh
PASS: font/devpdf/tests/check-default-foundry.sh
PASS: font/devpdf/tests/check-urw-foundry.sh
PASS: src/devices/grotty/tests/basic_latin_glyphs_map_correctly.sh
SKIP: src/devices/grotty/tests/basic_latin_glyphs_map_correctly.sh
PASS: src/devices/grotty/tests/osc8_works.sh
PASS: src/preproc/eqn/tests/diagnostics-report-correct-line-numbers.sh
PASS: src/preproc/preconv/tests/do-not-seek-the-unseekable.sh
@@ -61,7 +61,7 @@
PASS: src/roff/groff/tests/regression_savannah_58162.sh
PASS: src/roff/groff/tests/regression_savannah_58337.sh
PASS: src/roff/groff/tests/regression_savannah_59202.sh
FAIL: src/roff/groff/tests/smoke-test_html_device.sh
SKIP: src/roff/groff/tests/smoke-test_html_device.sh
PASS: src/roff/groff/tests/some_escapes_accept_newline_delimiters.sh
PASS: src/roff/groff/tests/soquiet_works.sh
PASS: src/roff/groff/tests/string_case_xform_errors.sh
@@ -163,9 +163,9 @@
PASS: tmac/tests/s_no-excess-space-around-displays.sh
PASS: tmac/tests/s_rejects-too-short-page-lengths.sh
# TOTAL: 164
# PASS:  155
# SKIP:  6
# PASS:  154
# SKIP:  8
# XFAIL: 2
# FAIL:  1
# FAIL:  0
# XPASS: 0
# ERROR: 0