kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

- Update to version 17.0

Browse source 
PR:		ports/161605
Submitted by:	KATO Tsuguru <tkato432@yahoo.com>
This commit is contained in:
Ryan Steinmetz 2011-10-15 14:27:10 +00:00
parent 30af59e948
commit 57eb4a1230
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=283574
3 changed files with 11 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
misc/nut/Makefile
View file

@ -6,7 +6,7 @@
# #
PORTNAME= nut PORTNAME= nut
PORTVERSION= 16.13 PORTVERSION= 17.0
CATEGORIES= misc CATEGORIES= misc
MASTER_SITES= SF MASTER_SITES= SF
PKGNAMEPREFIX= health- PKGNAMEPREFIX= health-
@ -14,8 +14,8 @@ PKGNAMEPREFIX= health-
MAINTAINER= ports@FreeBSD.org MAINTAINER= ports@FreeBSD.org
COMMENT= Nutrition software to record what you eat COMMENT= Nutrition software to record what you eat
LICENSE= GPLv2 GPLv3 LICENSE= GPLv2 # (or later)
LICENSE_COMB= dual LICENSE_FILE= ${WRKSRC}/LICENSE
OPTIONS= GUI "Build FLTK-based GUI" off OPTIONS= GUI "Build FLTK-based GUI" off
@ -28,16 +28,15 @@ MAN1= ${PORTNAME}.1
PORTDOCS= CREDITS README nut.html PORTDOCS= CREDITS README nut.html
PLIST_FILES= bin/${PORTNAME} %%DATADIR%%/FOOD_DES.txt \ PLIST_FILES= bin/${PORTNAME} %%DATADIR%%/FOOD_DES.txt \
%%DATADIR%%/NUT_DATA.txt %%DATADIR%%/WEIGHT.lib \ %%DATADIR%%/NUT_DATA.txt %%DATADIR%%/WEIGHT.lib \
%%DATADIR%%/WEIGHT.txt %%DATADIR%%/sr23.nut %%DATADIR%%/WEIGHT.txt %%DATADIR%%/sr24.nut
PLIST_DIRS= %%DATADIR%% PLIST_DIRS= %%DATADIR%%
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
.if defined(WITH_GUI) .if defined(WITH_GUI)
LIB_DEPENDS+= fltk.1:${PORTSDIR}/x11-toolkits/fltk LIB_DEPENDS+= fltk.1:${PORTSDIR}/x11-toolkits/fltk
MAKE_ENV+= HAVE_FLTK=1 FLTK_NUT="fltk/Nut"
PLIST_FILES+= bin/Nut PLIST_FILES+= bin/Nut
.else
EXTRA_PATCHES= ${FILESDIR}/extra-patch-Makefile
.endif .endif
post-patch: post-patch:
@ -46,7 +45,10 @@ post-patch:
s|^CC =|CC ?=| ; \ s|^CC =|CC ?=| ; \
s|^CXX =|CXX ?=| ; \ s|^CXX =|CXX ?=| ; \
s|^CFLAGS :=|CFLAGS +=| ; \ s|^CFLAGS :=|CFLAGS +=| ; \
s| -O | |' s| -O | | ; \
s|^HAVE_FLTK =|#HAVE_FLTK =| ; \
s|^FLTK_NUT =|#FLTK_NUT =| ; \
s|ldstaticflags|ldflags|'
do-install: do-install:
${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin

4
misc/nut/distinfo
View file

@ -1,2 +1,2 @@
SHA256 (nut-16.13.tar.gz) = 86491bae45d75a670f719db7d7053f1d2f18bd0eb171630728ac4d2b183e36d6 SHA256 (nut-17.0.tar.gz) = d5241a4b5bbfca622ace4b6643f31ee3455139fe7df5b2536ca20991445578ef
SIZE (nut-16.13.tar.gz) = 1258796 SIZE (nut-17.0.tar.gz) = 1316791

17
misc/nut/files/extra-patch-Makefile
View file

@ -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)