Date: Wed, 31 Oct 2012 12:10:01 GMT From: KATO Tsuguru <tkato432@yahoo.com> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/172246: misc/nut: Update to version 18.0 Message-ID: <201210311210.q9VCA1wv021083@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/172246; it has been noted by GNATS.
From: KATO Tsuguru <tkato432@yahoo.com>
To: bug-followup@FreeBSD.org
Cc:
Subject: Re: ports/172246: misc/nut: Update to version 18.0
Date: Wed, 31 Oct 2012 21:00:00 +0900
This is a multi-part message in MIME format.
--Multipart=_Wed__31_Oct_2012_21_00_00_+0900_VHbE5aFDvfHbg21=
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Version 18.3 has been released.
--Multipart=_Wed__31_Oct_2012_21_00_00_+0900_VHbE5aFDvfHbg21=
Content-Type: text/x-diff;
name="misc_nut.diff"
Content-Disposition: attachment;
filename="misc_nut.diff"
Content-Transfer-Encoding: 7bit
diff -urN /usr/ports/misc/nut/Makefile misc/nut/Makefile
--- /usr/ports/misc/nut/Makefile 2012-09-25 20:16:05.000000000 +0900
+++ misc/nut/Makefile 2012-10-31 20:05:15.000000000 +0900
@@ -2,7 +2,7 @@
# $FreeBSD: ports/misc/nut/Makefile,v 1.105 2012/09/25 11:16:05 culot Exp $
PORTNAME= nut
-PORTVERSION= 17.12
+PORTVERSION= 18.3
CATEGORIES= misc
MASTER_SITES= SF
PKGNAMEPREFIX= health-
@@ -12,36 +12,49 @@
LICENSE= GPLv2 # (or later)
+OPTIONS_DEFINE= FLTK DOCS
+FLTK_DESC= FLTK GUI toolkit
+
USE_GMAKE= yes
MAKE_JOBS_SAFE= yes
-OPTIONS_DEFINE= DOCS
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MDOCS}
DOCSDIR= ${PREFIX}/share/doc/${UNIQUENAME}
-PORTDOCS= CREDITS README nut.html
-.endif
MAN1= ${PORTNAME}.1
+PORTDOCS= CREDITS README nut.html
PLIST_FILES= bin/${PORTNAME} %%DATADIR%%/FOOD_DES.txt \
%%DATADIR%%/NUT_DATA.txt %%DATADIR%%/WEIGHT.lib \
- %%DATADIR%%/WEIGHT.txt %%DATADIR%%/sr24.nut
+ %%DATADIR%%/WEIGHT.txt %%DATADIR%%/sr25.nut
PLIST_DIRS= %%DATADIR%%
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MFLTK}
+LIB_DEPENDS+= fltk:${PORTSDIR}/x11-toolkits/fltk
+MAKE_ENV+= HAVE_FLTK=1 FLTK_NUT="fltk/Nut"
+PLIST_FILES+= bin/Nut
+.else
+MAKE_ENV+= HAVE_FLTK=0 FLTK_NUT=""
+.endif
+
post-patch:
@${FIND} ${WRKSRC} -name "Makefile" | ${XARGS} ${REINPLACE_CMD} -e \
's|$$(prefix)/lib/nut|${DATADIR}| ; \
+ s|^HAVE_FLTK|#HAVE_FLTK| ; \
+ s|^FLTK_NUT|#FLTK_NUT| ; \
s|^CC =|CC ?=| ; \
s|^CXX =|CXX ?=| ; \
s|^CFLAGS :=|CFLAGS +=| ; \
- s| -O | | ; \
+ s|-ansi -pedantic|| ; \
+ s|$$(OPT)|| ; \
s|ldstaticflags|ldflags| '
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${MANPREFIX}/man/man1
+.if ${PORT_OPTIONS:MFLTK}
+ ${INSTALL_PROGRAM} ${WRKSRC}/fltk/Nut ${PREFIX}/bin
+.endif
@${MKDIR} ${DATADIR}
@(cd ${WRKSRC}/raw.data && ${COPYTREE_SHARE} . ${DATADIR})
.if ${PORT_OPTIONS:MDOCS}
diff -urN /usr/ports/misc/nut/distinfo misc/nut/distinfo
--- /usr/ports/misc/nut/distinfo 2012-09-25 20:16:05.000000000 +0900
+++ misc/nut/distinfo 2012-10-31 20:29:12.000000000 +0900
@@ -1,2 +1,2 @@
-SHA256 (nut-17.12.tar.gz) = b2fbaa92cbb0351efc4b9a679c6fddb31ba56dd87c798fafecff12d21bb7d669
-SIZE (nut-17.12.tar.gz) = 1274051
+SHA256 (nut-18.3.tar.gz) = e703c063f0799cf44c418b19d367036d23b44ae354120ba6370081261dca5e86
+SIZE (nut-18.3.tar.gz) = 1336554
--Multipart=_Wed__31_Oct_2012_21_00_00_+0900_VHbE5aFDvfHbg21=--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201210311210.q9VCA1wv021083>