From infofarmer@gmail.com  Tue May  2 19:42:58 2006
Return-Path: <infofarmer@gmail.com>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 66AAC16A401
	for <FreeBSD-gnats-submit@freebsd.org>; Tue,  2 May 2006 19:42:58 +0000 (UTC)
	(envelope-from infofarmer@gmail.com)
Received: from nproxy.gmail.com (nproxy.gmail.com [64.233.182.186])
	by mx1.FreeBSD.org (Postfix) with ESMTP id E9BF643D45
	for <FreeBSD-gnats-submit@freebsd.org>; Tue,  2 May 2006 19:42:56 +0000 (GMT)
	(envelope-from infofarmer@gmail.com)
Received: by nproxy.gmail.com with SMTP id m18so721132nfc
        for <FreeBSD-gnats-submit@freebsd.org>; Tue, 02 May 2006 12:42:56 -0700 (PDT)
Received: by 10.48.217.9 with SMTP id p9mr783535nfg;
        Tue, 02 May 2006 12:13:05 -0700 (PDT)
Received: from localhost ( [83.237.228.201])
        by mx.gmail.com with ESMTP id c28sm2090581nfb.2006.05.02.12.13.03;
        Tue, 02 May 2006 12:13:04 -0700 (PDT)
Message-Id: <4457af40.528d14eb.5cbe.4250@mx.gmail.com>
Date: Tue, 02 May 2006 12:13:04 -0700 (PDT)
From: Andrew Pantyukhin <infofarmer@gmail.com>
To: FreeBSD-gnats-submit@freebsd.org
Subject: update misc/nut
X-Send-Pr-Version: 3.113
X-GNATS-Notify: freebsd@unixfreunde.de

>Number:         96687
>Category:       ports
>Synopsis:       update misc/nut
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    sat
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Tue May 02 19:50:20 GMT 2006
>Closed-Date:    Mon May 08 14:30:32 GMT 2006
>Last-Modified:  Mon May 08 14:30:32 GMT 2006
>Originator:     Andrew Pantyukhin
>Release:        FreeBSD 6.1-RC i386
>Organization:
>Environment:
System: FreeBSD sat64.net17 6.1-RC FreeBSD 6.1-RC #15: Tue Apr 18 00:29:23 MSD 2006 sat@sat64.net17:/usr/obj/usr/src/sys/SATCUR32 i386


	
>Description:
Move plist to Makefile
Use BZIP2
Simplify a bit
	
>How-To-Repeat:
	
>Fix:

	

--- nut.new.diff begins here ---
diff -urN /usr/ports/misc/nut/Makefile nut/Makefile
--- /usr/ports/misc/nut/Makefile	Mon May  1 18:58:57 2006
+++ nut/Makefile	Tue May  2 23:02:31 2006
@@ -1,6 +1,6 @@
-# New ports collection makefile for:  nut
-# Date created:       	Tue Apr 29 12:45:30 GMT 2003
-# Whom:                Kirill Ponomarew <ponomarew@oberon.net>
+# New ports collection makefile for:	nut
+# Date created:		Tue Apr 29 12:45:30 GMT 2003
+# Whom:			Kirill Ponomarew <ponomarew@oberon.net>
 #
 # $FreeBSD: ports/misc/nut/Makefile,v 1.60 2006/05/01 14:58:57 pav Exp $
 #
@@ -9,37 +9,37 @@
 PORTVERSION=	11.4
 CATEGORIES=	misc
 MASTER_SITES=	http://www.lafn.org/~av832/ \
+		http://bsd1.csme.ru/myports/ \
+		http://bsd2.csme.ru/myports/ \
+		http://bsd3.csme.ru/myports/ \
 		http://voodoo.bawue.com/download/
 PKGNAMEPREFIX=	health-
 
 MAINTAINER=	freebsd@unixfreunde.de
 COMMENT=	Nutrition software to record what you eat
 
-MAN1=		nut.1
+MAN1=		${PORTNAME}.1
 
+USE_BZIP2=	yes
 USE_GMAKE=	yes
+PORTDOCS=	CREDITS LICENSE README
 ALL_TARGET=	${PORTNAME}
+RAW=		FOOD_DES.txt NUT_DATA.txt WEIGHT.lib WEIGHT.txt sr18.nut
+PLIST_FILES=	bin/${PORTNAME} ${RAW:S,^,%%DATADIR%%/,}
+PLIST_DIRS=	%%DATADIR%%
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g ; \
-		s|^CFLAGS=|CFLAGS+=|g' ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e "s|/usr/local/lib/nut|${DATADIR}|" \
+		-e 's|^CFLAGS=|CFLAGS+=|g' ${WRKSRC}/Makefile
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
-	${MKDIR} ${PREFIX}/etc/${PORTNAME}
-	${INSTALL_DATA}	${WRKSRC}/raw.data/FOOD_DES.txt ${PREFIX}/etc/${PORTNAME}
-	${INSTALL_DATA} ${WRKSRC}/raw.data/NUT_DATA.txt	${PREFIX}/etc/${PORTNAME}
-	${INSTALL_DATA} ${WRKSRC}/raw.data/WEIGHT.lib ${PREFIX}/etc/${PORTNAME}
-	${INSTALL_DATA} ${WRKSRC}/raw.data/WEIGHT.txt ${PREFIX}/etc/${PORTNAME}
-	${INSTALL_DATA} ${WRKSRC}/raw.data/sr18.nut ${PREFIX}/etc/${PORTNAME}
-	${INSTALL_MAN} ${WRKSRC}/nut.1 ${MANPREFIX}/man/man1
-
-post-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin/
+	${INSTALL} -d ${DATADIR}
+	${INSTALL_DATA}	${RAW:S,^,${WRKSRC}/raw.data/,} ${DATADIR}/
+	${INSTALL_MAN} ${WRKSRC}/${MAN1} ${MAN1PREFIX}/man/man1/
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-.for i in README
-	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
-.endfor
+	${INSTALL} -d ${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR}/
 .endif
 
 .include <bsd.port.mk>
diff -urN /usr/ports/misc/nut/distinfo nut/distinfo
--- /usr/ports/misc/nut/distinfo	Mon May  1 18:58:57 2006
+++ nut/distinfo	Mon May  1 01:52:54 2006
@@ -1,3 +1,3 @@
-MD5 (nut-11.4.tar.gz) = 7c4d1b5056488f91f111a64f87898023
-SHA256 (nut-11.4.tar.gz) = bf0bc99bf5561b0fa9c91db3b27ea3951d002f259cea8f605be2a15e8e20d07f
-SIZE (nut-11.4.tar.gz) = 1083477
+MD5 (nut-11.4.tar.bz2) = 85dc86ee9e8fd129751c6d7d0fe16a54
+SHA256 (nut-11.4.tar.bz2) = 511793923c842de30e2ed0e593b057287e874d130c1c7d8f13d569dc5d29f8ad
+SIZE (nut-11.4.tar.bz2) = 869501
diff -urN /usr/ports/misc/nut/pkg-plist nut/pkg-plist
--- /usr/ports/misc/nut/pkg-plist	Sun Aug 28 14:36:22 2005
+++ nut/pkg-plist	Thu Jan  1 03:00:00 1970
@@ -1,9 +0,0 @@
-bin/nut
-etc/nut/FOOD_DES.txt
-etc/nut/NUT_DATA.txt
-etc/nut/WEIGHT.lib
-etc/nut/WEIGHT.txt
-etc/nut/sr18.nut
-%%PORTDOCS%%%%DOCSDIR%%/README
-@dirrm etc/nut
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
--- nut.new.diff ends here ---


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Tue May 2 19:52:10 UTC 2006 
State-Changed-Why:  
Awaiting maintainers feedback 

http://www.freebsd.org/cgi/query-pr.cgi?pr=96687 

From: Martin Wilke <freebsd@unixfreunde.de>
To: bug-followup@FreeBSD.org
Cc: edwin@FreeBSD.org
Subject: Re: ports/96687: update misc/nut
Date: Tue, 2 May 2006 21:58:17 +0200

 On Tue, 2 May 2006 19:52:04 UT
 Edwin Groothuis <edwin@FreeBSD.org> wrote:
 
 > Maintainer of misc/nut,
 > 
 > Please note that PR ports/96687 has just been submitted.
 > 
 > If it contains a patch for an upgrade, an enhancement or a bug fix
 > you agree on, reply to this email stating that you approve the patch
 > and a committer will take care of it.
 > 
 > The full text of the PR can be found at:
 >     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/96687
 > 
 yep approved.
 
 Thanks Andrew.
State-Changed-From-To: feedback->open 
State-Changed-By: edwin 
State-Changed-When: Tue May 2 23:30:21 UTC 2006 
State-Changed-Why:  
Approved by maintainer 

http://www.freebsd.org/cgi/query-pr.cgi?pr=96687 
Responsible-Changed-From-To: freebsd-ports-bugs->sat 
Responsible-Changed-By: sat 
Responsible-Changed-When: Sun May 7 08:53:27 UTC 2006 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=96687 
State-Changed-From-To: open->closed 
State-Changed-By: sat 
State-Changed-When: Mon May 8 14:30:22 UTC 2006 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=96687 
>Unformatted:
