From owner-svn-ports-all@FreeBSD.ORG Fri Apr 11 08:54:49 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 D181FC61; Fri, 11 Apr 2014 08:54:49 +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 BE4391A37; Fri, 11 Apr 2014 08:54:49 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3B8snKf035262; Fri, 11 Apr 2014 08:54:49 GMT (envelope-from ohauer@svn.freebsd.org) Received: (from ohauer@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3B8sne6035260; Fri, 11 Apr 2014 08:54:49 GMT (envelope-from ohauer@svn.freebsd.org) Message-Id: <201404110854.s3B8sne6035260@svn.freebsd.org> From: Olli Hauer Date: Fri, 11 Apr 2014 08:54:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r350907 - head/mail/spamd 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.17 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: Fri, 11 Apr 2014 08:54:49 -0000 Author: ohauer Date: Fri Apr 11 08:54:49 2014 New Revision: 350907 URL: http://svnweb.freebsd.org/changeset/ports/350907 QAT: https://qat.redports.org/buildarchive/r350907/ Log: - add stage support - change MASTER_SITE from berlios to SF Modified: head/mail/spamd/Makefile head/mail/spamd/pkg-descr Modified: head/mail/spamd/Makefile ============================================================================== --- head/mail/spamd/Makefile Fri Apr 11 08:52:12 2014 (r350906) +++ head/mail/spamd/Makefile Fri Apr 11 08:54:49 2014 (r350907) @@ -6,27 +6,30 @@ PORTVERSION= 4.9.1 PORTREVISION= 1 CATEGORIES= mail MASTER_SITES= SF -MASTER_SITE_SUBDIR=freebsdspamd.berlios +MASTER_SITE_SUBDIR=freebsdspamd/spamd MAINTAINER= ohauer@FreeBSD.org COMMENT= Traps spammers with a very slow smtp-login and return 4xx error -LICENSE= BSD +LICENSE= BSD2CLAUSE USE_RC_SUBR?= obspamd obspamlogd USERS= _spamd GROUPS= _spamd -MAN5= spamd.conf.5 -MAN8= spamd.8 spamd-setup.8 spamdb.8 spamlogd.8 PORTDOCS= ipfw-spamd.txt spamdb.txt PLIST_DIRSTRY= %%ETCDIR%% PLIST_FILES= %%ETCDIR%%/spamd.conf.sample \ libexec/spamlogd \ sbin/spamd-setup \ - sbin/spamdb + sbin/spamdb \ + man/man5/spamd.conf.5.gz \ + man/man8/spamd-setup.8.gz \ + man/man8/spamd.8.gz \ + man/man8/spamdb.8.gz \ + man/man8/spamlogd.8.gz PLIST_SUB= SPAMDUSER=${USERS} \ SPAMDGROUP=${GROUPS} @@ -38,10 +41,8 @@ PLIST_SUB= SPAMDUSER=${USERS} \ # be adjusted. Man page and pid file will not be renamed! .if !defined(CPANEL) PLIST_FILES+= libexec/spamd -PLIST_SUB+= SPAMDBIN=spamd .else PLIST_FILES+= libexec/obspamd -PLIST_SUB+= SPAMDBIN=obspamd .endif SUB_FILES= pkg-install \ @@ -50,40 +51,28 @@ SUB_FILES= pkg-install \ SUB_LIST= PREFIX=${PREFIX} \ ${PLIST_SUB} -NO_STAGE= yes - OPTIONS_DEFINE= DOCS .include -pre-install: - @${SH} ${PKGINSTALL} ${DISTNAME} PRE-INSTALL - do-install: .if !defined(CPANEL) - @${INSTALL_PROGRAM} ${WRKSRC}/spamd/spamd ${PREFIX}/libexec + ${INSTALL_PROGRAM} ${WRKSRC}/spamd/spamd ${STAGEDIR}${PREFIX}/libexec .else - @${INSTALL_PROGRAM} ${WRKSRC}/spamd/spamd ${PREFIX}/libexec/obspamd -.endif - @${INSTALL_PROGRAM} ${WRKSRC}/spamlogd/spamlogd ${PREFIX}/libexec - @${INSTALL_PROGRAM} ${WRKSRC}/spamd-setup/spamd-setup ${PREFIX}/sbin - @${INSTALL_PROGRAM} ${WRKSRC}/spamdb/spamdb ${PREFIX}/sbin - @${INSTALL_MAN} ${WRKSRC}/etc/spamd.conf.5 ${PREFIX}/man/man5 - @${INSTALL_MAN} ${WRKSRC}/spamd/spamd.8 ${PREFIX}/man/man8 - @${INSTALL_MAN} ${WRKSRC}/spamd-setup/spamd-setup.8 ${PREFIX}/man/man8 - @${INSTALL_MAN} ${WRKSRC}/spamdb/spamdb.8 ${PREFIX}/man/man8 - @${INSTALL_MAN} ${WRKSRC}/spamlogd/spamlogd.8 ${PREFIX}/man/man8 - @${INSTALL} -d ${ETCDIR} - @${INSTALL_DATA} -m 644 ${WRKSRC}/etc/spamd.conf ${ETCDIR}/spamd.conf.sample - -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} - @${INSTALL_DATA} ${WRKSRC}/doc/ipfw-spamd.txt ${DOCSDIR}/ - @${INSTALL_DATA} ${WRKSRC}/doc/spamdb.txt ${DOCSDIR}/ + ${INSTALL_PROGRAM} ${WRKSRC}/spamd/spamd ${STAGEDIR}${PREFIX}/libexec/obspamd .endif + ${INSTALL_PROGRAM} ${WRKSRC}/spamlogd/spamlogd ${STAGEDIR}${PREFIX}/libexec + ${INSTALL_PROGRAM} ${WRKSRC}/spamd-setup/spamd-setup ${STAGEDIR}${PREFIX}/sbin + ${INSTALL_PROGRAM} ${WRKSRC}/spamdb/spamdb ${STAGEDIR}${PREFIX}/sbin + ${INSTALL_MAN} ${WRKSRC}/etc/spamd.conf.5 ${STAGEDIR}${PREFIX}/man/man5 + ${INSTALL_MAN} ${WRKSRC}/spamd/spamd.8 ${STAGEDIR}${PREFIX}/man/man8 + ${INSTALL_MAN} ${WRKSRC}/spamd-setup/spamd-setup.8 ${STAGEDIR}${PREFIX}/man/man8 + ${INSTALL_MAN} ${WRKSRC}/spamdb/spamdb.8 ${STAGEDIR}${PREFIX}/man/man8 + ${INSTALL_MAN} ${WRKSRC}/spamlogd/spamlogd.8 ${STAGEDIR}${PREFIX}/man/man8 + ${INSTALL} -d ${STAGEDIR}${ETCDIR} + ${INSTALL_DATA} -m 644 ${WRKSRC}/etc/spamd.conf ${STAGEDIR}${ETCDIR}/spamd.conf.sample -post-install: - @${SH} ${PKGINSTALL} ${DISTNAME} POST-INSTALL - @${CAT} ${PKGMESSAGE} + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/doc/|} ${STAGEDIR}${DOCSDIR}/ .include Modified: head/mail/spamd/pkg-descr ============================================================================== --- head/mail/spamd/pkg-descr Fri Apr 11 08:52:12 2014 (r350906) +++ head/mail/spamd/pkg-descr Fri Apr 11 08:54:49 2014 (r350907) @@ -16,4 +16,4 @@ spamd considers sending hosts to be of t they are likely spammers. They are given a temporary failure message by spamd when they try to deliver mail. -WWW: http://freebsdspamd.berlios.de/ +WWW: http://freebsdspamd.sourceforge.net/