From nobody Sat Jun 24 08:51:29 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 4Qp7BT5zQzz4hJXK; Sat, 24 Jun 2023 08:51:29 +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 4Qp7BT56QNz3rKB; Sat, 24 Jun 2023 08:51:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687596689; 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=bpSkxkccJYDoyWOJuL0YaD4sXn59oofikXzKc4q2VeM=; b=YU8EsXF1NK7UILI9Aoa5WR085lkxxKKKwd1iMcS5792WN0AOHAN9X0Kk9YhE0BnbfYExvH ymsTAqzXb9znC2WyT101ryCSw+JM3UiieHxPmcYctUej400sREgkeFffBuXWPLRblKYnpQ vdDK2UHTvrMbDKSSmO42EFsnur1EO5a8eDUckVGYl+DpIINhWXMD4x79cLy7TE5exfwVJd nIgs7qSNu5/q69Ss37V0W/0tAAv0az4rA8PBF0621XnnJEjXhMtFHsi4oBgd8udCuLHVPx OXpuAOqs7mfeZm6pKEgG294iM1fv1qCv6hx2/49Uung7knHNXmOEXinTtOlIdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687596689; 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=bpSkxkccJYDoyWOJuL0YaD4sXn59oofikXzKc4q2VeM=; b=JKH2FBT5aJndCEAh6aKMeNkOZfboFFBAZSi+KD1iZKkRIdos9Nw2XR14kRRKc/sayldVSx rSjFDZZT1hKp0+MX2FSUgCpCpe9mbTeTsT/mgr39SAfOoencsDScNfwYxFYlB6BalcnaRj RGNFaDdEwkue+Fe36EltjbtiyU5j6S/px/OfkK1cKqhpfRnXN2OccBfhKnya3CCtW0goWg C8Ku73wdafgRo0dxZrKSjuvA+HdWSPexthjOMat7HYeg6uAlaHqnbKVGcDfcOY2Ag0pIdg Jr3oq8M7w14wGGB1Jy5gDqDLo6kbW4j0jOsaHV0bOiKTZ85IBm1vaVuTQnIVtA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687596689; a=rsa-sha256; cv=none; b=DP0i9Etglf5okkHXZzBJvnd5OnShYAcHl2GsvzmppbCCCVuJ2P6SyAkd176VCVKzLobBZS gKNe02GBkF5jGx5wZdovcoglEP/NcvRGJdXqvWlpJD/fikvVM+7uo5NukPt7WZNxUxRS+S qDec197gn/49zc4wFTvtqhtMofjT+ufMQynZNd9bVfEI7i29s0WrrzQ/Ia5zppHSdDwGCN XMLLg7jijBAGqcCBwSdfMRgGVj23aUfGTeA4X2Y5xW01fUk4WEVUNiijYlnoLbYQBieKSv zWhab1zaPgyoFhI1q7R4KxDMFhkCqwhFi7ihwu1I4taOov6ozuJfgX7G8TC4jQ== 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 4Qp7BT4D8Szg0d; Sat, 24 Jun 2023 08:51:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35O8pTm2097716; Sat, 24 Jun 2023 08:51:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35O8pTh1097715; Sat, 24 Jun 2023 08:51:29 GMT (envelope-from git) Date: Sat, 24 Jun 2023 08:51:29 GMT Message-Id: <202306240851.35O8pTh1097715@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Daniel Engberg Subject: git: 22c848a26101 - main - print/ghostscript10: Flavorize and add support for shared library 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: diizzy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 22c848a2610119c42e32095a0548ace69926b211 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=22c848a2610119c42e32095a0548ace69926b211 commit 22c848a2610119c42e32095a0548ace69926b211 Author: Chad Jacob Milios AuthorDate: 2023-06-24 07:53:30 +0000 Commit: Daniel Engberg CommitDate: 2023-06-24 08:51:24 +0000 print/ghostscript10: Flavorize and add support for shared library Add flavor support, support for shared library and various improvements to the port itself. Co-authored by Michael Osipov (maintainer) PR: 270989 Reviewed by: Michael Osipov (maintainer) --- print/ghostscript10/Makefile | 118 ++++++++++++++++++++++++++---------------- print/ghostscript10/pkg-plist | 7 +++ 2 files changed, 80 insertions(+), 45 deletions(-) diff --git a/print/ghostscript10/Makefile b/print/ghostscript10/Makefile index 7bca1945c134..6f48a5b54bca 100644 --- a/print/ghostscript10/Makefile +++ b/print/ghostscript10/Makefile @@ -1,8 +1,9 @@ PORTNAME= ghostscript DISTVERSION= 10.01.1 -PORTREVISION= 2 +PORTREVISION= 3 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 @@ -23,57 +24,81 @@ LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ RUN_DEPENDS= poppler-data>=0.4.9:graphics/poppler-data \ urw-base35-fonts>=20200910:x11-fonts/urw-base35-fonts +FLAVORS= default x11 +FLAVOR?= ${FLAVORS:[1]} +default_CONFLICTS_INSTALL= ${PORTNAME}${GS_MAJOR_VERSION}-${FLAVORS:[2]} +x11_PKGNAMESUFFIX= ${GS_MAJOR_VERSION}-${FLAVOR} +x11_CONFLICTS_INSTALL= ${PORTNAME}${GS_MAJOR_VERSION} + USES= cpe gmake iconv jpeg localbase pkgconfig tar:xz +USE_LDCONFIG= yes CPE_VENDOR= artifex CONFLICTS_INSTALL= ghostscript[789]-base \ - ghostscript[789]-x11 \ - ghostscript9-agpl-base \ - ghostscript9-agpl-x11 + ghostscript[789]-x11 \ + ghostscript9-agpl-base \ + ghostscript9-agpl-x11 + EXTRACT_AFTER_ARGS= --exclude cups/libs \ - --exclude freetype \ - --exclude ijs \ - --exclude jbig2dec \ - --exclude jpeg \ - --exclude lcms2mt \ - --exclude libpng \ - --exclude openjpeg \ - --exclude tiff \ - --exclude zlib - -DATADIR= ${PREFIX}/share/${PORTNAME}/${DISTVERSION} + --exclude freetype \ + --exclude ijs \ + --exclude jbig2dec \ + --exclude jpeg \ + --exclude lcms2mt \ + --exclude libpng \ + --exclude openjpeg \ + --exclude tiff \ + --exclude zlib GNU_CONFIGURE= yes -CONFIGURE_ARGS= --disable-compile-inits \ - --disable-dbus \ - --disable-gtk \ - --disable-dynamic \ - --enable-contrib \ - --enable-fontconfig \ - --enable-freetype \ - --enable-openjpeg \ - --with-fontpath=${LOCALBASE}/share/fonts \ - --with-jbig2dec \ - --with-libiconv=maybe \ - --with-libidn \ - --with-libpaper \ - --with-system-libtiff \ - --without-x - -OPTIONS_DEFINE= CUPS IJS TESSERACT -OPTIONS_DEFAULT=CUPS - -IJS_DESC= Support libijs based Ghostscript devices -TESSERACT_DESC= Enable bundled Tesseract OCR engine - -CUPS_LIB_DEPENDS= libcups.so:print/cups -CUPS_CONFIGURE_ENABLE= cups - -IJS_LIB_DEPENDS= libijs.so:print/libijs -IJS_CONFIGURE_WITH= ijs - -TESSERACT_USES= compiler:c++17-lang +ALL_TARGET= so +INSTALL_TARGET= soinstall + +.if ${FLAVOR} == default +CONFIGURE_ARGS+= --without-x +.endif +.if ${FLAVOR} == x11 +USES+= xorg +USE_XORG= ice sm x11 xext xt +CONFIGURE_ARGS+= --with-x +.endif + +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} \ + GS_MINOR_VERSION=${GS_MINOR_VERSION} + +CONFIGURE_ARGS+= --disable-compile-inits \ + --disable-dbus \ + --disable-gtk \ + --disable-dynamic \ + --enable-contrib \ + --enable-fontconfig \ + --enable-freetype \ + --enable-openjpeg \ + --with-fontpath=${LOCALBASE}/share/fonts \ + --with-jbig2dec \ + --with-libiconv=maybe \ + --with-libidn \ + --with-libpaper \ + --with-system-libtiff + +OPTIONS_DEFINE= CUPS IJS TESSERACT +OPTIONS_DEFAULT= CUPS + +IJS_DESC= Support libijs based Ghostscript devices +TESSERACT_DESC= Enable bundled Tesseract OCR engine + +CUPS_LIB_DEPENDS= libcups.so:print/cups +CUPS_CONFIGURE_ENABLE= cups + +IJS_LIB_DEPENDS= libijs.so:print/libijs +IJS_CONFIGURE_WITH= ijs + +TESSERACT_USES= compiler:c++17-lang TESSERACT_CONFIGURE_WITH= tesseract # No TESSERACT_LIB_DEPENDS= libtesseract.so:graphics/tesseract # See https://bugs.ghostscript.com/show_bug.cgi?id=706490 @@ -83,7 +108,10 @@ post-patch: ${PATCH_WRKSRC}/man/gs.1 post-install: - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/gs + ${MV} ${STAGEDIR}${PREFIX}/bin/gsc ${STAGEDIR}${PREFIX}/bin/gs + ${RM} ${STAGEDIR}${PREFIX}/bin/gsx + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/gs \ + ${STAGEDIR}${PREFIX}/lib/libgs.so.${GS_MAJOR_VERSION}.${GS_MINOR_VERSION} ${RM} ${STAGEDIR}${PREFIX}/bin/lprsetup.sh ${RM} ${STAGEDIR}${PREFIX}/bin/unix-lpr.sh ${MKDIR} ${STAGEDIR}${PREFIX}/share/color/icc diff --git a/print/ghostscript10/pkg-plist b/print/ghostscript10/pkg-plist index 861f38d4d3e3..c67c0b549cb3 100644 --- a/print/ghostscript10/pkg-plist +++ b/print/ghostscript10/pkg-plist @@ -22,6 +22,13 @@ bin/ps2pdf14 bin/ps2pdfwr bin/ps2ps bin/ps2ps2 +include/ghostscript/gdevdsp.h +include/ghostscript/gserrors.h +include/ghostscript/iapi.h +include/ghostscript/ierrors.h +lib/libgs.so +lib/libgs.so.%%GS_MAJOR_VERSION%% +lib/libgs.so.%%GS_MAJOR_VERSION%%.%%GS_MINOR_VERSION%% man/man1/dvipdf.1.gz man/man1/eps2eps.1.gz man/man1/gs.1.gz