svn commit: r351515 - head/mail/bmf

[Adam Weinberger]

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 at 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 <bsd.port.options.mk>
 
 .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 <bsd.port.mk>

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
- at dirrm %%DATADIR%%
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%@dirrm %%DOCSDIR%%