- Update to 17.10

- Remove support for GUI (abandoned upstream)
- Convert to new options framework

2 files changed, 12 insertions, 23 deletions

diff --git a/misc/nut/Makefile b/misc/nut/Makefile
index 3067c4abdf51..87bd5a1d64e7 100644
--- a/misc/nut/Makefile
+++ b/misc/nut/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	nut
-PORTVERSION=	17.9
+PORTVERSION=	17.10
 CATEGORIES=	misc
 MASTER_SITES=	SF
 PKGNAMEPREFIX=	health-
@@ -20,26 +20,21 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 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
 PLIST_DIRS=	%%DATADIR%%
 
-OPTIONS_DEFINE=	GUI
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MGUI}
-USE_XORG=	xpm
-BUILD_DEPENDS+=	${LOCALBASE}/lib/fltk11/libfltk.so:${PORTSDIR}/x11-toolkits/fltk11
-MAKE_ENV+=	HAVE_FLTK=1 FLTK_NUT="fltk/Nut"
-PLIST_FILES+=	bin/Nut
-.endif
-
 post-patch:
 	@${FIND} ${WRKSRC} -name "Makefile" | ${XARGS} ${REINPLACE_CMD} -e \
 		's|$$(prefix)/lib/nut|${DATADIR}| ; \
@@ -47,20 +42,14 @@ post-patch:
 		 s|^CXX =|CXX ?=| ; \
 		 s|^CFLAGS :=|CFLAGS +=| ; \
 		 s| -O | | ; \
-		 s|^HAVE_FLTK =|#HAVE_FLTK =| ; \
-		 s|^FLTK_NUT =|#FLTK_NUT =| ; \
-		 s|ldstaticflags|ldflags| ; \
-		 s|fltk-config|${LOCALBASE}/bin/fltk11/fltk-config|'
+		 s|ldstaticflags|ldflags| '
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${MANPREFIX}/man/man1
-.if defined(WITH_GUI)
-	${INSTALL_PROGRAM} ${WRKSRC}/fltk/Nut ${PREFIX}/bin
-.endif
 	@${MKDIR} ${DATADIR}
 	@(cd ${WRKSRC}/raw.data && ${COPYTREE_SHARE} . ${DATADIR})
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 .for file in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
diff --git a/misc/nut/distinfo b/misc/nut/distinfo
index 848586962460..ad3915ba188b 100644
--- a/misc/nut/distinfo
+++ b/misc/nut/distinfo
@@ -1,2 +1,2 @@
-SHA256 (nut-17.9.tar.gz) = 7a69b819a905c3a9e25aeb2de17ae48818cc6d6e047d1b1ca5c134bafc27bfee
-SIZE (nut-17.9.tar.gz) = 1314833
+SHA256 (nut-17.10.tar.gz) = 3ef0e3f8f92bb54c2c87c02a355f439596dfa3d0655609e4464f4a2a07d01c45
+SIZE (nut-17.10.tar.gz) = 1273099