Update to version 2.60.

PR:		14707
Submitted by:	maintainer

4 files changed, 48 insertions, 22 deletions

diff --git a/archivers/linux_rar/Makefile b/archivers/linux_rar/Makefile
index b00987692946..901c659dd7bc 100644
--- a/archivers/linux_rar/Makefile
+++ b/archivers/linux_rar/Makefile
@@ -1,48 +1,72 @@
 # New ports collection makefile for:    linux_rar
 # http://www.rarsoft.com/rar_archiver.htm
-# Version required:	2.50
+# Version required:	2.60
 # Date created:		30 April 1999
 # Whom:			FUJISHIMA Satsuki <k5@respo.or.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=       rarlnx25
-PKGNAME=        linux-rar-2.50
+DISTNAME=       rarlnx26
+PKGNAME=        linux_rar-2.60
 CATEGORIES=	archivers
 MASTER_SITES=	ftp://rarsoft.ti.sk/pub/rar/ \
 		ftp://ftp.cdrom.com/pub/cheats/dlh/rar/
 EXTRACT_SUFX=   .sfx
 
-MAINTAINER=     k5@respo.or.jp
+MAINTAINER=     k5@cheerful.com
 
+BUILD_DEPENDS=	/compat/linux/lib/ld-linux.so.2:${PORTSDIR}/emulators/linux_base
 RUN_DEPENDS=	/compat/linux/lib/ld-linux.so.2:${PORTSDIR}/emulators/linux_base
 
-CAT1=		rar.1
-
 NO_BUILD=	yes
 ONLY_FOR_ARCHS=	i386
 NO_PACKAGE=     Only unmodified original package can be distributed
 
-NO_WRKSUBDIR=   yes
 EXTRACT_CMD=		# empty
 EXTRACT_BEFORE_ARGS=	# empty
 EXTRACT_AFTER_ARGS=	# empty
 STRIP=			# empty: do not touch linux binary!
+WRKSRC=		${WRKDIR}/rar
+PLIST=		${WRKSRC}/PLIST
+
+RARDOCS=	license.txt rar_faq.txt rar_site.txt readme.txt register.frm \
+		register.txt rereg.txt technote.txt whatsnew.txt
+RARFILES=	rarfiles.lst default.sfx dos.sfx
 
 post-fetch:
 	@${CHMOD} a+x ${DISTDIR}/${DISTFILES}
 
+pre-configure:
+	@${ECHO_MSG} "To install unrar bundled with this package,"
+	@${ECHO_MSG} "set variable WITH_UNRAR=YES."
+
 do-install:
-	${MKDIR} ${PREFIX}/share/doc/rar ${PREFIX}/share/rar
-	${INSTALL_PROGRAM} ${WRKSRC}/rar ${PREFIX}/bin
-	cd ${WRKSRC} && \
-	${INSTALL_DATA} rarfiles.lst default.sfx dos.sfx ${PREFIX}/share/rar
-.if !defined(NOPORTDOCS)
-	${INSTALL_MAN} ${WRKSRC}/rar.txt ${PREFIX}/man/cat1/rar.1
-	cd ${WRKSRC} && \
-	${INSTALL_DATA} license.txt rar_faq.txt rar_site.txt readme.txt \
-		register.txt technote.txt ${PREFIX}/share/doc/rar
+	@${MKDIR} ${PREFIX}/share/doc/rar ${PREFIX}/share/rar
+	@${INSTALL_PROGRAM} ${WRKSRC}/rar ${PREFIX}/bin
+.for i in ${RARDOCS}
+	@${INSTALL_DATA} ${WRKSRC}/$i ${PREFIX}/share/doc/rar
+.endfor
+.for i in ${RARFILES}
+	@${INSTALL_DATA} ${WRKSRC}/$i ${PREFIX}/share/rar
+.endfor
+	@${INSTALL_MAN} ${WRKSRC}/rar.txt ${PREFIX}/man/cat1/rar.1
+
+	@${CP} ${PKGDIR}/PLIST ${WRKSRC}
+.if !defined(NOMANCOMPRESS)
+	@${GZIP_CMD} ${PREFIX}/man/cat1/rar.1
+	@${ECHO} man/cat1/rar.1.gz >> ${WRKSRC}/PLIST
+.else
+	@${ECHO} man/cat1/rar.1 >> ${WRKSRC}/PLIST
+.endif
+.if defined(WITH_UNRAR)
+	@${INSTALL_PROGRAM} ${WRKSRC}/unrar ${PREFIX}/bin
+	@${ECHO} bin/unrar >> ${WRKSRC}/PLIST
 .endif
 
+post-install:
+	@/usr/bin/brandelf -t Linux ${PREFIX}/bin/rar
+	@${ECHO_MSG} "This is 40days trial version of commercial software."
+	@${ECHO_MSG} "Read texts in ${PREFIX}/share/doc/rar before use."
+
 .include <bsd.port.mk>
diff --git a/archivers/linux_rar/distinfo b/archivers/linux_rar/distinfo
index 186fd21f4884..f7d11abc136e 100644
--- a/archivers/linux_rar/distinfo
+++ b/archivers/linux_rar/distinfo
@@ -1 +1 @@
-MD5 (rarlnx25.sfx) = 60ae979c1fc41ef1603753cf3260cc77
+MD5 (rarlnx26.sfx) = 1bd37ad53fa709a7e8e813cfd754bc15
diff --git a/archivers/linux_rar/pkg-descr b/archivers/linux_rar/pkg-descr
index e7565a603da9..a1e8ed7b5faa 100644
--- a/archivers/linux_rar/pkg-descr
+++ b/archivers/linux_rar/pkg-descr
@@ -2,7 +2,6 @@ This is Linux version of RAR which is a general purpose archiving
 and compression program.  It offers significantly improved compression
 ratios comparing with other competitors.
 
-This is *shareware*.
-Please read texts in /usr/local/share/doc/rar/ and the homepage.
+Also UNRAR could be installed with this port. 
 
 WWW: http://www.rarsoft.com/rar_archiver.htm
diff --git a/archivers/linux_rar/pkg-plist b/archivers/linux_rar/pkg-plist
index fd9f393230fc..a50391efe5d5 100644
--- a/archivers/linux_rar/pkg-plist
+++ b/archivers/linux_rar/pkg-plist
@@ -1,12 +1,15 @@
 bin/rar
-share/rar/dos.sfx
-share/rar/default.sfx
-share/rar/rarfiles.lst
 share/doc/rar/license.txt
 share/doc/rar/rar_faq.txt
 share/doc/rar/rar_site.txt
 share/doc/rar/readme.txt
+share/doc/rar/register.frm
 share/doc/rar/register.txt
+share/doc/rar/rereg.txt
 share/doc/rar/technote.txt
+share/doc/rar/whatsnew.txt
+share/rar/default.sfx
+share/rar/dos.sfx
+share/rar/rarfiles.lst
 @dirrm share/doc/rar
 @dirrm share/rar