mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-16 07:58:04 +00:00
Code Issues Releases Activity

misc/nut: Fix linking when FLTK option is on

Browse Source 
While here, use more options helpers and add a few missing XORG deps.

Reported by:	Andrew Xiang <andrewxiang@gmail.com> via jbeich
This commit is contained in:
Jason E. Hale 2023-08-21 07:08:22 -04:00
parent 22e222cbce
commit 52382727a5
2 changed files with 35 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
misc/nut/Makefile
View File

@ -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 <bsd.port.options.mk>
.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 <bsd.port.mk>

28
misc/nut/files/patch-anameal.c Normal file
View File

@ -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 <strings.h>
#include <time.h>
-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;