Received: by mail.netbsd.org (Postfix, from userid 605) id 2B5B984CF1; Wed, 19 Feb 2020 15:21:36 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id A643284D61 for ; Wed, 19 Feb 2020 15:21:35 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id AgbqXAVi4Lxq for ; Wed, 19 Feb 2020 15:21:35 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 2BD5C84CE9 for ; Wed, 19 Feb 2020 15:21:35 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 25004FBF4; Wed, 19 Feb 2020 15:21:35 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1582125695185180" MIME-Version: 1.0 Date: Wed, 19 Feb 2020 15:21:35 +0000 From: =?UTF-8?B?RnLDqWTDqXJpYyBGYXViZXJ0ZWF1?= Subject: CVS commit: pkgsrc/devel/libevent To: pkgsrc-changes@NetBSD.org Reply-To: triaxx@netbsd.org X-Mailer: log_accum Message-Id: <20200219152135.25004FBF4@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1582125695185180 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: triaxx Date: Wed Feb 19 15:21:35 UTC 2020 Modified Files: pkgsrc/devel/libevent: builtin.mk Log Message: libevent: fix PR pkg/54983 Remove symlinks before faking .pc files. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 pkgsrc/devel/libevent/builtin.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1582125695185180 Content-Disposition: inline Content-Length: 2027 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/devel/libevent/builtin.mk diff -u pkgsrc/devel/libevent/builtin.mk:1.19 pkgsrc/devel/libevent/builtin.mk:1.20 --- pkgsrc/devel/libevent/builtin.mk:1.19 Sun Nov 3 10:39:16 2019 +++ pkgsrc/devel/libevent/builtin.mk Wed Feb 19 15:21:34 2020 @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.19 2019/11/03 10:39:16 rillig Exp $ +# $NetBSD: builtin.mk,v 1.20 2020/02/19 15:21:34 triaxx Exp $ BUILTIN_PKG:= libevent @@ -153,6 +153,7 @@ override-message-libevent-pkgconfig: override-libevent-pkgconfig: ${RUN} \ ${MKDIR} ${BLKDIR_PKGCFG}; \ + ${RM} -f ${BLKDIR_PKGCFG}/${LIBEVENT_PKGCFGF}; \ { \ ${ECHO} "prefix=${LIBEVENT_PREFIX}"; \ ${ECHO} "exec_prefix=\$${prefix}"; \ @@ -164,8 +165,9 @@ override-libevent-pkgconfig: ${ECHO} "Version: ${BUILTIN_VERSION.libevent}"; \ ${ECHO} "Libs: ${COMPILER_RPATH_FLAG}\$${libdir} -L\$${libdir} -levent"; \ ${ECHO} "Cflags: -I\$${includedir}"; \ - } >> ${BLKDIR_PKGCFG}/${LIBEVENT_PKGCFGF}; + } > ${BLKDIR_PKGCFG}/${LIBEVENT_PKGCFGF}; ${RUN} \ + ${RM} -f ${BLKDIR_PKGCFG}/${LIBEVENT_OPENSSL_PKGCFGF}; \ { \ ${ECHO} "prefix=${LIBEVENT_PREFIX}"; \ ${ECHO} "exec_prefix=\$${prefix}"; \ @@ -178,8 +180,9 @@ override-libevent-pkgconfig: ${ECHO} "Requires: libevent"; \ ${ECHO} "Libs: ${COMPILER_RPATH_FLAG}\$${libdir} -L\$${libdir} -levent_openssl"; \ ${ECHO} "Cflags: -I\$${includedir}"; \ - } >> ${BLKDIR_PKGCFG}/${LIBEVENT_OPENSSL_PKGCFGF}; + } > ${BLKDIR_PKGCFG}/${LIBEVENT_OPENSSL_PKGCFGF}; ${RUN} \ + ${RM} -f ${BLKDIR_PKGCFG}/${LIBEVENT_PTHREADS_PKGCFGF}; \ { \ ${ECHO} "prefix=${LIBEVENT_PREFIX}"; \ ${ECHO} "exec_prefix=\$${prefix}"; \ @@ -192,6 +195,6 @@ override-libevent-pkgconfig: ${ECHO} "Requires: libevent"; \ ${ECHO} "Libs: ${COMPILER_RPATH_FLAG}\$${libdir} -L\$${libdir} -levent_pthreads"; \ ${ECHO} "Cflags: -I\$${includedir} -pthread"; \ - } >> ${BLKDIR_PKGCFG}/${LIBEVENT_PTHREADS_PKGCFGF}; + } > ${BLKDIR_PKGCFG}/${LIBEVENT_PTHREADS_PKGCFGF}; . endif .endif --_----------=_1582125695185180--