From owner-svn-ports-all@freebsd.org Fri Jul 3 14:54:10 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 907D03507F7; Fri, 3 Jul 2020 14:54:10 +0000 (UTC) (envelope-from lwhsu@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 49yyfB3G2wz4Mfw; Fri, 3 Jul 2020 14:54:10 +0000 (UTC) (envelope-from lwhsu@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 53E9DD70F; Fri, 3 Jul 2020 14:54:10 +0000 (UTC) (envelope-from lwhsu@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 063EsANV048911; Fri, 3 Jul 2020 14:54:10 GMT (envelope-from lwhsu@FreeBSD.org) Received: (from lwhsu@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 063EsAad048910; Fri, 3 Jul 2020 14:54:10 GMT (envelope-from lwhsu@FreeBSD.org) Message-Id: <202007031454.063EsAad048910@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: lwhsu set sender to lwhsu@FreeBSD.org using -f From: Li-Wen Hsu Date: Fri, 3 Jul 2020 14:54:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r541115 - head/security/clamav X-SVN-Group: ports-head X-SVN-Commit-Author: lwhsu X-SVN-Commit-Paths: head/security/clamav X-SVN-Commit-Revision: 541115 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.33 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: Fri, 03 Jul 2020 14:54:10 -0000 Author: lwhsu Date: Fri Jul 3 14:54:09 2020 New Revision: 541115 URL: https://svnweb.freebsd.org/changeset/ports/541115 Log: Fix build with non-default LOCALBASE, PREFIX PR: 246059 Submitted by: John Hein Approved by: Yasuhiro KIMURA (maintainer) Modified: head/security/clamav/Makefile Modified: head/security/clamav/Makefile ============================================================================== --- head/security/clamav/Makefile Fri Jul 3 14:49:40 2020 (r541114) +++ head/security/clamav/Makefile Fri Jul 3 14:54:09 2020 (r541115) @@ -30,19 +30,20 @@ PLIST_SUB+= DBDIR=${DBDIR} \ CLAMAVUSER=${CLAMAVUSER} \ CLAMAVGROUP=${CLAMAVGROUP} -CONFIGURE_ARGS= --libdir=${LOCALBASE}/lib \ - --with-dbdir=${DBDIR} \ +CONFIGURE_ARGS= --disable-dependency-tracking \ --enable-bigstack \ - --disable-dependency-tracking \ --enable-clamdtop \ + --libdir=${PREFIX}/lib \ + --with-dbdir=${DBDIR} \ + --with-libcurl=${LOCALBASE} \ + --with-openssl=${OPENSSLBASE} \ --with-system-libmspack=${LOCALBASE}/lib/libmspack.so CFLAGS_i386= -march=i486 -CPPFLAGS+= -I${LOCALBASE}/include # This port has a problem with -pthread, # force to use -lthr until it's not fixed. -LDFLAGS+= -lthr -L${LOCALBASE}/lib +LDFLAGS+= -lthr SUB_FILES= pkg-deinstall SUB_LIST+= DBDIR=${DBDIR} \ @@ -77,15 +78,15 @@ UNZOO_DESC= Enable zoo archives support ARC_RUN_DEPENDS= arc:archivers/arc ARJ_RUN_DEPENDS= arj:archivers/arj -DMG_XAR_CONFIGURE_ENABLE= xml +DMG_XAR_CONFIGURE_WITH= xml=${LOCALBASE} DMG_XAR_USE= GNOME=libxml2 EXPERIMENTAL_CONFIGURE_ENABLE= experimental ICONV_CONFIGURE_WITH= iconv ICONV_USES= iconv IPV6_CONFIGURE_ENABLE= ipv6 -JSON_CONFIGURE_WITH= libjson +JSON_CONFIGURE_WITH= libjson=${LOCALBASE} JSON_LIB_DEPENDS= libjson-c.so:devel/json-c -LDAP_LDFLAGS= -lldap +LDAP_LDFLAGS= -lldap -L${LOCALBASE}/lib LDAP_USE= OPENLDAP=yes LHA_RUN_DEPENDS= lha:archivers/lha MILTER_CONFIGURE_WITH= sendmail=/usr/sbin/sendmail