From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Jun 29 18:20:13 2011 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 14B52106566B for ; Wed, 29 Jun 2011 18:20:13 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id E50608FC30 for ; Wed, 29 Jun 2011 18:20:12 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id p5TIKCcF098979 for ; Wed, 29 Jun 2011 18:20:12 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p5TIKCtb098973; Wed, 29 Jun 2011 18:20:12 GMT (envelope-from gnats) Resent-Date: Wed, 29 Jun 2011 18:20:12 GMT Resent-Message-Id: <201106291820.p5TIKCtb098973@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, KATO Tsuguru Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2E43A106567C for ; Wed, 29 Jun 2011 18:14:56 +0000 (UTC) (envelope-from tkato432@yahoo.com) Received: from msa101lp.auone-net.jp (msa101lp.auone-net.jp [222.3.140.164]) by mx1.freebsd.org (Postfix) with ESMTP id CF1798FC13 for ; Wed, 29 Jun 2011 18:14:55 +0000 (UTC) Received: from msa101lp.auone-net.jp (MSA101lp [172.27.12.179]) by msa101lp.auone-net.jp (au one net msa) with ESMTP id 597202E027C for ; Thu, 30 Jun 2011 03:09:50 +0900 (JST) Received: from localhost.localdomain (ZT030106.ppp.dion.ne.jp [59.128.30.106]) by msa101lp.auone-net.jp (au one net msa) with ESMTP id 160C234034 for ; Thu, 30 Jun 2011 03:09:47 +0900 (JST) Message-Id: <20110630030851.e07f415a.tkato432@yahoo.com> Date: Thu, 30 Jun 2011 03:08:51 +0900 From: KATO Tsuguru To: FreeBSD-gnats-submit@FreeBSD.org Cc: Subject: ports/158462: Update port: misc/nut to 16.12 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 29 Jun 2011 18:20:13 -0000 >Number: 158462 >Category: ports >Synopsis: Update port: misc/nut to 16.12 >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: Wed Jun 29 18:20:12 UTC 2011 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 7.4-RELEASE-p2 i386 >Organization: >Environment: >Description: - Update to version 16.12 >How-To-Repeat: >Fix: 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-05-22 23:40:22.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 README.fltk 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 + +.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|/usr/local/lib/nut|${DATADIR}| ; \ + s|^CFLAGS :=|CFLAGS +=| ; \ + s| -O3 | | ; \ + s| -s -o | -o | ; \ + s|ldstaticflags|ldflags|' 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 +.include 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 >Release-Note: >Audit-Trail: >Unformatted: