git: eae03f41a037 - main - print/ghostscript10: update port to 10.02.0
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 15 Sep 2023 12:13:55 UTC
The branch main has been updated by meta:
URL: https://cgit.FreeBSD.org/ports/commit/?id=eae03f41a03799a8ed859f8e861f1603cc2728ce
commit eae03f41a03799a8ed859f8e861f1603cc2728ce
Author: Michael Osipov <michael.osipov@siemens.com>
AuthorDate: 2023-09-13 19:48:35 +0000
Commit: Koichiro Iwao <meta@FreeBSD.org>
CommitDate: 2023-09-15 12:12:25 +0000
print/ghostscript10: update port to 10.02.0
* Exclude bundled libexpat
* Link against external libtesseract and libleptonica on request
Changelog: https://ghostscript.readthedocs.io/en/gs10.02.0/News.html
PR: 272541
---
print/ghostscript10/Makefile | 33 ++++++++--------
print/ghostscript10/distinfo | 6 +--
print/ghostscript10/files/patch-configure | 2 +-
print/ghostscript10/files/patch-psi_imainarg.c | 44 ----------------------
.../files/patch-tesseract_src_arch_simddetect.cpp | 34 -----------------
print/ghostscript10/pkg-plist | 6 ---
6 files changed, 22 insertions(+), 103 deletions(-)
diff --git a/print/ghostscript10/Makefile b/print/ghostscript10/Makefile
index 5d3004c36122..fea0c6228f47 100644
--- a/print/ghostscript10/Makefile
+++ b/print/ghostscript10/Makefile
@@ -1,13 +1,12 @@
PORTNAME= ghostscript
-DISTVERSION= 10.01.2
-PORTREVISION= 2
+DISTVERSION= 10.02.0
CATEGORIES= print
MASTER_SITES= https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${DISTVERSION:S/.//g}/
PKGNAMESUFFIX= ${GS_MAJOR_VERSION}
MAINTAINER= michael.osipov@siemens.com
COMMENT= PostScript and PDF interpreter
-WWW= https://ghostscript.com/
+WWW= https://ghostscript.com/
LICENSE= AGPLv3
LICENSE_FILE= ${WRKSRC}/LICENSE
@@ -34,13 +33,16 @@ CONFLICTS_INSTALL= ghostscript[789]-base \
ghostscript9-agpl-x11
EXTRACT_AFTER_ARGS= --exclude cups/libs \
+ --exclude expat \
--exclude freetype \
--exclude ijs \
--exclude jbig2dec \
--exclude jpeg \
--exclude lcms2mt \
+ --exclude leptonica \
--exclude libpng \
--exclude openjpeg \
+ --exclude tesseract \
--exclude tiff \
--exclude zlib
@@ -49,11 +51,11 @@ GNU_CONFIGURE= yes
ALL_TARGET= so
INSTALL_TARGET= soinstall
-DATADIR= ${PREFIX}/share/${PORTNAME}/${DISTVERSION}
+DATADIR= ${PREFIX}/share/${PORTNAME}/${DISTVERSION}
GS_MAJOR_VERSION= ${DISTVERSION:R:R}
GS_MINOR_VERSION= ${DISTVERSION:R:E}
-PLIST_SUB= GS_MAJOR_VERSION=${GS_MAJOR_VERSION} \
+PLIST_SUB= GS_MAJOR_VERSION=${GS_MAJOR_VERSION} \
GS_MINOR_VERSION=${GS_MINOR_VERSION}
CONFIGURE_ARGS+= --disable-compile-inits \
@@ -71,22 +73,23 @@ CONFIGURE_ARGS+= --disable-compile-inits \
--with-libpaper \
--with-system-libtiff
-OPTIONS_DEFINE= CUPS IJS TESSERACT X11
+OPTIONS_DEFINE= CUPS IJS TESSERACT X11
OPTIONS_DEFAULT= CUPS X11
-IJS_DESC= Support libijs based Ghostscript devices
-TESSERACT_DESC= Enable bundled Tesseract OCR engine
+IJS_DESC= Support libijs based Ghostscript devices
+TESSERACT_DESC= Enable Tesseract OCR engine
-CUPS_LIB_DEPENDS= libcups.so:print/cups
-CUPS_CONFIGURE_ENABLE= cups
+CUPS_LIB_DEPENDS= libcups.so:print/cups
+CUPS_CONFIGURE_ENABLE= cups
-IJS_LIB_DEPENDS= libijs.so:print/libijs
-IJS_CONFIGURE_WITH= ijs
+IJS_LIB_DEPENDS= libijs.so:print/libijs
+IJS_CONFIGURE_WITH= ijs
-TESSERACT_USES= compiler:c++17-lang
+TESSERACT_USES= libarchive
TESSERACT_CONFIGURE_WITH= tesseract
-# No TESSERACT_LIB_DEPENDS= libtesseract.so:graphics/tesseract
-# See https://bugs.ghostscript.com/show_bug.cgi?id=706490
+TESSERACT_LIB_DEPENDS= libcurl.so:ftp/curl \
+ libleptonica.so:graphics/leptonica \
+ libtesseract.so:graphics/tesseract
X11_CONFIGURE_WITH= x
X11_USES= xorg
diff --git a/print/ghostscript10/distinfo b/print/ghostscript10/distinfo
index d38864605ddb..495cd37e6dcf 100644
--- a/print/ghostscript10/distinfo
+++ b/print/ghostscript10/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1687874762
-SHA256 (ghostscript-10.01.2.tar.xz) = 48d079242a2ca02a2e47a76a52cdfa818b2ad769c2bab00ad0497dd13560e7e7
-SIZE (ghostscript-10.01.2.tar.xz) = 67571808
+TIMESTAMP = 1694618577
+SHA256 (ghostscript-10.02.0.tar.xz) = fa08ce016b30d26293dc322c6353691aced94fd3667a68ede7ff5395d71fcd0b
+SIZE (ghostscript-10.02.0.tar.xz) = 67955320
diff --git a/print/ghostscript10/files/patch-configure b/print/ghostscript10/files/patch-configure
index 9f99249c05b1..4ecbe4ff7287 100644
--- a/print/ghostscript10/files/patch-configure
+++ b/print/ghostscript10/files/patch-configure
@@ -1,6 +1,6 @@
--- configure.orig 2022-04-04 13:48:49 UTC
+++ configure
-@@ -11629,7 +11629,12 @@ if test "${enable_dynamic+set}" = set; then :
+@@ -13383,7 +13383,12 @@ if test "${enable_dynamic+set}" = set; then :
DBG_CFLAGS="$DYNAMIC_CFLAGS $DBG_CFLAGS"
;;
*bsd*)
diff --git a/print/ghostscript10/files/patch-psi_imainarg.c b/print/ghostscript10/files/patch-psi_imainarg.c
deleted file mode 100644
index 65a9daf1d421..000000000000
--- a/print/ghostscript10/files/patch-psi_imainarg.c
+++ /dev/null
@@ -1,44 +0,0 @@
---- psi/imainarg.c.orig 2023-03-21 14:58:42 UTC
-+++ psi/imainarg.c
-@@ -109,7 +109,6 @@ static void print_usage(const gs_main_instance *);
- static void print_devices(const gs_main_instance *);
- static void print_emulators(const gs_main_instance *);
- static void print_paths(gs_main_instance *);
--static void print_help_trailer(const gs_main_instance *);
-
- /* ------ Main program ------ */
-
-@@ -1262,7 +1261,6 @@ static const char help_debug[] = "\
- --debug list debugging options\n";
- #endif
- static const char help_trailer[] = "\
--For more information, see %s.\n\
- Please report bugs to bugs.ghostscript.com.\n";
- static const char help_devices[] = "Available devices:";
- static const char help_default_device[] = "Default output device:";
-@@ -1305,7 +1303,7 @@ print_help(gs_main_instance * minst)
- if (have_rom_device) {
- outprintf(minst->heap, "Initialization files are compiled into the executable.\n");
- }
-- print_help_trailer(minst);
-+ outprintf(minst->heap, "%s", help_trailer);
- }
-
- /* Print the revision, revision date, and copyright. */
-@@ -1450,16 +1448,3 @@ print_paths(gs_main_instance * minst)
- outprintf(minst->heap, "%s", help_fontconfig);
- }
-
--/* Print the help trailer. */
--static void
--print_help_trailer(const gs_main_instance *minst)
--{
-- char buffer[gp_file_name_sizeof];
-- const char *use_htm = "Use.htm", *p = buffer;
-- uint blen = sizeof(buffer);
--
-- if (gp_file_name_combine(gs_doc_directory, strlen(gs_doc_directory),
-- use_htm, strlen(use_htm), false, buffer, &blen) != gp_combine_success)
-- p = use_htm;
-- outprintf(minst->heap, help_trailer, p);
--}
diff --git a/print/ghostscript10/files/patch-tesseract_src_arch_simddetect.cpp b/print/ghostscript10/files/patch-tesseract_src_arch_simddetect.cpp
deleted file mode 100644
index 85afcf5d10f9..000000000000
--- a/print/ghostscript10/files/patch-tesseract_src_arch_simddetect.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
---- tesseract/src/arch/simddetect.cpp.orig 2021-09-27 07:44:02 UTC
-+++ tesseract/src/arch/simddetect.cpp
-@@ -40,10 +40,13 @@
- #if defined(HAVE_NEON) && !defined(__aarch64__)
- #ifdef ANDROID
- #include <cpu-features.h>
--#else
-+#elif defined(__linux__)
- /* Assume linux */
- #include <sys/auxv.h>
- #include <asm/hwcap.h>
-+#elif defined(__FreeBSD__)
-+#include <sys/auxv.h>
-+#include <sys/elf.h>
- #endif
- #endif
-
-@@ -188,9 +191,15 @@ SIMDDetect::SIMDDetect() {
- neon_available_ = (android_getCpuFeatures() &
- ANDROID_CPU_ARM_FEATURE_NEON);
- }
--#else
-+#elif defined(__linux__)
- /* Assume linux */
- neon_available_ = getauxval(AT_HWCAP) & HWCAP_NEON;
-+#elif defined(__FreeBSD__)
-+ unsigned long hwcap = 0;
-+ elf_aux_info(AT_HWCAP, &hwcap, sizeof hwcap);
-+ neon_available_ = hwcap & HWCAP_NEON;
-+#else
-+ neon_available_ = 0;
- #endif
- #endif
-
diff --git a/print/ghostscript10/pkg-plist b/print/ghostscript10/pkg-plist
index c67c0b549cb3..3d3b080d9442 100644
--- a/print/ghostscript10/pkg-plist
+++ b/print/ghostscript10/pkg-plist
@@ -177,13 +177,7 @@ share/color/icc/ghostscript/srgb.icc
%%DATADIR%%/Resource/Init/gs_typ42.ps
%%DATADIR%%/Resource/Init/gs_type1.ps
%%DATADIR%%/Resource/Init/gs_wan_e.ps
-%%DATADIR%%/Resource/Init/pdf_base.ps
-%%DATADIR%%/Resource/Init/pdf_draw.ps
-%%DATADIR%%/Resource/Init/pdf_font.ps
%%DATADIR%%/Resource/Init/pdf_main.ps
-%%DATADIR%%/Resource/Init/pdf_ops.ps
-%%DATADIR%%/Resource/Init/pdf_rbld.ps
-%%DATADIR%%/Resource/Init/pdf_sec.ps
%%DATADIR%%/Resource/Init/xlatmap
%%DATADIR%%/Resource/SubstCID/CNS1-WMode
%%DATADIR%%/Resource/SubstCID/GB1-WMode