From nobody Sun Jul 23 10:50:30 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 4R80SR3B7Vz4pN71; Sun, 23 Jul 2023 10:50:31 +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 4R80SQ6v2jz3qtX; Sun, 23 Jul 2023 10:50:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690109431; 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=LkxE/h6k106p0fJiyxoiaIVqf43S28FgLJjWB4W1bn8=; b=BiNm5RuEi6gfOhMI62PXorxszFHyVdSP9XC8LcQEFgTVW/OKgLM5oNuoDxSM2zjm+RRGPv RhJn9RW80INGOiSVYpnRc4ZYHIFbfw+Xu7dtOgOrQpcPZGPtojovJxx5R4LRjgGFYq491y Dg6fMJELfhkrCYHZ3xZuR0nCSJWHx6+uUosp3A+/7NVdQVrXxRM+96GL83VaJO6rDcwNzB 8tlJjOMb9OqioC6sPEA+xKW8dUwsdeB+IOJfk3jiLMq+yUYF4vk6s3ruVt9NfBuPhq2x9+ GyPsG1MQpW1pP5ZvEXW7R5BbUF/rQItWliX2SnY7I3yl8zRR8JPVn4VIn5W2KQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690109431; 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=LkxE/h6k106p0fJiyxoiaIVqf43S28FgLJjWB4W1bn8=; b=Yk+Ra80VtgTmQF6eGh1ugQjtAJgLWQ9/5Oqop9lhZbc2ScpzyjJTjEKDeEF0EhgljYjE4U VmBZZ6NWRPgcBSgRCVBljwyeJrTkQU1umk+ISvauPptbYkelSxHj/DcD3ZELy/D2OEGkD1 dwmVnbUkN34M35pCB1FsnPXg/9uHZ2xhLRqBW8+ELhJnbpfz5kldNbmnAtl+5PsC3Liwwi ZYnXGJWpAXtmh4n6wNnVU6xrud2NUxP5lg7FjlWTAhDOf8lvpwIFd2nCZJ4jC8ImlgW3YJ 0C5TZOS+I86lMYzbL8Pb4/pbOOJhTYamK920z22I8Gqlt3hHh5edZ2rdI/7/VA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690109431; a=rsa-sha256; cv=none; b=hSHgMIoH6AYFJ17O7g+zp5P/7BTTW+rf39O1vabhq0oqxmEjBfarMMEbdrdHyqzKlKmfpA dOdYzFl29SGtKA8zOYWkVy1MFK5cp/DVnnI+FksGaHxYcIMIJJSIkQeYbLyRo10fHI75/J tFHrZGGNUJcYV7GUqzakx29vLSkJCDqStxrvu86+ZDIAlTUmBkMGAap6KwyWOgelsC1SyD mkw54pYYNd/Q1mzk9TNSwOviaFVgiG9yMeS00MkyP7jlpDyNRzSQ5AQ0HQE9y3KtKmPZkA EzdICZqSgvOZRwSCWucExPGG8IqHdHdRvHVfLfkl26z9f4ToWdtJL7yIrLn+UA== 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 4R80SQ6024zYM1; Sun, 23 Jul 2023 10:50:30 +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 36NAoUSt005638; Sun, 23 Jul 2023 10:50:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36NAoUl5005637; Sun, 23 Jul 2023 10:50:30 GMT (envelope-from git) Date: Sun, 23 Jul 2023 10:50:30 GMT Message-Id: <202307231050.36NAoUl5005637@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: 141cd26606a2 - main - print/ttf2pt1: Fix build with llvm16 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: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 141cd26606a2c8019966cdbb00a967db49bcb1b6 Auto-Submitted: auto-generated The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=141cd26606a2c8019966cdbb00a967db49bcb1b6 commit 141cd26606a2c8019966cdbb00a967db49bcb1b6 Author: Muhammad Moinur Rahman AuthorDate: 2023-07-23 10:18:45 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2023-07-23 10:50:17 +0000 print/ttf2pt1: Fix build with llvm16 - Utilize USES=localbase - Pet port{clippy|fmt} Sponsored by: The FreeBSD Foundation --- print/ttf2pt1/Makefile | 42 ++++++++++++++++++++------------------ print/ttf2pt1/files/patch-Makefile | 6 +++--- print/ttf2pt1/files/patch-ft.c | 4 ++-- 3 files changed, 27 insertions(+), 25 deletions(-) diff --git a/print/ttf2pt1/Makefile b/print/ttf2pt1/Makefile index cb80316b4b68..588b287bd063 100644 --- a/print/ttf2pt1/Makefile +++ b/print/ttf2pt1/Makefile @@ -14,26 +14,28 @@ LICENSE_FILE= ${WRKSRC}/COPYRIGHT LIB_DEPENDS= libfreetype.so:print/freetype2 RUN_DEPENDS= t1asm:print/t1utils -USES= pkgconfig shebangfix perl5 uidfix tar:tgz -MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS} ${CPPFLAGS}" LIBS="${LIBS}" \ - INSTDIR="${STAGEDIR}${PREFIX}" LIBXDIR="${STAGEDIR}${PREFIX}/bin" \ - OWNER=${BINOWN} GROUP=${BINGRP} -SHEBANG_FILES= app/TeX/sfd2map \ - app/TeX/cjk-latex-config \ - other/showdf \ - other/showg \ - other/*.pl \ - scripts/forceiso \ - scripts/frommap \ - scripts/inst_dir \ - scripts/html2man \ - scripts/t1fdir \ - scripts/trans - -CPPFLAGS+= `pkg-config --cflags freetype2` \ - -I${LOCALBASE}/include -DUSE_FREETYPE -LIBS+= `pkg-config --libs freetype2` \ - -L${LOCALBASE}/lib -lm +USES= localbase perl5 pkgconfig shebangfix tar:tgz uidfix + +SHEBANG_FILES= app/TeX/cjk-latex-config app/TeX/sfd2map other/*.pl \ + other/showdf other/showg scripts/forceiso scripts/frommap \ + scripts/html2man scripts/inst_dir scripts/t1fdir scripts/trans + +MAKE_ARGS= CC="${CC}" \ + CFLAGS="${CFLAGS} ${CPPFLAGS}" \ + GROUP=${BINGRP} \ + INSTDIR="${STAGEDIR}${PREFIX}" \ + LIBS="${LIBS}" \ + LIBXDIR="${STAGEDIR}${PREFIX}/bin" \ + OWNER=${BINOWN} + +CPPFLAGS+= `pkg-config --cflags freetype2` -DUSE_FREETYPE +LIBS+= `pkg-config --libs freetype2` -lm + +.include + +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091 +CFLAGS+= -Wno-error=incompatible-function-pointer-types +.endif post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/ttf2pt1 diff --git a/print/ttf2pt1/files/patch-Makefile b/print/ttf2pt1/files/patch-Makefile index 9e9c62b2b3c4..3c1cd37a83e6 100644 --- a/print/ttf2pt1/files/patch-Makefile +++ b/print/ttf2pt1/files/patch-Makefile @@ -1,6 +1,6 @@ ---- Makefile.orig Sun Oct 22 23:19:32 2006 -+++ Makefile Sun Oct 22 23:19:36 2006 -@@ -243,7 +243,6 @@ +--- Makefile.orig 2002-08-30 18:03:07 UTC ++++ Makefile +@@ -243,7 +243,6 @@ install: all chgrp -R $(GROUP) $(SHAREDIR) chmod -R go-w $(SHAREDIR) scripts/inst_file ttf2pt1 $(BINDIR)/ttf2pt1 $(OWNER) $(GROUP) 0755 diff --git a/print/ttf2pt1/files/patch-ft.c b/print/ttf2pt1/files/patch-ft.c index 80140af7a608..0eb1559a626f 100644 --- a/print/ttf2pt1/files/patch-ft.c +++ b/print/ttf2pt1/files/patch-ft.c @@ -1,5 +1,5 @@ ---- ft.c.orig 2003-12-31 22:30:50.000000000 +0100 -+++ ft.c 2013-12-16 16:50:37.000000000 +0100 +--- ft.c.orig 2003-12-31 21:30:50 UTC ++++ ft.c @@ -12,11 +12,12 @@ #include #include