- Update to version 16.12
Responsible Changed From-To: freebsd-ports-bugs->miwi miwi@ wants his PRs (via the GNATS Auto Assign Tool)
State Changed From-To: open->feedback build failed http://gecko.miwibox.org/index.php?action=describe_port&id=1808
Here is the corrected patch. 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-02 19:26:33.000000000 +0900 @@ -6,7 +6,7 @@ # PORTNAME= nut -PORTVERSION= 15.7 +PORTVERSION= 16.12 CATEGORIES= misc MASTER_SITES= SF PKGNAMEPREFIX= health- @@ -14,28 +14,57 @@ 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 -DOCSDIR= ${PREFIX}/share/doc/${UNIQUENAME} ALL_TARGET= ${PORTNAME} + +DOCSDIR= ${PREFIX}/share/doc/${UNIQUENAME} + +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 +.endif + +post-build: +.if defined(WITH_GUI) + @(cd ${WRKSRC}/fltk; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \ + ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}) +.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-05-22 23:45:48.000000000 +0900 @@ -1,2 +1,2 @@ -SHA256 (nut-15.7.tar.gz) = e7578d585c1d62b66e5ccf5c648260965f39722d159d71ae097e20e791064cf8 -SIZE (nut-15.7.tar.gz) = 1193423 +SHA256 (nut-16.12.tar.gz) = cf6185dcab2aedab3b7b847d89c933e5b182466d50728cce9a8246192f71a556 +SIZE (nut-16.12.tar.gz) = 1262771
State Changed From-To: feedback->open Submitter has replied with updated patch.
Responsible Changed From-To: miwi->freebsd-ports-bugs Back to pool at assignee request for the moment.
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
Class Changed From-To: change-request->update Fix class and take PR
Responsible Changed From-To: freebsd-ports-bugs->zi Fix class and take PR
State Changed From-To: open->feedback Could you resubmit the latest patch as an attachment? Feel free to email me directly or attach it to the PR. Thanks!
zi@FreeBSD.org wrote: > Could you resubmit the latest patch as an attachment? Feel free to > email me directly or attach it to the PR. Thanks! Sure. Here it is.
State Changed From-To: feedback->open Patch received.
State Changed From-To: open->closed Committed, with minor changes. Thanks!
zi 2011-08-01 16:41:20 UTC FreeBSD ports repository Modified files: misc/nut Makefile distinfo Added files: misc/nut/files extra-patch-Makefile Log: Update to 16.13 PR: ports/158462 Submitted by: KATO Tsuguru <tkato432@yahoo.com> Approved by: wxs (mentor) Revision Changes Path 1.97 +40 -15 ports/misc/nut/Makefile 1.86 +2 -2 ports/misc/nut/distinfo 1.1 +17 -0 ports/misc/nut/files/extra-patch-Makefile (new) _______________________________________________ cvs-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/cvs-all To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"