From owner-svn-ports-all@freebsd.org Mon Oct 12 17:34:46 2015 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 03C0FA11CB9; Mon, 12 Oct 2015 17:34:46 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A84A5A50; Mon, 12 Oct 2015 17:34:45 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9CHYiPq076208; Mon, 12 Oct 2015 17:34:44 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9CHYi00076206; Mon, 12 Oct 2015 17:34:44 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201510121734.t9CHYi00076206@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Mon, 12 Oct 2015 17:34:44 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r399143 - head/news/diablo X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Oct 2015 17:34:46 -0000 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 +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