svn commit: r483094 - in head/mail/bmf: . files

[Tobias Kortkamp]

On Sat, Oct 27, 2018, at 03:57, Steve Wills wrote:
> Author: swills
> Date: Sat Oct 27 01:57:25 2018
> New Revision: 483094
> URL: https://svnweb.freebsd.org/changeset/ports/483094
> 
> Log:
>   mail/bmf: Update to 0.84
>   
>   PR:		232493
>   Submitted by:	Nathan <ndowens at yahoo.com>
> 
> Deleted:
>   head/mail/bmf/files/patch-Makefile.in
> Modified:
>   head/mail/bmf/Makefile   (contents, props changed)
>   head/mail/bmf/distinfo   (contents, props changed)
>   head/mail/bmf/files/patch-configure   (contents, props changed)
>   head/mail/bmf/pkg-plist   (contents, props changed)
> 
> Modified: head/mail/bmf/Makefile
> ==============================================================================
> --- head/mail/bmf/Makefile	Sat Oct 27 01:52:47 2018	(r483093)
> +++ head/mail/bmf/Makefile	Sat Oct 27 01:57:25 2018	(r483094)
> @@ -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

Why BUILD_DEPENDS?  The port links with libmysqlclient.  This also
ignores the default mysql version selected by users via DEFAULT_VERSIONS.
I think it was ok before, though the non-deprecated variant of it
is

MYSQL_USES=	mysql

>  MYSQL_CONFIGURE_WITH=	mysql
> +MYSQL_VARS=		MAKE_ARGS=CFLAGS+="-I${WRKSRC} -I${LOCALBASE}/include" \
> +			LDFLAGS+=-L${LOCALBASE}/lib/mysql

MAKE_ARGS and LDFLAGS both have corresponding options helpers.  Why
not use them?

>  
>  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

INSTALL_PROGRAM already strips the binaries.

>  
>  .include <bsd.port.mk>
> 
> Modified: head/mail/bmf/distinfo
> ==============================================================================
> --- head/mail/bmf/distinfo	Sat Oct 27 01:52:47 2018	(r483093)
> +++ head/mail/bmf/distinfo	Sat Oct 27 01:57:25 2018	(r483094)
> @@ -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
> 
> Modified: head/mail/bmf/files/patch-configure
> ==============================================================================
> --- head/mail/bmf/files/patch-configure	Sat Oct 27 01:52:47 2018	(r483093)
> +++ head/mail/bmf/files/patch-configure	Sat Oct 27 01:57:25 2018	(r483094)
> @@ -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=""

I think this was changed by mistake (due to patch, post-patch,
makepatch interaction).  As it stands now post-patch does
nothing anymore.