From 595b12483c8b9ed5e086481b72c240a6f50dc94c Mon Sep 17 00:00:00 2001
From: tv <tv>
Date: Thu, 11 Mar 2004 21:39:17 +0000
Subject: Add Interix to non-largefile opsystems.  Obey CPPFLAGS.

---
 archivers/unrar/Makefile         |  4 ++--
 archivers/unrar/distinfo         |  4 ++--
 archivers/unrar/patches/patch-aa | 16 ++++++++++------
 3 files changed, 14 insertions(+), 10 deletions(-)

(limited to 'archivers')

diff --git a/archivers/unrar/Makefile b/archivers/unrar/Makefile
index e3903f11952..c4f60d704a9 100644
--- a/archivers/unrar/Makefile
+++ b/archivers/unrar/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2004/02/27 15:28:20 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2004/03/11 21:39:17 tv Exp $
 #
 
 DISTNAME=	unrarsrc-3.3.6
@@ -31,7 +31,7 @@ do-install:
 
 # Don't set _LARGEFILE_SOURCE for platforms w/o ftello() and fseeko().
 #
-.for __glob__ in NetBSD-1.5*
+.for __glob__ in Interix-* NetBSD-1.5*
 .if ${MACHINE_PLATFORM:M${__glob__}} != ""
 .MAKEFLAGS+=	DEFINES=""
 .endif
diff --git a/archivers/unrar/distinfo b/archivers/unrar/distinfo
index 3f85f46e2a6..990d6db029a 100644
--- a/archivers/unrar/distinfo
+++ b/archivers/unrar/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.15 2004/02/27 15:28:20 wiz Exp $
+$NetBSD: distinfo,v 1.16 2004/03/11 21:39:17 tv Exp $
 
 SHA1 (unrarsrc-3.3.6.tar.gz) = 2fea657757149ed430acf7b314e7183615587ed4
 Size (unrarsrc-3.3.6.tar.gz) = 117590 bytes
-SHA1 (patch-aa) = 33c4fc01f182516e73b050aa11fe3d6d84dd9610
+SHA1 (patch-aa) = 63c0e66d57c15564342ed6c92d83e5888c8aade0
diff --git a/archivers/unrar/patches/patch-aa b/archivers/unrar/patches/patch-aa
index a82218ad950..a24bf76d4ad 100644
--- a/archivers/unrar/patches/patch-aa
+++ b/archivers/unrar/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.9 2004/02/27 15:28:20 wiz Exp $
+$NetBSD: patch-aa,v 1.10 2004/03/11 21:39:17 tv Exp $
 
---- makefile.unix.orig	Fri Jan 30 14:42:12 2004
-+++ makefile.unix
+--- makefile.unix.orig	Fri Jan 30 08:42:12 2004
++++ makefile.unix	Thu Mar 11 16:34:10 2004
 @@ -6,8 +6,8 @@
  #
  
@@ -13,8 +13,12 @@ $NetBSD: patch-aa,v 1.9 2004/02/27 15:28:20 wiz Exp $
  DEFINES=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
  
  # Linux using LCC
-@@ -51,6 +51,8 @@ DEFINES=-D_FILE_OFFSET_BITS=64 -D_LARGEF
- COMPILE=$(CXX) $(CXXFLAGS) $(DEFINES)
+@@ -48,9 +48,11 @@
+ 
+ ##########################
+ 
+-COMPILE=$(CXX) $(CXXFLAGS) $(DEFINES)
++COMPILE=$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(DEFINES)
  LINK=$(CXX)
  
 +WHAT=UNRAR
@@ -22,7 +26,7 @@ $NetBSD: patch-aa,v 1.9 2004/02/27 15:28:20 wiz Exp $
  UNRAR_OBJ=filestr.o recvol.o rs.o scantree.o
  LIB_OBJ=dll.o
  
-@@ -67,7 +69,6 @@ all:	unrar
+@@ -67,7 +69,6 @@
  clean:
  	@rm -f *.o *.bak *~
  
-- 
cgit v1.2.3