From nobody Mon May 15 15:32:01 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 4QKjz53MF4z4Bkyy; Mon, 15 May 2023 15:32:01 +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 4QKjz526nvz3Fw9; Mon, 15 May 2023 15:32:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684164721; 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=rFxQhQXP7zrBJZT0JhQoBlFSAvut3gnhgr5lfH0PugM=; b=YapbJ58SFmdkXGEwIm8eZ6ZqXNuCI1adGFCGBnqB6zegMEtGAwN0kidR0LLjMXIkzwCX5T wgK0zuOBLsTk9egq9Yr0DgV58yUsZDBetu2Yfv/Cznd96DXQRuG1ErFGv7lClMJf0Q1vMa hhViAsovTG+8ML6oFJ51aw2c5sEtWtuqEu8gp8JPgzNJuECPfPnxgveC8znqwR05IonzjA f6sqnsl94WKI4+eS2xylVN4wxHdw5v5KQZKhCuaZ9FHRYc+pvbv49q5UTHVFcnWwXxiLyl FSDa5OhW+VcU875QYmDI3aWsfeVFswZkAsmlvDidRVJw+mipIufmD8IoB17Y/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684164721; 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=rFxQhQXP7zrBJZT0JhQoBlFSAvut3gnhgr5lfH0PugM=; b=vjfNeo1kFjTNdabyA7rAPoPgaETj5/QHHIx3JkshAqOD4mSKTjWIOR5aLP9s5ZdnBMj3z3 1mBhkqaDY+IcPGhhD23cQOt765QQS7ne9wDNM/5mDrjKBLVrvEe0ATXh2hKdAbhx1uwHQG f1xjYNOidAxLbXNxi3E0EfCEbndR1a2VPr42QG2VarRDjGgH/0eKjC7HCkvXxmg8ub3+xH UYpXKJfC41hUmfs27E2T1FCdtAbhK9gyN+R0xoAIZZWecWhpHKEvHDt3p44KKYesCKAih6 0mYRnjebV65dPO8nVs5/jmvLnX5pbvHK4whzzRM/oUZgvNDm2pAGhyIBJCFPow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684164721; a=rsa-sha256; cv=none; b=adINbfHIvaYLBajr2OBPs7CRXgu9T8hCEA7rjszjFJBEw8U3dMEKXejodT/1aGl76u6XsB NyYpW+T5c8gdXhih7SiOIJuVbdSfL5AfJ2xyKTOQG7ANm4EEwQ4xZ+X3ir/rePBiDbzU9W txyCtCxR8IQDsSP9WM4+F1q2PR1NczDxXtMAAIa9k/krFjwCivQl7LUnTCn9DmYpZz+kuZ 2y7IQaaD9tabmrzMVdu0I/Z5/voLXHT18GJroDvh6Apu1CABzWaGLr1Rogy6UuX+uhUCgS 6dSkO3yUuiw527JTfiB+LxVM6et8Hvi91Glge08KU/gblHNkLuFi7Taabny4Uw== 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 4QKjz51DWCzlXM; Mon, 15 May 2023 15:32:01 +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 34FFW1tM055646; Mon, 15 May 2023 15:32:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34FFW1MS055645; Mon, 15 May 2023 15:32:01 GMT (envelope-from git) Date: Mon, 15 May 2023 15:32:01 GMT Message-Id: <202305151532.34FFW1MS055645@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: cc7f11758877 - main - cad/magic: Unbreak on HEAD 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: cc7f11758877328278a24ff32b1c1e35e6174ebc Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=cc7f11758877328278a24ff32b1c1e35e6174ebc commit cc7f11758877328278a24ff32b1c1e35e6174ebc Author: Muhammad Moinur Rahman AuthorDate: 2023-05-15 14:48:13 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2023-05-15 15:31:47 +0000 cad/magic: Unbreak on HEAD - Refactor with USES=localbase:ldflags Approved by: portmgr (blanket) --- cad/magic/Makefile | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/cad/magic/Makefile b/cad/magic/Makefile index f57710a491cf..770e775d22de 100644 --- a/cad/magic/Makefile +++ b/cad/magic/Makefile @@ -15,7 +15,7 @@ LIB_DEPENDS= libBLT25.so:x11-toolkits/blt \ libfreetype.so:print/freetype2 RUN_DEPENDS= bash:shells/bash -USES= gmake gnome gl localbase python:3.6+,build shebangfix tk:tea tar:tgz xorg +USES= gmake gnome gl localbase:ldflags python:3.6+,build shebangfix tk:tea tar:tgz xorg USE_GNOME= cairo USE_XORG= ice x11 xext xi xmu USE_GL= gl glu @@ -28,8 +28,6 @@ CONFIGURE_WRKSRC= ${WRKSRC}/scripts ALL_TARGET= tcllibrary CFLAGS+= -Wno-return-type # workaround for https://github.com/RTimothyEdwards/magic/issues/67 -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib DESKTOP_ENTRIES="Magic" "" "" "${PORTNAME}" "" "" @@ -37,6 +35,12 @@ PORTSCOUT= limit:^8\. BINARY_ALIAS= python3=${PYTHON_CMD} # this is needed, see https://github.com/RTimothyEdwards/magic/issues/173#issuecomment-1200065429 +.include + +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400079 +CFLAGS+= -Wno-error=int-conversion +.endif + post-patch: @${REINPLACE_CMD} -e \ 's|^#!.*|#!${AWK} -f|' ${WRKSRC}/ext2spice/spice2sim @@ -59,4 +63,4 @@ pre-build: post-install: @cd ${STAGEDIR}${PREFIX}/lib/magic/tcl && ${STRIP_CMD} magicexec magicdnull tclmagic.so -.include +.include