mail/bmf: Update to 0.84

PR:		232493
Submitted by:	Nathan <ndowens@yahoo.com>

5 files changed, 21 insertions, 36 deletions

diff --git a/mail/bmf/Makefile b/mail/bmf/Makefile
index ef0471594da3..0b5d65c0a6c4 100644
--- a/mail/bmf/Makefile
+++ b/mail/bmf/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	bmf
-PORTVERSION=	0.9.4
-PORTREVISION=	3
+PORTVERSION=	0.84
 CATEGORIES=	mail
 MASTER_SITES=	SF
 
@@ -14,8 +13,9 @@ LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 HAS_CONFIGURE=	yes
+ALL_TARGET=	apps
 
-OPTIONS_DEFINE=	BDB MYSQL DEBUG DOCS
+OPTIONS_DEFINE=	BDB DEBUG DOCS MYSQL
 OPTIONS_DEFAULT=BDB
 
 BDB_USES=		bdb
@@ -26,19 +26,22 @@ BDB_CONFIGURE_ENV=	DB_LIBNAME=-l${BDB_LIB_NAME}
 
 DEBUG_CONFIGURE_ON=	--debug=yes
 
-MYSQL_USE=		MYSQL=client
+MYSQL_BUILD_DEPENDS=	mysql80-client>0:databases/mysql80-client
 MYSQL_CONFIGURE_WITH=	mysql
+MYSQL_VARS=		MAKE_ARGS=CFLAGS+="-I${WRKSRC} -I${LOCALBASE}/include" \
+			LDFLAGS+=-L${LOCALBASE}/lib/mysql
 
 post-patch:
 	@${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
+do-install:
+	(cd ${WRKSRC} ; ${INSTALL_PROGRAM} bmf bmfconv ${STAGEDIR}${PREFIX}/bin)
 
-post-install-DOCS-on:
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 
+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/bmf ${STAGEDIR}${PREFIX}/bin/bmfconv
+
 .include <bsd.port.mk>
diff --git a/mail/bmf/distinfo b/mail/bmf/distinfo
index 5eea1ca64a41..0fa67ec1fa60 100644
--- a/mail/bmf/distinfo
+++ b/mail/bmf/distinfo
@@ -1,2 +1,3 @@
-SHA256 (bmf-0.9.4.tar.gz) = 7eed21802f95df2321ac4c958f99e14d2809852a5708700b633e1abb032c9ce1
-SIZE (bmf-0.9.4.tar.gz) = 36740
+TIMESTAMP = 1540059041
+SHA256 (bmf-0.84.tar.gz) = 28df6d808c4c6fef0e646cc736283fccecd02c4e6fa09f5fd095bb9d63004038
+SIZE (bmf-0.84.tar.gz) = 40101
diff --git a/mail/bmf/files/patch-Makefile.in b/mail/bmf/files/patch-Makefile.in
deleted file mode 100644
index cbc40b2466f2..000000000000
--- a/mail/bmf/files/patch-Makefile.in
+++ /dev/null
@@ -1,17 +0,0 @@
---- ./Makefile.in.orig	2002-10-20 22:27:56.000000000 +0200
-+++ ./Makefile.in	2014-01-03 01:50:13.000000000 +0100
-@@ -1,11 +1,11 @@
- # Makefile for bmf
- 
--BINDIR=/usr/bin
--MANDIR=/usr/share/man
-+BINDIR=${PREFIX}/bin
-+MANDIR=${PREFIX}/man
- 
- VERSION=0.9.4
- 
--CC=@CC@
-+CC?=@CC@
- CFLAGS=@CFLAGS@
- LDFLAGS=@LDFLAGS@
- SYSLIBS=@SYSLIBS@
diff --git a/mail/bmf/files/patch-configure b/mail/bmf/files/patch-configure
index 8cef82f1c790..2c24667c67d7 100644
--- a/mail/bmf/files/patch-configure
+++ b/mail/bmf/files/patch-configure
@@ -1,20 +1,20 @@
---- ./configure.orig	2002-10-19 11:44:49.000000000 +0200
-+++ ./configure	2014-01-03 01:50:13.000000000 +0100
-@@ -127,16 +127,16 @@
+--- configure.orig	2002-10-09 16:29:26 UTC
++++ configure
+@@ -128,16 +128,16 @@ case "$UNAME_S" in
        CCDBG="-DNDEBUG"
        LDDBG=""
      fi
 -    CC=gcc
-+    CC=@@CC
++    CC=cc
      CFLAGS="$CCDBG -D_UNIX -D_BSD=$OSVER -Wall"
 -    CXX=g++
-+    CXX=@@CXX
++    CXX=c++
      CXXFLAGS=${CFLAGS}
      AR=ar
      ARFLAGS="-rc"
 -    LD=gcc
 -    LDFLAGS="$LDDBG"
-+    LD=@@CC
++    LD=cc
 +    LDFLAGS="${LDFLAGS}"
      SYSLIBS=""
 -    LIBDB_LIB=""
diff --git a/mail/bmf/pkg-plist b/mail/bmf/pkg-plist
index b20a589b46a7..f133ba6350c9 100644
--- a/mail/bmf/pkg-plist
+++ b/mail/bmf/pkg-plist
@@ -1,5 +1,3 @@
 bin/bmf
 bin/bmfconv
-man/man1/bmf.1.gz
-man/man1/bmfconv.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/README