From owner-svn-ports-head@FreeBSD.ORG Tue Feb 12 17:38:11 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id E6DAC27C; Tue, 12 Feb 2013 17:38:11 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id C0E823DA; Tue, 12 Feb 2013 17:38:11 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1CHcBoD020225; Tue, 12 Feb 2013 17:38:11 GMT (envelope-from bdrewery@svn.freebsd.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1CHcBln020217; Tue, 12 Feb 2013 17:38:11 GMT (envelope-from bdrewery@svn.freebsd.org) Message-Id: <201302121738.r1CHcBln020217@svn.freebsd.org> From: Bryan Drewery Date: Tue, 12 Feb 2013 17:38:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r312122 - head/mail/mailfront 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.14 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: Tue, 12 Feb 2013 17:38:12 -0000 Author: bdrewery Date: Tue Feb 12 17:38:10 2013 New Revision: 312122 URL: http://svnweb.freebsd.org/changeset/ports/312122 Log: - Update to 1.21 [1] - Add support for LUA [1] - Trim header - Remove unneeded QMAIL_PREFIX (pulled in from bsd.mail.mk already) - Remove ABI version from LIB_DEPENDS - Convert NOPORTDOCS -> DOCS PR: ports/174742 [1] (based on) Submitted by: Uffe Jakobsen [1] Approved by: maintainer timeout Modified: head/mail/mailfront/Makefile head/mail/mailfront/distinfo head/mail/mailfront/pkg-plist (contents, props changed) Modified: head/mail/mailfront/Makefile ============================================================================== --- head/mail/mailfront/Makefile Tue Feb 12 16:32:56 2013 (r312121) +++ head/mail/mailfront/Makefile Tue Feb 12 17:38:10 2013 (r312122) @@ -1,12 +1,8 @@ -# New ports collection makefile for: mailfront -# Date created: 03 Mar 2003 -# Whom: Sergei Kolobov -# +# Created by: Sergei Kolobov # $FreeBSD$ -# PORTNAME= mailfront -PORTVERSION= 1.18 +PORTVERSION= 1.21 CATEGORIES= mail MASTER_SITES= http://untroubled.org/${PORTNAME}/ \ http://untroubled.org/${PORTNAME}/archive/ @@ -14,13 +10,14 @@ MASTER_SITES= http://untroubled.org/${PO MAINTAINER= tarkhil@over.ru COMMENT= Mail server network protocol front-ends -LIB_DEPENDS= cvm-v2client.2:${PORTSDIR}/security/cvm +LIB_DEPENDS= cvm-v2client:${PORTSDIR}/security/cvm + +OPTIONS_DEFINE= LUA WANT_QMAIL= yes -QMAIL_PREFIX?= /var/qmail CFLAGS+= -I${CVM_INC} CFLAGS_SO= ${CFLAGS} -fPIC -shared -L${CVM_LIB} -LDFLAGS+= -g -L${CVM_LIB} -rdynamic +LDFLAGS+= -g -L${CVM_LIB} BGLIBS_INC= ${LOCALBASE}/include/bglibs BGLIBS_LIB= ${LOCALBASE}/lib/bglibs CVM_INC= ${LOCALBASE}/include @@ -31,6 +28,21 @@ DOCS= NEWS README TODO *.html .include +ALL_TARGET= all + +.if ${PORT_OPTIONS:MLUA} +ALL_TARGET+= lua +USE_LUA= yes +CFLAGS+= -I${LUA_INCDIR} +CFLAGS_SO+= -L${LUA_LIBDIR} +LDFLAGS+= -L${LUA_LIBDIR} +PLIST_SUB+= LUA="" +.else +PLIST_SUB+= LUA="@comment " +.endif + +LDFLAGS+= -rdynamic + do-configure: ${ECHO_CMD} "${PREFIX}/bin" > ${WRKSRC}/conf-bin ${ECHO_CMD} "${PREFIX}/include" > ${WRKSRC}/conf-include @@ -42,7 +54,7 @@ do-configure: ${ECHO_CMD} "${BGLIBS_LIB}" > ${WRKSRC}/conf-bglibs ${ECHO_CMD} "${QMAIL_PREFIX}" > ${WRKSRC}/conf-qmail -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} post-install: @${MKDIR} ${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR} Modified: head/mail/mailfront/distinfo ============================================================================== --- head/mail/mailfront/distinfo Tue Feb 12 16:32:56 2013 (r312121) +++ head/mail/mailfront/distinfo Tue Feb 12 17:38:10 2013 (r312122) @@ -1,2 +1,2 @@ -SHA256 (mailfront-1.18.tar.gz) = 18d2815949f6126fa4b6a2496c07121e13b89db0d0847538c7c6746c6f8db896 -SIZE (mailfront-1.18.tar.gz) = 109988 +SHA256 (mailfront-1.21.tar.gz) = 219dcefafc1a458407ac0605168499f2e3e585cd14b89659809e5bcda2c82825 +SIZE (mailfront-1.21.tar.gz) = 113966 Modified: head/mail/mailfront/pkg-plist ============================================================================== --- head/mail/mailfront/pkg-plist Tue Feb 12 16:32:56 2013 (r312121) +++ head/mail/mailfront/pkg-plist Tue Feb 12 17:38:10 2013 (r312122) @@ -18,6 +18,7 @@ libexec/mailfront/plugin-check-fqdn.so libexec/mailfront/plugin-clamav.so libexec/mailfront/plugin-counters.so libexec/mailfront/plugin-cvm-validate.so +%%LUA%%libexec/mailfront/plugin-lua.so libexec/mailfront/plugin-mailrules.so libexec/mailfront/plugin-patterns.so libexec/mailfront/plugin-qmail-validate.so @@ -45,6 +46,7 @@ libexec/mailfront/protocol-smtp.so %%PORTDOCS%%%%DOCSDIR%%/plugin-counters.html %%PORTDOCS%%%%DOCSDIR%%/plugin-cvm-validate.html %%PORTDOCS%%%%DOCSDIR%%/plugin-force-file.html +%%PORTDOCS%%%%DOCSDIR%%/plugin-lua.html %%PORTDOCS%%%%DOCSDIR%%/plugin-mailrules.html %%PORTDOCS%%%%DOCSDIR%%/plugin-patterns.html %%PORTDOCS%%%%DOCSDIR%%/plugin-qmail-validate.html