From nobody Fri Jul 21 14:45:36 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 4R6smd3jdtz4nX29; Fri, 21 Jul 2023 14:45:37 +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 4R6smd2VSMz43NX; Fri, 21 Jul 2023 14:45:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689950737; 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=RRcCcpMFiGdykK/+cF/vYxRgxKi2YmWYzHkvptz1Tbg=; b=bws4C11Dd9dGL8CRAkXvXw3+opOewFFBZ+aFfud7bAlZftUNyrwZH3kiC0FJjGpdCI1+zQ zWpNb4hcyWQn3RtT2kdySY/V6jFToCqFJ2kzYYjy1dBcR2xKAP4rujP3Qzlm6OQnKDEgaH Aeh9+BD2chl2DiyZCMHBxqWQWcAWBuAAqat4FB5jH5dEiHAXTbpNKGQWIS0LDpj7ozQEpn sGfVHEsXOcQITo21o6G006ayWEy76LD8rk6hmpo3AMfzzn6gYAw9G7Bfjsxyn1yr8JXqwD c5+hHNr6AbJyJ0wgZ+e/iU3rzE/dfuxJ0Hf1aaxgdf3NaFQpUdUWwGTiACIk+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689950737; 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=RRcCcpMFiGdykK/+cF/vYxRgxKi2YmWYzHkvptz1Tbg=; b=ZcXfHgHBL+d7Kib+uHRk1DJBL0UdIp9EwPuXjUXEKGtaP5gZQ8L5Vjfk/JVPm+PjSkJ7M5 nevFAnGByRrQD5d0E/l2jNdD4B2x29wM9kFHnnXTb54LRlNrgEWZ0nwZW5W8ju/a4NDdFe FNH+In2fQBISC5dwr4ZZhgoi+X4EdWtixYCOq9r1e6ZoAFiKzbMGwjwEjVc6gn0WyTc0M4 tcu5aFFsneipjsnBCSENdTYiYMngLpnMhJrPx8dN9mCmX3eecVbe0xpoxR1DN9ySzBgBHL rCd6+Jn7oQcMsHR3bXJJuyLfPjQ8WJ3skW+22KF90sylNPLJ/0fL7HhF3p61JA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689950737; a=rsa-sha256; cv=none; b=ED3aCM3q+8y7hzucPuS2Y+/a5A514EdsBJFljUzMZMBRF5Hj1ZnTMip0kril+dow0cWLAK LyysJ2VjkArwLKKXXA62fpk+C3/isUUzGe2M1ZEtHlhjHm7uVzasezN+VLPjCswqP/GhPQ dT0yegSV0R5orzmy0h2gbvfFQy5Y8kPFpw543qFoFVe6AFXK4PZwq3yQtjYC5SH+1tI//b pV2/lJvIAb3GYniLNVjv8fzsMWOfin2hmmjWGRYlDcjBuESc8MCJWO/GQUuDkkwCFM+K4L pBuAxRtPWSJqBXODPafV+8TZydrKhSRAMvdui61iUV1F2z9akzCem/ynbT1vjA== 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 4R6smc70pWzGmY; Fri, 21 Jul 2023 14:45:36 +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 36LEjala025403; Fri, 21 Jul 2023 14:45:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36LEjaVl025402; Fri, 21 Jul 2023 14:45:36 GMT (envelope-from git) Date: Fri, 21 Jul 2023 14:45:36 GMT Message-Id: <202307211445.36LEjaVl025402@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: 86a00f98f1af - main - science/drawxtl: Fix build with llvm16 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: 86a00f98f1afc843ad66e82e05d300d6e276e05b Auto-Submitted: auto-generated The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=86a00f98f1afc843ad66e82e05d300d6e276e05b commit 86a00f98f1afc843ad66e82e05d300d6e276e05b Author: Muhammad Moinur Rahman AuthorDate: 2023-07-21 13:39:11 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2023-07-21 14:45:28 +0000 science/drawxtl: Fix build with llvm16 Approved by: portmgr (blanket) Sponsored by: The FreeBSD Foundation --- science/drawxtl/files/patch-Makefile | 85 ++++++++++++++++++++++++++++++++++-- 1 file changed, 82 insertions(+), 3 deletions(-) diff --git a/science/drawxtl/files/patch-Makefile b/science/drawxtl/files/patch-Makefile index 1cbcca22e7a8..7f5c93af116f 100644 --- a/science/drawxtl/files/patch-Makefile +++ b/science/drawxtl/files/patch-Makefile @@ -1,6 +1,15 @@ --- Makefile.orig 2011-03-08 18:55:26 UTC +++ Makefile -@@ -34,11 +34,11 @@ ifeq ($(OS),Linux) +@@ -6,7 +6,7 @@ + + OPTIM = error + TARGET = ../../exe/DRAWxtl55 +-PREINC = ++PREINC = + RESFILE = + + # post processing command - overwritten for Mac +@@ -34,29 +34,29 @@ ifeq ($(OS),Linux) prefix = /usr/local includedir = ${prefix}/include @@ -14,7 +23,15 @@ endif # compiler name: -@@ -52,11 +52,11 @@ ifeq ($(OS),Linux) + CXX = g++ + + # flags for C++ compiler: +- OPTIM = -g -Wall -Wunused -fno-exceptions +-# work around a bug in freeglut 2.4 - only enable this if you have to use a version ++ OPTIM = -g -Wall -Wunused -fno-exceptions --std=c++14 ++# work around a bug in freeglut 2.4 - only enable this if you have to use a version + # of fltk before 1.1.8 AND exactly version 2.4 of freeglut + # GLUT = -DFREEGLUT24 CXXFLAGS = $(OPTIM) -I/usr/X11R6/include $(GLUT) # libraries to link with: @@ -28,7 +45,49 @@ # The extension to use for executables... EXEEXT = -@@ -216,7 +216,7 @@ clean: +@@ -68,7 +68,7 @@ ifeq ($(OS),CYGWIN) + # section to define the various symbols needed to build DRAWxtl for cygwin running on Windows + + prefix = /usr/ +- includedir = ++ includedir = + libdir = /fltk/lib + + # compiler name: +@@ -108,10 +108,10 @@ ifeq ($(OS),IRIX64) # use GNU g++ compil + + # flags for C++ compiler: + OPTIM = -g -O2 -Wall -Wunused -fno-exceptions +- CXXFLAGS = $(OPTIM) ++ CXXFLAGS = $(OPTIM) + + # libraries to link with: +- GLDLIBS = -L/usr/freeware/lib32 -lglut -L/usr/lib32/ -lGL -lGLU -lm -lXpm -lX11 ++ GLDLIBS = -L/usr/freeware/lib32 -lglut -L/usr/lib32/ -lGL -lGLU -lm -lXpm -lX11 + LINKFLTKGL = -L$(libdir) -lfltk_gl -lfltk + + # The extension to use for executables... +@@ -131,8 +131,8 @@ ifeq ($(OS),Darwin) + + # flags for C++ compiler: + OPTIM = -g -O2 -Wall -Wunused -fno-exceptions +- CXXFLAGS = $(OPTIM) +-# in 10.2 I think I needed to add this to the above: ++ CXXFLAGS = $(OPTIM) ++# in 10.2 I think I needed to add this to the above: + # -framework AGL -framework GLUT -framework OpenGL -framework Carbon -framework ApplicationServices + + # libraries to link with: +@@ -205,7 +205,7 @@ CPPFILES =\ + + OBJFILES = $(CPPFILES:.cxx=.o) $(RESFILE:.rc=.o) + +-all: $(TARGET) ++all: $(TARGET) + + clean: + -@ rm -f $(TARGET) *.o core *~ .deps ../../examples/*.{out,cns,pov,wrl,tmp,tga,lst,fl,bmp} \ +@@ -216,23 +216,22 @@ clean: .deps: $(CPPFILES) echo "Building dependencies..." echo >.deps @@ -37,3 +96,23 @@ -include .deps +-# DRAWxtl ++# DRAWxtl + +-$(TARGET) : .deps $(OBJFILES) ++$(TARGET) : .deps $(OBJFILES) + echo Linking $@... + mkdir -p ../../exe + $(CXX) $(CXXFLAGS) -o $@ $(OBJFILES) \ +- $(LINKFLTKGL) $(GLDLIBS) ++ $(LINKFLTKGL) $(GLDLIBS) + $(POSTLINK) $@ + +-static: .deps $(OBJFILES) ++static: .deps $(OBJFILES) + echo Linking $@... + mkdir -p ../../exe + $(CXX) $(CXXFLAGS) -static -o DRAWxtl.$@ $(OBJFILES) \ + $(LINKFLTKGL) $(GLDLIBS) -lXxf86vm -ldl + strip $@ +-