From owner-svn-ports-all@FreeBSD.ORG Thu Jun 26 16:03:28 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2AB2A4EC; Thu, 26 Jun 2014 16:03:28 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 F18EB2B51; Thu, 26 Jun 2014 16:03:27 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5QG3RN2068929; Thu, 26 Jun 2014 16:03:27 GMT (envelope-from wg@svn.freebsd.org) Received: (from wg@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5QG3R69068927; Thu, 26 Jun 2014 16:03:27 GMT (envelope-from wg@svn.freebsd.org) Message-Id: <201406261603.s5QG3R69068927@svn.freebsd.org> From: William Grzybowski Date: Thu, 26 Jun 2014 16:03:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r359384 - head/security/scamp 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.18 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: Thu, 26 Jun 2014 16:03:28 -0000 Author: wg Date: Thu Jun 26 16:03:27 2014 New Revision: 359384 URL: http://svnweb.freebsd.org/changeset/ports/359384 QAT: https://qat.redports.org/buildarchive/r359384/ Log: security/scamp: support stage - Use @sample Approved by: portmgr (stage blanket) Modified: head/security/scamp/Makefile head/security/scamp/pkg-plist Modified: head/security/scamp/Makefile ============================================================================== --- head/security/scamp/Makefile Thu Jun 26 16:00:00 2014 (r359383) +++ head/security/scamp/Makefile Thu Jun 26 16:03:27 2014 (r359384) @@ -25,38 +25,20 @@ RUN_DEPENDS+= curl>=7.24.0_2:${PORTSDIR} NO_BUILD= yes SUB_FILES= pkg-message -MAN1= scamp.1 - OPTIONS_DEFINE= DOCS -NO_STAGE= yes -.include +PORTDOCS= README CHANGE.LOG INSTALL Release.pdf post-patch: @${REINPLACE_CMD} -e 's|CLAMAV_DB=$${CLAMAV_DB:-""}|CLAMAV_DB=$${CLAMAV_DB:-\"/var/db/clamav\"}|g' ${WRKSRC}/${PORTNAME}.sh @${REINPLACE_CMD} -e 's|CONFIG_DIR=$${CONFIG_DIR:-"/etc/scamp"}|CONFIG_DIR=$${CONFIG_DIR:-"${ETCDIR}"}|g' ${WRKSRC}/${PORTNAME}.sh -post-install: - @if [ ! -d ${ETCDIR} ]; then \ - ${MKDIR} ${ETCDIR} ; \ - fi - - @${INSTALL_DATA} ${FILESDIR}/default.sample ${ETCDIR} - - @if [ ! -f ${PREFIX}/etc/scamp/default ]; then \ - ${CP} -p ${PREFIX}/etc/scamp/default.sample ${PREFIX}/etc/scamp/default ; \ - fi - do-install: - cd ${WRKSRC} && ${INSTALL_SCRIPT} ${PORTNAME}.sh ${PREFIX}/bin - cd ${WRKSRC} && ${INSTALL_MAN} scamp.1 ${MANPREFIX}/man/man1 - -# Documentation -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} - cd ${WRKSRC} && ${INSTALL_DATA} README CHANGE.LOG INSTALL Release.pdf ${DOCSDIR} -.endif - - @${CAT} ${PKGMESSAGE} + cd ${WRKSRC} && ${INSTALL_SCRIPT} ${PORTNAME}.sh ${STAGEDIR}${PREFIX}/bin + cd ${WRKSRC} && ${INSTALL_MAN} scamp.1 ${STAGEDIR}${MANPREFIX}/man/man1 + @${MKDIR} ${STAGEDIR}${ETCDIR} + ${INSTALL_DATA} ${FILESDIR}/default.sample ${STAGEDIR}${ETCDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} + cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} .include Modified: head/security/scamp/pkg-plist ============================================================================== --- head/security/scamp/pkg-plist Thu Jun 26 16:00:00 2014 (r359383) +++ head/security/scamp/pkg-plist Thu Jun 26 16:03:27 2014 (r359384) @@ -1,11 +1,4 @@ bin/scamp.sh -%%PORTDOCS%%%%DOCSDIR%%/CHANGE.LOG -%%PORTDOCS%%%%DOCSDIR%%/INSTALL -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/Release.pdf -%%PORTDOCS%%@dirrm %%DOCSDIR%% -@exec mkdir -p %D/etc/scamp -@unexec if cmp -s %D/etc/scamp/default.sample %D/etc/scamp/default; then rm -f %D/etc/scamp/default; fi -etc/scamp/default.sample -@exec if [ ! -f %D/etc/scamp/default ] ; then cp -p %D/%F %B/default; fi +man/man1/scamp.1.gz +@sample etc/scamp/default.sample @dirrmtry etc/scamp