From owner-svn-ports-head@freebsd.org Sat Jan 21 09:01:19 2017 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 6E4E7CB913B; Sat, 21 Jan 2017 09:01:19 +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 E02851A9C; Sat, 21 Jan 2017 09:01:18 +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 v0L91H8R032069; Sat, 21 Jan 2017 09:01:17 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0L91HY7032067; Sat, 21 Jan 2017 09:01:17 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201701210901.v0L91HY7032067@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Sat, 21 Jan 2017 09:01:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r432016 - 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.23 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: Sat, 21 Jan 2017 09:01:19 -0000 Author: amdmi3 Date: Sat Jan 21 09:01:16 2017 New Revision: 432016 URL: https://svnweb.freebsd.org/changeset/ports/432016 Log: - Add LICENSE - Switch to options helpers - Simplify docs handling Modified: head/mail/mailfront/Makefile head/mail/mailfront/pkg-plist Modified: head/mail/mailfront/Makefile ============================================================================== --- head/mail/mailfront/Makefile Sat Jan 21 05:11:50 2017 (r432015) +++ head/mail/mailfront/Makefile Sat Jan 21 09:01:16 2017 (r432016) @@ -11,12 +11,10 @@ MASTER_SITES= http://untroubled.org/${PO MAINTAINER= ports@FreeBSD.org COMMENT= Mail server network protocol front-ends -LIB_DEPENDS= libcvm-v2client.so:security/cvm - -OPTIONS_DEFINE= LUA DOCS +LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING -OPTIONS_DEFAULT=LUA -OPTIONS_SUB= yes +LIB_DEPENDS= libcvm-v2client.so:security/cvm USES= qmail:vars @@ -32,19 +30,17 @@ MODULES_DIR= ${PREFIX}/libexec/${PORTNAM ALL_TARGET= all LATE_INSTALL_ARGS= install_prefix=${STAGEDIR} -DOCS= NEWS README TODO *.html +PORTDOCS= NEWS README TODO *.html -.include +LDFLAGS+= -rdynamic -.if ${PORT_OPTIONS:MLUA} -ALL_TARGET+= lua -USES+= lua:51 -CFLAGS+= -I${LUA_INCDIR} -CFLAGS_SO+= -L${LUA_LIBDIR} -LDFLAGS+= -L${LUA_LIBDIR} -.endif +OPTIONS_DEFINE= LUA DOCS +OPTIONS_DEFAULT=LUA +OPTIONS_SUB= yes -LDFLAGS+= -rdynamic +LUA_ALL_TARGET= lua +LUA_USES= lua:51 +LUA_VARS= CFLAGS+=-I${LUA_INCDIR} LUA_CFLAGS_SO+=-L${LUA_LIBDIR} LUA_LDFLAGS+=-L${LUA_LIBDIR} do-configure: ${ECHO_CMD} "${PREFIX}/bin" > ${WRKSRC}/conf-bin @@ -60,10 +56,8 @@ do-configure: post-patch: @${REINPLACE_CMD} 's,-llua,-llua-${LUA_VER},' ${WRKSRC}/Makefile -.if ${PORT_OPTIONS:MDOCS} -post-install: +post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} - cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR} -.endif + cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} .include Modified: head/mail/mailfront/pkg-plist ============================================================================== --- head/mail/mailfront/pkg-plist Sat Jan 21 05:11:50 2017 (r432015) +++ head/mail/mailfront/pkg-plist Sat Jan 21 09:01:16 2017 (r432016) @@ -28,39 +28,3 @@ libexec/mailfront/plugin-starttls-ucspi. libexec/mailfront/protocol-qmqp.so libexec/mailfront/protocol-qmtp.so libexec/mailfront/protocol-smtp.so -%%PORTDOCS%%%%DOCSDIR%%/NEWS -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/TODO -%%PORTDOCS%%%%DOCSDIR%%/backend-echo.html -%%PORTDOCS%%%%DOCSDIR%%/backend-qmail.html -%%PORTDOCS%%%%DOCSDIR%%/imapfront.html -%%PORTDOCS%%%%DOCSDIR%%/mailfront.html -%%PORTDOCS%%%%DOCSDIR%%/mailrules.html -%%PORTDOCS%%%%DOCSDIR%%/mailrulesx.html -%%PORTDOCS%%%%DOCSDIR%%/msa.html -%%PORTDOCS%%%%DOCSDIR%%/plugin-accept-recipient.html -%%PORTDOCS%%%%DOCSDIR%%/plugin-accept-sender.html -%%PORTDOCS%%%%DOCSDIR%%/plugin-accept.html -%%PORTDOCS%%%%DOCSDIR%%/plugin-add-received.html -%%PORTDOCS%%%%DOCSDIR%%/plugin-api.html -%%PORTDOCS%%%%DOCSDIR%%/plugin-check-fqdn.html -%%PORTDOCS%%%%DOCSDIR%%/plugin-clamav.html -%%PORTDOCS%%%%DOCSDIR%%/plugin-counters.html -%%PORTDOCS%%%%DOCSDIR%%/plugin-cvm-authenticate.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 -%%PORTDOCS%%%%DOCSDIR%%/plugin-reject.html -%%PORTDOCS%%%%DOCSDIR%%/plugin-relayclient.html -%%PORTDOCS%%%%DOCSDIR%%/plugin-require-auth.html -%%PORTDOCS%%%%DOCSDIR%%/plugin-spamassassin.html -%%PORTDOCS%%%%DOCSDIR%%/plugin-starttls-ucspi.html -%%PORTDOCS%%%%DOCSDIR%%/plugin-template.html -%%PORTDOCS%%%%DOCSDIR%%/pop3front.html -%%PORTDOCS%%%%DOCSDIR%%/protocol-qmqp.html -%%PORTDOCS%%%%DOCSDIR%%/protocol-qmtp.html -%%PORTDOCS%%%%DOCSDIR%%/protocol-smtp.html -%%PORTDOCS%%%%DOCSDIR%%/std-handle.html