- Update to version 18.3 [1]

- Add option to install FLTK GUI [1]
- Add missing deps
- Install desktop entry when FLTK=on

PR:		ports/172246 [1]
Submitted by:	KATO Tsuguru <tkato432@yahoo.com> [1]
Feature safe:	yes

2 files changed, 33 insertions, 12 deletions

diff --git a/misc/nut/Makefile b/misc/nut/Makefile
index 4648ccf42845..5b8be7cf6c39 100644
--- a/misc/nut/Makefile
+++ b/misc/nut/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	nut
-PORTVERSION=	17.12
+PORTVERSION=	18.3
 CATEGORIES=	misc
 MASTER_SITES=	SF
 PKGNAMEPREFIX=	health-
@@ -12,36 +12,57 @@ COMMENT=	Nutrition software to record what you eat
 
 LICENSE=	GPLv2 # (or later)
 
+OPTIONS_DEFINE=	FLTK DOCS
+FLTK_DESC=	Install FLTK GUI
+
 USE_GMAKE=	yes
 MAKE_JOBS_SAFE=	yes
 
-OPTIONS_DEFINE=	DOCS
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MDOCS}
 DOCSDIR=	${PREFIX}/share/doc/${UNIQUENAME}
-PORTDOCS=	CREDITS README nut.html
-.endif
 
 MAN1=		${PORTNAME}.1
+PORTDOCS=	CREDITS README nut.html
 PLIST_FILES=	bin/${PORTNAME} %%DATADIR%%/FOOD_DES.txt \
 		%%DATADIR%%/NUT_DATA.txt %%DATADIR%%/WEIGHT.lib \
-		%%DATADIR%%/WEIGHT.txt %%DATADIR%%/sr24.nut
+		%%DATADIR%%/WEIGHT.txt %%DATADIR%%/sr25.nut
 PLIST_DIRS=	%%DATADIR%%
 
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MFLTK}
+LIB_DEPENDS+=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
+		freetype:${PORTSDIR}/print/freetype2 \
+		expat:${PORTSDIR}/textproc/expat2 \
+		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
+		fltk_images:${PORTSDIR}/x11-toolkits/fltk \
+		xcb:${PORTSDIR}/x11/libxcb
+USE_XORG+=	x11 xau xdmcp xext xft xinerama xrender
+MAKE_ENV+=	HAVE_FLTK=1 FLTK_NUT="fltk/Nut"
+PLIST_FILES+=	bin/Nut
+DESKTOP_ENTRIES="Nut" "${COMMENT}" "" "Nut" \
+		"Application;Science;Biology;MedicalSoftware;" "false"
+.else
+MAKE_ENV+=	HAVE_FLTK=0 FLTK_NUT=""
+.endif
+
 post-patch:
 	@${FIND} ${WRKSRC} -name "Makefile" | ${XARGS} ${REINPLACE_CMD} -e \
 		's|$$(prefix)/lib/nut|${DATADIR}| ; \
+		 s|^HAVE_FLTK|#HAVE_FLTK| ; \
+		 s|^FLTK_NUT|#FLTK_NUT| ; \
 		 s|^CC =|CC ?=| ; \
 		 s|^CXX =|CXX ?=| ; \
 		 s|^CFLAGS :=|CFLAGS +=| ; \
-		 s| -O | | ; \
+		 s|-ansi -pedantic|| ; \
+		 s|$$(OPT)|| ; \
 		 s|ldstaticflags|ldflags| '
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${MANPREFIX}/man/man1
+.if ${PORT_OPTIONS:MFLTK}
+	${INSTALL_PROGRAM} ${WRKSRC}/fltk/Nut ${PREFIX}/bin
+.endif
 	@${MKDIR} ${DATADIR}
 	@(cd ${WRKSRC}/raw.data && ${COPYTREE_SHARE} . ${DATADIR})
 .if ${PORT_OPTIONS:MDOCS}
diff --git a/misc/nut/distinfo b/misc/nut/distinfo
index e73f55cb8131..802295499c39 100644
--- a/misc/nut/distinfo
+++ b/misc/nut/distinfo
@@ -1,2 +1,2 @@
-SHA256 (nut-17.12.tar.gz) = b2fbaa92cbb0351efc4b9a679c6fddb31ba56dd87c798fafecff12d21bb7d669
-SIZE (nut-17.12.tar.gz) = 1274051
+SHA256 (nut-18.3.tar.gz) = e703c063f0799cf44c418b19d367036d23b44ae354120ba6370081261dca5e86
+SIZE (nut-18.3.tar.gz) = 1336554