Fix PR pkg/39247

Update to 4.1.1

* Convert to use Linux binary on compat_linux, instead of old BSD binary.

Changelog:
* Add some new options (ch etc.)
* Change option's behavior (-o etc.)
* Bugfixes

9 files changed, 40 insertions, 223 deletions

diff --git a/archivers/rar/MESSAGE.linux-i386 b/archivers/rar/MESSAGE.linux-i386
deleted file mode 100644
index 7a488acf078..00000000000
--- a/archivers/rar/MESSAGE.linux-i386
+++ /dev/null
@@ -1,6 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE.linux-i386,v 1.1 2007/08/22 16:43:33 jlam Exp $
-
-For best compression performance, please install
-${PREFIX}/share/doc/rar-bin/rarfiles.lst into /etc.
-===========================================================================
diff --git a/archivers/rar/MESSAGE.netbsd-i386 b/archivers/rar/MESSAGE.netbsd-i386
deleted file mode 100644
index f1002db01dd..00000000000
--- a/archivers/rar/MESSAGE.netbsd-i386
+++ /dev/null
@@ -1,6 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE.netbsd-i386,v 1.1 2007/08/22 16:43:33 jlam Exp $
-
-You must have COMPAT_12, COMPAT_13, COMPAT_43, COMPAT_NOMID and a.out
-support compiled into your kernel to use this program.
-===========================================================================
diff --git a/archivers/rar/Makefile b/archivers/rar/Makefile
index 13dcd360ba0..f33ef9be08a 100644
--- a/archivers/rar/Makefile
+++ b/archivers/rar/Makefile
@@ -1,33 +1,47 @@
-# $NetBSD: Makefile,v 1.52 2009/05/19 08:59:00 wiz Exp $
+# $NetBSD: Makefile,v 1.53 2012/04/04 21:22:18 ryoon Exp $
+#
 
-DISTNAME=		rar	# overridden in Makefile.${EMUL_PLATFORM}
-PKGNAME=		rar-2.02 # also overridden
-PKGREVISION=		1
-CATEGORIES=		archivers
-MASTER_SITES=		# empty
+DISTNAME=	# overridden
+PKGNAME=	rar-${RAR_VER}
+CATEGORIES=	archivers
+MASTER_SITES=	http://www.rarlabs.com/rar/
 
-PKG_DESTDIR_SUPPORT=	user-destdir
+MAINTAINER=	ryoon@NetBSD.org
+HOMEPAGE=	http://www.rarlabs.com/rar/
+COMMENT=	RAR file archiver (binary)
+LICENSE=	rar-license
 
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://www.rarsoft.com/
-COMMENT=		RAR file archiver (binary)
-LICENSE=		rar-license
+RAR_VER=	4.1.1
 
 RESTRICTED=		Only unmodified original package can be distributed
 NO_BIN_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_FTP=		${RESTRICTED}
 
-EMUL_PLATFORMS=		linux-i386 netbsd-i386
+EMUL_PLATFORMS=		linux-i386 linux-x86_64
+
+PKG_DESTDIR_SUPPORT=	user-destdir
 
-MESSAGE_SRC=		${PKGDIR}/MESSAGE.${EMUL_PLATFORM}
+NO_BUILD=	yes
+WRKSRC=		${WRKDIR}/rar
+USE_LANGUAGES=	# none
 
 .include "../../mk/bsd.prefs.mk"
 
-.if exists(Makefile.${EMUL_PLATFORM})
-.  include "Makefile.${EMUL_PLATFORM}"
-.else
-NO_BUILD=		yes
-do-install:		# nothing
+.if ${EMUL_PLATFORM} == "linux-i386"
+DISTFILES=	rarlinux-${RAR_VER}.tar.gz
+.elif ${EMUL_PLATFORM} == "linux-x86_64"
+DISTFILES=	rarlinux-x64-${RAR_VER}.tar.gz
 .endif
 
+DOCSDIR=		share/doc/rar
+
+INSTALLATION_DIRS=	bin etc lib ${DOCSDIR}
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/rar_static ${DESTDIR}${PREFIX}/bin/rar
+
+	${INSTALL_LIB} ${WRKSRC}/default.sfx ${DESTDIR}${PREFIX}/lib
+
+	${INSTALL_DATA} ${WRKSRC}/rarfiles.lst ${DESTDIR}${PREFIX}/${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/*txt ${DESTDIR}${PREFIX}/${DOCSDIR}
 .include "../../mk/bsd.pkg.mk"
diff --git a/archivers/rar/Makefile.linux-i386 b/archivers/rar/Makefile.linux-i386
deleted file mode 100644
index a0473c13adc..00000000000
--- a/archivers/rar/Makefile.linux-i386
+++ /dev/null
@@ -1,24 +0,0 @@
-# $NetBSD: Makefile.linux-i386,v 1.2 2009/02/09 23:33:27 joerg Exp $
-
-DISTNAME=		rarlinux-3.6.0
-PKGNAME=		${DISTNAME:S/linux//}
-MASTER_SITES=		http://www.rarsoft.com/rar/ \
-			ftp://ftp.rarsoft.com/rar/
-
-CONFLICTS=		rarlinux-[0-9]* rar-linux-[0-9]*
-
-EMUL_MODULES.linux=	base compat
-
-WRKSRC=			${WRKDIR}/rar
-BUILD_DIRS=		# empty
-
-DATADIR=		${PREFIX}/lib
-DOCDIR=			${PREFIX}/share/doc/rar
-
-INSTALLATION_DIRS=	bin lib ${DATADIR} ${DOCDIR}
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/rar_static ${DESTDIR}${PREFIX}/bin/rar
-	${INSTALL_DATA} ${WRKSRC}/default.sfx ${DESTDIR}${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/*.txt ${DESTDIR}${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/rarfiles.lst ${DESTDIR}${DOCDIR}
diff --git a/archivers/rar/Makefile.netbsd-i386 b/archivers/rar/Makefile.netbsd-i386
deleted file mode 100644
index 9d0609c8875..00000000000
--- a/archivers/rar/Makefile.netbsd-i386
+++ /dev/null
@@ -1,55 +0,0 @@
-# $NetBSD: Makefile.netbsd-i386,v 1.4 2010/10/27 19:00:35 shattered Exp $
-
-DISTNAME=		rarbsd
-PKGNAME=		rar-2.02
-MASTER_SITES=		ftp://ftp.elf.stuba.sk/pub/pc/pack/
-EXTRACT_SUFX=		.sfx
-
-EMUL_REQD=		netbsd>=1.2
-
-WRKSRC=			${WRKDIR}
-EXTRACT_CMD=		exec "$$extract_file" >/dev/null
-
-DATADIR=		${PREFIX}/share/rar
-DOCDIR=			${PREFIX}/share/doc/rar
-
-INSTALLATION_DIRS=	${DATADIR} ${DOCDIR} bin
-
-CHECK_KSYMS_CMD=	${SETENV} ECHO=${TOOLS_ECHO:Q}			\
-				GREP=${TOOLS_GREP:Q}			\
-				GZIP_CMD=${TOOLS_GZIP_CMD:Q}		\
-				NM=${NM:Q} RM=${TOOLS_RM:Q}		\
-				TMPDIR=${WRKDIR:Q}			\
-	   		${SH} ${FILESDIR}/check-ksyms.sh
-
-pre-extract:
-	${RUN} set -e;							\
-	if ${CHECK_KSYMS_CMD} compat_12 exec_nomid exec_aout; then	\
-		${TEST} -x ${DISTDIR}/${DISTFILES:Q} ||			\
-			${CHMOD} a+x ${DISTDIR:Q}/${DISTFILES:Q};	\
-	else								\
-		${ECHO} "==========================================================================="; \
-		${ECHO} "In order to extract this package,"		\
-			"you must have have booted from a";		\
-		${ECHO} "kernel with options COMPAT_NOMID and"		\
-			"COMPAT_12, and EXEC_AOUT if on";		\
-		${ECHO} "an ELF system.";				\
-		${ECHO} "==========================================================================="; \
-		${FALSE};						\
-	fi
-
-# DOS to Unix line conversion
-do-build:
-	${RUN} set -e; set -u;						\
-	cd ${WRKSRC:Q} && for i in *.Txt *.Lst; do			\
-		${TR} -d '\015' < "$$i" > "$$i".tmp;			\
-		${MV} -f "$$i".tmp "$$i";				\
-	done
-
-do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/rar ${DESTDIR}${PREFIX}/bin/rar
-	${INSTALL_DATA} ${WRKSRC}/RarFiles.Lst ${DESTDIR}${DATADIR}/rarfiles.lst
-	${INSTALL_DATA} ${WRKSRC}/default.sfx ${DESTDIR}${DATADIR}/default.sfx
-	${INSTALL_DATA} ${WRKSRC}/Dos.SFX ${DESTDIR}${DATADIR}/dos.sfx
-	cd ${WRKSRC} && ${INSTALL_MAN} Rar.Txt Rar_FAQ.txt		\
-		TechNote.Txt License.Txt Internet.Txt ${DESTDIR}${DOCDIR}
diff --git a/archivers/rar/PLIST.linux-i386 b/archivers/rar/PLIST
index 5312edb6769..5c879dd9e0c 100644
--- a/archivers/rar/PLIST.linux-i386
+++ b/archivers/rar/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.linux-i386,v 1.3 2009/06/14 17:28:17 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2012/04/04 21:22:19 ryoon Exp $
 bin/rar
 lib/default.sfx
 share/doc/rar/license.txt
diff --git a/archivers/rar/PLIST.netbsd-i386 b/archivers/rar/PLIST.netbsd-i386
deleted file mode 100644
index d2fa67631c9..00000000000
--- a/archivers/rar/PLIST.netbsd-i386
+++ /dev/null
@@ -1,10 +0,0 @@
-@comment $NetBSD: PLIST.netbsd-i386,v 1.2 2009/06/14 17:28:17 joerg Exp $
-bin/rar
-share/doc/rar/Internet.Txt
-share/doc/rar/License.Txt
-share/doc/rar/Rar.Txt
-share/doc/rar/Rar_FAQ.txt
-share/doc/rar/TechNote.Txt
-share/rar/default.sfx
-share/rar/dos.sfx
-share/rar/rarfiles.lst
diff --git a/archivers/rar/distinfo b/archivers/rar/distinfo
index 4e40273cf46..20f0766749b 100644
--- a/archivers/rar/distinfo
+++ b/archivers/rar/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.4 2007/08/22 16:43:36 jlam Exp $
+$NetBSD: distinfo,v 1.5 2012/04/04 21:22:19 ryoon Exp $
 
-SHA1 (rarbsd.sfx) = bafd5d6e4956ad10898ab19d601fa506d1681b4a
-RMD160 (rarbsd.sfx) = 3510af235244162f47d85fb7744468c9b093ffdf
-Size (rarbsd.sfx) = 246569 bytes
-SHA1 (rarlinux-3.6.0.tar.gz) = 4b43766371fd2f117fb3af5826001a7eab7a0f3b
-RMD160 (rarlinux-3.6.0.tar.gz) = c0f6d19738f69deb9fd75589e461a7a0ed430d39
-Size (rarlinux-3.6.0.tar.gz) = 752997 bytes
+SHA1 (rarlinux-4.1.1.tar.gz) = 4e5c8c7d5b610ce48a97729683688008c310e57e
+RMD160 (rarlinux-4.1.1.tar.gz) = a0aa14bc85996ca242ce6a48c7d244b4b171ecb6
+Size (rarlinux-4.1.1.tar.gz) = 915307 bytes
+SHA1 (rarlinux-x64-4.1.1.tar.gz) = 6ed70fe08e04bc2e381eb43be8905bc70f0582b2
+RMD160 (rarlinux-x64-4.1.1.tar.gz) = c81ff0fe9f1d001db61a0b8f92357b0b529b3953
+Size (rarlinux-x64-4.1.1.tar.gz) = 952748 bytes
diff --git a/archivers/rar/files/check-ksyms.sh b/archivers/rar/files/check-ksyms.sh
deleted file mode 100644
index 8e1fb3b569d..00000000000
--- a/archivers/rar/files/check-ksyms.sh
+++ /dev/null
@@ -1,96 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: check-ksyms.sh,v 1.1 2007/08/22 16:43:36 jlam Exp $
-#
-# check-ksyms.sh verifies that the given symbols are found in the booted
-# kernel file.
-#
-
-: ${ECHO=echo}
-: ${GREP=grep}
-: ${GZIP_CMD=gzip}
-: ${NM=nm}
-: ${RM=rm}
-: ${TMPDIR=/tmp}
-
-self="check-ksyms"
-
-verbose=
-while [ $# -gt 0 ]; do
-	case $1 in
-	-v)	verbose=yes; shift ;;
-	--)	shift; break ;;
-	-*)	${ECHO} 1>&2 "$self [-v] symbol ..."; exit 2 ;;
-	*)	break ;;
-	esac
-done
-
-# Locate kernel.
-PATH=/sbin:/usr/sbin:${PATH}; export PATH
-
-booted_kernel=
-kernlist="/netbsd /netbsd.gz /onetbsd /onetbsd.gz"
-kern=`sysctl -n machdep.booted_kernel 2>/dev/null`
-if [ -z "$kern" ]; then
-	kernlist="$kern $kernlist"
-fi
-for k in $kernlist; do
-	if [ -f "$k" ]; then
-		booted_kernel="$k"
-		break
-	fi
-done
-
-if [ -z "$booted_kernel" ]; then
-	${ECHO} 1>&2 "$self: could not determine the booted kernel."
-	exit 2
-fi
-
-pattern=
-for symbol	# in command-line arguments
-do
-	if [ -z "$pattern" ]; then
-		pattern="$symbol"
-	else
-		pattern="$pattern\|$symbol"
-	fi
-done
-
-# If there are no symbols to check, then exit with success.
-[ -n "$pattern" ] || exit 0
-
-if [ ! -d "${TMPDIR}" ]; then
-	${ECHO} 1>&2 "$self: ${TMPDIR} does not exist."
-	exit 2
-fi
-
-ksymsfile="${TMPDIR}/ksyms.$self.$$"
-
-# Clean up when we receive the following signals: INT QUIT ABRT KILL TERM.
-trap "${RM} -f \"$ksymsfile\"" 2 3 6 9 15
-
-case $booted_kernel in
-*.gz)	${GZIP_CMD} -d < "$booted_kernel" | ${NM} > "$ksymsfile" ;;
-*)	${NM} "$booted_kernel" > "$ksymsfile" ;;
-esac
-
-# Loop through the symbols and check that each of them are in $ksymsfile.
-exitcode=0
-while [ $# -gt 0 ]; do
-	symbol="$1"; shift
-	if [ x"$verbose" = xyes ]; then
-		cmd="${GREP} \"$symbol\" \"$ksymsfile\" 2>/dev/null"
-	else
-		cmd="${GREP} \"$symbol\" \"$ksymsfile\" >/dev/null 2>&1"
-	fi
-	if eval $cmd; then
-		:
-	else
-		${ECHO} 1>&2 "$self: symbol $symbol not found in $booted_kernel"
-		exitcode=1
-		break
-	fi
-done
-
-${RM} -f "$ksymsfile"
-exit $exitcode