Date: Fri, 4 Apr 2014 14:40:03 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r350128 - head/misc/upclient Message-ID: <201404041440.s34Ee33J031035@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Fri Apr 4 14:40:03 2014 New Revision: 350128 URL: http://svnweb.freebsd.org/changeset/ports/350128 QAT: https://qat.redports.org/buildarchive/r350128/ Log: Simplify Support stage Support packaging as a user Modified: head/misc/upclient/Makefile head/misc/upclient/pkg-plist Modified: head/misc/upclient/Makefile ============================================================================== --- head/misc/upclient/Makefile Fri Apr 4 14:28:16 2014 (r350127) +++ head/misc/upclient/Makefile Fri Apr 4 14:40:03 2014 (r350128) @@ -12,6 +12,8 @@ DISTNAME= ${PORTNAME}-${PORTVERSION:R}${ MAINTAINER= ports@FreeBSD.org COMMENT= Uptimes project client +OPTIONS_DEFINE= DOCS + USES= gettext USE_RC_SUBR= upclient ALL_TARGET= bsd @@ -20,69 +22,35 @@ BUILD_WRKSRC= ${WRKSRC}/src SUB_FILES= pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message -MAN8= upclient.8 - REINPLACE_SUB= PREFIX=${PREFIX} LOCALBASE=${LOCALBASE} DOC_FILES= AUTHORS COPYING FAQ HISTORY INSTALL README TODO DOC_FILES+= doc/UptimesProtocol5 DOC_FILES+= HISTORY-BETA -NO_STAGE= yes -.include <bsd.port.pre.mk> - -post-extract: rename-doc - -rename-doc: +post-extract: @${MV} ${WRKSRC}/doc/"Uptimes Protocol 5" ${WRKSRC}/doc/UptimesProtocol5 post-patch: @${REINPLACE_CMD} ${REINPLACE_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ ${WRKSRC}/scripts/upchk ${WRKSRC}/scripts/clientchk \ ${WRKSRC}/src/Makefile - ${REINPLACE_CMD} -e 's/CC=gcc/CC=${CC}/' ${WRKSRC}/src/Makefile - -do-install: install-program install-man install-sample install-script \ - install-locale - -install-program: - @${INSTALL_PROGRAM} -g kmem -m 2555 ${WRKSRC}/src/products/upclient \ - ${PREFIX}/sbin - -install-man: - @${INSTALL_MAN} ${WRKSRC}/src/products/upclient.8 \ - ${MAN8PREFIX}/man/man8 - -install-sample: - @${INSTALL_DATA} -g kmem -m 640 ${WRKSRC}/src/products/upclient.conf \ - ${PREFIX}/etc/upclient.conf.sample - -install-script: - @${INSTALL_SCRIPT} ${WRKSRC}/scripts/upchk ${WRKSRC}/scripts/clientchk \ - ${PREFIX}/sbin - -install-locale: - @cd ${WRKSRC}/src; ${MAKE} install-locales - -post-install: install-conf install-doc display-message - -install-conf: -.if !exists(${PREFIX}/etc/upclient.conf) - @${CP} -p ${PREFIX}/etc/upclient.conf.sample \ - ${PREFIX}/etc/upclient.conf -.endif + @${REINPLACE_CMD} -e 's/CC=gcc/CC="${CC}"/g' \ + ${WRKSRC}/src/Makefile -install-doc: -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} +do-install: + ${INSTALL_PROGRAM} -m 2555 ${WRKSRC}/src/products/upclient \ + ${STAGEDIR}${PREFIX}/sbin + ${INSTALL_MAN} ${WRKSRC}/src/products/upclient.8 \ + ${STAGEDIR}${MAN8PREFIX}/man/man8 + ${INSTALL_DATA} -m 640 ${WRKSRC}/src/products/upclient.conf \ + ${STAGEDIR}${PREFIX}/etc/upclient.conf.sample + ${INSTALL_SCRIPT} ${WRKSRC}/scripts/upchk ${WRKSRC}/scripts/clientchk \ + ${STAGEDIR}${PREFIX}/sbin + @cd ${WRKSRC}/src; ${MAKE_CMD} destdir=${STAGEDIR} install-locales + @${MKDIR} ${STAGEDIR}${DOCSDIR} .for file in ${DOC_FILES} - @${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR} .endfor -.endif - -display-message: - @${ECHO_MSG} - @${CAT} ${PKGMESSAGE} - @${ECHO_MSG} -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/misc/upclient/pkg-plist ============================================================================== --- head/misc/upclient/pkg-plist Fri Apr 4 14:28:16 2014 (r350127) +++ head/misc/upclient/pkg-plist Fri Apr 4 14:40:03 2014 (r350128) @@ -1,9 +1,14 @@ @unexec if cmp -s %D/etc/upclient.conf %D/etc/upclient.conf.sample; then rm -f %D/etc/upclient.conf; fi +@group kmem etc/upclient.conf.sample +@group wheel @exec [ -f %D/etc/upclient.conf ] || cp -p %D/etc/upclient.conf.sample %D/etc/upclient.conf +man/man8/upclient.8.gz sbin/clientchk sbin/upchk +@group kmem sbin/upclient +@group wheel %%PORTDOCS%%%%DOCSDIR%%/AUTHORS %%PORTDOCS%%%%DOCSDIR%%/COPYING %%PORTDOCS%%%%DOCSDIR%%/FAQ
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404041440.s34Ee33J031035>