From ac0fae4c2d5e6421ae44029b863cee2cf995fb80 Mon Sep 17 00:00:00 2001
From: wiz <wiz@pkgsrc.org>
Date: Mon, 1 Dec 2014 12:43:07 +0000
Subject: Fix build on OS X using a patch from Jonathan Buschmann in PR 49360

---
 archivers/p7zip/distinfo                          |  3 +-
 archivers/p7zip/patches/patch-CPP_Windows_DLL.cpp | 51 +++++++++++++++++++++++
 2 files changed, 53 insertions(+), 1 deletion(-)
 create mode 100644 archivers/p7zip/patches/patch-CPP_Windows_DLL.cpp

(limited to 'archivers/p7zip')

diff --git a/archivers/p7zip/distinfo b/archivers/p7zip/distinfo
index 4e314080e73..5af41a044a5 100644
--- a/archivers/p7zip/distinfo
+++ b/archivers/p7zip/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.41 2014/04/26 01:16:54 dsainty Exp $
+$NetBSD: distinfo,v 1.42 2014/12/01 12:43:07 wiz 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-CPP_Windows_DLL.cpp) = 212140b873058eb838a1eb97befebb90512cd7e4
 SHA1 (patch-aa) = 6031e4a571c890b6620627989d056ba606c2e0ca
 SHA1 (patch-ab) = a9bd9ab50f6c2d5964de9b2c4e5d9d75e3c29b79
 SHA1 (patch-ac) = f5f0acd488a7c524b692b5660042baa79f9937ce
diff --git a/archivers/p7zip/patches/patch-CPP_Windows_DLL.cpp b/archivers/p7zip/patches/patch-CPP_Windows_DLL.cpp
new file mode 100644
index 00000000000..d37870bd452
--- /dev/null
+++ b/archivers/p7zip/patches/patch-CPP_Windows_DLL.cpp
@@ -0,0 +1,51 @@
+$NetBSD: patch-CPP_Windows_DLL.cpp,v 1.1 2014/12/01 12:43:07 wiz Exp $
+
+Adapt for pkgsrc on OS X.
+
+--- CPP/Windows/DLL.cpp.orig	2010-02-28 12:44:52.000000000 +0000
++++ CPP/Windows/DLL.cpp
+@@ -2,7 +2,7 @@
+ 
+ #include "StdAfx.h"
+ 
+-#ifdef __APPLE_CC__
++#if defined(USE_APPLE_BUNDLE)
+ #include <mach-o/dyld.h>
+ #elif ENV_BEOS
+ #include <kernel/image.h>
+@@ -39,7 +39,7 @@ TRACEN((printf("CLibrary::Free(%p)\n",(v
+   if (_module == 0)
+     return true;
+ 
+-#ifdef __APPLE_CC__
++#if defined(USE_APPLE_BUNDLE)
+   int ret = NSUnLinkModule ((NSModule)_module, 0);
+ #elif ENV_BEOS
+   int ret = unload_add_on((image_id)_module);
+@@ -57,7 +57,7 @@ static FARPROC local_GetProcAddress(HMOD
+   void *ptr = 0;
+   TRACEN((printf("local_GetProcAddress(%p,%s)\n",(void *)module,lpProcName)))
+   if (module) {
+-#ifdef __APPLE_CC__
++#if defined(USE_APPLE_BUNDLE)
+     char name[MAX_PATHNAME_LEN];
+     snprintf(name,sizeof(name),"_%s",lpProcName);
+     name[sizeof(name)-1] = 0;
+@@ -115,7 +115,7 @@ bool CLibrary::Load(LPCTSTR lpLibFileNam
+ 
+   TRACEN((printf("CLibrary::Load(%ls) => %s\n",lpLibFileName,name)))
+ 
+-#ifdef __APPLE_CC__
++#if defined(USE_APPLE_BUNDLE)
+   NSObjectFileImage image;
+   NSObjectFileImageReturnCode nsret;
+ 
+@@ -173,7 +173,7 @@ TRACEN((printf("load_add_on(%s)=%d\n",p.
+     if (fctTest) fctTest();
+ 
+   } else {
+-#ifdef __APPLE_CC__
++#if defined(USE_APPLE_BUNDLE)
+     NSLinkEditErrors c;
+     int num_err;
+     const char *file,*err;
-- 
cgit v1.2.3