ports/161605: Update port: misc/nut to 17.0

[KATO Tsuguru]

>Number:         161605
>Category:       ports
>Synopsis:       Update port: misc/nut to 17.0
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Oct 14 18:50:11 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 7.4-RELEASE-p3 i386
>Organization:
>Environment:
>Description:
- Update to version 17.0

Remove file:
files/extra-patch-Makefile

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/misc/nut/Makefile misc/nut/Makefile
--- /usr/ports/misc/nut/Makefile	2011-08-02 16:13:37.000000000 +0900
+++ misc/nut/Makefile	2011-09-30 23:10:58.000000000 +0900
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	nut
-PORTVERSION=	16.13
+PORTVERSION=	17.0
 CATEGORIES=	misc
 MASTER_SITES=	SF
 PKGNAMEPREFIX=	health-
@@ -14,8 +14,8 @@
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Nutrition software to record what you eat
 
-LICENSE=	GPLv2 GPLv3
-LICENSE_COMB=	dual
+LICENSE=	GPLv2 # (or later)
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
 OPTIONS=	GUI "Build FLTK-based GUI" off
 
@@ -28,16 +28,15 @@
 PORTDOCS=	CREDITS README nut.html
 PLIST_FILES=	bin/${PORTNAME} %%DATADIR%%/FOOD_DES.txt \
 		%%DATADIR%%/NUT_DATA.txt %%DATADIR%%/WEIGHT.lib \
-		%%DATADIR%%/WEIGHT.txt %%DATADIR%%/sr23.nut
+		%%DATADIR%%/WEIGHT.txt %%DATADIR%%/sr24.nut
 PLIST_DIRS=	%%DATADIR%%
 
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_GUI)
 LIB_DEPENDS+=	fltk.1:${PORTSDIR}/x11-toolkits/fltk
+MAKE_ENV+=	HAVE_FLTK=1 FLTK_NUT="fltk/Nut"
 PLIST_FILES+=	bin/Nut
-.else
-EXTRA_PATCHES=	${FILESDIR}/extra-patch-Makefile
 .endif
 
 post-patch:
@@ -46,7 +45,10 @@
 		 s|^CC =|CC ?=| ; \
 		 s|^CXX =|CXX ?=| ; \
 		 s|^CFLAGS :=|CFLAGS +=| ; \
-		 s| -O | |'
+		 s| -O | | ; \
+		 s|^HAVE_FLTK =|#HAVE_FLTK =| ; \
+		 s|^FLTK_NUT =|#FLTK_NUT =| ; \
+		 s|ldstaticflags|ldflags|'
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
diff -urN /usr/ports/misc/nut/distinfo misc/nut/distinfo
--- /usr/ports/misc/nut/distinfo	2011-08-02 16:13:37.000000000 +0900
+++ misc/nut/distinfo	2011-09-30 22:42:40.000000000 +0900
@@ -1,2 +1,2 @@
-SHA256 (nut-16.13.tar.gz) = 86491bae45d75a670f719db7d7053f1d2f18bd0eb171630728ac4d2b183e36d6
-SIZE (nut-16.13.tar.gz) = 1258796
+SHA256 (nut-17.0.tar.gz) = d5241a4b5bbfca622ace4b6643f31ee3455139fe7df5b2536ca20991445578ef
+SIZE (nut-17.0.tar.gz) = 1316791
diff -urN /usr/ports/misc/nut/files/extra-patch-Makefile misc/nut/files/extra-patch-Makefile
--- /usr/ports/misc/nut/files/extra-patch-Makefile	2011-08-02 01:41:20.000000000 +0900
+++ misc/nut/files/extra-patch-Makefile	1970-01-01 09:00:00.000000000 +0900
@@ -1,17 +0,0 @@
---- ./Makefile.orig	2011-07-28 20:48:34.000000000 -0400
-+++ ./Makefile	2011-07-28 20:49:01.000000000 -0400
-@@ -8,14 +8,8 @@
- EXECUTABLE := nut
- LIBS := -lm
- 
--FLTK_CONFIG := $(shell fltk-config --version 2>/dev/null)
--ifeq ($(FLTK_CONFIG),)
- HAVE_FLTK = 0
- FLTK_NUT =
--else
--HAVE_FLTK = 1
--FLTK_NUT = fltk/Nut
--endif
- 
- OS := $(shell uname -s)
- ifeq ($(OS),HP-UX)
>Release-Note:
>Audit-Trail:
>Unformatted: