From nobody Sat Feb 11 14:57:25 2023 X-Original-To: dev-commits-ports-branches@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 4PDYc625lnz3qc1L; Sat, 11 Feb 2023 14:57:26 +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 4PDYc61MBFz3r17; Sat, 11 Feb 2023 14:57:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676127446; 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=Q4bSTk5Z927tywCmqg48DbXiiGhDnFrU0KkotxcGCd8=; b=PajxLhhXckgv/dsRKIFJT6PNH/WSLeR6+zS4MPw5/G7v1XAZd3b8fDvVjLShvU4G0U9qkm 8k+Q7yVxzpjoWmeP4ZJGiCK85sAGh+dHdegAWI6NAH8I2zUtOu3PbhgA2DzZfvqqHwOljX 8vWg/8kaDwFinxti4gp69AB7FRkdXjPqHDsduav/ONbAEgqqS++C34wwUK2yWr+f3nunmA Sxj1F5iv4+SukDnuZ9g9EFAf+bS/gctuTdYZ49uQLPXcIcnEiPcLbi5qb0QG/1v7TP+Djm 1TUgFB6DmdPecCsPv2tkJ9XqTS9ry08FOByuBlwo2jAbjdejEHrkuK335uIO2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676127446; 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=Q4bSTk5Z927tywCmqg48DbXiiGhDnFrU0KkotxcGCd8=; b=qC7am2InuFEXkk2DDoULzzB35fGJYfvQnRyhL+0bJQmq8yMRIXWbCAEWvIzEVxppomSiGe DGijVILZN6VAWC+DdXE56J3dfwoe7ZRlrxufx5seriwqk0ccU3jCCbga3FL5LtLx7i+gWi gZyI/9nTA4zBr22w+jPWKoHuGIQJWTCosmzMtHKI5EQDBKIAlW7U5CF6FxSPmM22wZ5PqZ apza/iE1vd5Wp1bBjvyjyyxLQ9eS12rj1sM3fgGhArEI79/UIU3jZDoYZn+l7Pa/UEQL07 3JQyiccTOOK/Q8uOtvJz9Tl2gTl8JndKW2Ef4Ok0FsTsIhuz4Fztld4pW2rBTg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676127446; a=rsa-sha256; cv=none; b=NP/cwTYIFiToUJ+sAQCLdEg/BhcODRG6/Yiw56yIV5DahaosD93oMDdd/jYNn6HpEWbaHx go5F52EB9WGN09sSL/Qxlz2DGO9fzO3zJH6boCgmL2ircxFvdCRoOugOKZVSlGyZZvGeP1 iWqZspO06CYh98iv5vHmUWHujx9WW+11x5ggxFj7oq8uB/YIwomLGrzlkZzjs8YTFAtkYM lkDaSdGxRpDUhHTNZKi5XfQLkbbLnJQfhXPFtnZsebl1/lYaVy56H/03+P/ytI1H4Fj6Ug mcLK1XxKGYFoQLMol1yEBIKhcipNgcn1e7goVtFm5AW5YFkSCG2laR5DE4yzzg== 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 4PDYc60Mznz12MD; Sat, 11 Feb 2023 14:57:26 +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 31BEvPMa017274; Sat, 11 Feb 2023 14:57:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31BEvPA8017273; Sat, 11 Feb 2023 14:57:25 GMT (envelope-from git) Date: Sat, 11 Feb 2023 14:57:25 GMT Message-Id: <202302111457.31BEvPA8017273@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Cy Schubert Subject: git: 2f115dc1ef39 - 2023Q1 - x11/xforward: Fix build with LLVM15 and other fixes List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q1 X-Git-Reftype: branch X-Git-Commit: 2f115dc1ef39ae4881b9a57c8fbd0f6bc0abf590 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q1 has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=2f115dc1ef39ae4881b9a57c8fbd0f6bc0abf590 commit 2f115dc1ef39ae4881b9a57c8fbd0f6bc0abf590 Author: Cy Schubert AuthorDate: 2023-02-11 14:32:18 +0000 Commit: Cy Schubert CommitDate: 2023-02-11 14:57:02 +0000 x11/xforward: Fix build with LLVM15 and other fixes In addition to fixing the build with LLVM15, a number of packages xforward depends on no longer provide static libraries, making building the static version impossible. Therefore this revision also reverts f6d424b24071 (SVN r414578 in May 2016) which added a static build option. (cherry picked from commit 91bb18500a34e6ffa1eee79c386711ac32679ae5) --- x11/xforward/Makefile | 6 ------ x11/xforward/files/patch-Makefile | 33 +++++++-------------------------- 2 files changed, 7 insertions(+), 32 deletions(-) diff --git a/x11/xforward/Makefile b/x11/xforward/Makefile index 9c2ff4cc8813..e058f1aba42a 100644 --- a/x11/xforward/Makefile +++ b/x11/xforward/Makefile @@ -23,10 +23,4 @@ MAKE_ARGS= PREFIX=${PREFIX} LOCALBASE=${LOCALBASE} NO_WRKSUBDIR= yes PLIST_FILES= bin/xforward man/man1/xforward.1.gz -OPTIONS_DEFINE= STATIC - -STATIC_ALL_TARGET= all-static -STATIC_INSTALL_TARGET= install-static -STATIC_PLIST_FILES= bin/xforward-static - .include diff --git a/x11/xforward/files/patch-Makefile b/x11/xforward/files/patch-Makefile index 6579b005b3df..dc9586307749 100644 --- a/x11/xforward/files/patch-Makefile +++ b/x11/xforward/files/patch-Makefile @@ -1,6 +1,6 @@ ---- Makefile.orig 1993-06-05 02:32:01 UTC -+++ Makefile -@@ -18,18 +18,20 @@ +--- Makefile.orig 1993-06-04 19:32:01.000000000 -0700 ++++ Makefile 2023-02-11 06:30:12.418352000 -0800 +@@ -18,18 +18,19 @@ # MANDIR is where the manual page will be installed. DESTDIR= @@ -20,41 +20,22 @@ +INCFLAGS= -I${LOCALBASE}/include +LDFLAGS= -L${LOCALBASE}/lib +LIBS= -lXm -lXt -lX11 -lXext -+LIBS_STATIC= -lXm -lXmu -lXt -lXext -lSM -lICE -lpng16 -lz -lm -ljpeg -lXft -lfontconfig -lexpat -lfreetype -lbz2 -lX11 -lXau -lxcb -lXdmcp -lXau -lXft -lXrender -lXp + CFLAGS= ${INCFLAGS} -O # For CenterLine CodeCenter -@@ -39,20 +41,30 @@ SRCS= xforward.c - AUXFILES= README NOTICE Makefile xforward.1 - - PROGS = xforward -+PROGS_STATIC = xforward-static - -+all-static: all ${PROGS_STATIC} -+ - all: ${PROGS} - - xforward: xforward.o +@@ -46,11 +47,12 @@ cc ${LDFLAGS} xforward.o -o xforward ${LIBS} -+xforward-static: xforward.o -+ cc ${LDFLAGS} -static xforward.o -o xforward-static ${LIBS_STATIC} -+ xforward.o: xforward.c - cc -c ${CFLAGS} xforward.c +- cc -c ${CFLAGS} xforward.c ++ cc -c -Wno-int-conversion ${CFLAGS} xforward.c install: ${PROGS} install -c xforward ${DESTDIR}${BINDIR}/xforward install -c xforward.1 ${DESTDIR}${MANDIR}/xforward.1 -+ -+install-static: install ${PROGS_STATIC} -+ install -c xforward-static ${DESTDIR}${BINDIR}/xforward-static + clean: ; -- rm -f *~ *.o core ${PROGS} -+ rm -f *~ *.o core ${PROGS} ${PROGS_STATIC} + rm -f *~ *.o core ${PROGS} - center: - #load ${LDFLAGS} ${LIBS}