diff options
| author | Ryan Steinmetz <zi@FreeBSD.org> | 2011-10-15 14:27:10 +0000 |
|---|---|---|
| committer | Ryan Steinmetz <zi@FreeBSD.org> | 2011-10-15 14:27:10 +0000 |
| commit | 57eb4a12304b9da294a5311965e5592cd7032c0e (patch) | |
| tree | af03b3904441fa1ffd67873bd09e215fb4cc74e6 /misc/nut | |
| parent | - Update to 0.2.2 (diff) | |
- Update to version 17.0
PR: ports/161605
Submitted by: KATO Tsuguru <tkato432@yahoo.com>
Notes
Notes:
svn path=/head/; revision=283574
Diffstat (limited to 'misc/nut')
| -rw-r--r-- | misc/nut/Makefile | 16 | ||||
| -rw-r--r-- | misc/nut/distinfo | 4 | ||||
| -rw-r--r-- | misc/nut/files/extra-patch-Makefile | 17 |
3 files changed, 11 insertions, 26 deletions
diff --git a/misc/nut/Makefile b/misc/nut/Makefile index 5848ca1801c6..7e8caadc8eb8 100644 --- a/misc/nut/Makefile +++ b/misc/nut/Makefile @@ -6,7 +6,7 @@ # PORTNAME= nut -PORTVERSION= 16.13 +PORTVERSION= 17.0 CATEGORIES= misc MASTER_SITES= SF PKGNAMEPREFIX= health- @@ -14,8 +14,8 @@ PKGNAMEPREFIX= health- MAINTAINER= ports@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 @@ 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%%/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 @@ post-patch: 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 --git a/misc/nut/distinfo b/misc/nut/distinfo index cc70d2caccfe..a750b91833d7 100644 --- a/misc/nut/distinfo +++ b/misc/nut/distinfo @@ -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 --git a/misc/nut/files/extra-patch-Makefile b/misc/nut/files/extra-patch-Makefile deleted file mode 100644 index bace5099e53e..000000000000 --- a/misc/nut/files/extra-patch-Makefile +++ /dev/null @@ -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) |