From nobody Fri Sep 22 05:07:46 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 4RsKyp5rkFz4vWhy; Fri, 22 Sep 2023 05:07:46 +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 4RsKyp5J23z3f54; Fri, 22 Sep 2023 05:07:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695359266; 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=rIXMw6xk/JITdWh9qHZSxTebHetzBf8B9VbSJ5zeZn8=; b=qGX1mTIAGpqj9Kb67Oa/itx+yl7e9idkuPfTLRdYmtM3yNyEiA0yFkK6UI+sfOpqz0zMH7 cQb6gObo4Ex29GBl87406Mz5SQ0LiQKkLNWgkP08SnIJcmAVr6ZyGMu6ATtU9pZLSY7c+6 xM/H2nY7ggR+wgU2CNqT2FZGBwX10jXpeESR34GX2oJm1C6zN/tHUr4VD+mKcLdIrIYt8O ItCDgPL0SubjtrYo25Z5AbkMg2p+1oVOkvo70dSQ531tvba0UkWBuVwqHS0Uz53xgRSJ/S iZGCSeEya4AYanx5dCqSm8JDEGpsbSbYU2GaUwZZ97Pi8I+gzz6cbWwu/oJ3Mg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695359266; a=rsa-sha256; cv=none; b=wvdZ1jPIiWOi7jEaknUG4X9RbAgnsJakdxGdjcmBwqw2anEmQnr9z0h0dQP+mxMwl5N+Qz ITklDajwYG4tVrZRA10m/gly8s3im5mTJlsu3a3ha7WFG1rddFiDyWuxhbSrQz4oK55eeH sSace2h69x/dSz1G9vvZ+p3VKKXrO02QvgPhj0BHrml8N0FNVU+rpLXcL4aKciVgsZUxNn DZkkc3l9cGdzWmb4yqhsg5hKXpUTIFEYxq676+BfFwo3/q+huqBT4L2V42LWCzVjbErZlt voIg3nW78D6W2weKQcAJZkeECAZ1IDKue/aKLNjVIjLUybwCqNB8Fr8zLUMryA== 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=1695359266; 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=rIXMw6xk/JITdWh9qHZSxTebHetzBf8B9VbSJ5zeZn8=; b=FVf/ngXCWzP5cf3VTUYCutWcmgTkInSPM4qgUchQ0bGBlDonC7r45PCkLpUVWj7fVM2y5W GxG7abxgdI3hAlg9sI2v3SGQitC5Zo/HhMKbgIl6PiEkK1oHnxNeUCFmTNhMJg2uyOFXrj qB6X6yGfLj5pq3qwTgTdJD1FkVgvYTeoep+2uxeOnauRR3n15g5vWcG3PxH0wYWTrlzv6y ZiTvpsmrpr3wAgG7QZIn/SmIxRBVC3XB6PllrDTPptXYTDJGgv/iTqvYPJVb5V2W5NEmyN a29rpWHHLvRYTBUrTJmojdxUXd5UvtxtpDHInBVXi3vVqAZqTtMRzHfz15Tsgw== 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 4RsKyp4M0zz17YQ; Fri, 22 Sep 2023 05:07:46 +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 38M57kfv065767; Fri, 22 Sep 2023 05:07:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38M57kG9065764; Fri, 22 Sep 2023 05:07:46 GMT (envelope-from git) Date: Fri, 22 Sep 2023 05:07:46 GMT Message-Id: <202309220507.38M57kG9065764@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Robert Clausecker Subject: git: 48c5dd95ac86 - main - textproc/htmldoc: update to 1.9.17 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: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 48c5dd95ac86d78830ef6ddb9617fb60c31e088c Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=48c5dd95ac86d78830ef6ddb9617fb60c31e088c commit 48c5dd95ac86d78830ef6ddb9617fb60c31e088c Author: Robert Clausecker AuthorDate: 2023-09-19 04:27:30 +0000 Commit: Robert Clausecker CommitDate: 2023-09-22 04:54:44 +0000 textproc/htmldoc: update to 1.9.17 Get rid of now obsolete workaround for clang 8 bug. Get rid of now obsolete GNUTLS option. Changelog: https://www.msweet.org/blog/2023-09-17-htmldoc-1.9.17.html --- textproc/htmldoc/Makefile | 16 +++++----------- textproc/htmldoc/distinfo | 6 +++--- textproc/htmldoc/files/patch-htmldoc_ps-pdf.cxx | 15 --------------- 3 files changed, 8 insertions(+), 29 deletions(-) diff --git a/textproc/htmldoc/Makefile b/textproc/htmldoc/Makefile index 8699beb2110c..be9f380f05bd 100644 --- a/textproc/htmldoc/Makefile +++ b/textproc/htmldoc/Makefile @@ -1,6 +1,5 @@ PORTNAME= htmldoc -PORTVERSION= 1.9.16 -PORTREVISION= 1 +PORTVERSION= 1.9.17 DISTVERSIONPREFIX= v CATEGORIES= textproc @@ -13,7 +12,8 @@ LICENSE_FILE= ${WRKSRC}/COPYING BROKEN_mips= complains about expecting ) before png_ptr -LIB_DEPENDS= libpng.so:graphics/png +LIB_DEPENDS= libcups.so:print/cups \ + libpng.so:graphics/png USES= compiler:c11 cpe jpeg pkgconfig CPE_VENDOR= ${PORTNAME}_project @@ -22,18 +22,12 @@ GH_ACCOUNT= michaelrsweet HAS_CONFIGURE= yes -OPTIONS_DEFINE= GNUTLS HTMLDOCGUI -OPTIONS_DEFAULT= GNUTLS - +OPTIONS_DEFINE= HTMLDOCGUI HTMLDOCGUI_DESC= Build GUI front-end - -GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls -GNUTLS_CONFIGURE_ENABLE= gnutls - HTMLDOCGUI_LIB_DEPENDS= libfltk.so:x11-toolkits/fltk \ libfontconfig.so:x11-fonts/fontconfig HTMLDOCGUI_USES= xorg -HTMLDOCGUI_USE= XORG=x11,xcursor,xext,xfixes,xft,xinerama,xrender +HTMLDOCGUI_USE= XORG=x11,xcursor,xext,xfixes,xft,xinerama,xpm,xrender HTMLDOCGUI_CONFIGURE_WITH= gui=yes post-install: diff --git a/textproc/htmldoc/distinfo b/textproc/htmldoc/distinfo index 87ca26e84c9f..78f2f13508c7 100644 --- a/textproc/htmldoc/distinfo +++ b/textproc/htmldoc/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1652990439 -SHA256 (michaelrsweet-htmldoc-v1.9.16_GH0.tar.gz) = f0d19d8be0fd961d07556f85dbea1d95f0d38728a45dc0f2cf92c715e4140542 -SIZE (michaelrsweet-htmldoc-v1.9.16_GH0.tar.gz) = 3416333 +TIMESTAMP = 1695096786 +SHA256 (michaelrsweet-htmldoc-v1.9.17_GH0.tar.gz) = 438cbd4c6673a9e156ef9a4793540762e8438298063cac019a45f55ac577872e +SIZE (michaelrsweet-htmldoc-v1.9.17_GH0.tar.gz) = 3310895 diff --git a/textproc/htmldoc/files/patch-htmldoc_ps-pdf.cxx b/textproc/htmldoc/files/patch-htmldoc_ps-pdf.cxx deleted file mode 100644 index 93762c943ced..000000000000 --- a/textproc/htmldoc/files/patch-htmldoc_ps-pdf.cxx +++ /dev/null @@ -1,15 +0,0 @@ -Workaround for potential optimizer bug in clang 8 that causes hangs at runtime - -https://github.com/michaelrsweet/htmldoc/issues/349 - ---- htmldoc/ps-pdf.cxx.orig 2018-04-10 11:56:03 UTC -+++ htmldoc/ps-pdf.cxx -@@ -5361,7 +5361,7 @@ parse_pre(tree_t *t, /* I - Tree to parse */ - line[10240], - *lineptr, - *dataptr; -- int col; -+ volatile int col; - float width, - height, - rgb[3];