From owner-svn-ports-all@freebsd.org Sat Oct 27 10:11:17 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0494010E39DD; Sat, 27 Oct 2018 10:11:17 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from out3-smtp.messagingengine.com (out3-smtp.messagingengine.com [66.111.4.27]) (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 AAE52897A4; Sat, 27 Oct 2018 10:11:16 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id F342B21FB6; Sat, 27 Oct 2018 06:11:15 -0400 (EDT) Received: from web3 ([10.202.2.213]) by compute4.internal (MEProxy); Sat, 27 Oct 2018 06:11:15 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:content-type :date:from:in-reply-to:message-id:mime-version:references :subject:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm1; bh=0uVrlGpfVpY49ZjxZ3VwH1IfiCF/2TOUDfVZLa8ai ro=; b=hbBpn6Pbk0w69sxKNjDtCmdV7fFKrLCTR7J3j9oIf7MClpQ9alCWLBB6o TbytUw6XmP8BMM8mcbVSIOgsHAZKXzIBzeK/HAAtm5uf5LEPRQywGGetgiVXq2DX niWTEhQ3aTnrCh/a5milsXkco1LNlamXqynI355ynkim/U2go82pBoclgxP2d+qi uj48wpHy1k3K4Sk4CaNU46YON4MtkoTxy2Jb0oWoqeS6GIiRupiDgzLM1F9Aevm2 RAtHQ/hbHYmhJ6NhfDL83dAwHpClDJBXWbMSoTGBv2MXgD3dVijvYFc3P1YrndTR 7nmpbkX+tAoCtK0iCDSJoo05q0J5A== X-ME-Sender: X-ME-Proxy: Received: by mailuser.nyi.internal (Postfix, from userid 99) id 35F149E531; Sat, 27 Oct 2018 06:11:15 -0400 (EDT) Message-Id: <1540635075.2516994.1556486128.3E6DB42C@webmail.messagingengine.com> From: Tobias Kortkamp To: Steve Wills , ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" X-Mailer: MessagingEngine.com Webmail Interface - ajax-63008d4f Date: Sat, 27 Oct 2018 12:11:15 +0200 In-Reply-To: <201810270157.w9R1vPkV045790@repo.freebsd.org> References: <201810270157.w9R1vPkV045790@repo.freebsd.org> Subject: Re: svn commit: r483094 - in head/mail/bmf: . files X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 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: Sat, 27 Oct 2018 10:11:17 -0000 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 > > 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 > > 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.