From nobody Sat Feb 11 14:41: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 4PDYFF0YQ9z3qZfH; Sat, 11 Feb 2023 14:41: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 4PDYFD5Fgxz3nyp; Sat, 11 Feb 2023 14:41:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676126464; 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=fkJzVO85jM37DjQQLeFpUZ3WyP6OcCgGFSq8qAT4Ddo=; b=YxAzl9erTMl+ZMoTtklZ9KhSD6asuKNb98A1z4BVBHK152UtgKgrKJUoHxl7BiV9zO58oI gJm4bqb7lMvsHO06SIozKEuhhMacyLDoHQGjsuud0/nOByGWNA6y7KMvj4WTDbOvimbCes Gfhd3Bun6kwebYvghCuY8AkhD/5ybE8HAcjqpsD5wTgFIRaFpE2fjaVyCr+m2g3MarCML2 opBnYkk0w5KTQG4fTMhv5u1enUiJGkhXL/j93RKlTUsN15QZuSV16N31PQ6dnnMuShVutU Tl5Qw0oksXusrwefosuIgplnT3k3kXuOTYKZin7+6upUViHcDGIUk0SSV2X7wg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676126464; 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=fkJzVO85jM37DjQQLeFpUZ3WyP6OcCgGFSq8qAT4Ddo=; b=QrdLOjhEp2hKTvNYQmaJTAXiMnkhKT7DWqcZ7T39kxs5KHmw/nwIRxnSZPeuAdqILmPo6O 8Y2gDV7cQkWbXO4wlU/G0Yt4IOcfXeyF8g+/m47Tv5z9WIgP84yNtG0voly2PyU3n63t/N VMh5+IHRb2T9zSjZrKYAPg6QF8f41Ev2cr0FrZVrw2O88gCizlVfuFeO6VZLzRUzE5MgMz WeJtjvu2fqj3TGJB8yh9sMm9bRuY9Omoi/ZHpiXo3ZyYeeqq3NUOId9k2hoVMb9yCCdUax LuB0lutCOVFnNfB4GIDjyKsCoc2Srh+fLC6EvUDfDbMGsBvqmxNRQ4gLSx6puw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676126464; a=rsa-sha256; cv=none; b=Q+zag8JhgKi5dDAtEi6+iwg4FYMeYLzyp1eMrs02fn+FGY2NwHxFSu1PigOK56ikh8EdDw PSaZ55f+3hLpXVgITEOAfRJdaEVcVJ7HXEFXCwwiXpYIjgZGdi0L077iwi5q3itVlfw4cO KQAim2w0mypYE7tGmjDMMyzt6vfxlqT11Q9zI1c1eXqCjBTzkUy/l/25t+AGAQCPwLq30z itVyAmBF6uNlngmRQQxraiHFiYQVwJNv1N5JPqUE+QwoOti2X5Wx3oYP1zJ5ChVgTh1u9Q Jo35pFdW4BQXYb0RyJIC+wB4bhQwUTYztSQLhFYGaMtz3ZC+d9vY4vX6VEaMkQ== 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 4PDYFD41mLz12C9; Sat, 11 Feb 2023 14:41: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 31BEf4Zk000493; Sat, 11 Feb 2023 14:41:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31BEf4ua000492; Sat, 11 Feb 2023 14:41:04 GMT (envelope-from git) Date: Sat, 11 Feb 2023 14:41:04 GMT Message-Id: <202302111441.31BEf4ua000492@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Cy Schubert Subject: git: 91bb18500a34 - main - x11/xforward: Fix build with LLVM15 and other fixes 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: cy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 91bb18500a34e6ffa1eee79c386711ac32679ae5 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=91bb18500a34e6ffa1eee79c386711ac32679ae5 commit 91bb18500a34e6ffa1eee79c386711ac32679ae5 Author: Cy Schubert AuthorDate: 2023-02-11 14:32:18 +0000 Commit: Cy Schubert CommitDate: 2023-02-11 14:32:18 +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. --- 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}