git: a0cdafda51c9 - main - converters/iconv: drop use of lorder(1)

From: Ed Maste <emaste_at_FreeBSD.org>
Date: Wed, 12 Apr 2023 17:57:48 UTC
The branch main has been updated by emaste:

URL: https://cgit.FreeBSD.org/ports/commit/?id=a0cdafda51c9a9f0b843a55bc6be43185fd53731

commit a0cdafda51c9a9f0b843a55bc6be43185fd53731
Author:     Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2021-10-21 18:17:31 +0000
Commit:     Ed Maste <emaste@FreeBSD.org>
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}