From 71e9401049be8378d1f7c0e45c89886f4d6f3d5f Mon Sep 17 00:00:00 2001
From: Marcel Telka <marcel@telka.sk>
Date: Tue, 09 Aug 2022 10:47:04 +0200
Subject: [PATCH] foomatic/db-engine: rebuild for perl 5.34; switch to 64 bit
---
components/foomatic/db-engine/manifests/sample-manifest.p5m | 25 +++---------
components/foomatic/db-engine/foomatic-db-engine.p5m | 17 ++++----
components/foomatic/db-engine/pkg5 | 5 +-
components/foomatic/db-engine/Makefile | 24 +++--------
components/foomatic/db-engine/patches/02-install_vendor.patch | 11 +++++
5 files changed, 35 insertions(+), 47 deletions(-)
diff --git a/components/foomatic/db-engine/Makefile b/components/foomatic/db-engine/Makefile
index 8319531..39cdd2f 100644
--- a/components/foomatic/db-engine/Makefile
+++ b/components/foomatic/db-engine/Makefile
@@ -24,7 +24,7 @@
COMPONENT_NAME= foomatic-db-engine
COMPONENT_VERSION= 3.0-20080903
-COMPONENT_REVISION= 1
+COMPONENT_REVISION= 2
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
COMPONENT_ARCHIVE_HASH= \
@@ -33,9 +33,9 @@
COMPONENT_PROJECT_URL= http://www.linuxfoundation.org/collaborate/workgroups/openprinting/database/foomatic/
COMPONENT_BUGDB= utility/foomatic
-include ../../../make-rules/prep.mk
-include ../../../make-rules/configure.mk
-include ../../../make-rules/ips.mk
+TEST_TARGET = $(NO_TESTS)
+
+include ../../../make-rules/common.mk
CONFIGURE_OPTIONS += CFLAGS="$(CFLAGS)"
CONFIGURE_OPTIONS += PERL=$(PERL)
@@ -48,10 +48,6 @@
# setup perl build
COMPONENT_PRE_CONFIGURE_ACTION += cd $(@D)/lib ; $(PERL) Makefile.PL
-# install perl modules
-COMPONENT_PRE_INSTALL_ACTION = \
- ( cd $(@D)/lib ; $(GMAKE) install_vendor DESTDIR=$(PROTO_DIR) )
-
# the perl .packlist contains the path to the file as built rather than
# as installed. Fix to be installed path, ie remove PROTO_DIR.
VENDORARCH= $(shell $(PERL) -e 'use Config; print $$Config{vendorarch}')
@@ -61,17 +57,11 @@
>> $(PROTO_DIR)/$(PACKLIST).fixed ; \
$(MV) $(PROTO_DIR)/$(PACKLIST).fixed $(PROTO_DIR)/$(PACKLIST)
-
-# common targets
-build: $(BUILD_32)
-
-install: $(INSTALL_32)
-
-test: $(NO_TESTS)
+# PKGVERS is needed for manifest processing
+PKG_MACROS += PERLVER=$(PERL_VERSION)
# Auto-generated dependencies
+PERL_REQUIRED_PACKAGES += runtime/perl
REQUIRED_PACKAGES += library/libxml2
-REQUIRED_PACKAGES += runtime/perl-522
-REQUIRED_PACKAGES += runtime/perl-524
REQUIRED_PACKAGES += shell/bash
REQUIRED_PACKAGES += system/library
diff --git a/components/foomatic/db-engine/foomatic-db-engine.p5m b/components/foomatic/db-engine/foomatic-db-engine.p5m
index c8f9bee..c33e50d 100644
--- a/components/foomatic/db-engine/foomatic-db-engine.p5m
+++ b/components/foomatic/db-engine/foomatic-db-engine.p5m
@@ -24,6 +24,7 @@
<transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
set name=pkg.fmri value=pkg:/print/cups/filter/foomatic-db-engine@0.20080903,$(BUILD_VERSION)
+set name=pkg.human-version value=$(HUMAN_VERSION)
set name=pkg.summary value="Foomatic Database Engine"
set name=com.oracle.info.description value="the Foomatic Database Engine"
set name=com.oracle.info.tpno value=6399
@@ -35,22 +36,23 @@
license foomatic-db-engine.license license='GPLv2, MIT'
-
file path=usr/bin/foomatic-combo-xml
file path=usr/bin/foomatic-compiledb
file path=usr/bin/foomatic-configure
+link path=usr/bin/foomatic-datafile target=foomatic-ppdfile
file path=usr/bin/foomatic-perl-data
file path=usr/bin/foomatic-ppd-options
file path=usr/bin/foomatic-ppdfile
file path=usr/bin/foomatic-printjob
file path=usr/bin/foomatic-searchprinter
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/Foomatic/DB.pm
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/Foomatic/PPD.pm
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/Foomatic/UIElem.pm
+link path=usr/lib/cups/driver/foomatic target=../../../../usr/bin/foomatic-ppdfile
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Foomatic/.packlist
+file path=usr/perl5/vendor_perl/$(PERLVER)/Foomatic/DB.pm
+file path=usr/perl5/vendor_perl/$(PERLVER)/Foomatic/PPD.pm
+file path=usr/perl5/vendor_perl/$(PERLVER)/Foomatic/UIElem.pm
# Defaults.pm are not built by the perl module, but by external utility, so it's in
# wrong place
-file $(MACH32)/lib/Foomatic/Defaults.pm path=usr/perl5/vendor_perl/$(PERL_VERSION)/Foomatic/Defaults.pm
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/Foomatic/.packlist
+file $(MACH64)/lib/Foomatic/Defaults.pm path=usr/perl5/vendor_perl/$(PERLVER)/Foomatic/Defaults.pm
file path=usr/sbin/foomatic-addpjloptions
file path=usr/sbin/foomatic-cleanupdrivers
file path=usr/sbin/foomatic-extract-text
@@ -75,6 +77,3 @@
file path=usr/share/man/man8/foomatic-getpjloptions.8
file path=usr/share/man/man8/foomatic-kitload.8
file path=usr/share/man/man8/foomatic-preferred-driver.8
-
-link path=usr/bin/foomatic-datafile target=foomatic-ppdfile
-link path=usr/lib/cups/driver/foomatic target=../../../../usr/bin/foomatic-ppdfile
diff --git a/components/foomatic/db-engine/manifests/sample-manifest.p5m b/components/foomatic/db-engine/manifests/sample-manifest.p5m
index 07ccb31..2f2ab56 100644
--- a/components/foomatic/db-engine/manifests/sample-manifest.p5m
+++ b/components/foomatic/db-engine/manifests/sample-manifest.p5m
@@ -10,10 +10,11 @@
#
#
-# Copyright 2016 <contributor>
+# Copyright 2022 <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)
@@ -32,24 +33,10 @@
file path=usr/bin/foomatic-printjob
file path=usr/bin/foomatic-searchprinter
link path=usr/lib/cups/driver/foomatic target=/usr/bin/foomatic-ppdfile
-file path=usr/perl5/5.16/lib/i86pc-solaris-64int/perllocal.pod
-file path=usr/perl5/5.22/lib/i86pc-solaris-64int/perllocal.pod
-file path=usr/perl5/site_perl/5.16/Foomatic/DB.pm
-file path=usr/perl5/site_perl/5.16/Foomatic/PPD.pm
-file path=usr/perl5/site_perl/5.16/Foomatic/UIElem.pm
-file path=usr/perl5/site_perl/5.16/i86pc-solaris-64int/auto/Foomatic/.packlist
-file path=usr/perl5/site_perl/5.22/Foomatic/DB.pm
-file path=usr/perl5/site_perl/5.22/Foomatic/PPD.pm
-file path=usr/perl5/site_perl/5.22/Foomatic/UIElem.pm
-file path=usr/perl5/site_perl/5.22/i86pc-solaris-64int/auto/Foomatic/.packlist
-file path=usr/perl5/vendor_perl/5.16/Foomatic/DB.pm
-file path=usr/perl5/vendor_perl/5.16/Foomatic/PPD.pm
-file path=usr/perl5/vendor_perl/5.16/Foomatic/UIElem.pm
-file path=usr/perl5/vendor_perl/5.16/i86pc-solaris-64int/auto/Foomatic/.packlist
-file path=usr/perl5/vendor_perl/5.22/Foomatic/DB.pm
-file path=usr/perl5/vendor_perl/5.22/Foomatic/PPD.pm
-file path=usr/perl5/vendor_perl/5.22/Foomatic/UIElem.pm
-file path=usr/perl5/vendor_perl/5.22/i86pc-solaris-64int/auto/Foomatic/.packlist
+file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Foomatic/.packlist
+file path=usr/perl5/vendor_perl/$(PERLVER)/Foomatic/DB.pm
+file path=usr/perl5/vendor_perl/$(PERLVER)/Foomatic/PPD.pm
+file path=usr/perl5/vendor_perl/$(PERLVER)/Foomatic/UIElem.pm
file path=usr/sbin/foomatic-addpjloptions
file path=usr/sbin/foomatic-cleanupdrivers
file path=usr/sbin/foomatic-extract-text
diff --git a/components/foomatic/db-engine/patches/02-install_vendor.patch b/components/foomatic/db-engine/patches/02-install_vendor.patch
new file mode 100644
index 0000000..24ab3e4
--- /dev/null
+++ b/components/foomatic/db-engine/patches/02-install_vendor.patch
@@ -0,0 +1,11 @@
+--- foomatic-db-engine-3.0-20080903/Makefile.in.orig 2022-08-09 09:53:42.484623215 +0000
++++ foomatic-db-engine-3.0-20080903/Makefile.in 2022-08-09 09:53:53.002643494 +0000
+@@ -188,7 +188,7 @@
+ # $(DESTDIR) properly
+ ( cd lib && \
+ $(MAKE) PREFIX=$(PERLPREFIX) && \
+- $(MAKE) PREFIX=$(DESTDIR)$(PERLPREFIX) pure_install \
++ $(MAKE) PREFIX=$(DESTDIR)$(PERLPREFIX) install_vendor \
+ )
+ ${SRC}/mkinstalldirs $(DESTDIR)$(BINDIR)
+ ${SRC}/mkinstalldirs $(DESTDIR)$(SBINDIR)
diff --git a/components/foomatic/db-engine/pkg5 b/components/foomatic/db-engine/pkg5
index 57f4ef6..e284770 100644
--- a/components/foomatic/db-engine/pkg5
+++ b/components/foomatic/db-engine/pkg5
@@ -2,9 +2,10 @@
"dependencies": [
"SUNWcs",
"library/libxml2",
- "runtime/perl-522",
- "runtime/perl-524",
+ "runtime/perl-534",
+ "runtime/perl-536",
"shell/bash",
+ "shell/ksh93",
"system/library"
],
"fmris": [
--
Gitblit v1.9.3