Date: Fri, 15 Jul 2011 18:40:13 GMT From: KATO Tsuguru <tkato432@yahoo.com> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/158462: Update port: misc/nut to 16.12 Message-ID: <201107151840.p6FIeDkV055819@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/158462; it has been noted by GNATS. From: KATO Tsuguru <tkato432@yahoo.com> To: bug-followup@FreeBSD.org Cc: Subject: Re: ports/158462: Update port: misc/nut to 16.12 Date: Sat, 16 Jul 2011 03:33:34 +0900 Version 16.13 has been released. diff -urN /usr/ports/misc/nut/Makefile misc/nut/Makefile --- /usr/ports/misc/nut/Makefile 2011-03-19 09:28:43.000000000 +0900 +++ misc/nut/Makefile 2011-07-13 15:53:41.000000000 +0900 @@ -6,7 +6,7 @@ # PORTNAME= nut -PORTVERSION= 15.7 +PORTVERSION= 16.13 CATEGORIES= misc MASTER_SITES= SF PKGNAMEPREFIX= health- @@ -14,28 +14,53 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Nutrition software to record what you eat +OPTIONS= GUI "Build FLTK-based GUI" off + +LICENSE= GPLv2 GPLv3 +LICENSE_COMB= dual + USE_GMAKE= yes -PORTDOCS= CREDITS LICENSE README nut.html README.DOS +MAKE_JOBS_SAFE= yes + DOCSDIR= ${PREFIX}/share/doc/${UNIQUENAME} -ALL_TARGET= ${PORTNAME} + +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%%/sr22.nut + %%DATADIR%%/WEIGHT.txt %%DATADIR%%/sr23.nut PLIST_DIRS= %%DATADIR%% -MAN1= ${PORTNAME}.1 + +.include <bsd.port.pre.mk> + +.if defined(WITH_GUI) +LIB_DEPENDS+= fltk.1:${PORTSDIR}/x11-toolkits/fltk +PLIST_FILES+= bin/Nut +.else +MAKE_ARGS+= FLTK_CONFIG="" +.endif post-patch: - @${REINPLACE_CMD} -e "s|/usr/local/lib/nut|${DATADIR}|" \ - -e 's|^CFLAGS=|CFLAGS+=|g;s|-Os||;s|gcc|$${CC}|' ${WRKSRC}/Makefile + @${FIND} ${WRKSRC} -name "Makefile" | ${XARGS} ${REINPLACE_CMD} -e \ + 's|$$(prefix)/lib/nut|${DATADIR}| ; \ + s|^CC =|CC ?=| ; \ + s|^CXX =|CXX ?=| ; \ + s|^CFLAGS :=|CFLAGS +=| ; \ + s| -O | |' do-install: - @${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin/ - @${INSTALL} -d ${DATADIR}/ - @cd ${WRKSRC}/raw.data/ && ${COPYTREE_SHARE} . ${DATADIR}/ - @${INSTALL_MAN} ${WRKSRC}/${MAN1} ${MAN1PREFIX}/man/man1/ -.ifndef NOPORTDOCS - @${INSTALL} -d ${DOCSDIR}/ - @${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR}/ + ${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) + @${MKDIR} ${DOCSDIR} +.for file in ${PORTDOCS} + ${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR} +.endfor .endif -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff -urN /usr/ports/misc/nut/distinfo misc/nut/distinfo --- /usr/ports/misc/nut/distinfo 2011-03-19 09:28:43.000000000 +0900 +++ misc/nut/distinfo 2011-07-13 13:56:26.000000000 +0900 @@ -1,2 +1,2 @@ -SHA256 (nut-15.7.tar.gz) = e7578d585c1d62b66e5ccf5c648260965f39722d159d71ae097e20e791064cf8 -SIZE (nut-15.7.tar.gz) = 1193423 +SHA256 (nut-16.13.tar.gz) = 86491bae45d75a670f719db7d7053f1d2f18bd0eb171630728ac4d2b183e36d6 +SIZE (nut-16.13.tar.gz) = 1258796
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201107151840.p6FIeDkV055819>