[pkgsrc/trunk]: pkgsrc/archivers/p7zip Require gcc 3.0 or newer, since it con...

[kristerw <kristerw%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4b06b34d5416
branches:  trunk
changeset: 477192:4b06b34d5416
user:      kristerw <kristerw%pkgsrc.org@localhost>
date:      Sun Jun 27 20:28:53 2004 +0000

description:
Require gcc 3.0 or newer, since it contains c++ constructs that
gcc 2.95 does not understand.

DTRT with threading for platforms without native threads.

diffstat:

 archivers/p7zip/Makefile         |   7 ++++++-
 archivers/p7zip/distinfo         |   3 ++-
 archivers/p7zip/patches/patch-ad |  13 +++++++++++++
 3 files changed, 21 insertions(+), 2 deletions(-)

diffs (58 lines):

diff -r 35977665f260 -r 4b06b34d5416 archivers/p7zip/Makefile
--- a/archivers/p7zip/Makefile  Sun Jun 27 20:21:52 2004 +0000
+++ b/archivers/p7zip/Makefile  Sun Jun 27 20:28:53 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/06/25 13:56:12 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2004/06/27 20:28:53 kristerw Exp $
 #
 
 DISTNAME=              p7zip_0.80
@@ -12,13 +12,18 @@
 COMMENT=               File archiver with high compression
 
 USE_BUILDLINK3=                yes
+USE_LANGUAGES=         c c++
 MAKEFILE=              makefile
 NO_CONFIGURE=          yes
 USE_GNU_TOOLS+=                make
+PTHREAD_OPTS+=         require
+
+GCC_REQD=              3.0
 
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/7z ${PREFIX}/bin
        ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/p7zip
        ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/p7zip
 
+.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 35977665f260 -r 4b06b34d5416 archivers/p7zip/distinfo
--- a/archivers/p7zip/distinfo  Sun Jun 27 20:21:52 2004 +0000
+++ b/archivers/p7zip/distinfo  Sun Jun 27 20:28:53 2004 +0000
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.1.1.1 2004/06/25 13:56:12 wiz Exp $
+$NetBSD: distinfo,v 1.2 2004/06/27 20:28:53 kristerw Exp $
 
 SHA1 (p7zip_0.80.tar.bz2) = c87cda0a8a2cd1300272d71f4cd371db7ebb4b79
 Size (p7zip_0.80.tar.bz2) = 921896 bytes
 SHA1 (patch-aa) = f6a15b99f25a8ba631c45df94cfe4f7aff26bc8b
 SHA1 (patch-ab) = e438472f1eb6886dcaee0147ca5f9a2604a9abb1
 SHA1 (patch-ac) = 61dff04aca7b0c69ba8f12af40a4c27815a0bef2
+SHA1 (patch-ad) = 34197da6654226155b26bcea083801d241f348d4
diff -r 35977665f260 -r 4b06b34d5416 archivers/p7zip/patches/patch-ad
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/archivers/p7zip/patches/patch-ad  Sun Jun 27 20:28:53 2004 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2004/06/27 20:28:53 kristerw Exp $
+
+--- makefile.orig      Sun Jun 27 21:49:38 2004
++++ makefile   Sun Jun 27 21:51:54 2004
+@@ -71,7 +71,7 @@
+ 
+ REP=$(shell pwd)
+ ARCHIVE=$(shell basename $(REP))
+-LIBS=-lpthread
++LIBS=-Wl,-R${LOCALBASE}/lib -lpthread
+ 
+ all: test_emul 7z
+