From f0adfe5390374c2074dfdcbe6ac39accc7dc3597 Mon Sep 17 00:00:00 2001
From: sat <sat@FreeBSD.org>
Date: Sat, 21 Jul 2007 10:48:59 +0000
Subject: - Update to 12.6 - Move docsdir to avoid conflicts with sysutils/nut
 - Respect CC and don't do -Os

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

(limited to 'misc')

diff --git a/misc/nut/Makefile b/misc/nut/Makefile
index 1299f4dd64a1..1e67689e91fe 100644
--- a/misc/nut/Makefile
+++ b/misc/nut/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	nut
-PORTVERSION=	12.5
+PORTVERSION=	12.6
 CATEGORIES=	misc
 MASTER_SITES=	http://www.lafn.org/~av832/ CENKES
 PKGNAMEPREFIX=	health-
@@ -19,6 +19,7 @@ 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%%/,}
@@ -26,7 +27,7 @@ PLIST_DIRS=	%%DATADIR%%
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|/usr/local/lib/nut|${DATADIR}|" \
-		-e 's|^CFLAGS=|CFLAGS+=|g' ${WRKSRC}/Makefile
+		-e 's|^CFLAGS=|CFLAGS+=|g;s|-Os||;s|gcc|$${CC}|' ${WRKSRC}/Makefile
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${TARGETDIR}/bin/
diff --git a/misc/nut/distinfo b/misc/nut/distinfo
index 92a21313e512..46da53271a01 100644
--- a/misc/nut/distinfo
+++ b/misc/nut/distinfo
@@ -1,3 +1,3 @@
-MD5 (nut-12.5.tar.bz2) = 9283268a5103dfad437b82d949f3d86c
-SHA256 (nut-12.5.tar.bz2) = 6b4e1687fedb9fbd48d018f17e35f53e1c459324f06518624cd63396818c8f09
-SIZE (nut-12.5.tar.bz2) = 904610
+MD5 (nut-12.6.tar.bz2) = cb086dd8e71232624c8697642800bc1d
+SHA256 (nut-12.6.tar.bz2) = d51535095d8da08a7c00587bd8fd30d8e63d9109bda076aa7dc88d06d4776ee1
+SIZE (nut-12.6.tar.bz2) = 905867
-- 
cgit