From 24350f2d6f05c2a33cbf724f281faa4bbc031f86 Mon Sep 17 00:00:00 2001
From: joerg <joerg@pkgsrc.org>
Date: Mon, 26 Sep 2005 11:26:46 +0000
Subject: Slightly adjust patch to deal with thread linking.

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

(limited to 'archivers/p7zip')

diff --git a/archivers/p7zip/distinfo b/archivers/p7zip/distinfo
index ffba740a51f..09a47c73e85 100644
--- a/archivers/p7zip/distinfo
+++ b/archivers/p7zip/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.12 2005/09/23 12:17:59 wiz Exp $
+$NetBSD: distinfo,v 1.13 2005/09/26 11:26:46 joerg Exp $
 
 SHA1 (p7zip_4.27_src.tar.bz2) = db6c271da9c988a34e190510eaa2ba33da7566b8
 RMD160 (p7zip_4.27_src.tar.bz2) = 32f75f1fe0a56e200e1e5d796aecf8db730b96cd
 Size (p7zip_4.27_src.tar.bz2) = 416045 bytes
-SHA1 (patch-aa) = 4c90fc909588a11604968ac3ce5accab6ea9c2b0
+SHA1 (patch-aa) = 23e24295b914d72b56df868dd6265317a0a2f65c
 SHA1 (patch-ab) = 9ee04c81b4699b4596dd58811f8d7e20c354b1d1
 SHA1 (patch-ac) = ed38fe44c9b1ee3fb502edef47cf28ed5852a95b
diff --git a/archivers/p7zip/patches/patch-aa b/archivers/p7zip/patches/patch-aa
index 45a798847ae..5b545367f1e 100644
--- a/archivers/p7zip/patches/patch-aa
+++ b/archivers/p7zip/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.8 2005/09/23 12:17:59 wiz Exp $
+$NetBSD: patch-aa,v 1.9 2005/09/26 11:26:46 joerg Exp $
 
 --- makefile.machine.orig	2005-09-22 14:23:32.000000000 -0500
 +++ makefile.machine
@@ -11,10 +11,12 @@ $NetBSD: patch-aa,v 1.8 2005/09/23 12:17:59 wiz Exp $
      	-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \
  	-DNDEBUG -D_REENTRANT -DENV_UNIX \
  	$(LOCAL_FLAGS)
-@@ -12,5 +12,5 @@
+@@ -11,6 +11,6 @@ CXX=g++ $(ALLFLAGS)
+ CC=gcc $(ALLFLAGS)
  LINK_SHARED=-shared
  
- LOCAL_LIBS=-lpthread
+-LOCAL_LIBS=-lpthread
 -LOCAL_LIBS_DLL=$(LOCAL_LIBS) -ldl
++LOCAL_LIBS=${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
 +LOCAL_LIBS_DLL=$(LOCAL_LIBS)
  
-- 
cgit v1.2.3