Attachment 116508 Details for Bug 158462 – file.diff

[patch] file.diff

file.diff (text/plain), 2.88 KB, created by tkato432 on 2011-06-29 19:20:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2011-06-29 19:20:12 UTC

Size: 2.88 KB

patch

obsolete

>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 <bsd.port.pre.mk>
>+
>+.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 <bsd.port.mk>
>+.include <bsd.port.post.mk>
>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

Actions: View | Diff

Attachments on bug 158462: 116508 | 116509