From owner-svn-ports-head@FreeBSD.ORG Sun Aug 26 15:06:48 2012 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DB6D5106566C; Sun, 26 Aug 2012 15:06:48 +0000 (UTC) (envelope-from adamw@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id AD1888FC0C; Sun, 26 Aug 2012 15:06:48 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q7QF6mHD040311; Sun, 26 Aug 2012 15:06:48 GMT (envelope-from adamw@svn.freebsd.org) Received: (from adamw@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7QF6mqd040309; Sun, 26 Aug 2012 15:06:48 GMT (envelope-from adamw@svn.freebsd.org) Message-Id: <201208261506.q7QF6mqd040309@svn.freebsd.org> From: Adam Weinberger Date: Sun, 26 Aug 2012 15:06:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r303188 - head/mail/bmf X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.5 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: Sun, 26 Aug 2012 15:06:49 -0000 Author: adamw Date: Sun Aug 26 15:06:48 2012 New Revision: 303188 URL: http://svn.freebsd.org/changeset/ports/303188 Log: Convert to new OPTIONS framework. In the process, this also fixes BDB support, and actually enables MYSQL support, which as far as I can tell was never actually enabled in the 9 years this port has been in the tree. Modified: head/mail/bmf/Makefile Modified: head/mail/bmf/Makefile ============================================================================== --- head/mail/bmf/Makefile Sun Aug 26 12:03:29 2012 (r303187) +++ head/mail/bmf/Makefile Sun Aug 26 15:06:48 2012 (r303188) @@ -14,41 +14,36 @@ MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= A fast Bayesian Mail Filter compatible with maildrop and procmail -.if defined(WITH_BDB41) -LIB_DEPENDS= db41.1:${PORTSDIR}/databases/db41 -LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_ENV+= DB_LIBNAME=-ldb41 -.elif defined(WITH_BDB4) -LIB_DEPENDS= db4.0:${PORTSDIR}/databases/db4 -LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_ENV+= DB_LIBNAME=-ldb4 -.elif defined(WITH_BDB3) -LIB_DEPENDS= db3.3:${PORTSDIR}/databases/db3 -LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_ENV+= DB_LIBNAME=-ldb3 +OPTIONS_DEFINE= BDB MYSQL DEBUG +OPTIONS_DEFAULT= BDB +BDB_DESC= Berkeley DB support (may specify w/ WITH_BDB_VER) +MYSQL_DESC= Adds MySQL Support + +.include + +.if ${PORT_OPTIONS:MBDB} +USE_BDB= 40+ +CFLAGS+= -I${BDB_INCLUDE_DIR} +LDFLAGS+= -L${BDB_LIB_DIR} +CONFIGURE_ARGS+=--with-libdb=yes +CONFIGURE_ENV+= DB_LIBNAME=-l${BDB_LIB_NAME} +.else +CONFIGURE_ARGS+=--with-libdb=no +.endif +.if ${PORT_OPTIONS:MMYSQL} +USE_MYSQL= client +CONFIGURE_ARGS+=--with-mysql .endif HAS_CONFIGURE= yes CONFIGURE_ARGS+= --without-package -.if defined(WITH_DEBUG) +.if ${PORT_OPTIONS:MDEBUG} CONFIGURE_ARGS+= --debug=yes .endif MAN1= bmf.1 bmfconv.1 -pre-everything:: - @${ECHO} "" - @${ECHO} "${PORTNAME} has several tunables available:" - @${ECHO} "" - @${ECHO} " WITH_BDB4 Builds with BDB4 support" - @${ECHO} " WITH_BDB41 Builds with BDB4.1 support" - @${ECHO} " WITH_DEBUG Builds with debugging arguments" - @${ECHO} " WITH_MYSQL Builds with MySQL support" - @${ECHO} "" - @${ECHO} " Note: the default database is BDB3" - @${ECHO} "" - post-install: @ ${MKDIR} ${PREFIX}/share/bmf @ ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/bmf