Date: Wed, 25 Jun 2014 13:45:55 +0000 (UTC) From: "Jason E. Hale" <jhale@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r359240 - head/sysutils/sysinfo Message-ID: <201406251345.s5PDjt84029953@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jhale Date: Wed Jun 25 13:45:54 2014 New Revision: 359240 URL: http://svnweb.freebsd.org/changeset/ports/359240 QAT: https://qat.redports.org/buildarchive/r359240/ Log: - Support staging - Simplify MASTER_SITES - Install LICENSE with LICENSE framework - Use options helpers - Use @sample in pkg-plist - Bump PORTREVISION Approved by: portmgr (blanket approval) Modified: head/sysutils/sysinfo/Makefile head/sysutils/sysinfo/pkg-plist Modified: head/sysutils/sysinfo/Makefile ============================================================================== --- head/sysutils/sysinfo/Makefile Wed Jun 25 13:36:30 2014 (r359239) +++ head/sysutils/sysinfo/Makefile Wed Jun 25 13:45:54 2014 (r359240) @@ -3,34 +3,27 @@ PORTNAME= sysinfo PORTVERSION= 1.0.1 +PORTREVISION= 1 CATEGORIES= sysutils -MASTER_SITES= ${MASTER_SITE_LOCAL} \ +MASTER_SITES= LOCAL/danger \ http://danger.rulez.sk/projects/sysinfo/ -MASTER_SITE_SUBDIR=danger MAINTAINER= danger@FreeBSD.org COMMENT= Utility used to gather system configuration information +LICENSE= BSD2CLAUSE +LICENSE_FILE= ${WRKSRC}/LICENCE + NO_BUILD= yes WRKSRC= ${WRKDIR}/${PORTNAME} -MAN5= sysinfo.conf.5 -MAN8= sysinfo.8 - OPTIONS_DEFINE= DMIDECODE PORTAUDIT -DMIDECODE_DESC= Include information from the dmidecode tool -PORTAUDIT_DESC= Include information from the portaudit tool -NO_STAGE= yes -.include <bsd.port.options.mk> +DMIDECODE_DESC= Include information from the dmidecode tool +DMIDECODE_RUN_DEPENDS= dmidecode:${PORTSDIR}/sysutils/dmidecode -.if ${PORT_OPTIONS:MDMIDECODE} -RUN_DEPENDS= dmidecode:${PORTSDIR}/sysutils/dmidecode -.endif - -.if ${PORT_OPTIONS:MPORTAUDIT} -RUN_DEPENDS+= portaudit:${PORTSDIR}/ports-mgmt/portaudit -.endif +PORTAUDIT_DESC= Include information from the portaudit tool +PORTAUDIT_RUN_DEPENDS= portaudit:${PORTSDIR}/ports-mgmt/portaudit post-patch: @${REINPLACE_CMD} -e 's|common.subr|${DATADIR}/common.subr|g' ${WRKSRC}/sysinfo @@ -40,20 +33,12 @@ post-patch: ${WRKSRC}/sysinfo.conf ${WRKSRC}/doc/sysinfo.conf.5 do-install: - ${INSTALL_SCRIPT} ${WRKSRC}/sysinfo ${PREFIX}/sbin - ${INSTALL_DATA} ${WRKSRC}/sysinfo.conf ${PREFIX}/etc/sysinfo.conf.sample - -post-install: - ${MKDIR} ${DATADIR} - ${INSTALL_DATA} ${WRKSRC}/common.subr ${DATADIR} - ${INSTALL_DATA} ${WRKSRC}/LICENCE ${DATADIR} - (cd ${WRKSRC} && ${COPYTREE_BIN} modules ${DATADIR}) - - ${INSTALL_MAN} ${WRKSRC}/doc/sysinfo.conf.5 ${MANPREFIX}/man/man5 - ${INSTALL_MAN} ${WRKSRC}/doc/sysinfo.8 ${MANPREFIX}/man/man8 - - @if [ ! -f ${PREFIX}/etc/sysinfo.conf ]; then \ - ${CP} -p ${PREFIX}/etc/sysinfo.conf.sample ${PREFIX}/etc/sysinfo.conf ; \ - fi + ${INSTALL_SCRIPT} ${WRKSRC}/sysinfo ${STAGEDIR}${PREFIX}/sbin + ${INSTALL_DATA} ${WRKSRC}/sysinfo.conf ${STAGEDIR}${PREFIX}/etc/sysinfo.conf.sample + @${MKDIR} ${STAGEDIR}${DATADIR} + ${INSTALL_DATA} ${WRKSRC}/common.subr ${STAGEDIR}${DATADIR} + (cd ${WRKSRC} && ${COPYTREE_BIN} modules ${STAGEDIR}${DATADIR}) + ${INSTALL_MAN} ${WRKSRC}/doc/sysinfo.conf.5 ${STAGEDIR}${MAN5PREFIX}/man/man5 + ${INSTALL_MAN} ${WRKSRC}/doc/sysinfo.8 ${STAGEDIR}${MAN8PREFIX}/man/man8 .include <bsd.port.mk> Modified: head/sysutils/sysinfo/pkg-plist ============================================================================== --- head/sysutils/sysinfo/pkg-plist Wed Jun 25 13:36:30 2014 (r359239) +++ head/sysutils/sysinfo/pkg-plist Wed Jun 25 13:45:54 2014 (r359240) @@ -1,5 +1,7 @@ +@sample etc/sysinfo.conf.sample +man/man5/sysinfo.conf.5.gz +man/man8/sysinfo.8.gz sbin/sysinfo -share/sysinfo/LICENCE share/sysinfo/common.subr share/sysinfo/modules/bios share/sysinfo/modules/cpu @@ -14,6 +16,3 @@ share/sysinfo/modules/system share/sysinfo/modules/user @dirrm share/sysinfo/modules @dirrm share/sysinfo -@unexec if cmp -s %D/etc/sysinfo.conf.sample %D/etc/sysinfo.conf; then rm -f %D/etc/sysinfo.conf; fi -etc/sysinfo.conf.sample -@exec if [ ! -f %D/etc/sysinfo.conf ] ; then cp -p %D/%F %B/sysinfo.conf; fi
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201406251345.s5PDjt84029953>