Date: Thu, 31 May 2018 08:41:44 +0000 (UTC) From: Fukang Chen <loader@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r471197 - in head/mail/mailsync: . files Message-ID: <201805310841.w4V8fiwb048108@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: loader (doc committer) Date: Thu May 31 08:41:44 2018 New Revision: 471197 URL: https://svnweb.freebsd.org/changeset/ports/471197 Log: mail/mailsync: Fix build with Clang 6.0.0 exit function declared in autoconf 2.59 configure scripts conflicts with Clang 6 because stdlib.h declares it with an attribute for C++11 or later. This is fixed in later versions of autoconf 2.60. - Add USES=autoreconf to regenerate configure, new version of autoconf no longer declares the exit function. [1] - Merge the changes from files/patch-configure and post-patch taget into acinclude/ac_with_{cclient,openssl}.m4 [1] http://git.savannah.gnu.org/cgit/autoconf.git/commit/?id=a71c24a704ec0570ba99be909fffbc044d50908b Reviewed by: koobs, mat Approved by: koobs (mentor) Differential Revision: https://reviews.freebsd.org/D15532 MFH: 2018Q2 Added: head/mail/mailsync/files/patch-acinclude_ac__with__cclient.m4 (contents, props changed) head/mail/mailsync/files/patch-acinclude_ac__with__openssl.m4 (contents, props changed) head/mail/mailsync/files/patch-configure.ac (contents, props changed) Deleted: head/mail/mailsync/files/patch-configure Modified: head/mail/mailsync/Makefile Modified: head/mail/mailsync/Makefile ============================================================================== --- head/mail/mailsync/Makefile Thu May 31 08:34:20 2018 (r471196) +++ head/mail/mailsync/Makefile Thu May 31 08:41:44 2018 (r471197) @@ -3,7 +3,7 @@ PORTNAME= mailsync PORTVERSION= 5.2.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= mail MASTER_SITES= SF DISTNAME= ${PORTNAME}_${PORTVERSION}.orig @@ -15,7 +15,7 @@ LICENSE= GPLv2 LIB_DEPENDS= libc-client4.so:mail/cclient -USES= gmake ssl +USES= autoreconf gmake ssl GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-c-client=${LOCALBASE} \ --with-openssl=${OPENSSLBASE} @@ -23,10 +23,6 @@ CONFIGURE_ARGS= --with-c-client=${LOCALBASE} \ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} OPTIONS_DEFINE= DOCS EXAMPLES - -post-patch: - ${REINPLACE_CMD} -e 's|\($withval\),$${OPENSSLLOCATIONS}|\1|g' \ - ${WRKSRC}/configure do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/mailsync ${STAGEDIR}${PREFIX}/bin Added: head/mail/mailsync/files/patch-acinclude_ac__with__cclient.m4 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/mailsync/files/patch-acinclude_ac__with__cclient.m4 Thu May 31 08:41:44 2018 (r471197) @@ -0,0 +1,54 @@ +FreeBSD sh(1) does not support the Brace Expansion. + +--- acinclude/ac_with_cclient.m4.orig 2018-05-22 07:37:52 UTC ++++ acinclude/ac_with_cclient.m4 +@@ -3,7 +3,7 @@ dnl Output: + dnl AC_SUBST: @CCLIENT_INCLUDES@ @CCLIENT_LIBS@ @CCLIENT_CXXFLAGS@ + dnl AM_CONDITIONAL: HAVE_CCLIENT + AC_DEFUN(AC_WITH_CCLIENT,[ +- CCLIENTLOCATIONS="/usr,/usr/local" ++ CCLIENTLOCATIONS="" + HAVE_CCLIENT="no" + CCLIENT_LIBS="" + CCLIENT_INCLUDES="" +@@ -16,7 +16,7 @@ AC_DEFUN(AC_WITH_CCLIENT,[ + if test "$withval" = "no" ; then + CCLIENTLOCATIONS="" + else +- test "$withval" = "yes" || CCLIENTLOCATIONS="$withval,${CCLIENTLOCATIONS}" ++ test "$withval" = "yes" || CCLIENTLOCATIONS="$withval" + fi + ] + ) +@@ -28,7 +28,7 @@ AC_DEFUN(AC_WITH_CCLIENT,[ + dnl Looking for headers c-client headers + dnl + AC_MSG_CHECKING([for c-client.h]) +- for p in `eval "echo {${CCLIENTLOCATIONS}}{,/c-client,/lib/c-client,/include/c-client,/include,/include/imap}"` ; do ++ p=${CCLIENTLOCATIONS}/include/c-client + if test -r "${p}/c-client.h" -a -r "${p}/linkage.h" -a -r "${p}/linkage.c" ; then + CCLIENT_INCLUDES="-I${p}" + CCLIENT_LINKAGE_H="${p}/linkage.h" +@@ -36,7 +36,6 @@ AC_DEFUN(AC_WITH_CCLIENT,[ + AC_MSG_RESULT([found in ${p}]) + break + fi +- done + if test -z "${CCLIENT_INCLUDES}" ; then + AC_MSG_RESULT([not found]) + ifelse([$2], , :, [$2]) +@@ -48,13 +47,12 @@ AC_DEFUN(AC_WITH_CCLIENT,[ + dnl Looking for c-client libraries + dnl + AC_MSG_CHECKING([for c-client library]) +- for l in `eval "echo {${CCLIENTLOCATIONS}}{,/c-client,/lib/c-client,/lib,/lib64}/{libc-client,libc-client4,c-client}{${SOP}}"` ; do ++ l=${CCLIENTLOCATIONS}/lib/libc-client4.so + if test -r "$l" ; then + AC_MSG_RESULT([found ${l}]) + CCLIENT_LIBS="$l" + break + fi +- done + if test -z "${CCLIENT_LIBS}" ; then + AC_MSG_RESULT([not found]) + ifelse([$2], , :, [$2]) Added: head/mail/mailsync/files/patch-acinclude_ac__with__openssl.m4 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/mailsync/files/patch-acinclude_ac__with__openssl.m4 Thu May 31 08:41:44 2018 (r471197) @@ -0,0 +1,52 @@ +FreeBSD sh(1) does not support the Brace Expansion. + +--- acinclude/ac_with_openssl.m4.orig 2018-05-22 07:38:01 UTC ++++ acinclude/ac_with_openssl.m4 +@@ -3,7 +3,7 @@ dnl Output: + dnl AC_SUBST: @OPENSSL_INCLUDES@ @OPENSSL_LDFLAGS@ @OPENSSL_LIBS@ + dnl AM_CONDITIONAL: HAVE_OPENSSL + AC_DEFUN(AC_WITH_OPENSSL,[ +- OPENSSLLOCATIONS="/usr,/usr/local,/usr/local/openssl,/opt/openssl,/usr/local/ssl,/usr/lib/ssl,/usr/ssl" ++ OPENSSLLOCATIONS="" + HAVE_OPENSSL="no" + OPENSSL_LDFLAGS="" + OPENSSL_LIBS="" +@@ -14,7 +14,7 @@ AC_DEFUN(AC_WITH_OPENSSL,[ + if test "$withval" = "no" ; then + OPENSSLLOCATIONS="" + else +- test "$withval" = "yes" || OPENSSLLOCATIONS="$withval,${OPENSSLLOCATIONS}" ++ test "$withval" = "yes" || OPENSSLLOCATIONS="$withval" + fi + ] + ) +@@ -22,13 +22,12 @@ AC_DEFUN(AC_WITH_OPENSSL,[ + ifelse([$2], , :, [$2]) + else + AC_MSG_CHECKING([for libssl]) +- for p in `eval "echo {${OPENSSLLOCATIONS}}{/lib,/lib64}"` ; do ++ p=${OPENSSLLOCATIONS}/lib + if test -r "${p}/libssl.a" -o -r "${p}/libssl.so" ; then + OPENSSL_LDFLAGS="-L${p}" + AC_MSG_RESULT([found in ${p}]) + break + fi +- done + if test -z "${OPENSSL_LDFLAGS}" ; then + AC_MSG_RESULT([not found]) + ifelse([$2], , :, [$2]) +@@ -50,13 +49,12 @@ AC_DEFUN(AC_WITH_OPENSSL,[ + ifelse([$2], , :, [$2]) + else + AC_MSG_CHECKING([for openssl/ssl.h]) +- for p in `eval "echo {${OPENSSLLOCATIONS}}{/include,}"` ; do ++ p=${OPENSSLLOCATIONS}/include + if test -r "${p}/openssl/ssl.h" ; then + OPENSSL_INCLUDES="-I${p}" + AC_MSG_RESULT([found in ${p}]) + break + fi +- done + if test -z "${OPENSSL_INCLUDES}" ; then + AC_MSG_RESULT([not found]) + ifelse([$2], , :, [$2]) Added: head/mail/mailsync/files/patch-configure.ac ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/mailsync/files/patch-configure.ac Thu May 31 08:41:44 2018 (r471197) @@ -0,0 +1,8 @@ +--- configure.ac.orig 2018-05-22 07:39:19 UTC ++++ configure.ac +@@ -1,4 +1,5 @@ + AC_INIT([mailsync], [5.2.1], [tpo_deb@sourcepole.ch]) ++AC_CONFIG_MACRO_DIR([acinclude]) + AM_INIT_AUTOMAKE + AM_CONFIG_HEADER(config.h) + AC_CONFIG_SRCDIR([src/mailsync_main.cc])
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201805310841.w4V8fiwb048108>