[Midnightbsd-cvs] mports: archivers/libunrar: update to 3.8.5

[crash at midnightbsd.org]

Log Message:
-----------
update to 3.8.5

Modified Files:
--------------
    mports/archivers/libunrar:
        Makefile (r1.4 -> r1.5)
        distinfo (r1.3 -> r1.4)
    mports/archivers/libunrar/files:
        patch-dll.hpp (r1.1 -> r1.2)
        patch-makefile.unix (r1.1 -> r1.2)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/archivers/libunrar/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -L archivers/libunrar/Makefile -L archivers/libunrar/Makefile -u -r1.4 -r1.5
--- archivers/libunrar/Makefile
+++ archivers/libunrar/Makefile
@@ -7,14 +7,10 @@
 #
 
 PORTNAME=	libunrar
-PORTVERSION=	3.7.8
+PORTVERSION=	3.8.5
 PORTEPOCH=	1
 CATEGORIES=	archivers
-MASTER_SITES=	http://files2.rarlab.com/rar/ \
-		http://files3.rarlab.com/rar/ \
-		http://files4.rarlab.com/rar/ \
-		http://files5.rarlab.com/rar/ \
-		http://files6.rarlab.com/rar/
+MASTER_SITES=	http://www.rarlab.com/rar/
 DISTNAME=	unrarsrc-${PORTVERSION}
 
 MAINTAINER=	ports at MidnightBSD.org
@@ -25,7 +21,7 @@
 
 USE_GMAKE=	yes
 MAKEFILE=	makefile.unix
-MAKE_ENV+=	CXX="${CXX}" LDFLAGS="${LDFLAGS}"
+MAKE_ENV+=	LDFLAGS="${LDFLAGS}"
 ALL_TARGET=	lib
 USE_LDCONFIG=	yes
 
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/archivers/libunrar/distinfo,v
retrieving revision 1.3
retrieving revision 1.4
diff -L archivers/libunrar/distinfo -L archivers/libunrar/distinfo -u -r1.3 -r1.4
--- archivers/libunrar/distinfo
+++ archivers/libunrar/distinfo
@@ -1,3 +1,3 @@
-MD5 (unrarsrc-3.7.8.tar.gz) = b783f1932bc0c73902c6399f7c2c6f43
-SHA256 (unrarsrc-3.7.8.tar.gz) = 10476e8f0152830922d1038cbc852ec08cdbcd9945fa6b4b8aca16bb736084e9
-SIZE (unrarsrc-3.7.8.tar.gz) = 131120
+MD5 (unrarsrc-3.8.5.tar.gz) = 875688e6a144a3f75d2a6a0da3e43f8b
+SHA256 (unrarsrc-3.8.5.tar.gz) = 9173a68f7ec106248a4942653b9bd2ca8e3c8d288b543d1462dda6d52b11338a
+SIZE (unrarsrc-3.8.5.tar.gz) = 135670
Index: patch-makefile.unix
===================================================================
RCS file: /home/cvs/mports/archivers/libunrar/files/patch-makefile.unix,v
retrieving revision 1.1
retrieving revision 1.2
diff -L archivers/libunrar/files/patch-makefile.unix -L archivers/libunrar/files/patch-makefile.unix -u -r1.1 -r1.2
--- archivers/libunrar/files/patch-makefile.unix
+++ archivers/libunrar/files/patch-makefile.unix
@@ -1,21 +1,21 @@
---- makefile.unix.orig	Sat Apr 30 04:00:12 2005
-+++ makefile.unix	Fri Sep 23 16:22:04 2005
-@@ -6,10 +6,10 @@
- #
+--- makefile.unix.orig	2008-10-09 15:43:06.000000000 +0200
++++ makefile.unix	2008-11-06 01:43:52.000000000 +0100
+@@ -7,10 +7,11 @@
  
  # Linux using GCC
--CXX=g++
--CXXFLAGS=-O2
+ #CXX=g++
+-#CXXFLAGS=-O2
 -DEFINES=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
 +CXXFLAGS=$(CFLAGS) -fPIC -DPIC
 +DEFINES=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -DGUI -DSILENT
  STRIP=strip
+ DESTDIR=/usr
 +RANLIB=ranlib
  
  # Linux using LCC
  #CXX=lcc
-@@ -86,7 +86,7 @@
- LINK=$(CXX)
+@@ -100,7 +101,7 @@
+ WHAT=UNRAR
  
  UNRAR_OBJ=filestr.o recvol.o rs.o scantree.o
 -LIB_OBJ=filestr.o scantree.o dll.o
@@ -23,7 +23,7 @@
  
  OBJECTS=rar.o strlist.o strfn.o pathfn.o int64.o savepos.o global.o file.o filefn.o filcreat.o \
  	archive.o arcread.o unicode.o system.o isnt.o crypt.o crc.o rawread.o encname.o \
-@@ -114,6 +114,12 @@
+@@ -131,9 +132,15 @@
  	$(STRIP) default.sfx
  
  lib:	WHAT=RARDLL
@@ -39,3 +39,8 @@
 +	@rm -f libunrar.a
 +	$(AR) rc libunrar.a $(OBJECTS) $(LIB_OBJ) $(UNRAR_OBJ)
 +	$(RANLIB) libunrar.a
+
+ install-unrar:
+
+                        install unrar $(DESTDIR)/bin
+
Index: patch-dll.hpp
===================================================================
RCS file: /home/cvs/mports/archivers/libunrar/files/patch-dll.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -L archivers/libunrar/files/patch-dll.hpp -L archivers/libunrar/files/patch-dll.hpp -u -r1.1 -r1.2
--- archivers/libunrar/files/patch-dll.hpp
+++ archivers/libunrar/files/patch-dll.hpp
@@ -1,18 +1,18 @@
---- dll.hpp.orig  2004-09-08 17:57:20.000000000 +0400
-+++ dll.hpp       2004-10-22 10:43:08.000000000 +0400
-@@ -26,13 +26,13 @@
- 
+--- dll.hpp     2008-11-06 01:37:37.000000000 +0100
++++ dll.hpp     2008-11-06 01:38:47.000000000 +0100
+@@ -28,14 +28,14 @@ 
  #define RAR_DLL_VERSION       4
  
 -#ifdef _UNIX
-+//#ifdef _UNIX
++// #ifdef _UNIX
  #define CALLBACK
  #define PASCAL
  #define LONG long
  #define HANDLE void *
+ #define LPARAM long
  #define UINT unsigned int
 -#endif
-+//#endif
++// #endif
  
  struct RARHeaderData
  {