From nobody Wed Apr 12 17:57:48 2023 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 4PxVmX4YNBz45Brp; Wed, 12 Apr 2023 17:57:48 +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 4PxVmX3N0Rz4Drm; Wed, 12 Apr 2023 17:57:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681322268; 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=cmmhB7LKIgD5EuLzcgENWahJbDCu7XDWHuNVaTA4Y2w=; b=pjk3EwYqbK2cdbcx5B91+PKpEbjQWfklgZpflzfzFQfHctFVeQorkJ9pxx9tFZu5RMI2RY ciCFM6J+HinVBAeI6TcazyNxNkcYOF8CGiNmCYBg9hN2m5Yp0sNYA8lf8/T2dRt0TLmePK onrYJmgmLHavnlqX2Q4J2dc9VncmBzQ5FqCPZsQSegMNu78yowDmx1ffKUvV+jZoI9vGwf 8Vz0E9PMVVriofSfTudkTSkm1GT+RGpvuVT2xzND7+gq1sqYDP/rLgX4UuRnpHid+KXG6o 6a8UT5VxaCmvpwio9PzaUuXj0K1fn6ydqm0c1p7O+c+FBKfPRONmtkd1BeX9Vg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681322268; 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=cmmhB7LKIgD5EuLzcgENWahJbDCu7XDWHuNVaTA4Y2w=; b=yKqYe5hVYE1rt69mYkAIZheB/aSBkBGhwhbqlEYXimRpoKPzxjeN5pT4anyk53G3qLUPWf s7It2fN3dFT4Qku5KorNeyKIFmoAQvabapETsHDveejlKYan3QOVIpyMCrV3boaENv3mSo 8l5uKZDNGzpQbsX7hsTBLyhE7Y4/Q/fWvqwxGNUyaeEaO0ueND4FtWIB6OJQHeeoUAmbAG PRwudw1PyaF/O0wLGZrDaq7rg3pt8w3mVvsh7ubWh+Se0g3XYxmt93BgiMWUaMTI6HscpR JgrKqfkLny7y1iKLjFisfm3XwTUl/jHC4cLFbKm59+WecUZOUUJKwcDtaiP69g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681322268; a=rsa-sha256; cv=none; b=vbjbC/G1yI2VncVuSCsvEierMuYrFbiIUhlsAk9YgBTV64QpUgys+ppbhtlTnTeb7s431A TCw7oarUfrax7npnMPYy2ED+/NoAeVhqW07ltTEWkUH1IKREwxGGRgdPTZJ81O11CBiS8i KPJlGuDMCTznYwyn1rhtjTNnHfVtrP1WBpvYL9SYVTWwd6a4ngzTF+9Z3PkPcq8cvhHCF+ Ue3qVGveY5d/YGmMNl8FSuIv7/CHlEWVZIc3IeTuhPIeNt+8iZupmjRX060oKMEn/XZWui +s1dCsnNmERhzKh9l4e11nbdoZVZFEAcPuE75fJ+fWeMpaGLqCellgC+qXqQ3g== 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 4PxVmX1dmBz18rt; Wed, 12 Apr 2023 17:57:48 +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 33CHvmiq031481; Wed, 12 Apr 2023 17:57:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33CHvmfq031480; Wed, 12 Apr 2023 17:57:48 GMT (envelope-from git) Date: Wed, 12 Apr 2023 17:57:48 GMT Message-Id: <202304121757.33CHvmfq031480@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Ed Maste Subject: git: a0cdafda51c9 - main - converters/iconv: drop use of lorder(1) 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: emaste X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a0cdafda51c9a9f0b843a55bc6be43185fd53731 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/ports/commit/?id=a0cdafda51c9a9f0b843a55bc6be43185fd53731 commit a0cdafda51c9a9f0b843a55bc6be43185fd53731 Author: Ed Maste AuthorDate: 2021-10-21 18:17:31 +0000 Commit: Ed Maste CommitDate: 2023-04-12 17:56:22 +0000 converters/iconv: drop use of lorder(1) lorder is obsolete and may be removed from the base system in the future. PR: 259254 [exp-run] Reviewed by: jrm Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D32593 --- converters/iconv/Makefile | 2 +- converters/iconv/files/patch-ces__Makefile | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/converters/iconv/Makefile b/converters/iconv/Makefile index 5b283fe586f3..90e228ed3f44 100644 --- a/converters/iconv/Makefile +++ b/converters/iconv/Makefile @@ -1,6 +1,6 @@ PORTNAME= iconv PORTVERSION= 2.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= converters MASTER_SITES= LOCAL/bland diff --git a/converters/iconv/files/patch-ces__Makefile b/converters/iconv/files/patch-ces__Makefile index 5c39a6915660..7f5c8a2961cd 100644 --- a/converters/iconv/files/patch-ces__Makefile +++ b/converters/iconv/files/patch-ces__Makefile @@ -9,7 +9,7 @@ INTERNALLIB = -@@ -27,9 +27,9 @@ ces_builtin.c: ${CHARSETS_C} ${CHARSETS_ +@@ -27,11 +27,11 @@ ces_builtin.c: ${CHARSETS_C} ${CHARSETS_O} ${.CURDIR}/../iconv_builtin -mo ${.TARGET} \ ${CHARSETS_C} PIC ${CHARSETS_O} @@ -19,8 +19,11 @@ -.So.so: +.So.so .pico.so: @${LDDESTDIRENV} ${CC} -shared -Wl,-x -o ${.TARGET} \ - -Wl,-soname,${.TARGET} `lorder ${.ALLSRC} | tsort -q` \ +- -Wl,-soname,${.TARGET} `lorder ${.ALLSRC} | tsort -q` \ ++ -Wl,-soname,${.TARGET} ${.ALLSRC} \ ${LDDESTDIR} ${LDADD} + + beforeinstall: @@ -41,8 +41,8 @@ beforeinstall: ${INSTALLFLAGS} ${SHLINSTALLFLAGS} ${CHARSETS_SO} \ ${DESTDIR}${MODULEDIR}