From nobody Fri Sep 15 12:08:16 2023 X-Original-To: dev-commits-ports-all@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 4RnCdD5gK2z4tDCD; Fri, 15 Sep 2023 12:08:16 +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 4RnCdD59lRz3M4P; Fri, 15 Sep 2023 12:08:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694779696; 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=57DzD+m5mlh0YCFBvDI+UF/BVP6tbrFcm7wcwONUsSY=; b=Ozk4BYt2nGwx/7ptAnjJzEpDSIvHwABhECculmU9u2SCNQPD4ia9T7tbaol8Iq5cKHlgyu dnBP9ZQGn9R60cG2XtvAjB6I8dh86pttqsTga72xJyd/i4IET59XRhq8FVLynssIa2Fz6s QGbZLx/JTr6V9+QuxpLk7KmtqO2jObMPojNB5MEqEKZ7+f5OvmXBWfq5PiaO+QK4V057OE w5jyt59WQYcHtbglX9hagJ7zLmeHRsg58uRwaLFOvnidcj83O/ccci/hlSCZj3G2ePSJtb 3OV7U/bq8z2podng2CWO3+DAi1DMxT9JfwC0BmXlw7el8e7hAHxJhipwhkTHFA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694779696; a=rsa-sha256; cv=none; b=adknhJRbJTLUrIg6rZGYDM7rSUDqifX4MXUr/dlxj6qEF2+74zvd6KFt9A7pMAFskNLiU7 9SI92LPeqqH1A/RbXlfL/V2O9Woa2mdhQhhU8R5g8goOQCgzAq+8MGxJWoFqnG4O2HDTFH iWh1kNTZskXyOWFTV4oQLbgQbNmHK4z35xA/JoPCMPchDykbST+sLVTSrzPg3CB6z0Ssr+ Ty49bL1K4zfkeH4TOJw173vpc2FIbe6JnIHJ+DiMMXcIBox6IPCdThYPbk8AfcMs3VMlmm TzSjQk3OOZFgxj5Xw0YHs2L8yfUMVG9qLHVsdcQZUknzUoSTM1/7ZqUgGwqABA== 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=1694779696; 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=57DzD+m5mlh0YCFBvDI+UF/BVP6tbrFcm7wcwONUsSY=; b=bp+fxYxWn2B/C1h+wEuKmYQ1JYTXTJOIJY287ycn6fhCbxJ0l4KWXUvVk9eSlrK2Cd+Jcz AZ54R2uRJn+VaWvEz4owFSmOfV7cDIZNaxAPG1Fwu+JkxDKuodtMGmAa4VpH5NKH+PUwlK LJjm9xMyPIY3Bg++TNZFTGFtJSl/iQoc8JI7laiXO+RF4JghcICT+sz+gIOywTY3AiGbcd /smDqQ85rZB1ADTYTOZsGLnEydsBK6IMKY73T5PBRKJgmUv2Fsxaics/UrbaKAP/UahUrK H1H5voHK5zy5BaxzfI5KH+vy+HPvKgM++/rKfOdVm+6CcsSTFR8elgsGWqoqrQ== 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 4RnCdD4Dkgz8FK; Fri, 15 Sep 2023 12:08:16 +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 38FC8Gxn090898; Fri, 15 Sep 2023 12:08:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38FC8GLo090895; Fri, 15 Sep 2023 12:08:16 GMT (envelope-from git) Date: Fri, 15 Sep 2023 12:08:16 GMT Message-Id: <202309151208.38FC8GLo090895@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: 83964d19d9f6 - main - print/ghostscript10: add default port option for X11 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: 83964d19d9f692d91242d53609b9005e2e5e7ac8 Auto-Submitted: auto-generated The branch main has been updated by meta: URL: https://cgit.FreeBSD.org/ports/commit/?id=83964d19d9f692d91242d53609b9005e2e5e7ac8 commit 83964d19d9f692d91242d53609b9005e2e5e7ac8 Author: Michael Osipov AuthorDate: 2023-08-31 13:15:09 +0000 Commit: Koichiro Iwao CommitDate: 2023-09-15 12:07:41 +0000 print/ghostscript10: add default port option for X11 This change replaces flavors with a new default port option for X11. Compared to GS 9 port the X11 device driver is now integrated into GS instead of being dynamically loaded which is not in conformance with new GS 10 approach. The flavors approach creates conflicting dependencies with other ports which cannot be solved this time with the ports framework. See PRs 270989 and 272541 for details. PR: 272541 Tested by: kib --- UPDATING | 10 ++++++++++ print/ghostscript10/Makefile | 25 +++++++------------------ 2 files changed, 17 insertions(+), 18 deletions(-) diff --git a/UPDATING b/UPDATING index ba4e4ca76b74..23dab47ee57f 100644 --- a/UPDATING +++ b/UPDATING @@ -5,6 +5,16 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20230915: + AFFECTS: users of print/ghostscript10 + AUTHOR: michael.osipov@siemens.com + + The port flavors have been replaced with a default port option of X11. + The flavors approach creates conflicting dependencies with other ports which + cannot be solved this time with the ports framework. + + See PRs 270989 and 272541 for details. + 20230910: AFFECTS: users of dns/powerdns AUTHOR: tremere@cainites.net diff --git a/print/ghostscript10/Makefile b/print/ghostscript10/Makefile index 2150ac1d4db9..5d3004c36122 100644 --- a/print/ghostscript10/Makefile +++ b/print/ghostscript10/Makefile @@ -1,6 +1,6 @@ PORTNAME= ghostscript DISTVERSION= 10.01.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= print MASTER_SITES= https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${DISTVERSION:S/.//g}/ PKGNAMESUFFIX= ${GS_MAJOR_VERSION} @@ -24,12 +24,6 @@ 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 @@ -55,15 +49,6 @@ GNU_CONFIGURE= yes 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} @@ -86,8 +71,8 @@ CONFIGURE_ARGS+= --disable-compile-inits \ --with-libpaper \ --with-system-libtiff -OPTIONS_DEFINE= CUPS IJS TESSERACT -OPTIONS_DEFAULT= CUPS +OPTIONS_DEFINE= CUPS IJS TESSERACT X11 +OPTIONS_DEFAULT= CUPS X11 IJS_DESC= Support libijs based Ghostscript devices TESSERACT_DESC= Enable bundled Tesseract OCR engine @@ -103,6 +88,10 @@ TESSERACT_CONFIGURE_WITH= tesseract # No TESSERACT_LIB_DEPENDS= libtesseract.so:graphics/tesseract # See https://bugs.ghostscript.com/show_bug.cgi?id=706490 +X11_CONFIGURE_WITH= x +X11_USES= xorg +X11_USE= xorg=ice,sm,x11,xext,xt + post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${PATCH_WRKSRC}/man/gs.1