From 0e8f8424a07fec46f9b16b6e452e17784a63f2e3 Mon Sep 17 00:00:00 2001
From: Marcel Telka <marcel@telka.sk>
Date: Wed, 31 Jan 2024 18:22:28 +0100
Subject: [PATCH] automake-1.16: switch to unversioned Perl; make info pages mediated
---
/dev/null | 10 -
components/developer/automake-1.16/patches/01-test-cxx-bison.patch | 46 +++++
components/meta-packages/automake/pkg5 | 7
components/developer/automake-1.16/manifests/sample-manifest.p5m | 28 +-
components/meta-packages/automake/Makefile | 34 ++++
components/meta-packages/automake/automake.p5m | 23 ++
components/developer/automake-1.16/test/results-all.master | 82 +++++-----
components/meta-packages/automake/manifests/sample-manifest.p5m | 25 +++
components/developer/automake-1.16/Makefile | 64 +++++---
components/developer/automake-1.16/pkg5 | 10
components/developer/automake-1.16/automake.p5m | 140 ++++++++++++++++-
11 files changed, 363 insertions(+), 106 deletions(-)
diff --git a/components/developer/automake-1.16/Makefile b/components/developer/automake-1.16/Makefile
index b1e5182..568098d 100644
--- a/components/developer/automake-1.16/Makefile
+++ b/components/developer/automake-1.16/Makefile
@@ -27,38 +27,54 @@
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME= automake
-COMPONENT_MAJOR_VERSION=1.16
-COMPONENT_VERSION= $(COMPONENT_MAJOR_VERSION).5
-COMPONENT_REVISION= 1
-COMPONENT_FMRI= developer/build/automake-116
-COMPONENT_CLASSIFICATION=Development/GNU
-COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
-COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
-COMPONENT_ARCHIVE_HASH= sha256:07bd24ad08a64bc17250ce09ec56e921d6343903943e99ccf63bbf0705e34605
+COMPONENT_VERSION= 1.16.5
+COMPONENT_REVISION= 2
+COMPONENT_SUMMARY= A Makefile generator
COMPONENT_PROJECT_URL= https://www.gnu.org/software/automake/
+COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
+COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.xz
+COMPONENT_ARCHIVE_HASH= \
+ sha256:f01d58cd6d9d77fbdca9eb4bbd5ead1988228fdb73d6f7a201f5f8d6b118b469
COMPONENT_ARCHIVE_URL= https://ftp.gnu.org/pub/gnu/automake/$(COMPONENT_ARCHIVE)
-COMPONENT_SUMMARY= A Makefile generator
-COMPONENT_LICENSE= GPLv2 FDLv1.3
+COMPONENT_FMRI= developer/build/automake-116
+COMPONENT_CLASSIFICATION=Development/GNU
+COMPONENT_LICENSE= GPL-2.0-only
+COMPONENT_LICENSE_FILE= COPYING
+
+USE_DEFAULT_TEST_TRANSFORMS = yes
include $(WS_MAKE_RULES)/common.mk
-PKG_MACROS+= COMPONENT_MAJOR_VERSION=$(COMPONENT_MAJOR_VERSION)
+# Testing expects GNU make
+PATH = $(PATH.gnu)
-#CONFIGURE_OPTIONS += --program-transform-name=s/$$/-$(COMPONENT_MAJOR_VERSION)/
-CONFIGURE_OPTIONS += --docdir=$(CONFIGURE_PREFIX)/share/doc/$(COMPONENT_NAME)-$(COMPONENT_MAJOR_VERSION)
-CONFIGURE_OPTIONS += --infodir=$(CONFIGURE_INFODIR)
-CONFIGURE_OPTIONS += PERL="$(PERL)"
+COMPONENT_VERSION_MAJOR = $(subst $(space),.,$(wordlist 1,2,$(subst ., ,$(HUMAN_VERSION))))
-COMPONENT_TEST_ENV += -i PATH=$(GCC_BINDIR):$(PATH.gnu)
+CONFIGURE_OPTIONS += --docdir=$(USRSHAREDOCDIR)/automake-$(COMPONENT_VERSION_MAJOR)
-COMPONENT_TEST_TRANSFORMS += \
- '-n ' \
- '-e "/TOTAL:/p" ' \
- '-e "/SKIP:/p" ' \
- '-e "/PASS:/p" ' \
- '-e "/FAIL:/p" ' \
- '-e "/ERROR:/p" '
+# Convert unversioned binary hardlinks and man page files to symlinks
+COMPONENT_POST_INSTALL_ACTION += \
+ for f in aclocal automake ; do \
+ $(RM) $(PROTOUSRBINDIR)/$$f ; \
+ $(SYMLINK) $$f-$(COMPONENT_VERSION_MAJOR) $(PROTOUSRBINDIR)/$$f ; \
+ $(RM) $(PROTOUSRSHAREMAN1DIR)/$$f.1 ; \
+ $(SYMLINK) $$f-$(COMPONENT_VERSION_MAJOR).1 $(PROTOUSRSHAREMAN1DIR)/$$f.1 ; \
+ done ;
+
+# We do not want the info index file
+COMPONENT_POST_INSTALL_ACTION += $(RM) $(PROTOUSRSHAREDIR)/info/dir ;
+
+# Convert unversioned info files to versioned and create unversioned symlinks
+COMPONENT_POST_INSTALL_ACTION += \
+ for f in automake-history.info automake.info automake.info-1 automake.info-2 ; do \
+ $(MV) $(PROTOUSRSHAREDIR)/info/$$f \
+ $(PROTOUSRSHAREDIR)/info/$${f%.*}-$(COMPONENT_VERSION_MAJOR).$${f\#\#*.} ; \
+ $(SYMLINK) $${f%.*}-$(COMPONENT_VERSION_MAJOR).$${f\#\#*.} $(PROTOUSRSHAREDIR)/info/$$f ; \
+ done ;
+
+# We do not want the README file in the aclocal directory
+COMPONENT_POST_INSTALL_ACTION += $(RM) $(PROTOUSRSHAREDIR)/aclocal/README ;
# Auto-generated dependencies
-PERL_REQUIRED_PACKAGES += runtime/perl
+REQUIRED_PACKAGES += runtime/perl
REQUIRED_PACKAGES += shell/ksh93
diff --git a/components/developer/automake-1.16/automake-116.p5m b/components/developer/automake-1.16/automake-116.p5m
deleted file mode 100644
index 924b7c6..0000000
--- a/components/developer/automake-1.16/automake-116.p5m
+++ /dev/null
@@ -1,153 +0,0 @@
-#
-# This file and its contents are supplied under the terms of the
-# Common Development and Distribution License ("CDDL"), version 1.0.
-# You may only use this file in accordance with the terms of version
-# 1.0 of the CDDL.
-#
-# A full copy of the text of the CDDL should have accompanied this
-# source. A copy of the CDDL is also available via the Internet at
-# http://www.illumos.org/license/CDDL.
-#
-
-#
-# Copyright 2018 Aurelien Larcher
-#
-
-set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-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)'
-
-# Info files are provided by default version
-<transform file path=usr/share/info/.+ -> drop>
-
-file usr/bin/aclocal path=usr/bin/aclocal-$(COMPONENT_MAJOR_VERSION)
-link path=usr/bin/aclocal target=aclocal-$(COMPONENT_MAJOR_VERSION) \
- mediator=automake mediator-version=$(COMPONENT_MAJOR_VERSION)
-file usr/bin/automake path=usr/bin/automake-$(COMPONENT_MAJOR_VERSION)
-link path=usr/bin/automake target=automake-$(COMPONENT_MAJOR_VERSION) \
- mediator=automake mediator-version=$(COMPONENT_MAJOR_VERSION)
-file path=usr/share/aclocal-$(COMPONENT_MAJOR_VERSION)/amversion.m4
-file path=usr/share/aclocal-$(COMPONENT_MAJOR_VERSION)/ar-lib.m4
-file path=usr/share/aclocal-$(COMPONENT_MAJOR_VERSION)/as.m4
-file path=usr/share/aclocal-$(COMPONENT_MAJOR_VERSION)/auxdir.m4
-file path=usr/share/aclocal-$(COMPONENT_MAJOR_VERSION)/cond-if.m4
-file path=usr/share/aclocal-$(COMPONENT_MAJOR_VERSION)/cond.m4
-file path=usr/share/aclocal-$(COMPONENT_MAJOR_VERSION)/depend.m4
-file path=usr/share/aclocal-$(COMPONENT_MAJOR_VERSION)/depout.m4
-file path=usr/share/aclocal-$(COMPONENT_MAJOR_VERSION)/dmalloc.m4
-file path=usr/share/aclocal-$(COMPONENT_MAJOR_VERSION)/extra-recurs.m4
-file path=usr/share/aclocal-$(COMPONENT_MAJOR_VERSION)/gcj.m4
-file path=usr/share/aclocal-$(COMPONENT_MAJOR_VERSION)/init.m4
-file path=usr/share/aclocal-$(COMPONENT_MAJOR_VERSION)/install-sh.m4
-file path=usr/share/aclocal-$(COMPONENT_MAJOR_VERSION)/internal/ac-config-macro-dirs.m4
-file path=usr/share/aclocal-$(COMPONENT_MAJOR_VERSION)/lead-dot.m4
-file path=usr/share/aclocal-$(COMPONENT_MAJOR_VERSION)/lex.m4
-file path=usr/share/aclocal-$(COMPONENT_MAJOR_VERSION)/lispdir.m4
-file path=usr/share/aclocal-$(COMPONENT_MAJOR_VERSION)/maintainer.m4
-file path=usr/share/aclocal-$(COMPONENT_MAJOR_VERSION)/make.m4
-file path=usr/share/aclocal-$(COMPONENT_MAJOR_VERSION)/missing.m4
-file path=usr/share/aclocal-$(COMPONENT_MAJOR_VERSION)/mkdirp.m4
-file path=usr/share/aclocal-$(COMPONENT_MAJOR_VERSION)/obsolete.m4
-file path=usr/share/aclocal-$(COMPONENT_MAJOR_VERSION)/options.m4
-file path=usr/share/aclocal-$(COMPONENT_MAJOR_VERSION)/prog-cc-c-o.m4
-file path=usr/share/aclocal-$(COMPONENT_MAJOR_VERSION)/python.m4
-file path=usr/share/aclocal-$(COMPONENT_MAJOR_VERSION)/runlog.m4
-file path=usr/share/aclocal-$(COMPONENT_MAJOR_VERSION)/sanity.m4
-file path=usr/share/aclocal-$(COMPONENT_MAJOR_VERSION)/silent.m4
-file path=usr/share/aclocal-$(COMPONENT_MAJOR_VERSION)/strip.m4
-file path=usr/share/aclocal-$(COMPONENT_MAJOR_VERSION)/substnot.m4
-file path=usr/share/aclocal-$(COMPONENT_MAJOR_VERSION)/tar.m4
-file path=usr/share/aclocal-$(COMPONENT_MAJOR_VERSION)/upc.m4
-file path=usr/share/aclocal-$(COMPONENT_MAJOR_VERSION)/vala.m4
-file path=usr/share/automake-$(COMPONENT_MAJOR_VERSION)/Automake/ChannelDefs.pm
-file path=usr/share/automake-$(COMPONENT_MAJOR_VERSION)/Automake/Channels.pm
-file path=usr/share/automake-$(COMPONENT_MAJOR_VERSION)/Automake/Condition.pm
-file path=usr/share/automake-$(COMPONENT_MAJOR_VERSION)/Automake/Config.pm
-file path=usr/share/automake-$(COMPONENT_MAJOR_VERSION)/Automake/Configure_ac.pm
-file path=usr/share/automake-$(COMPONENT_MAJOR_VERSION)/Automake/DisjConditions.pm
-file path=usr/share/automake-$(COMPONENT_MAJOR_VERSION)/Automake/FileUtils.pm
-file path=usr/share/automake-$(COMPONENT_MAJOR_VERSION)/Automake/General.pm
-file path=usr/share/automake-$(COMPONENT_MAJOR_VERSION)/Automake/Getopt.pm
-file path=usr/share/automake-$(COMPONENT_MAJOR_VERSION)/Automake/Item.pm
-file path=usr/share/automake-$(COMPONENT_MAJOR_VERSION)/Automake/ItemDef.pm
-file path=usr/share/automake-$(COMPONENT_MAJOR_VERSION)/Automake/Language.pm
-file path=usr/share/automake-$(COMPONENT_MAJOR_VERSION)/Automake/Location.pm
-file path=usr/share/automake-$(COMPONENT_MAJOR_VERSION)/Automake/Options.pm
-file path=usr/share/automake-$(COMPONENT_MAJOR_VERSION)/Automake/Rule.pm
-file path=usr/share/automake-$(COMPONENT_MAJOR_VERSION)/Automake/RuleDef.pm
-file path=usr/share/automake-$(COMPONENT_MAJOR_VERSION)/Automake/VarDef.pm
-file path=usr/share/automake-$(COMPONENT_MAJOR_VERSION)/Automake/Variable.pm
-file path=usr/share/automake-$(COMPONENT_MAJOR_VERSION)/Automake/Version.pm
-file path=usr/share/automake-$(COMPONENT_MAJOR_VERSION)/Automake/Wrap.pm
-file path=usr/share/automake-$(COMPONENT_MAJOR_VERSION)/Automake/XFile.pm
-file path=usr/share/automake-$(COMPONENT_MAJOR_VERSION)/COPYING
-file path=usr/share/automake-$(COMPONENT_MAJOR_VERSION)/INSTALL
-file path=usr/share/automake-$(COMPONENT_MAJOR_VERSION)/am/check.am
-file path=usr/share/automake-$(COMPONENT_MAJOR_VERSION)/am/check2.am
-file path=usr/share/automake-$(COMPONENT_MAJOR_VERSION)/am/clean-hdr.am
-file path=usr/share/automake-$(COMPONENT_MAJOR_VERSION)/am/clean.am
-file path=usr/share/automake-$(COMPONENT_MAJOR_VERSION)/am/compile.am
-file path=usr/share/automake-$(COMPONENT_MAJOR_VERSION)/am/configure.am
-file path=usr/share/automake-$(COMPONENT_MAJOR_VERSION)/am/data.am
-file path=usr/share/automake-$(COMPONENT_MAJOR_VERSION)/am/dejagnu.am
-file path=usr/share/automake-$(COMPONENT_MAJOR_VERSION)/am/depend.am
-file path=usr/share/automake-$(COMPONENT_MAJOR_VERSION)/am/depend2.am
-file path=usr/share/automake-$(COMPONENT_MAJOR_VERSION)/am/distdir.am
-file path=usr/share/automake-$(COMPONENT_MAJOR_VERSION)/am/footer.am
-file path=usr/share/automake-$(COMPONENT_MAJOR_VERSION)/am/header-vars.am
-file path=usr/share/automake-$(COMPONENT_MAJOR_VERSION)/am/header.am
-file path=usr/share/automake-$(COMPONENT_MAJOR_VERSION)/am/inst-vars.am
-file path=usr/share/automake-$(COMPONENT_MAJOR_VERSION)/am/install.am
-file path=usr/share/automake-$(COMPONENT_MAJOR_VERSION)/am/java.am
-file path=usr/share/automake-$(COMPONENT_MAJOR_VERSION)/am/lang-compile.am
-file path=usr/share/automake-$(COMPONENT_MAJOR_VERSION)/am/lex.am
-file path=usr/share/automake-$(COMPONENT_MAJOR_VERSION)/am/library.am
-file path=usr/share/automake-$(COMPONENT_MAJOR_VERSION)/am/libs.am
-file path=usr/share/automake-$(COMPONENT_MAJOR_VERSION)/am/libtool.am
-file path=usr/share/automake-$(COMPONENT_MAJOR_VERSION)/am/lisp.am
-file path=usr/share/automake-$(COMPONENT_MAJOR_VERSION)/am/ltlib.am
-file path=usr/share/automake-$(COMPONENT_MAJOR_VERSION)/am/ltlibrary.am
-file path=usr/share/automake-$(COMPONENT_MAJOR_VERSION)/am/mans-vars.am
-file path=usr/share/automake-$(COMPONENT_MAJOR_VERSION)/am/mans.am
-file path=usr/share/automake-$(COMPONENT_MAJOR_VERSION)/am/program.am
-file path=usr/share/automake-$(COMPONENT_MAJOR_VERSION)/am/progs.am
-file path=usr/share/automake-$(COMPONENT_MAJOR_VERSION)/am/python.am
-file path=usr/share/automake-$(COMPONENT_MAJOR_VERSION)/am/remake-hdr.am
-file path=usr/share/automake-$(COMPONENT_MAJOR_VERSION)/am/scripts.am
-file path=usr/share/automake-$(COMPONENT_MAJOR_VERSION)/am/subdirs.am
-file path=usr/share/automake-$(COMPONENT_MAJOR_VERSION)/am/tags.am
-file path=usr/share/automake-$(COMPONENT_MAJOR_VERSION)/am/texi-vers.am
-file path=usr/share/automake-$(COMPONENT_MAJOR_VERSION)/am/texibuild.am
-file path=usr/share/automake-$(COMPONENT_MAJOR_VERSION)/am/texinfos.am
-file path=usr/share/automake-$(COMPONENT_MAJOR_VERSION)/am/vala.am
-file path=usr/share/automake-$(COMPONENT_MAJOR_VERSION)/am/yacc.am
-file path=usr/share/automake-$(COMPONENT_MAJOR_VERSION)/ar-lib mode=0555
-file path=usr/share/automake-$(COMPONENT_MAJOR_VERSION)/compile mode=0555
-file path=usr/share/automake-$(COMPONENT_MAJOR_VERSION)/config.guess mode=0555
-file path=usr/share/automake-$(COMPONENT_MAJOR_VERSION)/config.sub mode=0555
-file path=usr/share/automake-$(COMPONENT_MAJOR_VERSION)/depcomp mode=0555
-file path=usr/share/automake-$(COMPONENT_MAJOR_VERSION)/install-sh mode=0555
-file path=usr/share/automake-$(COMPONENT_MAJOR_VERSION)/mdate-sh mode=0555
-file path=usr/share/automake-$(COMPONENT_MAJOR_VERSION)/missing mode=0555
-file path=usr/share/automake-$(COMPONENT_MAJOR_VERSION)/mkinstalldirs mode=0555
-file path=usr/share/automake-$(COMPONENT_MAJOR_VERSION)/py-compile mode=0555
-file path=usr/share/automake-$(COMPONENT_MAJOR_VERSION)/tap-driver.sh mode=0555
-file path=usr/share/automake-$(COMPONENT_MAJOR_VERSION)/test-driver mode=0555
-file path=usr/share/automake-$(COMPONENT_MAJOR_VERSION)/texinfo.tex
-file path=usr/share/automake-$(COMPONENT_MAJOR_VERSION)/ylwrap mode=0555
-file path=usr/share/doc/automake-$(COMPONENT_MAJOR_VERSION)/amhello-1.0.tar.gz
-#file path=usr/share/info/automake-history.info
-#file path=usr/share/info/automake.info
-#file path=usr/share/info/automake.info-1
-#file path=usr/share/info/automake.info-2
-file usr/share/man/man1/aclocal-1.16.1 path=usr/share/man/man1/aclocal-$(COMPONENT_VERSION)
-link path=usr/share/man/man1/aclocal.1 target=aclocal-$(COMPONENT_VERSION) \
- mediator=automake mediator-version=$(COMPONENT_MAJOR_VERSION)
-file usr/share/man/man1/automake-1.16.1 path=usr/share/man/man1/automake-$(COMPONENT_VERSION)
-link path=usr/share/man/man1/automake.1 target=automake-$(COMPONENT_VERSION) \
- mediator=automake mediator-version=$(COMPONENT_MAJOR_VERSION)
diff --git a/components/developer/automake-1.16/automake.license b/components/developer/automake-1.16/automake.license
deleted file mode 100644
index d511905..0000000
--- a/components/developer/automake-1.16/automake.license
+++ /dev/null
@@ -1,339 +0,0 @@
- GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
- Preamble
-
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users. This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it. (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.) You can apply it to
-your programs, too.
-
- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
- To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have. You must make sure that they, too, receive or can get the
-source code. And you must show them these terms so they know their
-rights.
-
- We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
- Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software. If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
- Finally, any free program is threatened constantly by software
-patents. We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary. To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
- The precise terms and conditions for copying, distribution and
-modification follow.
-
- GNU GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License. The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language. (Hereinafter, translation is included without limitation in
-the term "modification".) Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
- 1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
- 2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
- a) You must cause the modified files to carry prominent notices
- stating that you changed the files and the date of any change.
-
- b) You must cause any work that you distribute or publish, that in
- whole or in part contains or is derived from the Program or any
- part thereof, to be licensed as a whole at no charge to all third
- parties under the terms of this License.
-
- c) If the modified program normally reads commands interactively
- when run, you must cause it, when started running for such
- interactive use in the most ordinary way, to print or display an
- announcement including an appropriate copyright notice and a
- notice that there is no warranty (or else, saying that you provide
- a warranty) and that users may redistribute the program under
- these conditions, and telling the user how to view a copy of this
- License. (Exception: if the Program itself is interactive but
- does not normally print such an announcement, your work based on
- the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
- 3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
- a) Accompany it with the complete corresponding machine-readable
- source code, which must be distributed under the terms of Sections
- 1 and 2 above on a medium customarily used for software interchange; or,
-
- b) Accompany it with a written offer, valid for at least three
- years, to give any third party, for a charge no more than your
- cost of physically performing source distribution, a complete
- machine-readable copy of the corresponding source code, to be
- distributed under the terms of Sections 1 and 2 above on a medium
- customarily used for software interchange; or,
-
- c) Accompany it with the information you received as to the offer
- to distribute corresponding source code. (This alternative is
- allowed only for noncommercial distribution and only if you
- received the program in object code or executable form with such
- an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it. For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable. However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
- 4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License. Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
- 5. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Program or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
- 6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
- 7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all. For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
- 8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded. In such case, this License incorporates
-the limitation as if written in the body of this License.
-
- 9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time. Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation. If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
- 10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission. For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this. Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
- NO WARRANTY
-
- 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
- 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
-
- If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
- To do so, attach the following notices to the program. It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
- <one line to give the program's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
- Gnomovision version 69, Copyright (C) year name of author
- Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary. Here is a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the program
- `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
- <signature of Ty Coon>, 1 April 1989
- Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs. If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library. If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.
diff --git a/components/developer/automake-1.16/automake.p5m b/components/developer/automake-1.16/automake.p5m
index 5e2bd6d..f145ebf 100644
--- a/components/developer/automake-1.16/automake.p5m
+++ b/components/developer/automake-1.16/automake.p5m
@@ -10,11 +10,11 @@
#
#
-# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
-# Copyright 2015 Aurelien Larcher
+# Copyright 2018 Aurelien Larcher
#
-set name=pkg.fmri value=pkg:/developer/build/automake@$(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="$(COMPONENT_SUMMARY)"
set name=info.classification value="$(COMPONENT_CLASSIFICATION)"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
@@ -23,11 +23,129 @@
license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)'
-#Add dependency on versioned package
-depend type=require fmri=developer/build/automake-116
-
-# Install info files from the latest version
-file path=usr/share/info/automake-history.info
-file path=usr/share/info/automake.info
-file path=usr/share/info/automake.info-1
-file path=usr/share/info/automake.info-2
+link path=usr/bin/aclocal target=aclocal-1.16 mediator=automake mediator-version=1.16
+file path=usr/bin/aclocal-1.16
+link path=usr/bin/automake target=automake-1.16 mediator=automake mediator-version=1.16
+file path=usr/bin/automake-1.16
+file path=usr/share/aclocal-1.16/amversion.m4
+file path=usr/share/aclocal-1.16/ar-lib.m4
+file path=usr/share/aclocal-1.16/as.m4
+file path=usr/share/aclocal-1.16/auxdir.m4
+file path=usr/share/aclocal-1.16/cond-if.m4
+file path=usr/share/aclocal-1.16/cond.m4
+file path=usr/share/aclocal-1.16/depend.m4
+file path=usr/share/aclocal-1.16/depout.m4
+file path=usr/share/aclocal-1.16/dmalloc.m4
+file path=usr/share/aclocal-1.16/extra-recurs.m4
+file path=usr/share/aclocal-1.16/gcj.m4
+file path=usr/share/aclocal-1.16/init.m4
+file path=usr/share/aclocal-1.16/install-sh.m4
+file path=usr/share/aclocal-1.16/internal/ac-config-macro-dirs.m4
+file path=usr/share/aclocal-1.16/lead-dot.m4
+file path=usr/share/aclocal-1.16/lex.m4
+file path=usr/share/aclocal-1.16/lispdir.m4
+file path=usr/share/aclocal-1.16/maintainer.m4
+file path=usr/share/aclocal-1.16/make.m4
+file path=usr/share/aclocal-1.16/missing.m4
+file path=usr/share/aclocal-1.16/mkdirp.m4
+file path=usr/share/aclocal-1.16/obsolete.m4
+file path=usr/share/aclocal-1.16/options.m4
+file path=usr/share/aclocal-1.16/prog-cc-c-o.m4
+file path=usr/share/aclocal-1.16/python.m4
+file path=usr/share/aclocal-1.16/runlog.m4
+file path=usr/share/aclocal-1.16/sanity.m4
+file path=usr/share/aclocal-1.16/silent.m4
+file path=usr/share/aclocal-1.16/strip.m4
+file path=usr/share/aclocal-1.16/substnot.m4
+file path=usr/share/aclocal-1.16/tar.m4
+file path=usr/share/aclocal-1.16/upc.m4
+file path=usr/share/aclocal-1.16/vala.m4
+file path=usr/share/automake-1.16/Automake/ChannelDefs.pm
+file path=usr/share/automake-1.16/Automake/Channels.pm
+file path=usr/share/automake-1.16/Automake/Condition.pm
+file path=usr/share/automake-1.16/Automake/Config.pm
+file path=usr/share/automake-1.16/Automake/Configure_ac.pm
+file path=usr/share/automake-1.16/Automake/DisjConditions.pm
+file path=usr/share/automake-1.16/Automake/FileUtils.pm
+file path=usr/share/automake-1.16/Automake/General.pm
+file path=usr/share/automake-1.16/Automake/Getopt.pm
+file path=usr/share/automake-1.16/Automake/Item.pm
+file path=usr/share/automake-1.16/Automake/ItemDef.pm
+file path=usr/share/automake-1.16/Automake/Language.pm
+file path=usr/share/automake-1.16/Automake/Location.pm
+file path=usr/share/automake-1.16/Automake/Options.pm
+file path=usr/share/automake-1.16/Automake/Rule.pm
+file path=usr/share/automake-1.16/Automake/RuleDef.pm
+file path=usr/share/automake-1.16/Automake/VarDef.pm
+file path=usr/share/automake-1.16/Automake/Variable.pm
+file path=usr/share/automake-1.16/Automake/Version.pm
+file path=usr/share/automake-1.16/Automake/Wrap.pm
+file path=usr/share/automake-1.16/Automake/XFile.pm
+file path=usr/share/automake-1.16/COPYING
+file path=usr/share/automake-1.16/INSTALL
+file path=usr/share/automake-1.16/am/check.am
+file path=usr/share/automake-1.16/am/check2.am
+file path=usr/share/automake-1.16/am/clean-hdr.am
+file path=usr/share/automake-1.16/am/clean.am
+file path=usr/share/automake-1.16/am/compile.am
+file path=usr/share/automake-1.16/am/configure.am
+file path=usr/share/automake-1.16/am/data.am
+file path=usr/share/automake-1.16/am/dejagnu.am
+file path=usr/share/automake-1.16/am/depend.am
+file path=usr/share/automake-1.16/am/depend2.am
+file path=usr/share/automake-1.16/am/distdir.am
+file path=usr/share/automake-1.16/am/footer.am
+file path=usr/share/automake-1.16/am/header-vars.am
+file path=usr/share/automake-1.16/am/header.am
+file path=usr/share/automake-1.16/am/inst-vars.am
+file path=usr/share/automake-1.16/am/install.am
+file path=usr/share/automake-1.16/am/java.am
+file path=usr/share/automake-1.16/am/lang-compile.am
+file path=usr/share/automake-1.16/am/lex.am
+file path=usr/share/automake-1.16/am/library.am
+file path=usr/share/automake-1.16/am/libs.am
+file path=usr/share/automake-1.16/am/libtool.am
+file path=usr/share/automake-1.16/am/lisp.am
+file path=usr/share/automake-1.16/am/ltlib.am
+file path=usr/share/automake-1.16/am/ltlibrary.am
+file path=usr/share/automake-1.16/am/mans-vars.am
+file path=usr/share/automake-1.16/am/mans.am
+file path=usr/share/automake-1.16/am/program.am
+file path=usr/share/automake-1.16/am/progs.am
+file path=usr/share/automake-1.16/am/python.am
+file path=usr/share/automake-1.16/am/remake-hdr.am
+file path=usr/share/automake-1.16/am/scripts.am
+file path=usr/share/automake-1.16/am/subdirs.am
+file path=usr/share/automake-1.16/am/tags.am
+file path=usr/share/automake-1.16/am/texi-vers.am
+file path=usr/share/automake-1.16/am/texibuild.am
+file path=usr/share/automake-1.16/am/texinfos.am
+file path=usr/share/automake-1.16/am/vala.am
+file path=usr/share/automake-1.16/am/yacc.am
+file path=usr/share/automake-1.16/ar-lib mode=0555
+file path=usr/share/automake-1.16/compile mode=0555
+file path=usr/share/automake-1.16/config.guess mode=0555
+file path=usr/share/automake-1.16/config.sub mode=0555
+file path=usr/share/automake-1.16/depcomp mode=0555
+file path=usr/share/automake-1.16/install-sh mode=0555
+file path=usr/share/automake-1.16/mdate-sh mode=0555
+file path=usr/share/automake-1.16/missing mode=0555
+file path=usr/share/automake-1.16/mkinstalldirs mode=0555
+file path=usr/share/automake-1.16/py-compile mode=0555
+file path=usr/share/automake-1.16/tap-driver.sh mode=0555
+file path=usr/share/automake-1.16/test-driver mode=0555
+file path=usr/share/automake-1.16/texinfo.tex
+file path=usr/share/automake-1.16/ylwrap mode=0555
+file path=usr/share/doc/automake-1.16/amhello-1.0.tar.gz
+file path=usr/share/info/automake-1.16.info
+file path=usr/share/info/automake-1.16.info-1
+file path=usr/share/info/automake-1.16.info-2
+file path=usr/share/info/automake-history-1.16.info
+link path=usr/share/info/automake-history.info target=automake-history-1.16.info mediator=automake mediator-version=1.16
+link path=usr/share/info/automake.info target=automake-1.16.info mediator=automake mediator-version=1.16
+link path=usr/share/info/automake.info-1 target=automake-1.16.info-1 mediator=automake mediator-version=1.16
+link path=usr/share/info/automake.info-2 target=automake-1.16.info-2 mediator=automake mediator-version=1.16
+file path=usr/share/man/man1/aclocal-1.16.1
+link path=usr/share/man/man1/aclocal.1 target=aclocal-1.16.1 mediator=automake mediator-version=1.16
+file path=usr/share/man/man1/automake-1.16.1
+link path=usr/share/man/man1/automake.1 target=automake-1.16.1 mediator=automake mediator-version=1.16
diff --git a/components/developer/automake-1.16/manifests/sample-manifest.p5m b/components/developer/automake-1.16/manifests/sample-manifest.p5m
index cb9f8ef..385ddf3 100644
--- a/components/developer/automake-1.16/manifests/sample-manifest.p5m
+++ b/components/developer/automake-1.16/manifests/sample-manifest.p5m
@@ -10,7 +10,7 @@
#
#
-# Copyright 2022 <contributor>
+# Copyright 2024 <contributor>
#
set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
@@ -23,10 +23,10 @@
license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)'
-file path=usr/bin/aclocal
-hardlink path=usr/bin/aclocal-1.16 target=aclocal
-file path=usr/bin/automake
-hardlink path=usr/bin/automake-1.16 target=automake
+link path=usr/bin/aclocal target=aclocal-1.16
+file path=usr/bin/aclocal-1.16
+link path=usr/bin/automake target=automake-1.16
+file path=usr/bin/automake-1.16
file path=usr/share/aclocal-1.16/amversion.m4
file path=usr/share/aclocal-1.16/ar-lib.m4
file path=usr/share/aclocal-1.16/as.m4
@@ -60,7 +60,6 @@
file path=usr/share/aclocal-1.16/tar.m4
file path=usr/share/aclocal-1.16/upc.m4
file path=usr/share/aclocal-1.16/vala.m4
-file path=usr/share/aclocal/README
file path=usr/share/automake-1.16/Automake/ChannelDefs.pm
file path=usr/share/automake-1.16/Automake/Channels.pm
file path=usr/share/automake-1.16/Automake/Condition.pm
@@ -138,12 +137,15 @@
file path=usr/share/automake-1.16/texinfo.tex
file path=usr/share/automake-1.16/ylwrap
file path=usr/share/doc/automake-1.16/amhello-1.0.tar.gz
-file path=usr/share/info/automake-history.info
-file path=usr/share/info/automake.info
-file path=usr/share/info/automake.info-1
-file path=usr/share/info/automake.info-2
-file path=usr/share/info/dir
+file path=usr/share/info/automake-1.16.info
+file path=usr/share/info/automake-1.16.info-1
+file path=usr/share/info/automake-1.16.info-2
+file path=usr/share/info/automake-history-1.16.info
+link path=usr/share/info/automake-history.info target=automake-history-1.16.info
+link path=usr/share/info/automake.info target=automake-1.16.info
+link path=usr/share/info/automake.info-1 target=automake-1.16.info-1
+link path=usr/share/info/automake.info-2 target=automake-1.16.info-2
file path=usr/share/man/man1/aclocal-1.16.1
-file path=usr/share/man/man1/aclocal.1
+link path=usr/share/man/man1/aclocal.1 target=aclocal-1.16.1
file path=usr/share/man/man1/automake-1.16.1
-file path=usr/share/man/man1/automake.1
+link path=usr/share/man/man1/automake.1 target=automake-1.16.1
diff --git a/components/developer/automake-1.16/patches/01-depout-gmake.patch b/components/developer/automake-1.16/patches/01-depout-gmake.patch
deleted file mode 100644
index 84e688e..0000000
--- a/components/developer/automake-1.16/patches/01-depout-gmake.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-Hardcoding /usr/bin/gmake instead of $MAKE where -f --am-depfiles is used
-
---- automake-1.16.1/m4/depout.m4 2018-02-26 21:38:27.000000000 +0000
-+++ automake-1.16.1/m4/depout.m4.new 2019-08-25 14:59:06.741043451 +0000
-@@ -62,4 +62,4 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS
- AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
- [AC_CONFIG_COMMANDS([depfiles],
- [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
-- [AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"])])
-+ [AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-gmake}"])])
diff --git a/components/developer/automake-1.16/patches/01-test-cxx-bison.patch b/components/developer/automake-1.16/patches/01-test-cxx-bison.patch
new file mode 100644
index 0000000..2c65aec
--- /dev/null
+++ b/components/developer/automake-1.16/patches/01-test-cxx-bison.patch
@@ -0,0 +1,46 @@
+https://debbugs.gnu.org/cgi/bugreport.cgi?bug=68832
+
+--- automake-1.16.5/t/yacc-cxx.sh.orig
++++ automake-1.16.5/t/yacc-cxx.sh
+@@ -18,7 +18,7 @@
+ # headers are not involved).
+ # Keep in sync with sister test 'yacc-basic.sh'.
+
+-required='c++ yacc'
++required='c++ bison'
+ . test-init.sh
+
+ cat >> configure.ac << 'END'
+--- automake-1.16.5/t/yacc-clean-cxx.sh.orig
++++ automake-1.16.5/t/yacc-clean-cxx.sh
+@@ -20,7 +20,7 @@
+ # "make maintainer-clean".
+ # See also sister test 'yacc-clean.sh'.
+
+-required='c++ yacc'
++required='c++ bison'
+ . test-init.sh
+
+ cat >> configure.ac << 'END'
+--- automake-1.16.5/t/yacc-d-cxx.sh.orig
++++ automake-1.16.5/t/yacc-d-cxx.sh
+@@ -18,7 +18,7 @@
+ # (i.e., '-d' in *YFLAGS).
+ # Keep in sync with sister test 'yacc-d-basic.sh'.
+
+-required='c++ yacc'
++required='c++ bison'
+ . test-init.sh
+
+ write_parse ()
+--- automake-1.16.5/t/yacc-mix-c-cxx.sh.orig
++++ automake-1.16.5/t/yacc-mix-c-cxx.sh
+@@ -17,7 +17,7 @@
+ # Check that many different Yacc parsers (both C and C++) can co-exists
+ # in the same directory.
+
+-required='cc c++ yacc'
++required='cc c++ bison'
+ . test-init.sh
+
+ cat >> configure.ac << 'END'
diff --git a/components/developer/automake-1.16/pkg5 b/components/developer/automake-1.16/pkg5
index 9b49afa..b0491ae 100644
--- a/components/developer/automake-1.16/pkg5
+++ b/components/developer/automake-1.16/pkg5
@@ -1,14 +1,10 @@
{
"dependencies": [
- "SUNWcs",
- "runtime/perl-534",
- "runtime/perl-536",
- "shell/ksh93",
- "system/library"
+ "runtime/perl",
+ "shell/ksh93"
],
"fmris": [
- "developer/build/automake",
"developer/build/automake-116"
],
"name": "automake"
-}
\ No newline at end of file
+}
diff --git a/components/developer/automake-1.16/test/results-32.master b/components/developer/automake-1.16/test/results-all.master
similarity index 98%
rename from components/developer/automake-1.16/test/results-32.master
rename to components/developer/automake-1.16/test/results-all.master
index 47ec696..3376f5b 100644
--- a/components/developer/automake-1.16/test/results-32.master
+++ b/components/developer/automake-1.16/test/results-all.master
@@ -2,11 +2,11 @@
XFAIL: t/pm/Cond2.pl
XFAIL: t/pm/Cond3.pl
PASS: t/pm/Condition.pl
-SKIP: t/pm/Condition-t.pl
+PASS: t/pm/Condition-t.pl
XFAIL: t/pm/DisjCon2.pl
XFAIL: t/pm/DisjCon3.pl
PASS: t/pm/DisjConditions.pl
-SKIP: t/pm/DisjConditions-t.pl
+PASS: t/pm/DisjConditions-t.pl
PASS: t/pm/General.pl
PASS: t/pm/Version.pl
XFAIL: t/pm/Version2.pl
@@ -123,7 +123,7 @@
PASS: t/aclocal-dirlist-globbing.sh
PASS: t/aclocal-dirlist-abspath.sh
PASS: t/aclocal-install-absdir.sh
-SKIP: t/aclocal-install-fail.sh
+PASS: t/aclocal-install-fail.sh
PASS: t/aclocal-install-mkdir.sh
PASS: t/aclocal-m4-include-are-scanned-aclocal-amflags.sh
PASS: t/aclocal-m4-include-are-scanned.sh
@@ -734,7 +734,7 @@
PASS: t/check8.sh
PASS: t/check10.sh
PASS: t/check11.sh
-SKIP: t/check12.sh
+PASS: t/check12.sh
PASS: t/check-subst.sh
PASS: t/check-subst-prog.sh
PASS: t/check-exported-srcdir.sh
@@ -888,14 +888,14 @@
PASS: t/defun2.sh
PASS: t/dejagnu.sh
PASS: t/dejagnu2.sh
-SKIP: t/dejagnu3.sh
-SKIP: t/dejagnu4.sh
-SKIP: t/dejagnu5.sh
-SKIP: t/dejagnu6.sh
-SKIP: t/dejagnu7.sh
-SKIP: t/dejagnu-absolute-builddir.sh
-SKIP: t/dejagnu-relative-srcdir.sh
-SKIP: t/dejagnu-siteexp-extend.sh
+PASS: t/dejagnu3.sh
+PASS: t/dejagnu4.sh
+PASS: t/dejagnu5.sh
+PASS: t/dejagnu6.sh
+PASS: t/dejagnu7.sh
+PASS: t/dejagnu-absolute-builddir.sh
+PASS: t/dejagnu-relative-srcdir.sh
+PASS: t/dejagnu-siteexp-extend.sh
PASS: t/dejagnu-siteexp-append.sh
PASS: t/dejagnu-siteexp-useredit.sh
PASS: t/deleted-am.sh
@@ -914,7 +914,7 @@
PASS: t/depend6.sh
PASS: t/depend-postproc.sh
PASS: t/deprecated-acinit.sh
-SKIP: t/destdir.sh
+PASS: t/destdir.sh
PASS: t/dir-named-obj-is-bad.sh
PASS: t/discover.sh
PASS: t/dist-formats.tap 1 - default [automake]
@@ -1002,7 +1002,7 @@
PASS: t/dist-missing-am.sh
PASS: t/dist-missing-included-m4.sh
PASS: t/dist-missing-m4.sh
-SKIP: t/dist-readonly.sh
+PASS: t/dist-readonly.sh
PASS: t/dist-repeated.sh
XFAIL: t/dist-pr109765.sh
PASS: t/dist-no-built-sources.sh
@@ -1126,12 +1126,12 @@
PASS: t/init.sh
PASS: t/init2.sh
PASS: t/dist-install-sh.sh
-SKIP: t/dist-with-unreadable-makefile-fails.sh
+PASS: t/dist-with-unreadable-makefile-fails.sh
PASS: t/installdir.sh
PASS: t/add-missing-install-sh.sh
PASS: t/install-sh-unittests.sh
-SKIP: t/install-sh-option-C.sh
-SKIP: t/install-sh-option-S.sh
+PASS: t/install-sh-option-C.sh
+PASS: t/install-sh-option-S.sh
PASS: t/instdat.sh
PASS: t/instdat2.sh
PASS: t/instdir.sh
@@ -1146,16 +1146,16 @@
PASS: t/instdir-python.sh
SKIP: t/instdir-texi.sh
PASS: t/instexec.sh
-SKIP: t/instfail.sh
-SKIP: t/instfail-info.sh
-SKIP: t/instfail-java.sh
-SKIP: t/instfail-libtool.sh
+PASS: t/instfail.sh
+PASS: t/instfail-info.sh
+PASS: t/instfail-java.sh
+PASS: t/instfail-libtool.sh
PASS: t/insthook.sh
PASS: t/instman.sh
PASS: t/instman2.sh
-SKIP: t/instmany.sh
-SKIP: t/instmany-mans.sh
-SKIP: t/instmany-python.sh
+PASS: t/instmany.sh
+PASS: t/instmany-mans.sh
+PASS: t/instmany-python.sh
PASS: t/install-info-dir.sh
PASS: t/interp.sh
PASS: t/interp2.sh
@@ -1195,9 +1195,9 @@
PASS: t/lex-libobj.sh
PASS: t/lex-multiple.sh
PASS: t/lex-noyywrap.sh
-FAIL: t/lex-clean-cxx.sh
+PASS: t/lex-clean-cxx.sh
PASS: t/lex-clean.sh
-FAIL: t/lex-depend-cxx.sh
+PASS: t/lex-depend-cxx.sh
PASS: t/lex-depend-grep.sh
PASS: t/lex-depend.sh
PASS: t/lex-line.sh
@@ -1265,7 +1265,7 @@
PASS: t/lisp-subdir.sh
PASS: t/lisp-subdir2.sh
PASS: t/lisp-subdir-mix.sh
-SKIP: t/lispdry.sh
+PASS: t/lispdry.sh
PASS: t/lisp-pr11806.sh
PASS: t/lisp-flags.sh
PASS: t/listval.sh
@@ -1513,7 +1513,7 @@
PASS: t/parallel-tests-fd-redirect.sh
PASS: t/parallel-tests-fd-redirect-exeext.sh
PASS: t/parallel-tests-extra-programs.sh
-SKIP: t/parallel-tests-unreadable.sh
+PASS: t/parallel-tests-unreadable.sh
PASS: t/parallel-tests-subdir.sh
PASS: t/parallel-tests-interrupt.tap 1 - logfile created and readable [SIG 1]
PASS: t/parallel-tests-interrupt.tap 2 - logfile contains output from test script [SIG 1]
@@ -1579,7 +1579,7 @@
PASS: t/test-missing2.sh
PASS: t/test-trs-basic.sh
PASS: t/test-trs-recover.sh
-SKIP: t/test-trs-recover2.sh
+PASS: t/test-trs-recover2.sh
PASS: t/test-extensions.sh
PASS: t/test-extensions-cond.sh
PASS: t/toplevelmd.sh
@@ -1942,7 +1942,7 @@
PASS: t/python-dist.sh
PASS: t/python-prefix.sh
PASS: t/python-vars.sh
-SKIP: t/python-virtualenv.sh
+PASS: t/python-virtualenv.sh
PASS: t/python-pr10995.sh
PASS: t/recurs-user.sh
PASS: t/recurs-user2.sh
@@ -2201,8 +2201,8 @@
PASS: t/strictness-override.sh
PASS: t/strictness-precedence.sh
PASS: t/strip.sh
-SKIP: t/strip2.sh
-SKIP: t/strip3.sh
+PASS: t/strip2.sh
+PASS: t/strip3.sh
PASS: t/subdir.sh
PASS: t/subdir-ac-subst.sh
PASS: t/subdir-add-pr46.sh
@@ -2392,12 +2392,12 @@
PASS: t/tap-bad-prog.tap 1 - "make check" returns non-zero exit status
PASS: t/tap-bad-prog.tap 2 - non-existent test is reported
PASS: t/tap-bad-prog.tap 3 - non-executable test is reported
-SKIP: t/tap-bad-prog.tap 4 - non-readable test is reported # SKIP any file is readable
+PASS: t/tap-bad-prog.tap 4 - non-readable test is reported
XFAIL: t/tap-bad-prog.tap 5 - no spurious "missing plan" message # TODO
XFAIL: t/tap-bad-prog.tap 6 - no spurious results # TODO still get "missing plan"
PASS: t/tap-basic.sh
PASS: t/tap-diagnostic-custom.sh
-SKIP: t/tap-driver-stderr.sh
+PASS: t/tap-driver-stderr.sh
PASS: t/tap-doc.sh
PASS: t/tap-doc2.sh
PASS: t/tap-more.sh
@@ -2458,7 +2458,7 @@
PASS: t/transform.sh
PASS: t/transform2.sh
PASS: t/transform3.sh
-SKIP: t/uninstall-fail.sh
+PASS: t/uninstall-fail.sh
PASS: t/uninstall-pr9578.sh
PASS: t/unused.sh
SKIP: t/upc.sh
@@ -2551,7 +2551,7 @@
PASS: t/check-tests-in-builddir-w.sh
PASS: t/check-w.sh
PASS: t/check11-w.sh
-SKIP: t/check12-w.sh
+PASS: t/check12-w.sh
PASS: t/check2-w.sh
PASS: t/check4-w.sh
PASS: t/check5-w.sh
@@ -2568,8 +2568,8 @@
PASS: t/compile6-w.sh
SKIP: t/compile7-w.sh
PASS: t/exeext4-w.sh
-SKIP: t/install-sh-option-C-w.sh
-SKIP: t/install-sh-option-S-w.sh
+PASS: t/install-sh-option-C-w.sh
+PASS: t/install-sh-option-S-w.sh
PASS: t/install-sh-unittests-w.sh
PASS: t/maken3-w.sh
PASS: t/mdate5-w.sh
@@ -2979,9 +2979,9 @@
PASS: contrib/t/help-multilib.sh
PASS: contrib/t/multilib.sh
# TOTAL: 2980
-# PASS: 2851
-# SKIP: 88
+# PASS: 2889
+# SKIP: 52
# XFAIL: 39
-# FAIL: 2
+# FAIL: 0
# XPASS: 0
# ERROR: 0
diff --git a/components/meta-packages/automake/Makefile b/components/meta-packages/automake/Makefile
new file mode 100644
index 0000000..1161716
--- /dev/null
+++ b/components/meta-packages/automake/Makefile
@@ -0,0 +1,34 @@
+#
+# This file and its contents are supplied under the terms of the
+# Common Development and Distribution License ("CDDL"). You may
+# only use this file in accordance with the terms of the CDDL.
+#
+# A full copy of the text of the CDDL should have accompanied this
+# source. A copy of the CDDL is also available via the Internet at
+# http://www.illumos.org/license/CDDL.
+#
+
+#
+# Copyright 2024 Marcel Telka
+#
+
+BUILD_STYLE = pkg
+
+include ../../../make-rules/shared-macros.mk
+
+COMPONENT_NAME = automake
+HUMAN_VERSION = 1.16
+# When we upgrade to new major version (e.g. 1.17) the COMPONENT_VERSION should
+# be removed.
+COMPONENT_VERSION = 1.16.5
+COMPONENT_REVISION= 2
+COMPONENT_SUMMARY = A Makefile generator
+COMPONENT_PROJECT_URL = https://www.gnu.org/software/automake/
+COMPONENT_FMRI = developer/build/automake
+COMPONENT_CLASSIFICATION = Development/GNU
+
+include $(WS_MAKE_RULES)/common.mk
+
+PKG_MACROS += AMV=$(subst .,,$(HUMAN_VERSION))
+
+# Auto-generated dependencies
diff --git a/components/meta-packages/automake/automake.p5m b/components/meta-packages/automake/automake.p5m
new file mode 100644
index 0000000..8e9d285
--- /dev/null
+++ b/components/meta-packages/automake/automake.p5m
@@ -0,0 +1,23 @@
+#
+# This file and its contents are supplied under the terms of the
+# Common Development and Distribution License ("CDDL"), version 1.0.
+# You may only use this file in accordance with the terms of version
+# 1.0 of the CDDL.
+#
+# A full copy of the text of the CDDL should have accompanied this
+# source. A copy of the CDDL is also available via the Internet at
+# http://www.illumos.org/license/CDDL.
+#
+
+#
+# Copyright 2023 Marcel Telka
+#
+
+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)
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+
+depend type=require fmri=developer/build/automake-$(AMV)
diff --git a/components/meta-packages/automake/manifests/sample-manifest.p5m b/components/meta-packages/automake/manifests/sample-manifest.p5m
new file mode 100644
index 0000000..862f329
--- /dev/null
+++ b/components/meta-packages/automake/manifests/sample-manifest.p5m
@@ -0,0 +1,25 @@
+#
+# This file and its contents are supplied under the terms of the
+# Common Development and Distribution License ("CDDL"), version 1.0.
+# You may only use this file in accordance with the terms of version
+# 1.0 of the CDDL.
+#
+# A full copy of the text of the CDDL should have accompanied this
+# source. A copy of the CDDL is also available via the Internet at
+# http://www.illumos.org/license/CDDL.
+#
+
+#
+# Copyright 2024 <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)
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+
+license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)'
+
diff --git a/components/meta-packages/automake/pkg5 b/components/meta-packages/automake/pkg5
new file mode 100644
index 0000000..8f59a61
--- /dev/null
+++ b/components/meta-packages/automake/pkg5
@@ -0,0 +1,7 @@
+{
+ "dependencies": [],
+ "fmris": [
+ "developer/build/automake"
+ ],
+ "name": "automake"
+}
--
Gitblit v1.9.3