Marcel Telka
2024-02-02 8bbe608321ff3190009b93baa7edeaef56f6fe24
foomatic/db-engine: update to 4.0.13

1 files deleted
7 files modified
289 ■■■■ changed files
components/foomatic/db-engine/Makefile 48 ●●●● patch | view | raw | blame | history
components/foomatic/db-engine/foomatic-db-engine.license 136 ●●●●● patch | view | raw | blame | history
components/foomatic/db-engine/foomatic-db-engine.p5m 21 ●●●●● patch | view | raw | blame | history
components/foomatic/db-engine/manifests/sample-manifest.p5m 7 ●●●●● patch | view | raw | blame | history
components/foomatic/db-engine/patches/00-foomatic-kitload.in.patch 30 ●●●●● patch | view | raw | blame | history
components/foomatic/db-engine/patches/01-DB.pm.patch 30 ●●●●● patch | view | raw | blame | history
components/foomatic/db-engine/patches/02-install_vendor.patch 10 ●●●● patch | view | raw | blame | history
components/foomatic/db-engine/pkg5 7 ●●●● patch | view | raw | blame | history
components/foomatic/db-engine/Makefile
@@ -20,45 +20,47 @@
#
# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME=        foomatic-db-engine
COMPONENT_VERSION=    3.0-20080903
COMPONENT_REVISION=    2
COMPONENT_VERSION=    4.0.13
COMPONENT_SUMMARY=    Foomatic Database Engine
COMPONENT_SRC=        $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE=    $(COMPONENT_SRC).tar.gz
COMPONENT_ARCHIVE_HASH=    \
    sha256:668f2020eb136359523090cc17151e6aad0c56bce0e4ae91217a9eba19eec917
COMPONENT_ARCHIVE_URL=    http://dlc.openindiana.org/oi-build/source-archives/$(COMPONENT_ARCHIVE)
COMPONENT_PROJECT_URL=    http://www.linuxfoundation.org/collaborate/workgroups/openprinting/database/foomatic/
COMPONENT_BUGDB=    utility/foomatic
    sha256:b5c89027aa26967d2e6db62e2af7db0c4039d2480d4fbf2476a6ddcf609a5faf
COMPONENT_ARCHIVE_URL=    https://www.openprinting.org/download/foomatic/$(COMPONENT_ARCHIVE)
COMPONENT_PROJECT_URL=    https://openprinting.github.io/projects/02-foomatic/
COMPONENT_FMRI=        print/cups/filter/foomatic-db-engine
COMPONENT_CLASSIFICATION=    System/Printing
COMPONENT_LICENSE=    GPL-2.0-only
COMPONENT_LICENSE_FILE=    COPYING
TEST_TARGET = $(NO_TESTS)
include ../../../make-rules/common.mk
include $(WS_MAKE_RULES)/common.mk
CONFIGURE_OPTIONS +=    CFLAGS="$(CFLAGS)"
CONFIGURE_OPTIONS +=    PERL=$(PERL)
CONFIGURE_OPTIONS +=    FILEUTIL=/bin/true
CONFIGURE_OPTIONS +=    --sysconfdir=$(ETCDIR)/gnu
# Force known Perl version
CONFIGURE_OPTIONS += PERL=$(PERL)
# configure is not happy with /usr/bin/file and asks for astron file
CONFIGURE_OPTIONS += FILEUTIL=/usr/bin/gfile
# the build system does not support building outside of the source tree
COMPONENT_PRE_CONFIGURE_ACTION = $(CLONEY) $(SOURCE_DIR) $(@D) ;
COMPONENT_PRE_CONFIGURE_ACTION += $(CLONEY) $(SOURCE_DIR) $(@D) ;
# setup perl build
COMPONENT_PRE_CONFIGURE_ACTION += cd $(@D)/lib ; $(PERL) Makefile.PL
COMPONENT_PRE_CONFIGURE_ACTION += cd $(@D)/lib ; $(PERL) Makefile.PL ;
# 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}')
PACKLIST=   $(VENDORARCH)/auto/Foomatic/.packlist
COMPONENT_POST_INSTALL_ACTION = \
 sed -e "s/$(subst /,\\/,$(PROTO_DIR))//g" $(PROTO_DIR)/$(PACKLIST) \
     >> $(PROTO_DIR)/$(PACKLIST).fixed ; \
 $(MV) $(PROTO_DIR)/$(PACKLIST).fixed $(PROTO_DIR)/$(PACKLIST)
# Defaults.pm is not built by the perl module, but by external utility, so it's in wrong place
COMPONENT_POST_INSTALL_ACTION += \
    $(INSTALL) $(@D)/lib/Foomatic/Defaults.pm $(PROTOUSRDIR)/perl5/vendor_perl/$(PERL_VERSION)/Foomatic ;
# PKGVERS is needed for manifest processing
PKG_MACROS += PERLVER=$(PERL_VERSION)
# Convert absolute symlink to relative one
COMPONENT_POST_INSTALL_ACTION += \
    $(RM) $(PROTOUSRLIBDIR)/cups/driver/foomatic ; \
    $(SYMLINK) ../../../bin/foomatic-ppdfile $(PROTOUSRLIBDIR)/cups/driver/foomatic ;
# Auto-generated dependencies
PERL_REQUIRED_PACKAGES += runtime/perl
components/foomatic/db-engine/foomatic-db-engine.license
File was deleted
components/foomatic/db-engine/foomatic-db-engine.p5m
@@ -21,20 +21,15 @@
# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<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.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(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
set name=info.classification value="org.opensolaris.category.2008:System/Printing"
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)
set name=org.opensolaris.arc-caseid value=PSARC/2008/595
license foomatic-db-engine.license license='GPLv2, MIT'
license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)'
file path=usr/bin/foomatic-combo-xml
file path=usr/bin/foomatic-compiledb
@@ -42,17 +37,15 @@
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-ppd-to-xml
file path=usr/bin/foomatic-ppdfile
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/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Foomatic/.packlist
link path=usr/lib/cups/driver/foomatic target=../../../bin/foomatic-ppdfile
file path=usr/perl5/vendor_perl/$(PERLVER)/Foomatic/DB.pm
file path=usr/perl5/vendor_perl/$(PERLVER)/Foomatic/Defaults.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 $(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
components/foomatic/db-engine/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)
@@ -29,12 +29,13 @@
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-ppd-to-xml
file path=usr/bin/foomatic-ppdfile
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/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Foomatic/.packlist
link path=usr/lib/cups/driver/foomatic target=../../../bin/foomatic-ppdfile
file path=usr/perl5/vendor_perl/$(PERLVER)/Foomatic/DB.pm
file path=usr/perl5/vendor_perl/$(PERLVER)/Foomatic/Defaults.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
components/foomatic/db-engine/patches/00-foomatic-kitload.in.patch
@@ -1,19 +1,11 @@
*** a/foomatic-kitload.in.orig    Mon Oct 27 15:58:18 2008
--- b/foomatic-kitload.in        Mon Oct 27 15:59:18 2008
***************
*** 54,60 ****
  $ENV{'LANG'} = "C";
  # Copy the files
! my $retval = system("( cd $dir ; tar cf - --exclude CVS . ) | tar xv${dontoverwrite}Cf $destdir$libdir/db/source - 2> $destdir$libdir/kitload2.log | tee $destdir$libdir/kitload.log");
  #$retval = $retval / 256;
  #if ($retval) {
  #    die "Error copying files to $destdir$libdir/db/source: $?";
--- 54,60 ----
  $ENV{'LANG'} = "C";
  # Copy the files
! my $retval = system("( cd $dir ; /usr/bin/gtar cf - --exclude CVS . ) | /usr/bin/gtar xv${dontoverwrite}Cf $destdir$libdir/db/source - 2> $destdir$libdir/kitload2.log | tee $destdir$libdir/kitload.log");
  #$retval = $retval / 256;
  #if ($retval) {
  #    die "Error copying files to $destdir$libdir/db/source: $?";
--- foomatic-db-engine-4.0.13/foomatic-kitload.in.orig
+++ foomatic-db-engine-4.0.13/foomatic-kitload.in
@@ -54,7 +54,7 @@
 $ENV{'LANG'} = "C";
 # Copy the files
-my $retval = system("( cd $dir ; tar cf - --exclude CVS . ) | tar xv${dontoverwrite}Cf $destdir$libdir/db/source - 2> $destdir$libdir/kitload2.log | tee $destdir$libdir/kitload.log");
+my $retval = system("( cd $dir ; /usr/bin/gtar cf - --exclude CVS . ) | /usr/bin/gtar xv${dontoverwrite}Cf $destdir$libdir/db/source - 2> $destdir$libdir/kitload2.log | tee $destdir$libdir/kitload.log");
 #$retval = $retval / 256;
 #if ($retval) {
 #    die "Error copying files to $destdir$libdir/db/source: $?";
components/foomatic/db-engine/patches/01-DB.pm.patch
@@ -1,19 +1,11 @@
*** a/lib/Foomatic/DB.pm.orig    Mon Oct 27 15:51:02 2008
--- b/lib/Foomatic/DB.pm    Mon Oct 27 15:50:37 2008
***************
*** 102,108 ****
      }
      # Build a new overview
!     my $otype = ($cupsppds ? '-C' : '-O');
      $otype .= ' -n' if ($cupsppds == 1);
      # Generate overview Perl data structure from database
      my $VAR1;
--- 102,108 ----
      }
      # Build a new overview
!     my $otype = ($cupsppds ? '-C' : '-C');
      $otype .= ' -n' if ($cupsppds == 1);
      # Generate overview Perl data structure from database
      my $VAR1;
--- foomatic-db-engine-4.0.13/lib/Foomatic/DB.pm.orig
+++ foomatic-db-engine-4.0.13/lib/Foomatic/DB.pm
@@ -111,7 +111,7 @@
     }
     # Build a new overview
-    my $otype = ($cupsppds ? '-C' : '-O');
+    my $otype = ($cupsppds ? '-C' : '-C');
     $otype .= ' -n' if ($cupsppds == 1);
     # Generate overview Perl data structure from database
     my $VAR1;
components/foomatic/db-engine/patches/02-install_vendor.patch
@@ -1,11 +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 @@
--- foomatic-db-engine-4.0.13/Makefile.in.orig
+++ foomatic-db-engine-4.0.13/Makefile.in
@@ -189,7 +189,7 @@
 #    $(DESTDIR) properly
     ( cd lib && \
       $(MAKE) PREFIX=$(PERLPREFIX) && \
-      $(MAKE) PREFIX=$(DESTDIR)$(PERLPREFIX) pure_install \
+      $(MAKE) PREFIX=$(DESTDIR)$(PERLPREFIX) install_vendor \
-      $(MAKE) PREFIX=$(PERLPREFIX) DESTDIR=$(DESTDIR) pure_install \
+      $(MAKE) PREFIX=$(PERLPREFIX) DESTDIR=$(DESTDIR) install_vendor \
     )
     ${SRC}/mkinstalldirs $(DESTDIR)$(BINDIR)
     ${SRC}/mkinstalldirs $(DESTDIR)$(SBINDIR)
components/foomatic/db-engine/pkg5
@@ -1,15 +1,12 @@
{
    "dependencies": [
        "SUNWcs",
        "library/libxml2",
        "runtime/perl-534",
        "runtime/perl-536",
        "runtime/perl-538",
        "shell/bash",
        "shell/ksh93",
        "system/library"
    ],
    "fmris": [
        "print/cups/filter/foomatic-db-engine"
    ],
    "name": "foomatic-db-engine"
}
}