From 1e1462eb29e0df4286ef9b1e80314c71e8426e4f Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <adridg@FreeBSD.org>
Date: Mon, 10 May 2021 20:47:52 +0200
Subject: [PATCH] devel/libbfd: bring up-to-date wrt devel/binutils

Match the versions of libiberty and binutils. These come
from the same tarball upstream, so it's a bit odd to have
mismatched versions to start with; in addition the libiberty
version is years out-of-date.

Approved by:    joerg@ (maintainer)
---
 devel/libbfd/Makefile              |  5 ++---
 devel/libbfd/distinfo              |  5 +++--
 devel/libbfd/files/patch-configure | 11 -----------
 devel/libbfd/pkg-plist             |  5 ++++-
 4 files changed, 9 insertions(+), 17 deletions(-)
 delete mode 100644 devel/libbfd/files/patch-configure

diff --git a/devel/libbfd/Makefile b/devel/libbfd/Makefile
index df52d5335b66..48c17353e05e 100644
--- a/devel/libbfd/Makefile
+++ b/devel/libbfd/Makefile
@@ -1,8 +1,7 @@
 # Created by: Joerg Wunsch <joerg@FreeBSD.org>
 
 PORTNAME=	libbfd
-PORTVERSION=	2.19.1
-PORTREVISION=	3
+PORTVERSION=	2.33.1
 CATEGORIES=	devel
 MASTER_SITES=	SOURCEWARE/binutils/releases
 DISTNAME=	binutils-${PORTVERSION}
@@ -20,7 +19,7 @@ CONFLICTS=	mingw-binutils-[0-9]* binutils-[0-9]*
 
 WRKSRC=		${WRKDIR}/binutils-${PORTVERSION}/bfd
 
-USES=		libtool tar:bzip2
+USES=		libtool tar:xz
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-install-libbfd \
 		--disable-nls \
diff --git a/devel/libbfd/distinfo b/devel/libbfd/distinfo
index 7cd363b480ba..26bb6cf5fda4 100644
--- a/devel/libbfd/distinfo
+++ b/devel/libbfd/distinfo
@@ -1,2 +1,3 @@
-SHA256 (binutils-2.19.1.tar.bz2) = 3e8225b4d7ace0a2039de752e11fd6922d3b89a7259a292c347391c4788739f6
-SIZE (binutils-2.19.1.tar.bz2) = 16245771
+TIMESTAMP = 1575361927
+SHA256 (binutils-2.33.1.tar.xz) = ab66fc2d1c3ec0359b8e08843c9f33b63e8707efdff5e4cc5c200eae24722cbf
+SIZE (binutils-2.33.1.tar.xz) = 21490848
diff --git a/devel/libbfd/files/patch-configure b/devel/libbfd/files/patch-configure
deleted file mode 100644
index 09c4304b45dc..000000000000
--- a/devel/libbfd/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig
-+++ configure
-@@ -19503,7 +19503,7 @@ case "${host}" in
-     WIN32LIBADD="-L`pwd`/../libiberty -liberty -L`pwd`/../intl -lintl -lcygwin -lkernel32"
-   fi
-   ;;
--*-*-linux*)
-+*)
-   # We borrow WIN32LIBADD so that the shared libbfd won't depend on
-   # libiberty.a.
-   x=`sed -n -e 's/^[ 	]*PICFLAG[ 	]*=[ 	]*//p' < ../libiberty/Makefile | sed -n '$p'`
diff --git a/devel/libbfd/pkg-plist b/devel/libbfd/pkg-plist
index ebf52dbe6d35..ed8ba61a5ad3 100644
--- a/devel/libbfd/pkg-plist
+++ b/devel/libbfd/pkg-plist
@@ -1,7 +1,10 @@
 include/ansidecl.h
 include/bfd.h
 include/bfdlink.h
+include/bfd_stdint.h
+include/diagnostics.h
+include/plugin-api.h
 include/symcat.h
-lib/libbfd-2.19.1.so
+lib/libbfd-2.33.1.so
 lib/libbfd.a
 lib/libbfd.so