From nobody Mon Aug 21 11:42:13 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 4RTrDk2GWvz4qfxH; Mon, 21 Aug 2023 11:42:14 +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 4RTrDk1NF8z4XLC; Mon, 21 Aug 2023 11:42:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692618134; 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=NrWd/RhQhrQJh5dwSlaavCusY17rTHe3macIE6h70RY=; b=HisA0Vd9OaRxbLTvwmx0lgSfcOWpsenPo5JQ+dgioV44eeRhpNPRxjPwVuNSIzUK44KiS5 qsNdfltA28hYIU+3bFr5m8Fd6y2u0MEaVVj6OrzpPgFOmjFrn1C98lTSGvuco6+apASW4y KKfbrXiMswNVTqQxxqaas2Gh8fRualNgY9xHYAk+1zCYs7MzamtoDLwNqvcy0mdL+Z/FU5 5vioFmwTDdROtoiJCNwStBBrfFKcVK6deOa4F57o8H9mnQ9NqR/1HT30PpMBvOCcEmU8e6 1bfxT5C8JZ7ME5btUdVS5N/Gn2XLg7y4j7DCcH+ACKxqTu0t+bakEIbqy4sG3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692618134; 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=NrWd/RhQhrQJh5dwSlaavCusY17rTHe3macIE6h70RY=; b=haBDg8A0AocWh6cZEleOI+ND6WBtb9oMVfLWosQ0beajHTW+Imom6kbM0LZVjlaG9hP39P PDvo0babdXRyX61Pk6oD1y7TJnHS9mKfgdYYkT39d0oQZZAUI+M/Hf0falNtqyZ7S0tFEb vH6NIVtUJopAfysOvFx47ucrL8V3c9LZMcFXVMDAdBXdWD/NMq/eXts49t96bIXQ1ah4bS 6BnF9oCLj89yKzaPBFKRh+AAuNdefuD0OvAwbEVcEQ/OcddF0b0OSKtookLOhxMzj1xq7o 2zneTKVCRZsIRd4bSf2wB0ERTrRymBsJ1z3MNivX9GayISm0fP7vbZQJ9xqRyw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692618134; a=rsa-sha256; cv=none; b=FxSSVTGvyqX8FK5edXlTp1u6Sk1oquVB9u+199svYTLE79iRI32oqcm/MNLrBPVyahtUpi z+C1m+ZeMlgtkj/KGMrJfHH9I2t6ELms1nTzS9/W9qJILWG3BKj88ledb3aHdjS2DHeCEK +AECdOQwGejv9tpDyCUCmQGmJ24LiiRa4ao2yFjze1yjYikISxJ/0MWmcD6jC5ItNVlA+f RRw+ETmPXgP4CRFHUiV0OfxJ+jRnwBOEDHlCZBtUcR1nfXZqOCe2WEaxH+Kjdr16ktAZJ/ QWd4Vb9H/rSoZZx6ni06bx9k4wT3kzlRKZoRQr1ICpsi4QzF/2Ey9Vncyn+IGw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RTrDk0Rm5z4ZQ; Mon, 21 Aug 2023 11:42:14 +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 37LBgDsi047379; Mon, 21 Aug 2023 11:42:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37LBgDXL047376; Mon, 21 Aug 2023 11:42:13 GMT (envelope-from git) Date: Mon, 21 Aug 2023 11:42:13 GMT Message-Id: <202308211142.37LBgDXL047376@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: "Jason E. Hale" Subject: git: 2aebc6c0b909 - 2023Q3 - misc/nut: Fix linking when FLTK option is on 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: jhale X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q3 X-Git-Reftype: branch X-Git-Commit: 2aebc6c0b9097bacd6c054a98cd8adfef76810b2 Auto-Submitted: auto-generated The branch 2023Q3 has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=2aebc6c0b9097bacd6c054a98cd8adfef76810b2 commit 2aebc6c0b9097bacd6c054a98cd8adfef76810b2 Author: Jason E. Hale AuthorDate: 2023-08-21 11:08:22 +0000 Commit: Jason E. Hale CommitDate: 2023-08-21 11:40:38 +0000 misc/nut: Fix linking when FLTK option is on While here, use more options helpers and add a few missing XORG deps. Reported by: Andrew Xiang via jbeich (cherry picked from commit 52382727a5c20bcfb142cbadced9a4b913abbdd4) --- misc/nut/Makefile | 20 +++++++------------- misc/nut/files/patch-anameal.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 13 deletions(-) diff --git a/misc/nut/Makefile b/misc/nut/Makefile index 0a87d4b6a913..04935a8cd992 100644 --- a/misc/nut/Makefile +++ b/misc/nut/Makefile @@ -1,6 +1,6 @@ PORTNAME= nut PORTVERSION= 20.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= misc MASTER_SITES= SF PKGNAMEPREFIX= health- @@ -26,16 +26,10 @@ FLTK_LIB_DEPENDS= libfreetype.so:print/freetype2 \ libfontconfig.so:x11-fonts/fontconfig \ libfltk_images.so:x11-toolkits/fltk FLTK_USES= xorg -FLTK_USE= XORG=x11,xau,xcb,xdmcp,xext,xft,xinerama,xpm,xrender +FLTK_USE= XORG=x11,xau,xcb,xcursor,xdmcp,xext,xfixes,xft,xinerama,xpm,xrender FLTK_MAKE_ENV= HAVE_FLTK=1 FLTK_NUT="fltk/Nut" FLTK_MAKE_ENV_OFF= HAVE_FLTK=0 FLTK_NUT="" - -.include - -.if ${PORT_OPTIONS:MFLTK} -DESKTOP_ENTRIES="Nut" "" "nuticon" "Nut" \ - "Science;Biology;MedicalSoftware;" false -.endif +FLTK_DESKTOP_ENTRIES= "Nut" "" "nuticon" "Nut" "Science;Biology;MedicalSoftware;" false post-patch: @${FIND} ${WRKSRC} -name "Makefile" | ${XARGS} ${REINPLACE_CMD} -e \ @@ -48,10 +42,6 @@ post-patch: s|$$(OPT)||' do-install: -.if ${PORT_OPTIONS:MFLTK} - ${INSTALL_PROGRAM} ${WRKSRC}/fltk/Nut ${STAGEDIR}${PREFIX}/bin - ${INSTALL_DATA} ${WRKSRC}/nuticon.xpm ${STAGEDIR}${PREFIX}/share/pixmaps -.endif ${INSTALL_PROGRAM} ${WRKSRC}/nut ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/nut.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 @${MKDIR} ${STAGEDIR}${DATADIR} @@ -59,4 +49,8 @@ do-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} +do-install-FLTK-on: + ${INSTALL_PROGRAM} ${WRKSRC}/fltk/Nut ${STAGEDIR}${PREFIX}/bin + ${INSTALL_DATA} ${WRKSRC}/nuticon.xpm ${STAGEDIR}${PREFIX}/share/pixmaps + .include diff --git a/misc/nut/files/patch-anameal.c b/misc/nut/files/patch-anameal.c new file mode 100644 index 000000000000..10bfd40f6e47 --- /dev/null +++ b/misc/nut/files/patch-anameal.c @@ -0,0 +1,28 @@ +Fix linker error when FLTK option is enabled. + +ld: error: duplicate symbol: foodwork +>>> defined at anameal.c +>>> ../anameal.o:(foodwork) +>>> defined at PersonalOptions.cc +>>> PersonalOptions.o:(.bss+0x0) + +--- anameal.c.orig 2023-08-21 10:50:52 UTC ++++ anameal.c +@@ -29,7 +29,7 @@ + #include + #include + +-struct food *foodwork; ++struct food *foodwork_cli; + int max; + + void analyze_meals(struct meal *meal_ptr_origin, int specialheader) +@@ -43,7 +43,7 @@ float prodefic, thispct, totaldefic, serving_ratio; + float deficpct[DV_COUNT], food_abacus[MAX_FOOD], serving_ratio_abacus[MAX_FOOD]; + int deficnut[DV_COUNT]; + float prodefic, thispct, totaldefic, serving_ratio; +-foodwork = &food_work; ++foodwork_cli = &food_work; + options.temp_meal_root = meal_ptr_origin; + mealcount = meal_count(meal_ptr_origin); + max = mealcount;