From owner-svn-ports-head@freebsd.org Wed Oct 2 08:46:21 2019 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 0D7F5127367; Wed, 2 Oct 2019 08:46:21 +0000 (UTC) (envelope-from bapt@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46jqVj0F47z426M; Wed, 2 Oct 2019 08:46:21 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C549828FE0; Wed, 2 Oct 2019 08:46:20 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x928kKC1080254; Wed, 2 Oct 2019 08:46:20 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x928kJH1080249; Wed, 2 Oct 2019 08:46:19 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201910020846.x928kJH1080249@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Wed, 2 Oct 2019 08:46:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r513559 - in head: . textproc/groff textproc/groff/files X-SVN-Group: ports-head X-SVN-Commit-Author: bapt X-SVN-Commit-Paths: in head: . textproc/groff textproc/groff/files X-SVN-Commit-Revision: 513559 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Oct 2019 08:46:21 -0000 Author: bapt Date: Wed Oct 2 08:46:19 2019 New Revision: 513559 URL: https://svnweb.freebsd.org/changeset/ports/513559 Log: groff: remove X11 option and dependency Now that groff is required for manpages that are not supported by mandoc the default dependency on X11 has become a big concern for many people. From now the entire X11 option has been removed as it is only needed for legacy part of groff that have little end user value. The other part that was dragging in all the X11 dependencies was the ghostscript dependency which is needed for 2 cases: 1. find the path of the urw fonts which is needed for pdf generation. the configure script has been patched to stop using ghostscript to find that path, but directly use the one provided. 2. the html driver which calls at runtime the gs binary along with some binaries provided by the netpbm package. Given how little use it is, add a message to tell the users to manually install ghostscript and netpbm as optional dependency if they do need to use groff -Thtml. Requested by: many Added: head/textproc/groff/files/patch-configure (contents, props changed) head/textproc/groff/pkg-message (contents, props changed) Modified: head/UPDATING head/textproc/groff/Makefile head/textproc/groff/pkg-plist Modified: head/UPDATING ============================================================================== --- head/UPDATING Wed Oct 2 08:40:32 2019 (r513558) +++ head/UPDATING Wed Oct 2 08:46:19 2019 (r513559) @@ -5,6 +5,17 @@ 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. +20191002: + AFFECTS: users of groff + AUTHOR: bapt@FreeBSD.org + + with groff 1.2.4_3, groff does not depends anymore on ghostscript and + netpbm. In order to be able to properly use the html backend the user + can install ghostscript and netpbm from ports without the need of + reinstalling the package. + + Also note that the X11 option has been removed. + 20190930: AFFECTS: users of NetBox AUTHOR: kai@FreeBSD.org Modified: head/textproc/groff/Makefile ============================================================================== --- head/textproc/groff/Makefile Wed Oct 2 08:40:32 2019 (r513558) +++ head/textproc/groff/Makefile Wed Oct 2 08:46:19 2019 (r513559) @@ -3,7 +3,7 @@ PORTNAME= groff PORTVERSION= 1.22.4 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= textproc MASTER_SITES= GNU @@ -12,23 +12,26 @@ COMMENT= Software typesetting package LICENSE= GPLv3 -BUILD_DEPENDS= psselect:print/psutils +BUILD_DEPENDS= psselect:print/psutils \ + gsfonts>=0:print/gsfonts +LIB_DEPENDS= libuchardet.so:textproc/uchardet RUN_DEPENDS:= psselect:print/psutils MAKE_JOBS_UNSAFE= yes -USES= cpe gmake perl5 shebangfix makeinfo +USES= cpe gmake perl5 makeinfo GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --with-awk=/usr/bin/awk -CONFIGURE_ENV+= PERLPATH=${perl_CMD} # shebangfix +CONFIGURE_ARGS+= --with-urw-fonts-dir=${LOCALBASE}/share/ghostscript/fonts/ \ + --with-awk=/usr/bin/awk \ + --without-x \ + --without-gs \ + pnmcrop=missing \ + pnmcut=missing \ + pnmtopng=missing \ + pnmtops=missing \ + psselect=missing CPE_VENDOR= gnu -SHEBANG_FILES= src/utils/afmtodit/afmtodit.pl \ - contrib/mm/mmroff.pl \ - font/devps/generate/symbol.sed -SHEBANG_LANG= sed -sed_OLD_CMD= /bin/sed -sed_CMD= /usr/bin/sed .ifdef QEMU_EMULATING # XXX bug 224740: configure hangs: GSlice: failed to allocate 496 bytes (alignment: 512) @@ -43,11 +46,6 @@ PAPERSIZE=A4 CONFIGURE_ENV+= PAGE=${PAPERSIZE} .endif -OPTIONS_DEFINE= X11 URWFONTS -X11_DESC= X11 devices (-TX*) and gxditview -URWFONTS_DESC= URW fonts support (needed for growpdf) -OPTIONS_DEFAULT= X11 URWFONTS - CONFLICTS= ja-groff-[0-9]* INFO= groff @@ -56,30 +54,8 @@ DATADIR= ${PREFIX}/share/${PORTNAME}/${PORTVERSION} DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION} EXAMPLESDIR= ${DOCSDIR}/examples -URWFONTS_CONFIGURE_OFF= --without-urw-fonts-dir --without-gs -URWFONTS_USES= ghostscript:build -URWFONTS_BUILD_DEPENDS= gsfonts>=0:print/gsfonts -OPTIONS_SUB= yes - -.include - -.if ! ${PORT_OPTIONS:MX11} -CONFIGURE_ARGS+=--without-x -.if exists(${LOCALBASE}/bin/pnmcut) && exists(${LOCALBASE}/bin/pnmcrop) && \ - exists(${LOCALBASE}/bin/pnmtops) && exists(${LOCALBASE}/bin/pnmtopng) -PLIST_SUB+= HTMLDOCS="" -.else -PLIST_SUB+= HTMLDOCS="@comment " -.endif -.else -USE_XORG= x11 xaw xmu -BUILD_DEPENDS+= ${LOCALBASE}/bin/pnmtops:graphics/netpbm -RUN_DEPENDS+= ${LOCALBASE}/bin/pnmtops:graphics/netpbm -CONFIGURE_ARGS+=--with-x --with-appresdir=${PREFIX}/lib/X11/app-defaults -PLIST_SUB+= HTMLDOCS="" -.endif - post-install: - ${INSTALL_DATA} ${FILESDIR}/mdoc.local ${STAGEDIR}/${PREFIX}/share/groff/site-tmac + ${INSTALL_DATA} ${FILESDIR}/mdoc.local ${STAGEDIR}${PREFIX}/share/groff/site-tmac + ${REINPLACE_CMD} -i "" -e "s/missing/gs/" ${STAGEDIR}${DATADIR}/font/devhtml/DESC .include Added: head/textproc/groff/files/patch-configure ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/groff/files/patch-configure Wed Oct 2 08:46:19 2019 (r513559) @@ -0,0 +1,28 @@ +--- configure.orig 2018-12-23 14:34:25 UTC ++++ configure +@@ -24750,11 +24750,11 @@ $as_echo_n "checking whether URW fonts in pfb format a + + + groff_have_urw_fonts=no +- if test "$AWK" = "missing" -o "$GHOSTSCRIPT" = "missing"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: awk and gs are required, can't look for URW fonts" >&5 +-$as_echo "$as_me: WARNING: awk and gs are required, can't look for URW fonts" >&2;} +- else +- _list_paths=`$GHOSTSCRIPT -h | $AWK 'BEGIN { found = 0 } /Search path:/ { found = 1 } /^ *\// { print $'0' }'| tr : ' '` ++ # if test "$AWK" = "missing" -o "$GHOSTSCRIPT" = "missing"; then ++ # { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: awk and gs are required, can't look for URW fonts" >&5 ++#$as_echo "$as_me: WARNING: awk and gs are required, can't look for URW fonts" >&2;} ++ # else ++# _list_paths=`$GHOSTSCRIPT -h | $AWK 'BEGIN { found = 0 } /Search path:/ { found = 1 } /^ *\// { print $'0' }'| tr : ' '` + _list_paths="$_list_paths /usr/share/fonts/type1/gsfonts/ \ + /opt/local/share/fonts/urw-fonts/" + if test -n "$urwfontsdir"; then +@@ -24768,7 +24768,7 @@ $as_echo "found in $k" >&6; } + break + fi + done +- fi ++ # fi + if test $groff_have_urw_fonts = no; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } Added: head/textproc/groff/pkg-message ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/groff/pkg-message Wed Oct 2 08:46:19 2019 (r513559) @@ -0,0 +1,21 @@ +[ +{ + type: install, + message: <