From owner-svn-ports-all@freebsd.org Mon Aug 24 11:39:18 2020 Return-Path: Delivered-To: svn-ports-all@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 9E3ED3BB14D; Mon, 24 Aug 2020 11:39:18 +0000 (UTC) (envelope-from jrm@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BZqsL3m1hz4cFM; Mon, 24 Aug 2020 11:39:18 +0000 (UTC) (envelope-from jrm@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 6443C17DBC; Mon, 24 Aug 2020 11:39:18 +0000 (UTC) (envelope-from jrm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07OBdInO090522; Mon, 24 Aug 2020 11:39:18 GMT (envelope-from jrm@FreeBSD.org) Received: (from jrm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07OBdIXo090521; Mon, 24 Aug 2020 11:39:18 GMT (envelope-from jrm@FreeBSD.org) Message-Id: <202008241139.07OBdIXo090521@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jrm set sender to jrm@FreeBSD.org using -f From: Joseph Mingrone Date: Mon, 24 Aug 2020 11:39:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r546068 - head/print/foomatic-filters X-SVN-Group: ports-head X-SVN-Commit-Author: jrm X-SVN-Commit-Paths: head/print/foomatic-filters X-SVN-Commit-Revision: 546068 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Aug 2020 11:39:18 -0000 Author: jrm Date: Mon Aug 24 11:39:17 2020 New Revision: 546068 URL: https://svnweb.freebsd.org/changeset/ports/546068 Log: print/foomatic-filters: No-op formatting changes - accept portfmt/portclippy suggestions - remove REINPLACE_CMD that was not modifying any files Modified: head/print/foomatic-filters/Makefile (contents, props changed) Modified: head/print/foomatic-filters/Makefile ============================================================================== --- head/print/foomatic-filters/Makefile Mon Aug 24 11:37:05 2020 (r546067) +++ head/print/foomatic-filters/Makefile Mon Aug 24 11:39:17 2020 (r546068) @@ -13,14 +13,12 @@ COMMENT= Foomatic wrapper scripts LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -CONFLICTS= cups-filters-[0-9]* - USES= autoreconf ghostscript perl5 pkgconfig GNU_CONFIGURE= yes CONFIGURE_ENV= ac_cv_path_A2PS=${LOCALBASE}/bin/a2ps \ ac_cv_path_CUPS=${LOCALBASE}/libexec/cups \ - ac_cv_path_CUPS_FILTERS=${LOCALBASE}/libexec/cups/filter \ ac_cv_path_CUPS_BACKENDS=${LOCALBASE}/libexec/cups/backend \ + ac_cv_path_CUPS_FILTERS=${LOCALBASE}/libexec/cups/filter \ ac_cv_path_ENSCRIPT=${LOCALBASE}/bin/enscript \ ac_cv_path_MPAGE=${LOCALBASE}/bin/mpage \ ac_cv_path_PERL=${LOCALBASE}/bin/perl \ @@ -32,30 +30,30 @@ CONFIGURE_ENV= ac_cv_path_A2PS=${LOCALBASE}/bin/a2ps \ CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -OPTIONS_DEFINE= A2PS DBUS CUPS_IMAGE MPAGE -OPTIONS_RADIO= ENSCRIPT -OPTIONS_RADIO_ENSCRIPT= ENSCRIPT_A4 ENSCRIPT_LETTER ENSCRIPT_LETTERDJ -OPTIONS_DEFAULT= A2PS CUPS_IMAGE DBUS ENSCRIPT_A4 MPAGE -CUPS_IMAGE_DESC= Install cups image utilities -A2PS_DESC= Install a2ps convertor -ENSCRIPT_A4_DESC= Install enscript convertor (A4) -ENSCRIPT_LETTER_DESC= Install enscript convertor (letter) -ENSCRIPT_LETTERDJ_DESC= Install enscript convertor (letterdj) -MPAGE_DESC= Print multiple pages per sheet of paper +CONFLICTS= cups-filters-[0-9]* +OPTIONS_DEFINE= A2PS CUPS_IMAGE DBUS MPAGE +OPTIONS_DEFAULT= A2PS CUPS_IMAGE DBUS ENSCRIPT_A4 MPAGE +OPTIONS_RADIO= ENSCRIPT +OPTIONS_RADIO_ENSCRIPT= ENSCRIPT_A4 ENSCRIPT_LETTER ENSCRIPT_LETTERDJ + +A2PS_DESC= Install a2ps convertor +CUPS_IMAGE_DESC= Install cups image utilities +ENSCRIPT_A4_DESC= Install enscript convertor (A4) +ENSCRIPT_LETTERDJ_DESC= Install enscript convertor (letterdj) +ENSCRIPT_LETTER_DESC= Install enscript convertor (letter) +MPAGE_DESC= Print multiple pages per sheet of paper + A2PS_RUN_DEPENDS= a2ps:print/a2ps CUPS_IMAGE_LIB_DEPENDS= libcupsimage.so:print/cups -DBUS_CONFIGURE_ENABLE= dbus DBUS_LIB_DEPENDS= libdbus-1.so:devel/dbus +DBUS_CONFIGURE_ENABLE= dbus ENSCRIPT_A4_RUN_DEPENDS= enscript:print/enscript-a4 ENSCRIPT_LETTERDJ_RUN_DEPENDS= enscript:print/enscript-letterdj ENSCRIPT_LETTER_RUN_DEPENDS= enscript:print/enscript-letter MPAGE_RUN_DEPENDS= mpage:print/mpage post-patch: - @${REINPLACE_CMD} -e 's|/bin/bash|${SH}|g' ${WRKSRC}/foomaticrip.c - @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ - ${WRKSRC}/foomaticrip.c @${REINPLACE_CMD} -e 's|ln -sf $$(BINDIR)|ln -sf ../../../bin|g' \ -e '/filter.conf/ s|if.*||' \ ${WRKSRC}/Makefile.am