From 946180661a9aefa7be94bed9a5d5386c12b49513 Mon Sep 17 00:00:00 2001
From: Andrew Pantyukhin <sat@FreeBSD.org>
Date: Thu, 9 Aug 2007 22:52:13 +0000
Subject: - Update to 12.7 - Style nits

---
 misc/nut/Makefile | 25 ++++++++++++-------------
 misc/nut/distinfo |  6 +++---
 2 files changed, 15 insertions(+), 16 deletions(-)

(limited to 'misc')

diff --git a/misc/nut/Makefile b/misc/nut/Makefile
index c03a0310c194..6f8c5e1c1d5c 100644
--- a/misc/nut/Makefile
+++ b/misc/nut/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	nut
-PORTVERSION=	12.6
+PORTVERSION=	12.7
 CATEGORIES=	misc
 MASTER_SITES=	http://www.lafn.org/~av832/ CENKES
 PKGNAMEPREFIX=	health-
@@ -14,29 +14,28 @@ PKGNAMEPREFIX=	health-
 MAINTAINER=	infofarmer@FreeBSD.org
 COMMENT=	Nutrition software to record what you eat
 
-MAN1=		${PORTNAME}.1
-
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 PORTDOCS=	CREDITS LICENSE README
 DOCSDIR=	${PREFIX}/share/doc/${UNIQUENAME}
 ALL_TARGET=	${PORTNAME}
-RAW=		FOOD_DES.txt NUT_DATA.txt WEIGHT.lib WEIGHT.txt sr19.nut
-PLIST_FILES=	bin/${PORTNAME} ${RAW:S,^,%%DATADIR%%/,}
-PLIST_DIRS=	%%DATADIR%%
+PORTDATA=	FOOD_DES.txt NUT_DATA.txt WEIGHT.lib WEIGHT.txt sr19.nut
+PLIST_FILES=	bin/${PORTNAME}
+MAN1=		${PORTNAME}.1
+.undef		NOPORTDATA
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|/usr/local/lib/nut|${DATADIR}|" \
 		-e 's|^CFLAGS=|CFLAGS+=|g;s|-Os||;s|gcc|$${CC}|' ${WRKSRC}/Makefile
 
 do-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)
-	${INSTALL} -d ${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR}/
+	@${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin/
+	@${INSTALL} -d ${DATADIR}/
+	@cd ${WRKSRC}/raw.data/&&${INSTALL_DATA} ${PORTDATA} ${DATADIR}/
+	@${INSTALL_MAN} ${WRKSRC}/${MAN1} ${MAN1PREFIX}/man/man1/
+.ifndef NOPORTDOCS
+	@${INSTALL} -d ${DOCSDIR}/
+	@cd ${WRKSRC}/&&${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}/
 .endif
 
 .include <bsd.port.mk>
diff --git a/misc/nut/distinfo b/misc/nut/distinfo
index 46da53271a01..7db5691aa8d5 100644
--- a/misc/nut/distinfo
+++ b/misc/nut/distinfo
@@ -1,3 +1,3 @@
-MD5 (nut-12.6.tar.bz2) = cb086dd8e71232624c8697642800bc1d
-SHA256 (nut-12.6.tar.bz2) = d51535095d8da08a7c00587bd8fd30d8e63d9109bda076aa7dc88d06d4776ee1
-SIZE (nut-12.6.tar.bz2) = 905867
+MD5 (nut-12.7.tar.bz2) = cce6eafe488caf531705b1b22b0cf778
+SHA256 (nut-12.7.tar.bz2) = d6c03e51fae2226e8310047d3dafe83d1d389c5505415fbad4da043805269a6e
+SIZE (nut-12.7.tar.bz2) = 915193
-- 
cgit v1.2.3