Upgrade to 2.65

5 files changed, 19 insertions, 43 deletions

diff --git a/archivers/unarj/Makefile b/archivers/unarj/Makefile
index 91ebf20846e2..d5b32a108228 100644
--- a/archivers/unarj/Makefile
+++ b/archivers/unarj/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	unarj
-PORTVERSION=	2.43
-PORTREVISION=	1
+PORTVERSION=	2.65
 CATEGORIES=	archivers
-MASTER_SITES=	ftp://ftp.kiarchive.ru/pub/unix/arcers/
+MASTER_SITES=	${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR=	ache
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ache@FreeBSD.org
@@ -19,7 +19,7 @@ do-install:
 	${INSTALL} -d -m 755 -o ${SHAREOWN} -g ${SHAREGRP} \
 		${PREFIX}/share/doc/unarj
 	cd ${WRKSRC}; ${INSTALL_PROGRAM} unarj ${PREFIX}/bin
-	cd ${WRKSRC}; ${INSTALL_DATA} unarj.doc technote.doc \
+	cd ${WRKSRC}; ${INSTALL_DATA} unarj.txt technote.txt \
 		${PREFIX}/share/doc/unarj
 
 .include <bsd.port.mk>
diff --git a/archivers/unarj/distinfo b/archivers/unarj/distinfo
index c67c9c895128..38a30bf7a5ea 100644
--- a/archivers/unarj/distinfo
+++ b/archivers/unarj/distinfo
@@ -1,2 +1,2 @@
-MD5 (unarj-2.43.tgz) = 5240b3c376a3ecac692246c9c482d8c7
-SIZE (unarj-2.43.tgz) = 20728
+MD5 (unarj-2.65.tgz) = a35c9a969cfdbb621b2084dce65fda70
+SIZE (unarj-2.65.tgz) = 21568
diff --git a/archivers/unarj/files/patch-ab b/archivers/unarj/files/patch-ab
index 1442f03576c3..5b683946234c 100644
--- a/archivers/unarj/files/patch-ab
+++ b/archivers/unarj/files/patch-ab
@@ -1,17 +1,6 @@
-diff -urN unarj-2.43/unarj.c unarj-2.43.new/unarj.c
---- unarj.c.orig	Mon Sep 29 14:00:24 1997
-+++ unarj.c	Tue Aug  8 15:57:58 2000
-@@ -42,7 +42,8 @@
-  * 02/17/93  R. Jung     Added archive modified date support.
-  * 01/22/94  R. Jung     Changed copyright message.
-  * 07/29/96  R. Jung     Added "/" to list of path separators.
-- *
-+ * 08/08/00  P. Knirsch  Added subdirectory creation for the x command. Also
-+ *                       fixed some compiler warnings.
-  */
- 
- #include "unarj.h"
-@@ -51,6 +52,10 @@
+--- unarj.c.orig	Wed Jun  5 12:28:06 2002
++++ unarj.c	Mon Nov 29 17:48:27 2004
+@@ -54,6 +54,10 @@
  #include <stdlib.h>
  #include <string.h>
  #include <ctype.h>
@@ -22,7 +11,7 @@ diff -urN unarj-2.43/unarj.c unarj-2.43.new/unarj.c
  #else /* !MODERN */
  extern void free();
  extern void exit();
-@@ -712,6 +717,8 @@
+@@ -718,6 +722,8 @@
  extract()
  {
      char name[FNAME_MAX];
@@ -31,7 +20,7 @@ diff -urN unarj-2.43/unarj.c unarj-2.43.new/unarj.c
  
      if (check_flags())
      {
-@@ -730,6 +737,21 @@
+@@ -736,6 +742,21 @@
  
      if (host_os != OS)
          default_case_path(name);
diff --git a/archivers/unarj/pkg-descr b/archivers/unarj/pkg-descr
index a152518beed0..27246b9db286 100644
--- a/archivers/unarj/pkg-descr
+++ b/archivers/unarj/pkg-descr
@@ -1,20 +1,7 @@
-This is an extract-only program which allows access to the contents of ARJ
-archives.
+This is an extract-only program which allows access to the contents of ARJ 
+archives. You cannot specify a base directory or select individual files 
+to extract.  UNARJ does not support empty directories or volume labels.  
+UNARJ is much slower than ARJ because ARJ is highly optimized using 
+assembly language.
 
-     COMMAND SYNTAX:
-
-     UNARJ has been modified to support the four commands: "e", "l", "t",
-     and "x".  These are similar to the ARJ version of these commands.
-     However, UNARJ does not create directories when using the "x" command.
-
-     Usage:  UNARJ archive[.arj]    (list archive)
-             UNARJ e archive        (extract archive)
-             UNARJ l archive        (list archive)
-             UNARJ t archive        (test archive)
-             UNARJ x archive        (extract with pathnames)
-
-     UNARJ does not accept any other commands or options.  You cannot
-     specify a base directory or select individual files to extract.  UNARJ
-     does not support empty directories or volume labels.  UNARJ is much
-     slower than ARJ because ARJ is highly optimized using assembly
-     language.
+WWW: http://www.arjsoftware.com/
diff --git a/archivers/unarj/pkg-plist b/archivers/unarj/pkg-plist
index a3b852d9623f..a17185497705 100644
--- a/archivers/unarj/pkg-plist
+++ b/archivers/unarj/pkg-plist
@@ -1,4 +1,4 @@
 bin/unarj
-%%DOCSDIR%%/unarj.doc
-%%DOCSDIR%%/technote.doc
+%%DOCSDIR%%/unarj.txt
+%%DOCSDIR%%/technote.txt
 @dirrm %%DOCSDIR%%