From nobody Sat Jun 03 15:39:04 2023 X-Original-To: dev-commits-ports-all@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 4QYPDT0fghz4Z20J; Sat, 3 Jun 2023 15:39:05 +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 4QYPDS73Syz4Mc2; Sat, 3 Jun 2023 15:39:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685806745; 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=h9SkEDzs0Mq0hJGgFcVMHpHF/E7eoAH8N00W85b/dec=; b=SS8iKXxqugpjBvL4yPCOMBkmuQVhLTALKOrDpgxMduNRnKtpbzeCcLjM//izl8VS0iMUTP o1L0Ole2xVzVuh89GZIhB422ChbJPjWNQBXqMaVLlabqiqmoyOUmv+AKMCLJXlE+CgsgIp sGtl2kxd6riAj4gdwkEe/TH0V8TAfvEUCSHI7Fhjm2Mb+Dczftz3lJLuwKIG/z4EBeZ72q HrGbRVK4N18DoNyX7CYkSDiIoe15t1GFNS3eNSQJasH0nMBlp/b4dRDT7JltTxlcD+y5eN RmZ5qempdSnYiIFIy7LoydBf1y5WnQ+T/Tl6ItDCmEjMRyAGMVf0VVxMLCejEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685806745; 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=h9SkEDzs0Mq0hJGgFcVMHpHF/E7eoAH8N00W85b/dec=; b=DGszFbdCctIvYv2aUeEvDax2caLrqTQulwQHGdbW/qQ5Q3gUnZS0MMSflNR1cOtjUCBjwa LI76QgkaMLiZorYakMS+65f6xVLEC+bCI7CVxsmnyD3SZlKyXUOmdmxXFqX9E8NBgQcWPn 6SFsKGIl6s9RY74apBbHdevW3bhKuOk5uM4R7x/dyUYIdTDFVGo7UTMP4UaVv8ASrTKC34 LnugK9M3gcL7pBFkEosuDpUo/JDZjmLQqb8+nuhJfXuVscV61ZhUxnRCe+myJdonKPbhN/ Fvtrwe6+oAWi6gkURMlXA0Vp3djVvakYQtlwbCk13d/IysG14uzx4uWukX67eQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685806745; a=rsa-sha256; cv=none; b=wq2bHHMlPYA+JGt9INEu0eg9cHHgJoLiMpreaGxzRkamRF9q85n+Yftg6KsSLq0oMVzlZt pW3O4fklSB8Oa0gCMujAZ5OwcEbNaZ2DMxMSR0zYkA67WbCAJdy3mCL6Rum9+YIq41tzW/ a2naiV5mfxUUEcxmYm8uzH3G5m3+U2zLtD4dNWmGYAbM2aPuf1TDhbetnVvucIa1pdd3ha sDERYZXh5RVFCY5dmnJrLVAevdin7af4s6BMHdOIOemmsjHSgtGTCtUhFm7YSGgpts69J2 ySE9Ke20bS9a+NToA8kigM+j4DxM7kS1Q8WOPnHE2yG9QOLh3t6TKc/tUrEy9A== 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 4QYPDS5VTXzWTK; Sat, 3 Jun 2023 15:39:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 353Fd4UL071630; Sat, 3 Jun 2023 15:39:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 353Fd44p071628; Sat, 3 Jun 2023 15:39:04 GMT (envelope-from git) Date: Sat, 3 Jun 2023 15:39:04 GMT Message-Id: <202306031539.353Fd44p071628@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: 4c2bb9fcd1b6 - main - x11/xskyroot: Fix build with llvm15 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: 4c2bb9fcd1b6d276d8fde1d27114290befe03dea Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=4c2bb9fcd1b6d276d8fde1d27114290befe03dea commit 4c2bb9fcd1b6d276d8fde1d27114290befe03dea Author: Muhammad Moinur Rahman AuthorDate: 2023-06-03 14:50:55 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2023-06-03 15:38:52 +0000 x11/xskyroot: Fix build with llvm15 - Pet portclippy - Reresh pathces - Use DISTNAME and EXTRACT_SUFX instead of DISTFILES --- x11/xskyroot/Makefile | 21 ++++++++++++++++----- x11/xskyroot/distinfo | 1 + x11/xskyroot/files/patch-Imakefile | 6 +++--- x11/xskyroot/files/patch-astro.c | 4 ++-- .../files/{patch-xsyroot.c => patch-xskyroot.c} | 4 ++-- 5 files changed, 24 insertions(+), 12 deletions(-) diff --git a/x11/xskyroot/Makefile b/x11/xskyroot/Makefile index 34666a758170..1fa6cbbf1b78 100644 --- a/x11/xskyroot/Makefile +++ b/x11/xskyroot/Makefile @@ -3,19 +3,30 @@ PORTVERSION= 920428 PORTREVISION= 2 CATEGORIES= x11 MASTER_SITES= ftp://ftp.sra.co.jp/pub/news/fj.sources/V10/ -DISTFILES= 1079.gz +DISTNAME= 1079 +EXTRACT_SUFX= .gz +DIST_SUBDIR= ${PORTNAME} MAINTAINER= ports@FreeBSD.org COMMENT= Realtime sky drawer for X root window +LICENSE= NONE + +USES= imake xorg +USE_XORG= x11 + EXTRACT_CMD= ${GZIP_CMD} EXTRACT_BEFORE_ARGS= -dc EXTRACT_AFTER_ARGS= | ${SED} -e "/^...bin.sh/,/exit 0/!d" | ${SH} -DIST_SUBDIR= ${PORTNAME} NO_WRKSUBDIR= yes -USES= imake xorg -USE_XORG= x11 + PLIST_FILES= bin/xskyroot -.include +.include + +.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +CFLAGS+= -Wno-error=int-conversion +.endif + +.include diff --git a/x11/xskyroot/distinfo b/x11/xskyroot/distinfo index fa4c4cbea002..ae09a9ce27c1 100644 --- a/x11/xskyroot/distinfo +++ b/x11/xskyroot/distinfo @@ -1,2 +1,3 @@ +TIMESTAMP = 1685803531 SHA256 (xskyroot/1079.gz) = 66e78ccd9c787ec9d21661be715702ae4a6d34e12b3c529dfca17ac382ffec92 SIZE (xskyroot/1079.gz) = 10285 diff --git a/x11/xskyroot/files/patch-Imakefile b/x11/xskyroot/files/patch-Imakefile index 571af377cb00..3a02ed146aed 100644 --- a/x11/xskyroot/files/patch-Imakefile +++ b/x11/xskyroot/files/patch-Imakefile @@ -1,6 +1,6 @@ ---- Imakefile.orig Sat Oct 14 07:16:08 2000 -+++ Imakefile Sat Oct 14 07:16:45 2000 -@@ -4,4 +4,4 @@ +--- Imakefile.orig 2023-06-03 14:41:54 UTC ++++ Imakefile +@@ -4,4 +4,4 @@ SYS_LIBRARIES = -lX11 -lm SRCS = xskyroot.c draw.c colorname.c astro.c OBJS = xskyroot.o draw.o colorname.o astro.o diff --git a/x11/xskyroot/files/patch-astro.c b/x11/xskyroot/files/patch-astro.c index 16c3108c3ace..f154bccb87e8 100644 --- a/x11/xskyroot/files/patch-astro.c +++ b/x11/xskyroot/files/patch-astro.c @@ -1,5 +1,5 @@ ---- astro.c.orig Mon May 31 09:06:03 1999 -+++ astro.c Mon May 31 09:06:18 1999 +--- astro.c.orig 2023-06-03 14:41:54 UTC ++++ astro.c @@ -7,7 +7,7 @@ #include #include "mathlocal.h" diff --git a/x11/xskyroot/files/patch-xsyroot.c b/x11/xskyroot/files/patch-xskyroot.c similarity index 55% rename from x11/xskyroot/files/patch-xsyroot.c rename to x11/xskyroot/files/patch-xskyroot.c index c2152bca70f1..479ad5455b9a 100644 --- a/x11/xskyroot/files/patch-xsyroot.c +++ b/x11/xskyroot/files/patch-xskyroot.c @@ -1,5 +1,5 @@ ---- xskyroot.c- Thu May 29 08:56:15 1997 -+++ xskyroot.c Thu May 29 08:52:51 1997 +--- xskyroot.c.orig 2023-06-03 14:41:54 UTC ++++ xskyroot.c @@ -1,4 +1,4 @@ - +#include