From nobody Tue Jul 25 08:36:41 2023 X-Original-To: dev-commits-ports-main@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 4R99P62HMqz4p2T3; Tue, 25 Jul 2023 08:36:42 +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 4R99P61SlVz46NK; Tue, 25 Jul 2023 08:36:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690274202; 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=GYivOv41YBQDhiRyb10jwUqWzMtFYh0k9Je3aweQMi0=; b=tTABIW1wVjRPXWd86d49xIpxE/EkfdR8R4WqqrbDSfyc0X//7WP/jVZKHH0iMULmdlT839 6yam7ZJuFkRU+iLvNasfRUtUpjIgc29YBchYJZQx6sPJhDoUIY5etFSSoO9iT4Obl2Vray /TwxURGvGZvz9ct30nEjtDop3ITReXft0tHQeVRk3PTMiKPjf/AJLZ9jRXHilbduatT8r7 MQBtXwaObdddeFLeUztPX0FdnT73tZn/u/g80jTyfIXh1aMAgyyAfUfViRKhxU++DG6dS3 cKISGKaFa66WHFONeCSUlAI5awS23N0ypFHaIslgAA1BZN4a9WZAp9EfksU5Ag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690274202; 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=GYivOv41YBQDhiRyb10jwUqWzMtFYh0k9Je3aweQMi0=; b=bSY0SlomKFSk7nCxByXMDMEjudmwcA+ql9WKPHqJ7Pmth0KHxC2BRznItlq7bo1+EZqjLU hcl+q/KJJhlPD3vb3fiEHYhHWCFgJyuxwDun/pgezyvIBT0c0ifE9yKwE8slpusRzj/hDW f1aRWHM/Cybv15rIlcRf7K3Yt8R7PR+DNgB+WGBE6NqrnMaNNrIl7A1RbgrQFTy0wwQEwr 3wHUJZq1ZSFHy6n0hLk5phONrVX8QwMQeMehgIFDbAu3CodAqh/+hFzBs8e5Ke8BBd2X2l 7gMb7KXUOsmoGexU/9Kri851Tm0Gly1fnfqbImGECgGaiIo/3AEO/e6AK9s5vg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690274202; a=rsa-sha256; cv=none; b=fNAIYBCso+bUkozuyKNueGzE+fe5h33MTUeoeNxIl3IBmhJ7NsxhKr0fdoXCG4c2DQu0kY 6qd9azw4KeIjZYT0sy+r+bBTJuN6fQc7dE/eKuI8KUNeUZdLJqJVRFkLkzF4AeUKYULibC ZpHz9MAEOtOUB6PFJH64ulGazLRW9vkcSwnexioDWygkN8LKx3j4XH1dmjVocIxfYnvvlX 2ZCJWubO0T44p3SQl1/65EAO0ej/CgomGbjdqPqF0B1UUvTL1hu0HCkM09a9xcg45YMeis buXhkCUvjC5fNMm/v/9XXGDRq62KCWKBJ+6VURqsS6aVJUQBsoGtjDk4fCviPg== 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 4R99P60TqnztMK; Tue, 25 Jul 2023 08:36:42 +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 36P8af8N054146; Tue, 25 Jul 2023 08:36:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36P8afZq054145; Tue, 25 Jul 2023 08:36:41 GMT (envelope-from git) Date: Tue, 25 Jul 2023 08:36:41 GMT Message-Id: <202307250836.36P8afZq054145@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: 28c954ae983f - main - graphics/dia: Fix build with llvm16 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: 28c954ae983f82069dc923f2aa8ede9e14324fd0 Auto-Submitted: auto-generated The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=28c954ae983f82069dc923f2aa8ede9e14324fd0 commit 28c954ae983f82069dc923f2aa8ede9e14324fd0 Author: Muhammad Moinur Rahman AuthorDate: 2023-07-25 08:12:16 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2023-07-25 08:36:28 +0000 graphics/dia: Fix build with llvm16 - Add LICENSE GPLv2 - Pet portclippy Sponsored by: The FreeBSD Foundation --- graphics/dia/Makefile | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/graphics/dia/Makefile b/graphics/dia/Makefile index fa1d27b5ecee..db387895707d 100644 --- a/graphics/dia/Makefile +++ b/graphics/dia/Makefile @@ -1,6 +1,6 @@ PORTNAME= dia PORTVERSION= 0.97.3 -PORTREVISION= 4 +PORTREVISION= 5 PORTEPOCH= 1 CATEGORIES= graphics gnome MASTER_SITES= GNOME @@ -10,22 +10,28 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= Diagram creation program, similar to Visio WWW= https://live.gnome.org/Dia -OPTIONS_DEFINE= DOCS +LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libpng.so:graphics/png -USES= cpe desktop-file-utils gettext gmake gnome libtool pathfix \ - pkgconfig tar:xz +USES= cpe desktop-file-utils gettext gmake gnome libtool \ + localbase:ldflags pathfix pkgconfig tar:xz +CPE_VENDOR= gnome USE_GNOME= gtk20 gnomeprefix libxslt libartlgpl2 intlhack + GNU_CONFIGURE= yes -CONFIGURE_ENV= LOCALBASE="${LOCALBASE}" -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib `pkg-config --libs gmodule-2.0` CONFIGURE_ARGS= --disable-gnome +CONFIGURE_ENV= LOCALBASE="${LOCALBASE}" + INSTALL_TARGET= install-strip -CPE_VENDOR= gnome + +LDFLAGS+= `pkg-config --libs gmodule-2.0` + +OPTIONS_DEFINE= DOCS DOCS_BUILD_DEPENDS= ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl + .include #.if ${ARCH} == "i386" @@ -37,6 +43,10 @@ CONFIGURE_ARGS+= --disable-libemf PLIST_SUB+= WMF="@comment " #.endif +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091 +CFLAGS+= -Wno-error=incompatible-function-pointer-types +.endif + post-patch: @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ ${WRKSRC}/lib/intl.c