From nobody Thu Aug 17 07:38:03 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 4RRH0q6cNbz4qMBv; Thu, 17 Aug 2023 07:38:03 +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 4RRH0q4M5Xz3gvc; Thu, 17 Aug 2023 07:38:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692257883; 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=64zanRR7TsFkYboC6TArXtYkT9uU1Dk1XFQ/cFUF5DY=; b=JpXxQ5e9rME8FZtpwESe+/42RoJ6L0YQAx4Y9RURy1MUJ42yG1Ad40qm7WCl/9eKVDA2AR OzVzxGV0ULOKc0oWkBzabjloF2Ige555BQgcJhPRTs5px5J03N6eQQtfHdlNtJYs6TH0Sl 8nEhvLatPavUq2Rct6SdgwbRkjqdBYXZErfXyfgP0LVttx65MkReyDsrysX8LrOVdfpQ89 F+NTzZHOELFJIiMHV54u3/FNz4id0g2MRhSDOF14vcOb7DYBD6ZvcjbQRJVX38S1YhjkKK mRfMo63dx7xbFp/RhkaTAwHnao6eIbbRFZwq5SJNjBLfE9ObZ+xUmfb5ADst/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692257883; 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=64zanRR7TsFkYboC6TArXtYkT9uU1Dk1XFQ/cFUF5DY=; b=VhXNhBIIAbzrlOxJaHBbdyg3XomT7afr6KR3SyocCF3nnvZUkj8dn+stTcEuvAD7UvmXH1 uJFhaTGvtG7KTN/uGYiR62scihoVSphu/lIBPcnh+uboW94zP3WOdmpij08tbeYP/C+n9n jMnhJuSVFXXAIFejoXgXkQd/1QFAlhP7U9kc1r5EO8fLwnd0/rnaYhAxTv2egTdJJNMsy8 l9eLHB/58LgdLoa3DFoULQx0u3XrifklFLRWAQjH6TMmL+SNHzBMSXICHflgz6oAgefY3L 5yDyE3CtD+2rOzrosQbmGPbU0pOidxa2sh6qwZedVQ0ojYYaGffvrDB/ITRrcQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692257883; a=rsa-sha256; cv=none; b=Z5z9J7hpyjDzFsimPQtqvoCtkL3TiAvuyOGJNdNcYPER8E2iJq1AYDzFryPpST4FM6KJ4O 9Mqhu8Ah7bDAVOyqUW1/5VhyfG21GMV9uTUlsjptJ9oAghPfubGjowwE8ypMoLZjsDAJzU 9/piTztGeYfJkCExlFQkk1re3XAhBa+UwVQyVJIlBjEEXmksmOgeyVF53G4nBFrsVEew+V r5+m2QlVY803Mok7Z55Od/559yBMedEyhLA4RZDYCwJ6VAxjU3VAykgiWzaKdgWKUKhvdn z/hKR/h+CKwKnIKThDWUF47cVm5vvr6v7fuCOHYBrmcE45sxfc4lL7/YO/wb+A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RRH0q3RdPz9cl; Thu, 17 Aug 2023 07:38:03 +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 37H7c3Wd047073; Thu, 17 Aug 2023 07:38:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37H7c3mX047070; Thu, 17 Aug 2023 07:38:03 GMT (envelope-from git) Date: Thu, 17 Aug 2023 07:38:03 GMT Message-Id: <202308170738.37H7c3mX047070@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Tijl Coosemans Subject: git: 7753f124339f - main - print/hplip: Fix patch from f97941e2c029 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: tijl X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7753f124339fd7c52cddd7afd37c15b1aecf9cc9 Auto-Submitted: auto-generated The branch main has been updated by tijl: URL: https://cgit.FreeBSD.org/ports/commit/?id=7753f124339fd7c52cddd7afd37c15b1aecf9cc9 commit 7753f124339fd7c52cddd7afd37c15b1aecf9cc9 Author: Tijl Coosemans AuthorDate: 2023-08-17 07:24:16 +0000 Commit: Tijl Coosemans CommitDate: 2023-08-17 07:32:01 +0000 print/hplip: Fix patch from f97941e2c029 by applying dos2unix first. PR: 272804 --- print/hplip/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/print/hplip/Makefile b/print/hplip/Makefile index 85298e9a682b..14c3f0cbbc51 100644 --- a/print/hplip/Makefile +++ b/print/hplip/Makefile @@ -23,7 +23,8 @@ USES= dos2unix jpeg libtool localbase pkgconfig python \ shebangfix USE_LDCONFIG= yes -DOS2UNIX_FILES= scan/sane/OrbliteScan/LinuxCommon.h scan/sane/orblite.c +DOS2UNIX_FILES= fax/filters/cdmfax/jetlib.cpp \ + scan/sane/OrbliteScan/LinuxCommon.h scan/sane/orblite.c SHEBANG_GLOB= *.py hpps pstotiff GNU_CONFIGURE= yes