From owner-svn-ports-all@freebsd.org  Fri Dec 11 11:09:27 2015
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@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 D4BFF9D7EC3;
 Fri, 11 Dec 2015 11:09:27 +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 A0D9D1BC2;
 Fri, 11 Dec 2015 11:09:27 +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 tBBB9QLG023989;
 Fri, 11 Dec 2015 11:09:26 GMT (envelope-from amdmi3@FreeBSD.org)
Received: (from amdmi3@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBBB9Qpw023988;
 Fri, 11 Dec 2015 11:09:26 GMT (envelope-from amdmi3@FreeBSD.org)
Message-Id: <201512111109.tBBB9Qpw023988@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to
 amdmi3@FreeBSD.org using -f
From: Dmitry Marakasov <amdmi3@FreeBSD.org>
Date: Fri, 11 Dec 2015 11:09:26 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r403518 - head/mail/bmf
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.20
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 11 Dec 2015 11:09:27 -0000

Author: amdmi3
Date: Fri Dec 11 11:09:26 2015
New Revision: 403518
URL: https://svnweb.freebsd.org/changeset/ports/403518

Log:
  - Add LICENSE
  - Switch to options helpers

Modified:
  head/mail/bmf/Makefile

Modified: head/mail/bmf/Makefile
==============================================================================
--- head/mail/bmf/Makefile	Fri Dec 11 10:07:27 2015	(r403517)
+++ head/mail/bmf/Makefile	Fri Dec 11 11:09:26 2015	(r403518)
@@ -10,35 +10,35 @@ MASTER_SITES=	SF
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Fst Bayesian Mail Filter compatible with maildrop and procmail
 
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
 HAS_CONFIGURE=	yes
 
 OPTIONS_DEFINE=	BDB MYSQL DEBUG DOCS
 OPTIONS_DEFAULT=BDB
 
-BDB_USE=	BDB=40+
+BDB_USE=		BDB=40+
 BDB_CONFIGURE_WITH=	libdb
+BDB_CFLAGS=		-I${BDB_INCLUDE_DIR}
+BDB_LDFLAGS=		-L${BDB_LIB_DIR}
+BDB_CONFIGURE_ENV=	DB_LIBNAME=-l${BDB_LIB_NAME}
 
 DEBUG_CONFIGURE_ON=	--debug=yes
 
-MYSQL_USE=	MYSQL=client
+MYSQL_USE=		MYSQL=client
 MYSQL_CONFIGURE_WITH=	mysql
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MBDB}
-CFLAGS+=	-I${BDB_INCLUDE_DIR}
-LDFLAGS+=	-L${BDB_LIB_DIR}
-CONFIGURE_ENV+=	DB_LIBNAME=-l${BDB_LIB_NAME}
-.endif
-
 post-patch:
-	${REINPLACE_CMD} -e 's/@@CC/${CC}/;s/@@CXX/${CXX}/' ${WRKSRC}/configure
-	${REINPLACE_CMD} -e 's/: checkroot/: /g' ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e 's|@@CC|${CC}|;s|@@CXX|${CXX}|' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's/: checkroot/: /g' ${WRKSRC}/Makefile.in
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/bmf
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/bmfconv
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
+
+post-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>