Date: Wed, 2 Dec 2020 11:59:15 +0000 (UTC) From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r556816 - in head/x11-fm/worker: . files Message-ID: <202012021159.0B2BxFpe013826@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: danfe Date: Wed Dec 2 11:59:14 2020 New Revision: 556816 URL: https://svnweb.freebsd.org/changeset/ports/556816 Log: - Update to version 4.6.0, which now requires OpenSSL (it should not be a hard requirement, but the build fails without it for the time being) - Patch the configure script to not assume that OpenSSL is missing when it's not being found by the pkgconf(1) and print locations for header files and libraries to help with debugging Approved by: maintainer Added: head/x11-fm/worker/files/ head/x11-fm/worker/files/patch-configure (contents, props changed) Modified: head/x11-fm/worker/Makefile head/x11-fm/worker/distinfo Modified: head/x11-fm/worker/Makefile ============================================================================== --- head/x11-fm/worker/Makefile Wed Dec 2 11:49:27 2020 (r556815) +++ head/x11-fm/worker/Makefile Wed Dec 2 11:59:14 2020 (r556816) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= worker -PORTVERSION= 4.5.1 +PORTVERSION= 4.6.0 CATEGORIES= x11-fm MASTER_SITES= http://www.boomerangsworld.de/cms/worker/downloads/ @@ -14,9 +14,11 @@ LICENSE= GPLv2+ RUN_DEPENDS= bash:shells/bash USES= compiler:c++14-lang localbase pkgconfig python:run \ - shebangfix tar:bzip2 xorg + shebangfix ssl tar:bzip2 xorg GNU_CONFIGURE= yes -USE_XORG= x11 xinerama +CONFIGURE_ENV= OPENSSL_CFLAGS="-I${OPENSSLINC}" \ + OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto" +USE_XORG= ice sm x11 xinerama SHEBANG_FILES= ${WRKSRC}/scripts/*.sh \ ${WRKSRC}/scripts/xeditor \ Modified: head/x11-fm/worker/distinfo ============================================================================== --- head/x11-fm/worker/distinfo Wed Dec 2 11:49:27 2020 (r556815) +++ head/x11-fm/worker/distinfo Wed Dec 2 11:59:14 2020 (r556816) @@ -1,3 +1,3 @@ -TIMESTAMP = 1598384043 -SHA256 (worker-4.5.1.tar.bz2) = 3bb7c8091bf516edab28906453695ac7d0f212a50a924bc029903cb9cc051e40 -SIZE (worker-4.5.1.tar.bz2) = 1608624 +TIMESTAMP = 1606600381 +SHA256 (worker-4.6.0.tar.bz2) = bb21d11991476b69451caa2d47970cb915b5860d30f5d9beb60b1ea10c06e360 +SIZE (worker-4.6.0.tar.bz2) = 1613476 Added: head/x11-fm/worker/files/patch-configure ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-fm/worker/files/patch-configure Wed Dec 2 11:59:14 2020 (r556816) @@ -0,0 +1,20 @@ +--- configure.orig 2020-11-28 21:52:13 UTC ++++ configure +@@ -21598,7 +21598,7 @@ if test -n "$PKG_CONFIG" && \ + ($PKG_CONFIG --exists --print-errors "openssl") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; }; then ++ test $ac_status = 0 -o -n "$OPENSSL_CFLAGS" -o -n "$OPENSSL_LIBS"; }; then + + + pkg_failed=no +@@ -25182,6 +25182,8 @@ fi + + if test "$have_openssl_sha256" = "yes"; then + echo " OpenSSL SHA256 : yes" ++ echo " $OPENSSL_CFLAGS" ++ echo " $OPENSSL_LIBS" + else + echo " OpenSSL SHA256 : no" + echo " *** install openssl-dev for checksumming support"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202012021159.0B2BxFpe013826>