From owner-svn-ports-head@freebsd.org Thu Sep 24 21:19:32 2015 Return-Path: Delivered-To: svn-ports-head@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 BC914A08139; Thu, 24 Sep 2015 21:19:32 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.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 54F131E70; Thu, 24 Sep 2015 21:19:32 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t8OLJWWY045475; Thu, 24 Sep 2015 21:19:32 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t8OLJVGb045473; Thu, 24 Sep 2015 21:19:31 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201509242119.t8OLJVGb045473@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Thu, 24 Sep 2015 21:19:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r397764 - head/mail/spamdyke X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Sep 2015 21:19:32 -0000 Author: amdmi3 Date: Thu Sep 24 21:19:31 2015 New Revision: 397764 URL: https://svnweb.freebsd.org/changeset/ports/397764 Log: - Switch to options helpers - Switch to @sample Approved by: portmgr blanket Modified: head/mail/spamdyke/Makefile head/mail/spamdyke/pkg-plist Modified: head/mail/spamdyke/Makefile ============================================================================== --- head/mail/spamdyke/Makefile Thu Sep 24 21:19:28 2015 (r397763) +++ head/mail/spamdyke/Makefile Thu Sep 24 21:19:31 2015 (r397764) @@ -3,6 +3,7 @@ PORTNAME= spamdyke PORTVERSION= 5.0.1 +PORTREVISION= 1 CATEGORIES= mail MASTER_SITES= http://www.spamdyke.org/releases/ @@ -33,26 +34,21 @@ TLS_USE= OPENSSL=yes DEBUG_CONFIGURE_ENABLE= debug-output DEBUG_EXCESSIVE_CONFIGURE_ENABLE= excessive-output -.include - -.if ${PORT_OPTIONS:MDOCS} PORTDOCS= Changelog.txt FAQ.html GNUGPL.txt INSTALL.txt \ README.html README_ip_file_format.html \ README_rdns_directory_format.html README_rdns_file_format.html \ UPGRADING.txt UPGRADING_version_3_to_version_4.txt -.endif - -post-install: -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${STAGEDIR}${DOCSDIR} - cd ${WRKDIR}/${DISTNAME}/documentation && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} -.endif - ${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/documentation/spamdyke.conf.example ${STAGEDIR}${PREFIX}/etc post-patch: @${REINPLACE_CMD} -e 's#^CFLAGS :=.*#CFLAGS = ${CFLAGS}#' ${WRKSRC}/Makefile.in do-install: ${INSTALL_PROGRAM} ${WRKSRC}/spamdyke ${STAGEDIR}${PREFIX}/bin + ${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/documentation/spamdyke.conf.example \ + ${STAGEDIR}${PREFIX}/etc/spamdyke.conf.sample + +do-install-DOCS-on: + @${MKDIR} ${STAGEDIR}${DOCSDIR} + cd ${WRKDIR}/${DISTNAME}/documentation && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} .include Modified: head/mail/spamdyke/pkg-plist ============================================================================== --- head/mail/spamdyke/pkg-plist Thu Sep 24 21:19:28 2015 (r397763) +++ head/mail/spamdyke/pkg-plist Thu Sep 24 21:19:31 2015 (r397764) @@ -1,4 +1,2 @@ bin/spamdyke -@unexec if cmp -s %D/etc/spamdyke.conf.example %D/etc/spamdyke.conf; then rm -f %D/etc/spamdyke.conf; fi -etc/spamdyke.conf.example -@exec if [ ! -f %D/etc/spamdyke.conf ] ; then cp -p %D/%F %B/spamdyke.conf; fi +@sample etc/spamdyke.conf.sample