From b6cb9da8a289a228bb5352fec3389ba35b62e9ab Mon Sep 17 00:00:00 2001
From: dsainty <dsainty@pkgsrc.org>
Date: Sat, 26 Apr 2014 01:16:54 +0000
Subject: Use BUILDLINK_TRANSFORM to edit -ldl as required, fixing the build
 for Linux.

---
 archivers/p7zip/Makefile         | 5 ++++-
 archivers/p7zip/distinfo         | 4 ++--
 archivers/p7zip/patches/patch-aa | 8 +++-----
 3 files changed, 9 insertions(+), 8 deletions(-)

(limited to 'archivers/p7zip')

diff --git a/archivers/p7zip/Makefile b/archivers/p7zip/Makefile
index d50b4e0e3ca..15878d7c98e 100644
--- a/archivers/p7zip/Makefile
+++ b/archivers/p7zip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2013/10/05 07:40:59 adam Exp $
+# $NetBSD: Makefile,v 1.55 2014/04/26 01:16:54 dsainty Exp $
 
 DISTNAME=	p7zip_9.20.1_src_all
 PKGNAME=	p7zip-9.20.1
@@ -49,6 +49,9 @@ SUBST_FILES.lib+=	CPP/7zip/UI/Common/LoadCodecs.cpp
 SUBST_SED.lib+=		-e "s,getenv(.P7ZIP_HOME_DIR.),\"${PREFIX}/lib/\","
 SUBST_STAGE.lib=	post-patch
 
+.include "../../mk/dlopen.buildlink3.mk"
+BUILDLINK_TRANSFORM+=	opt:-ldl:${BUILDLINK_LDADD.dl:M*}
+
 .include "../../mk/endian.mk"
 
 .if !empty(MACHINE_ENDIAN:Mbig)
diff --git a/archivers/p7zip/distinfo b/archivers/p7zip/distinfo
index e60f31e1013..4e314080e73 100644
--- a/archivers/p7zip/distinfo
+++ b/archivers/p7zip/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.40 2011/03/21 13:45:51 adam Exp $
+$NetBSD: distinfo,v 1.41 2014/04/26 01:16:54 dsainty Exp $
 
 SHA1 (p7zip_9.20.1_src_all.tar.bz2) = 1cd567e043ee054bf08244ce15f32cb3258306b7
 RMD160 (p7zip_9.20.1_src_all.tar.bz2) = c3ff2dd12459282b46d9a68ab4af7800ff46039f
 Size (p7zip_9.20.1_src_all.tar.bz2) = 3835235 bytes
-SHA1 (patch-aa) = 6df31ad2f391b7f1b5220f05ff0142ee258a92e7
+SHA1 (patch-aa) = 6031e4a571c890b6620627989d056ba606c2e0ca
 SHA1 (patch-ab) = a9bd9ab50f6c2d5964de9b2c4e5d9d75e3c29b79
 SHA1 (patch-ac) = f5f0acd488a7c524b692b5660042baa79f9937ce
diff --git a/archivers/p7zip/patches/patch-aa b/archivers/p7zip/patches/patch-aa
index cbc792dc92c..3328f799022 100644
--- a/archivers/p7zip/patches/patch-aa
+++ b/archivers/p7zip/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.18 2010/06/16 08:30:09 adam Exp $
+$NetBSD: patch-aa,v 1.19 2014/04/26 01:16:54 dsainty Exp $
 
 --- makefile.machine.orig	2010-05-30 08:33:48.000000000 +0000
 +++ makefile.machine
-@@ -2,21 +2,21 @@
+@@ -2,20 +2,20 @@
  # makefile for Linux (x86, PPC, alpha ...)
  #
  
@@ -26,9 +26,7 @@ $NetBSD: patch-aa,v 1.18 2010/06/16 08:30:09 adam Exp $
 +LINK_SHARED=-shared
  
 -LOCAL_LIBS=-lpthread
--LOCAL_LIBS_DLL=$(LOCAL_LIBS) -ldl
 +LOCAL_LIBS=${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
-+LOCAL_LIBS_DLL=$(LOCAL_LIBS)
+ LOCAL_LIBS_DLL=$(LOCAL_LIBS) -ldl
  
  OBJ_CRC32=$(OBJ_CRC32_C)
- 
-- 
cgit v1.2.3