From owner-svn-ports-all@freebsd.org Wed Dec 2 11:59:15 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id D8DE8478BB3; Wed, 2 Dec 2020 11:59:15 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CmHZC5rXvz4j45; Wed, 2 Dec 2020 11:59:15 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id ACCB926F33; Wed, 2 Dec 2020 11:59:15 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0B2BxFPa013829; Wed, 2 Dec 2020 11:59:15 GMT (envelope-from danfe@FreeBSD.org) Received: (from danfe@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0B2BxFpe013826; Wed, 2 Dec 2020 11:59:15 GMT (envelope-from danfe@FreeBSD.org) Message-Id: <202012021159.0B2BxFpe013826@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: danfe set sender to danfe@FreeBSD.org using -f From: Alexey Dokuchaev Date: Wed, 2 Dec 2020 11:59:15 +0000 (UTC) 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 X-SVN-Group: ports-head X-SVN-Commit-Author: danfe X-SVN-Commit-Paths: in head/x11-fm/worker: . files X-SVN-Commit-Revision: 556816 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.34 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: Wed, 02 Dec 2020 11:59:15 -0000 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"