From owner-svn-ports-all@FreeBSD.ORG Fri Apr 18 02:53:14 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 9C38F575; Fri, 18 Apr 2014 02:53:14 +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 6F333127E; Fri, 18 Apr 2014 02:53:14 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3I2rE9J099103; Fri, 18 Apr 2014 02:53:14 GMT (envelope-from adamw@svn.freebsd.org) Received: (from adamw@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3I2rEZ7099101; Fri, 18 Apr 2014 02:53:14 GMT (envelope-from adamw@svn.freebsd.org) Message-Id: <201404180253.s3I2rEZ7099101@svn.freebsd.org> From: Adam Weinberger Date: Fri, 18 Apr 2014 02:53:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r351515 - 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.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, 18 Apr 2014 02:53:14 -0000 Author: adamw Date: Fri Apr 18 02:53:13 2014 New Revision: 351515 URL: http://svnweb.freebsd.org/changeset/ports/351515 QAT: https://qat.redports.org/buildarchive/r351515/ Log: Use OPTIONS helpers, pass proper configure arguments, and install docs into DOCSDIR, not DATADIR. PORTREVISION bump for that last change. Modified: head/mail/bmf/Makefile head/mail/bmf/pkg-plist Modified: head/mail/bmf/Makefile ============================================================================== --- head/mail/bmf/Makefile Fri Apr 18 02:37:23 2014 (r351514) +++ head/mail/bmf/Makefile Fri Apr 18 02:53:13 2014 (r351515) @@ -3,39 +3,32 @@ PORTNAME= bmf PORTVERSION= 0.9.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= Fst Bayesian Mail Filter compatible with maildrop and procmail +HAS_CONFIGURE= yes + OPTIONS_DEFINE= BDB MYSQL DEBUG OPTIONS_DEFAULT= BDB -BDB_DESC= Berkeley DB support (may specify w/ WITH_BDB_VER) -MYSQL_DESC= Adds MySQL Support + +BDB_USE= BDB=40+ +BDB_CONFIGURE_WITH= libdb + +DEBUG_CONFIGURE_ON= --debug=yes + +MYSQL_USE= MYSQL=client +MYSQL_CONFIGURE_WITH= mysql .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 ${PORT_OPTIONS:MDEBUG} -CONFIGURE_ARGS+= --debug=yes .endif post-patch: @@ -45,7 +38,7 @@ post-patch: post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/bmf ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/bmfconv - ${MKDIR} ${STAGEDIR}${PREFIX}/share/bmf - ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${PREFIX}/share/bmf + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} .include Modified: head/mail/bmf/pkg-plist ============================================================================== --- head/mail/bmf/pkg-plist Fri Apr 18 02:37:23 2014 (r351514) +++ head/mail/bmf/pkg-plist Fri Apr 18 02:53:13 2014 (r351515) @@ -2,5 +2,5 @@ bin/bmf bin/bmfconv man/man1/bmf.1.gz man/man1/bmfconv.1.gz -%%DATADIR%%/README -@dirrm %%DATADIR%% +%%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%@dirrm %%DOCSDIR%%