From nobody Wed Jul 20 19:27:39 2022 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 4Lp5Lz4Wkjz4Wm7Y; Wed, 20 Jul 2022 19:27:39 +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 4Lp5Lz32fLz3S9n; Wed, 20 Jul 2022 19:27:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658345259; 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=MkL/etBD1/jqSrutnlVZDoZXb0hWlbl4eQYKKare0g0=; b=NS3co+j1nJWNMtJ0sBfBxw4AxHB/AJIKiIGNMxb3Pl1Hngp+uQTPqyKXs8t41Fr3fdtLnx F9ydD2Z3oV7AWqZccMfnd9VXk2ocAMV4ztkYJexneUCr6fqvGXZxbnUoCGTaP9LpZ0qZyD 8nzaUDNqvsjKKAHP+h5w+n22wKz/KGYIQeYRuErBto/j55Z01SPoqxakNHRD1fPldnoJ1k 5IUWHxbSjyt92VyzF2wwjtThJlbCzmqVBCQpU3D+bIn0HbbAo5f24UqI+zytYxtEwabQeg 4dI+dWAht//OkmMJ1417CtsLSdv4Z56lsytc4dICzSW1QywONFgUrTChuLaZqg== 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 4Lp5Lz28QBz18G8; Wed, 20 Jul 2022 19:27:39 +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 26KJRdv6014020; Wed, 20 Jul 2022 19:27:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26KJRd55014019; Wed, 20 Jul 2022 19:27:39 GMT (envelope-from git) Date: Wed, 20 Jul 2022 19:27:39 GMT Message-Id: <202207201927.26KJRd55014019@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Yuri Victorovich Subject: git: f0a0f8d9cc6e - 2022Q3 - science/gabedit: Improve BROKEN lines and options 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: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q3 X-Git-Reftype: branch X-Git-Commit: f0a0f8d9cc6e62f9afc008dd33286d9758640f7a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658345259; 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=MkL/etBD1/jqSrutnlVZDoZXb0hWlbl4eQYKKare0g0=; b=lycBechZCWnzVdPtqQ4sgrFRCHT2CxXNB8uLxO3vFBfeM+iCgSP+PBniH7xG7sYCNtaOeu 90iaihP2QiLQ2EQy133Jda93JqFXQiwgNC3Q/4EUjvazG+pd7NNGiSGHvCgq3t5BGtxyBl +gNd/bRGJ0GnAM1jEZDaAPYUZYVOibu36mD3Bw0M2EEYz6uvvT07OF3aQqg3A1c1DmNCuV m7Aagvvszb0dXT2Bjj1UXsX+XzzQg+ZShlw3bq+WPsVnS+mYX5VPpV9Ggp3shYWMZl1nc1 4KH9nYZn3UYfPfR5pbZLqkPHxhWe4OsCHvKwrVFdIWqXFg6EL/Tjl8p77OrLJA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658345259; a=rsa-sha256; cv=none; b=RKLPWqLiVsu5mTNXNcEA6l7B4RHYIU8Nooo8ljxImS8alZNoXD9IL2UHBEvosQAC1QaSvQ kiKO4q1D5Bo9ZRoYaXmnx76A3oeNjI07uXsQCInEDLp5PC9a7BZ8uU5Bt7wtGqwHD2BtS5 1Vat3z/swsHtqzYcmHXbUhUUEAEOhaTDDX6GEhJ7KvtTZpdqW+MD83vdeknaAlDShOQVs6 VEhVtP1IE+xr80pIz97/ozSzc6dSlAWmLe0YMqRaTzH0IUaAwL2v62+wAL94yCXLrFvXxp 3bLxV0hpFBU2l+hviOOqHPMhoLnejhylKrb6p26SgwHPZQouVFvqj9bv1o9Odw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q3 has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=f0a0f8d9cc6e62f9afc008dd33286d9758640f7a commit f0a0f8d9cc6e62f9afc008dd33286d9758640f7a Author: Yuri Victorovich AuthorDate: 2022-07-20 19:10:38 +0000 Commit: Yuri Victorovich CommitDate: 2022-07-20 19:27:24 +0000 science/gabedit: Improve BROKEN lines and options OPENMP option doesn't appear where it is not supported. (cherry picked from commit 704f77e78a9532b153a8863b7d96e30c81e88bcc) --- science/gabedit/Makefile | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/science/gabedit/Makefile b/science/gabedit/Makefile index 72ec14c27b70..b75fc5200449 100644 --- a/science/gabedit/Makefile +++ b/science/gabedit/Makefile @@ -11,9 +11,10 @@ COMMENT= Graphical user interface for several chemistry software packages LICENSE= MIT LICENSE_FILE= ${WRKSRC}/License -BROKEN_armv6= fatal error: 'omp.h' file not found -BROKEN_armv7= fatal error: 'omp.h' file not found BROKEN_i386= undefined reference to `__atomic_load' +.if !exists(/usr/include/omp.h) +BROKEN= requires OpenMP support that is missing on this architecture +.endif LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ @@ -37,14 +38,9 @@ ICON_SIZES= 16 24 32 48 PLIST_FILES+= share/icons/hicolor/${SZ}x${SZ}/apps/${PORTNAME}.png .endfor +.if exists(/usr/include/omp.h) OPTIONS_DEFINE= OPENMP OPTIONS_DEFAULT= OPENMP -OPTIONS_EXCLUDE_powerpc= OPENMP - -.include - -.if ${OSVERSION} < 1301000 -BROKEN_riscv64= fatal error: 'omp.h' file not found .endif post-patch: @@ -61,4 +57,4 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/icons/Gabedit${SZ}.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/${SZ}x${SZ}/apps/${PORTNAME}.png .endfor -.include +.include