Index: nut/Makefile
===================================================================
RCS file: /home/pcvs/ports/misc/nut/Makefile,v
retrieving revision 1.60
diff -u -r1.60 Makefile
--- nut/Makefile	1 May 2006 14:58:57 -0000	1.60
+++ nut/Makefile	7 May 2006 10:52:20 -0000
@@ -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>
Index: nut/distinfo
===================================================================
RCS file: /home/pcvs/ports/misc/nut/distinfo,v
retrieving revision 1.54
diff -u -r1.54 distinfo
--- nut/distinfo	1 May 2006 14:58:57 -0000	1.54
+++ nut/distinfo	7 May 2006 10:52:20 -0000
@@ -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
Index: nut/pkg-plist
===================================================================
RCS file: nut/pkg-plist
diff -N nut/pkg-plist
--- nut/pkg-plist	28 Aug 2005 10:36:22 -0000	1.7
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -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%%