From nobody Tue Mar 08 07:10:40 2022 X-Original-To: dev-commits-ports-all@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 B647C19FB6A3; Tue, 8 Mar 2022 07:10:40 +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 4KCRLS4qqZz4Wx0; Tue, 8 Mar 2022 07:10:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646723440; 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=BU/hZZvIR/HK60RTptWQgXeHEHSvCqh6GgKT2phnW08=; b=lI59Ps02uOcu231krownZ2RMBEHVKJ4wsSBC77Xu0MuTPMOGRdTeIBrzWvSGNuQnBWWxpU OtDXYRJhS4seTiwCHaEIWEurGgBYziyk2oATxVQHuBiHWx50jdFUyz8BmItyzaSSlWK2ni WjX9zAqyxQD5iPgFHpU++uGs5yUboOYlvNDG64ZL1OKReTDrrnGP+Qh2EaKX61/+Rd9qtM oiDxIUaYIxC+KkHJwk1y4kqk6s3hBOIVoHk6wMciopBrOH/S+fmagp2heMm/aBIpIHtVQo XCpgHvsABma5bDM22sTdZ8xBcfqFiP+2IPmR6OxHsGhblHdsNJhdKOEwbQIzFw== 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 86D581822E; Tue, 8 Mar 2022 07:10:40 +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 2287Ae3x023276; Tue, 8 Mar 2022 07:10:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2287AeWw023275; Tue, 8 Mar 2022 07:10:40 GMT (envelope-from git) Date: Tue, 8 Mar 2022 07:10:40 GMT Message-Id: <202203080710.2287AeWw023275@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Matthew Seaman Subject: git: 3f360912cd9b - main - sysutils/rsyslog8: delete unnecessary code List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: matthew X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3f360912cd9b55a1fe132aabad3d6c96c7a0f354 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646723440; 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=BU/hZZvIR/HK60RTptWQgXeHEHSvCqh6GgKT2phnW08=; b=Xq2LJN97vgi7SQR0A02csv2tLg3x5Cl4FLsluULqjNcFuFflLHfrJi1f9Wg9sHntmi0P6y FPVDCsz2A1JFXUcZmOfWJKsdUnxOZU68Vz6+Fg/QY7k2LjdmWbpz4OOMIdCqzH5HQwCHYt srT1/Sikm3NOktOCzOjc41ldHyU4MPyUcqsouQ2cmtxeIWfCqOz48Swo32AzH0jWERlwUb KPUoBJp7G5wmYUGkIDFYy+sEDPfgsuFg6XIulGmYdZQblQZ+tL60D6cBbaKceNM0rXeaOy 3OUXjM1ka0d9EClBcE/xDIANGwls13Xso/qIiPQbvnjxSvdzMlCjNBQulmaPOg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646723440; a=rsa-sha256; cv=none; b=wstrSH5/10fPL1gaIx9qmPLFvH7THIrb0wgGD6CYtsZd83n3DGF1u8XVpwFx+Xoh+ASXg8 3o2TnxrnhP2rZkeT2XYJ3x4gRXEvfAcFgYN468RgV83iPaZSJzF7mpYHQuFIRGkKj0df0C IHPjKoDEQ22tyi3UVn9owCwpgoZ9Vj8+0IelyiiyGiu6H4qq5/xeT36RZJXj/jbjCYxgvB BvXoOqbqB+Oyuro8GlJuKCWujRTnzqrQ48CXpm3Z/chm0YT3AXGVbvXY2LsQk5vQIDgBor joUL5ywwKAskG0Mw5WCjv3/Z8/n6QjigOm1AHdhtsW2Rwhe6WwJhOWbxw3PHVQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by matthew: URL: https://cgit.FreeBSD.org/ports/commit/?id=3f360912cd9b55a1fe132aabad3d6c96c7a0f354 commit 3f360912cd9b55a1fe132aabad3d6c96c7a0f354 Author: Matthew Seaman AuthorDate: 2022-03-08 07:04:52 +0000 Commit: Matthew Seaman CommitDate: 2022-03-08 07:10:34 +0000 sysutils/rsyslog8: delete unnecessary code Remove USE_LDCONFIG -- the port installs a number of loadable modules for its own use. These are not shared libraries that ldconfig(8) needs to deal with. (1) Remove REINPLACE_CMD lines that no longer do anything. The library path compiled into the code is set from autoconfig nowadays. PR: 262393 (1) Reported by: mikael --- sysutils/rsyslog8/Makefile | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/sysutils/rsyslog8/Makefile b/sysutils/rsyslog8/Makefile index 7207d5c10f8f..b7d2f5dcd797 100644 --- a/sysutils/rsyslog8/Makefile +++ b/sysutils/rsyslog8/Makefile @@ -1,5 +1,6 @@ PORTNAME= rsyslog PORTVERSION= 8.2202.0 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= http://www.rsyslog.com/files/download/rsyslog/ @@ -17,7 +18,6 @@ LIB_DEPENDS= libestr.so:devel/libestr \ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}docutils>0:textproc/py-docutils@${PY_FLAVOR} USES= cpe libtool pkgconfig autoreconf python:env -USE_LDCONFIG= yes PORTSCOUT= limit:^8\. @@ -146,11 +146,8 @@ CONFIGURE_ARGS+= --enable-imdiag --enable-imfile --enable-impstats \ ac_cv_func_inotify_init=no ac_cv_header_sys_inotify_h=no post-patch: - @${REINPLACE_CMD} -e 's|/lib/rsyslog/|${PREFIX}/lib/rsyslog/|'\ - ${WRKSRC}/tools/syslogd.c @${GREP} -rl '/etc/rsyslog.conf' ${WRKSRC}|${XARGS} ${REINPLACE_CMD} -e\ 's|/etc/rsyslog.conf|${PREFIX}/etc/rsyslog.conf|' - @${REINPLACE_CMD} -e 's,/lib/rsyslog,${PREFIX}/lib/rsyslog,' ${WRKSRC}/tools/syslogd.c @${FIND} ${WRKSRC} -name '*.bak' -delete post-install: