svn commit: r357161 - head/misc/nut
Jason E. Hale
jhale at FreeBSD.org
Mon Jun 9 14:47:11 UTC 2014
Author: jhale
Date: Mon Jun 9 14:47:10 2014
New Revision: 357161
URL: http://svnweb.freebsd.org/changeset/ports/357161
QAT: https://qat.redports.org/buildarchive/r357161/
Log:
- Update to 19.1
- Support staging
- Use options helpers where possible
- Install icon for FLTK option
- Use newer LIB_DEPENDS syntax
- Convert PLIST_FILES to pkg-plist
- Take maintainership
Added:
head/misc/nut/pkg-plist (contents, props changed)
Modified:
head/misc/nut/Makefile
head/misc/nut/distinfo
Modified: head/misc/nut/Makefile
==============================================================================
--- head/misc/nut/Makefile Mon Jun 9 14:46:11 2014 (r357160)
+++ head/misc/nut/Makefile Mon Jun 9 14:47:10 2014 (r357161)
@@ -2,47 +2,39 @@
# $FreeBSD$
PORTNAME= nut
-PORTVERSION= 18.4
-PORTREVISION= 2
+PORTVERSION= 19.1
CATEGORIES= misc
MASTER_SITES= SF
PKGNAMEPREFIX= health-
-MAINTAINER= ports at FreeBSD.org
+MAINTAINER= jhale at FreeBSD.org
COMMENT= Nutrition software to record what you eat
LICENSE= GPLv2 # (or later)
-OPTIONS_DEFINE= FLTK DOCS
-FLTK_DESC= Install FLTK GUI
-
USES= gmake
DOCSDIR= ${PREFIX}/share/doc/${UNIQUENAME}
-
-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%%/sr25.nut
-PLIST_DIRS= %%DATADIR%%
-NO_STAGE= yes
+OPTIONS_DEFINE= FLTK DOCS
+OPTIONS_SUB= yes
+
+FLTK_DESC= Install FLTK GUI
+FLTK_LIB_DEPENDS= libpthread-stubs.so:${PORTSDIR}/devel/libpthread-stubs \
+ libfreetype.so:${PORTSDIR}/print/freetype2 \
+ libexpat.so:${PORTSDIR}/textproc/expat2 \
+ libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
+ libfltk_images.so:${PORTSDIR}/x11-toolkits/fltk
+FLTK_USE= XORG=x11 xau xcb xdmcp xext xft xinerama xpm xrender
+FLTK_MAKE_ENV= HAVE_FLTK=1 FLTK_NUT="fltk/Nut"
+FLTK_MAKE_ENV_OFF= HAVE_FLTK=0 FLTK_NUT=""
+
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MFLTK}
-LIB_DEPENDS+= pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
- libfreetype.so:${PORTSDIR}/print/freetype2 \
- expat:${PORTSDIR}/textproc/expat2 \
- fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
- fltk_images:${PORTSDIR}/x11-toolkits/fltk
-USE_XORG+= x11 xau xcb xdmcp xext xft xinerama xrender
-MAKE_ENV+= HAVE_FLTK=1 FLTK_NUT="fltk/Nut"
-PLIST_FILES+= bin/Nut
-DESKTOP_ENTRIES="Nut" "${COMMENT}" "" "Nut" \
- "Science;Biology;MedicalSoftware;" "false"
-.else
-MAKE_ENV+= HAVE_FLTK=0 FLTK_NUT=""
+DESKTOP_ENTRIES="Nut" "" "nuticon" "Nut" \
+ "Science;Biology;MedicalSoftware;" false
.endif
post-patch:
@@ -53,23 +45,18 @@ post-patch:
s|^CC =|CC ?=| ; \
s|^CXX =|CXX ?=| ; \
s|^CFLAGS :=|CFLAGS +=| ; \
- s|-ansi -pedantic|| ; \
- s|$$(OPT)|| ; \
- s|ldstaticflags|ldflags| '
+ s|$$(OPT)||'
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}
- @${MKDIR} ${DOCSDIR}
-.for file in ${PORTDOCS}
- ${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
-.endfor
+ ${INSTALL_PROGRAM} ${WRKSRC}/fltk/Nut ${STAGEDIR}${PREFIX}/bin
+ ${INSTALL_DATA} ${WRKSRC}/nuticon.xpm ${STAGEDIR}${PREFIX}/share/pixmaps
.endif
+ ${INSTALL_PROGRAM} ${WRKSRC}/nut ${STAGEDIR}${PREFIX}/bin
+ ${INSTALL_MAN} ${WRKSRC}/nut.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
+ @${MKDIR} ${STAGEDIR}${DATADIR}
+ (cd ${WRKSRC}/raw.data && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR})
+ @${MKDIR} ${STAGEDIR}${DOCSDIR}
+ ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
.include <bsd.port.mk>
Modified: head/misc/nut/distinfo
==============================================================================
--- head/misc/nut/distinfo Mon Jun 9 14:46:11 2014 (r357160)
+++ head/misc/nut/distinfo Mon Jun 9 14:47:10 2014 (r357161)
@@ -1,2 +1,2 @@
-SHA256 (nut-18.4.tar.gz) = b6cc5382ddbedd788ecdb9745111e3f8c606bfbf7d5fe2f7b9298e9bd77c903a
-SIZE (nut-18.4.tar.gz) = 1336493
+SHA256 (nut-19.1.tar.gz) = 643aaccaeee1122ca785f903bdf9bf19f5c7900941318a833561db204b495f7e
+SIZE (nut-19.1.tar.gz) = 1399743
Added: head/misc/nut/pkg-plist
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/misc/nut/pkg-plist Mon Jun 9 14:47:10 2014 (r357161)
@@ -0,0 +1,7 @@
+%%FLTK%%bin/Nut
+bin/nut
+man/man1/nut.1.gz
+%%FLTK%%share/pixmaps/nuticon.xpm
+%%DATADIR%%/WEIGHT.lib
+%%DATADIR%%/sr26.nut
+ at dirrmtry %%DATADIR%%
More information about the svn-ports-head
mailing list