Import of pkgsrc-2015Q1

archivers/p7zip/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2013/10/05 07:40:59 adam Exp $
+# $NetBSD: Makefile,v 1.57 2014/12/01 12:43:43 wiz Exp $
 
 DISTNAME=	p7zip_9.20.1_src_all
 PKGNAME=	p7zip-9.20.1
@@ -7,13 +7,11 @@ CATEGORIES=	archivers
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=p7zip/}
 EXTRACT_SUFX=	.tar.bz2
 
-MAINTAINER=	wiz@NetBSD.org
+MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://p7zip.sourceforge.net/
 COMMENT=	File archiver with high compression
 LICENSE=	gnu-lgpl-v2.1 AND unrar-license
 
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
-
 USE_LANGUAGES=		c c++
 USE_TOOLS+=		gmake
 MAKE_FILE=		makefile
@@ -49,6 +47,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)

archivers/p7zip/distinfo

@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.40 2011/03/21 13:45:51 adam 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-aa) = 6df31ad2f391b7f1b5220f05ff0142ee258a92e7
+SHA1 (patch-CPP_Windows_DLL.cpp) = 212140b873058eb838a1eb97befebb90512cd7e4
+SHA1 (patch-aa) = 6031e4a571c890b6620627989d056ba606c2e0ca
 SHA1 (patch-ab) = a9bd9ab50f6c2d5964de9b2c4e5d9d75e3c29b79
 SHA1 (patch-ac) = f5f0acd488a7c524b692b5660042baa79f9937ce

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;

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)
-