From nobody Sun May 15 14:30:36 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 58FA81AE0341; Sun, 15 May 2022 14:30:36 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4L1Pth223Rz4nfC; Sun, 15 May 2022 14:30:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652625036; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=b1ZLwtg/EVwLqO1ZBd4bhKG0zhRfYUfdmJW8JQFCQ3w=; b=jmA3sOFqle/WR1Oc1bvNxxxuOAyoRJ1boWVZZMJmnJTJ/VTfydxEe3stURXiqelrAlqPv9 eOiGzbrDXzRFF/WhNp/wI6h7PCmWrDE3tCWFDmRLOWZa1sS0eb3kH3R9MXirnzHIHRmHlD Mdyg5STO7roDloxrs0iXsvTeTTtTS8GO+Da92b3eNhXUOvzqHIk0JgaVm9aLT5I8CwdLOI 4cmyUr7Qy5lL+PfWLR7tPlYC/Q1+5buk2ZtQx3gitfvUC7vqfqT6wIhepAYJ5yFd0gYdvL S8HOnLKorP5wnmXxDcfQgn4bt7L49wZPbWUzIxXf2pCzcckZA/PTJ10Bwd4i1A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 276225789; Sun, 15 May 2022 14:30:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 24FEUaHf079664; Sun, 15 May 2022 14:30:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24FEUa5E079663; Sun, 15 May 2022 14:30:36 GMT (envelope-from git) Date: Sun, 15 May 2022 14:30:36 GMT Message-Id: <202205151430.24FEUa5E079663@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: 209915b076fd - main - multimedia/motion: unbreak the port's build against MYSQL option List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 209915b076fd1f1989dde37f4a2173ca80eb7c9f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652625036; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=b1ZLwtg/EVwLqO1ZBd4bhKG0zhRfYUfdmJW8JQFCQ3w=; b=b0vNnUSRsB3cgMpV6iRnuKZfOfRIeOXd5lF09QWgViexXOmXwnAKadi3u8uaIfPOtE6W+l TaKxAf41whMp9PRqNfR9UuZyAQ7LemoGCQRXZ3sPzUA9M+nfVdV3GyVaWfECu3zdpBC5H2 EreYauEW/EGEBMJAzt+Tn2L3w6HvNaU8M4S3Y4QYJcIC7921j5q2LZhafNZJ131+LdrzNk 5J8EE1wbgQepq9mnYgB1MCqv/bNM5QVw6oAemTeKgaTEw1/KdLSI8vGrMWLE0Qi2VJcDsB MwVr/AiqoBEF7mvb4g6PoP8is9s37TucjQQ8cD1FwACIWHYibZ6/9379790rLA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652625036; a=rsa-sha256; cv=none; b=l9g+Q1Kn+5kXJt1y35on2pZBJ1LSq+Y0zuE63+p7sbz68QiONS45y7pMWPiFMmQWYeFI/J 70HcVGRebAXGv31wk2vBx3swN1FEOKiGfIVDr6QFIvA1F6MPZjOTbvV9TOvi80lHzm5i61 mzIWBA+r+u5aCJEOlChJ1kQBk1wS/d2gBLnOKKvke1vIRTo11DOICYqrBpk0KjUP3yCp6+ 3gtPw9Fs3aBZl0Xb8IfeK8e7zcdjCVDatRX+9ytxa9VyORFzx0OrZ/iEjDKkYMtqXsxKpE KVqFzLEQ5aCI7dX30VOd4j3e2H1ijrojo7dnYWGmh1o0e1zl8Ta/5nWsTmftfQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=209915b076fd1f1989dde37f4a2173ca80eb7c9f commit 209915b076fd1f1989dde37f4a2173ca80eb7c9f Author: Alexey Dokuchaev AuthorDate: 2022-05-15 14:29:10 +0000 Commit: Alexey Dokuchaev CommitDate: 2022-05-15 14:29:10 +0000 multimedia/motion: unbreak the port's build against MYSQL option This is not a 100% correct fix, more of a mitigation: ``pkg-config --cflags mysqlclient'' fails with default OpenSSL, and thus MySQL header files could be be found: Package openssl was not found in the pkg-config search path. Perhaps you should add the directory containing `openssl.pc' to the PKG_CONFIG_PATH environment variable Package 'openssl', required by 'mysqlclient', not found The configure script makes several other bogus (at least in FreeBSD context) assumptions, but those could be fixed in a separate commit. Drop no longer supported options from the CONFIGURE_ARGS while here. --- multimedia/motion/Makefile | 9 +-------- multimedia/motion/files/patch-configure.ac | 28 ++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 8 deletions(-) diff --git a/multimedia/motion/Makefile b/multimedia/motion/Makefile index 75aeff3b296f..d3e8702f7d96 100644 --- a/multimedia/motion/Makefile +++ b/multimedia/motion/Makefile @@ -28,8 +28,6 @@ GH_ACCOUNT= Motion-Project USE_RC_SUBR= ${PORTNAME} GNU_CONFIGURE= yes -CONFIGURE_ARGS= --without-linuxthreads \ - --without-jpeg-mmx # Standard bsd.port.mk variables SUB_FILES= pkg-message @@ -63,8 +61,7 @@ FFMPEG_CONFIGURE_ON= --with-ffmpeg=${LOCALBASE} FFMPEG_CONFIGURE_OFF= --without-ffmpeg MYSQL_USES= mysql -MYSQL_CONFIGURE_ON= --with-mysql-lib=${LOCALBASE}/lib/mysql \ - --with-mysql-include=${LOCALBASE}/include/mysql +MYSQL_CONFIGURE_ON= --with-mysql=${LOCALBASE}/include/mysql MYSQL_CONFIGURE_OFF= --without-mysql PGSQL_USES= pgsql @@ -85,10 +82,6 @@ WEBCAMD_CONFIGURE_WITH= pwcbsd .include -.if ${JPEG_PORT} == "graphics/jpeg-turbo" -CONFIGURE_ARGS+= --with-jpeg-turbo=${LOCALBASE} -.endif - post-patch: @${REINPLACE_CMD} -e \ 's|/usr/local|${LOCALBASE}|g' ${WRKSRC}/configure.ac diff --git a/multimedia/motion/files/patch-configure.ac b/multimedia/motion/files/patch-configure.ac new file mode 100644 index 000000000000..90ec4379d3b6 --- /dev/null +++ b/multimedia/motion/files/patch-configure.ac @@ -0,0 +1,28 @@ +--- configure.ac.orig 2020-10-25 20:53:44 UTC ++++ configure.ac +@@ -327,15 +327,11 @@ AS_IF([test "${MYSQL}" = "no"], [ + AC_MSG_CHECKING(for MySQL) + AC_MSG_RESULT(skipped) + ],[ +- TEMP_PATH=$PKG_CONFIG_PATH +- AC_MSG_CHECKING(MySQL pkg-config path) + AS_IF([test "${MYSQL}" != "yes"], [ +- PKG_CONFIG_PATH=${MYSQL}/lib/pkgconfig:$PKG_CONFIG_PATH ++ TEMP_CFLAGS="$TEMP_CFLAGS -I${MYSQL}" + MYSQL="yes" + ] + ) +- export PKG_CONFIG_PATH +- AC_MSG_RESULT($PKG_CONFIG_PATH) + + AC_MSG_CHECKING(for MySQL) + AS_IF([pkg-config mysqlclient], [ +@@ -347,8 +343,6 @@ AS_IF([test "${MYSQL}" = "no"], [ + ] + ) + AC_MSG_RESULT([$MYSQL]) +- PKG_CONFIG_PATH=$TEMP_PATH +- export PKG_CONFIG_PATH + ] + ) +