From nobody Fri Sep 15 12:13:55 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RnClm1qTDz4tFJN; Fri, 15 Sep 2023 12:13:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RnClm1J8dz3NG7; Fri, 15 Sep 2023 12:13:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694780036; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=duBwyAuBtipFTuxs0mW3PbbtUwCK2CdK4BwYvI9lBKE=; b=o5G4OZdipgNgwdgW2lF4NQr0O7zGUYqEAYDQf3sjm7FPQGC3397zoMLQ6xJh4beIBO33aK iVegSc9mTbLhhQ7j+wk9O462by2ppV22TrpcgG1FF/KYbb7TmuwuqUDsmxhsmUGUwu5eV7 KaXE38Ewoj2jJ8pFO5tQts9MVeRCPLy4JEuS2EaiEi5Ep+/DYD+jpxvuaAbLudFUvcDZVf MLTlveih4wGWUo5caqHKaR3dP/duxPtJ273dJ8gcYs/efYChVCVwE/f1eObIvc0Ch/Di3m QICqGwuyNUqOuq4tZXQ0bqTvh42ozR4ri5D47clHFEKU8MC/ij9o/iWK/zf65Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694780036; a=rsa-sha256; cv=none; b=fhfxQFbSPQoDdf9TIF64MwDAt5pVUkZ0Wna52DazUzjEUTdGAT0oM/skASlgBh65I9ROJz D4qykQ9CaihiI0MjXDHyj5Fnb9ykOEohAQO8zt441VsN5PVv60n+rDcYMqYTnGXArMuOtg MSCVrSO4Oy8fCF9i/wU5JVWyEVH+rMl9ZUSPhlcwLz11pPZcag00q3gvDBXvp7rzcUaTnb +h/fdIePytzLLnRYNy4HpFOqY4M5i9JPhMPfOjfmW/WPpIKGmVdG7hZy46sgD/0Sx/TKqc d8lMdtayIOXpZ1QB3DzKlaS8dwm56Bbjfjc3FOhHUvasQ6YDPCpAgk8WMTkvAg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694780036; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=duBwyAuBtipFTuxs0mW3PbbtUwCK2CdK4BwYvI9lBKE=; b=akqH+m6Z7nz++Us8Kku2Q+ztdu/sVzYJRVSJQ2E/0XtgUZQash0JHQ5jySxP+gQH0iwEAe w9Y503d2nwkayM1BBQvXcA/j72GspHlytoknxJgi0NpCEXTSgX2yaEqEBVEAa1W/eDzWNV UZtj21ls/kRfPFImhynx8wguchhtyJTwcqqVSjaU3MT2gOJfBKh3hcaHH9/lq+CZrB+sfs q4xwzCQ+9KLW98wnBNwpWUhrWxOBQ2/6zPZ3YGuEfWeOHeiSfYzrPHbrcw9HH/s9D5MllR pFDrzeAZxhVretKs/dvSe1MfxKWZ2tJvqPGoau/foy3OWej1YRiflUe21pnMZQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RnClm0Ldcz84t; Fri, 15 Sep 2023 12:13:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38FCDtGw007044; Fri, 15 Sep 2023 12:13:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38FCDtfB007041; Fri, 15 Sep 2023 12:13:55 GMT (envelope-from git) Date: Fri, 15 Sep 2023 12:13:55 GMT Message-Id: <202309151213.38FCDtfB007041@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Koichiro Iwao Subject: git: eae03f41a037 - main - print/ghostscript10: update port to 10.02.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: meta X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: eae03f41a03799a8ed859f8e861f1603cc2728ce Auto-Submitted: auto-generated The branch main has been updated by meta: URL: https://cgit.FreeBSD.org/ports/commit/?id=eae03f41a03799a8ed859f8e861f1603cc2728ce commit eae03f41a03799a8ed859f8e861f1603cc2728ce Author: Michael Osipov AuthorDate: 2023-09-13 19:48:35 +0000 Commit: Koichiro Iwao 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 --#else -+#elif defined(__linux__) - /* Assume linux */ - #include - #include -+#elif defined(__FreeBSD__) -+#include -+#include - #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