Date: Mon, 12 Oct 2015 17:34:44 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r399143 - head/news/diablo Message-ID: <201510121734.t9CHYi00076206@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Mon Oct 12 17:34:44 2015 New Revision: 399143 URL: https://svnweb.freebsd.org/changeset/ports/399143 Log: - Add missing directories to plist, fixing stage-qa - Silence patching - Switch to options helpers PR: 203665 Submitted by: amdmi3 Approved by: lifanov@mail.lifanov.com (maintainer) Modified: head/news/diablo/Makefile head/news/diablo/pkg-plist Modified: head/news/diablo/Makefile ============================================================================== --- head/news/diablo/Makefile Mon Oct 12 15:58:11 2015 (r399142) +++ head/news/diablo/Makefile Mon Oct 12 17:34:44 2015 (r399143) @@ -20,24 +20,21 @@ PORTDOCS= COPYRIGHT INSTALL README.READE OPTIONS_DEFINE= DES DOCS DES_DESC= DES encryption support -USES= tar:tgz - -.include <bsd.port.options.mk> +USES= tar:tgz post-patch: - ${CP} ${FILESDIR}/diablo.in ${WRKDIR}/diablo - ${REINPLACE_CMD} -E 's|%%PREFIX%%|${STAGEDIR}${PREFIX}|g ;\ + @${CP} ${FILESDIR}/diablo.in ${WRKDIR}/diablo + @${REINPLACE_CMD} -E 's|%%PREFIX%%|${STAGEDIR}${PREFIX}|g ;\ s|-g -O.?|${CFLAGS}| ; s|g?cc|${CC}|' \ ${WRKSRC}/XMakefile.inc - ${REINPLACE_CMD} -E 's|%%PREFIX%%|${PREFIX}|g' \ + @${REINPLACE_CMD} -E 's|%%PREFIX%%|${PREFIX}|g' \ ${WRKDIR}/diablo ${WRKSRC}/XMakefile.inst # Fix for GCC 4.2 - ${REINPLACE_CMD} -e 's|VServerConfig\[\]|*VServerConfig|' \ + @${REINPLACE_CMD} -e 's|VServerConfig\[\]|*VServerConfig|' \ ${WRKSRC}/dreaderd/main.c -.if empty(PORT_OPTIONS:MDES) - ${REINPLACE_CMD} -e 's| -ldes||g' ${WRKSRC}/XMakefile.inc -.endif +post-patch-DES-off: + @${REINPLACE_CMD} -e 's| -ldes||g' ${WRKSRC}/XMakefile.inc do-build: (cd ${WRKSRC} && xmake all) @@ -51,8 +48,11 @@ do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/news/spool/group ${MKDIR} ${STAGEDIR}${PREFIX}/news/spool/postq (cd ${WRKSRC} && xmake install) + @${RM} -rf ${STAGEDIR}${PREFIX}/news/man @${STRIP_CMD} ${STAGEDIR}${PREFIX}/news/dbin/* ${INSTALL_SCRIPT} ${WRKDIR}/diablo ${STAGEDIR}${PREFIX}/etc/rc.d + +do-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} .for file in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR} Modified: head/news/diablo/pkg-plist ============================================================================== --- head/news/diablo/pkg-plist Mon Oct 12 15:58:11 2015 (r399142) +++ head/news/diablo/pkg-plist Mon Oct 12 17:34:44 2015 (r399143) @@ -122,5 +122,14 @@ news/samples/reader/distrib.pats news/samples/reader/dreader.access news/samples/reader/dserver.hosts news/samples/reader/moderators +@dir news/spool/postq +@dir news/spool/news +@dir news/spool/group +@dir news/spool/cache +@dir news/spool +@dir news/run +@dir news/log +@dir news/dqueue +@dir news @owner @group
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201510121734.t9CHYi00076206>