pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Merge archivers/rar-bin into archivers/rar and convert...
details: https://anonhg.NetBSD.org/pkgsrc/rev/95a08c0a5abf
branches: trunk
changeset: 532527:95a08c0a5abf
user: jlam <jlam%pkgsrc.org@localhost>
date: Wed Aug 22 16:43:31 2007 +0000
description:
Merge archivers/rar-bin into archivers/rar and convert archivers/rar to
use the emulator framework.
diffstat:
archivers/Makefile | 3 +-
archivers/rar-bin/DESCR | 13 -----
archivers/rar-bin/MESSAGE | 7 --
archivers/rar-bin/Makefile | 33 -------------
archivers/rar-bin/PLIST | 10 ---
archivers/rar-bin/distinfo | 5 -
archivers/rar/DESCR | 17 ++++-
archivers/rar/MESSAGE | 7 --
archivers/rar/MESSAGE.linux-i386 | 6 ++
archivers/rar/MESSAGE.netbsd-i386 | 6 ++
archivers/rar/Makefile | 63 +++++-------------------
archivers/rar/Makefile.linux-i386 | 24 +++++++++
archivers/rar/Makefile.netbsd-i386 | 55 +++++++++++++++++++++
archivers/rar/PLIST | 12 ----
archivers/rar/PLIST.linux-i386 | 10 +++
archivers/rar/PLIST.netbsd-i386 | 12 ++++
archivers/rar/distinfo | 5 +-
archivers/rar/files/check-ksyms.sh | 96 ++++++++++++++++++++++++++++++++++++++
doc/CHANGES-2007 | 3 +-
19 files changed, 242 insertions(+), 145 deletions(-)
diffs (truncated from 500 to 300 lines):
diff -r 15681c99db3a -r 95a08c0a5abf archivers/Makefile
--- a/archivers/Makefile Wed Aug 22 16:29:15 2007 +0000
+++ b/archivers/Makefile Wed Aug 22 16:43:31 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.98 2007/08/15 22:28:22 joerg Exp $
+# $NetBSD: Makefile,v 1.99 2007/08/22 16:43:32 jlam Exp $
#
COMMENT= Archivers
@@ -61,7 +61,6 @@
SUBDIR+= ppmd
SUBDIR+= ppunpack
SUBDIR+= rar
-SUBDIR+= rar-bin
SUBDIR+= rox-archive
SUBDIR+= ruby-zip
SUBDIR+= rzip
diff -r 15681c99db3a -r 95a08c0a5abf archivers/rar-bin/DESCR
--- a/archivers/rar-bin/DESCR Wed Aug 22 16:29:15 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-RAR is a powerful tool allowing you to manage and control archive
-files.
-
-RAR features include:
-
-* Highly sophisticated, original compression algorithm
-* Special compression algorithms optimized for text, audio,
- graphics data, 32 and 64-bit Intel executables
-* Better compression than similar tools, using 'solid' archiving
-* Authenticity verification (registered version only)
-* Self-extracting archives and volumes (SFX)
-* Ability to recover physically damaged archives
-* Locking, password, file order list, file security & more ...
diff -r 15681c99db3a -r 95a08c0a5abf archivers/rar-bin/MESSAGE
--- a/archivers/rar-bin/MESSAGE Wed Aug 22 16:29:15 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.1.1.1 2006/03/03 22:36:09 wiz Exp $
-
-For best compression performance, please install
-${PREFIX}/share/doc/rar-bin/rarfiles.lst into /etc.
-
-===========================================================================
diff -r 15681c99db3a -r 95a08c0a5abf archivers/rar-bin/Makefile
--- a/archivers/rar-bin/Makefile Wed Aug 22 16:29:15 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-# $NetBSD: Makefile,v 1.7 2007/07/29 05:18:36 jlam Exp $
-
-DISTNAME= rarlinux-3.6.0
-PKGNAME= ${DISTNAME:C/linux/-bin/}
-CATEGORIES= archivers
-MASTER_SITES= http://www.rarsoft.com/rar/ \
- ftp://ftp.rarsoft.com/rar/
-
-MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE= http://www.rarsoft.com/rar_archiver.htm
-COMMENT= RAR command line archiver (Linux binary)
-
-CONFLICTS= rarlinux-[0-9]* rar-linux-[0-9]*
-
-LICENSE= rar-license
-
-EMUL_PLATFORMS= linux-i386
-EMUL_MODULES.linux= base compat
-
-WRKSRC= ${WRKDIR}/rar
-BUILD_DIRS= # empty
-
-INSTALLATION_DIRS= bin lib
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/rar_static ${PREFIX}/bin/rar-bin
-# ${INSTALL_PROGRAM} ${WRKSRC}/unrar ${PREFIX}/bin/unrar-bin
- ${INSTALL_DATA} ${WRKSRC}/default.sfx ${PREFIX}/lib
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/rar-bin
- ${INSTALL_DATA} ${WRKSRC}/*.txt ${PREFIX}/share/doc/rar-bin
- ${INSTALL_DATA} ${WRKSRC}/rarfiles.lst ${PREFIX}/share/doc/rar-bin
-
-.include "../../mk/bsd.pkg.mk"
diff -r 15681c99db3a -r 95a08c0a5abf archivers/rar-bin/PLIST
--- a/archivers/rar-bin/PLIST Wed Aug 22 16:29:15 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/03/03 22:36:09 wiz Exp $
-bin/rar-bin
-lib/default.sfx
-share/doc/rar-bin/license.txt
-share/doc/rar-bin/rar.txt
-share/doc/rar-bin/rarfiles.lst
-share/doc/rar-bin/readme.txt
-share/doc/rar-bin/technote.txt
-share/doc/rar-bin/whatsnew.txt
-@dirrm share/doc/rar-bin
diff -r 15681c99db3a -r 95a08c0a5abf archivers/rar-bin/distinfo
--- a/archivers/rar-bin/distinfo Wed Aug 22 16:29:15 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.2 2006/09/16 11:29:16 wiz Exp $
-
-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
diff -r 15681c99db3a -r 95a08c0a5abf archivers/rar/DESCR
--- a/archivers/rar/DESCR Wed Aug 22 16:29:15 2007 +0000
+++ b/archivers/rar/DESCR Wed Aug 22 16:43:31 2007 +0000
@@ -1,6 +1,13 @@
- The rar archiver adds and extracts files to and from an archive. The
- archive is usually a regular file, which name has ".rar" suffix in its
- end. Archive could be a media like a floppy diskette, tape or any other
- storage device.
+RAR is a powerful tool allowing you to manage and control archive
+files.
+
+RAR features include:
- *** You will need COMPAT_12 in your kernel for this to work. ***
+* Highly sophisticated, original compression algorithm
+* Special compression algorithms optimized for text, audio,
+ graphics data, 32 and 64-bit Intel executables
+* Better compression than similar tools, using 'solid' archiving
+* Authenticity verification (registered version only)
+* Self-extracting archives and volumes (SFX)
+* Ability to recover physically damaged archives
+* Locking, password, file order list, file security & more ...
diff -r 15681c99db3a -r 95a08c0a5abf archivers/rar/MESSAGE
--- a/archivers/rar/MESSAGE Wed Aug 22 16:29:15 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.4 2005/05/25 22:51:15 rillig 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 -r 15681c99db3a -r 95a08c0a5abf archivers/rar/MESSAGE.linux-i386
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/archivers/rar/MESSAGE.linux-i386 Wed Aug 22 16:43:31 2007 +0000
@@ -0,0 +1,6 @@
+===========================================================================
+$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 -r 15681c99db3a -r 95a08c0a5abf archivers/rar/MESSAGE.netbsd-i386
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/archivers/rar/MESSAGE.netbsd-i386 Wed Aug 22 16:43:31 2007 +0000
@@ -0,0 +1,6 @@
+===========================================================================
+$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 -r 15681c99db3a -r 95a08c0a5abf archivers/rar/Makefile
--- a/archivers/rar/Makefile Wed Aug 22 16:29:15 2007 +0000
+++ b/archivers/rar/Makefile Wed Aug 22 16:43:31 2007 +0000
@@ -1,64 +1,29 @@
-# $NetBSD: Makefile,v 1.46 2006/06/22 21:38:06 rillig Exp $
+# $NetBSD: Makefile,v 1.47 2007/08/22 16:43:33 jlam Exp $
-DISTNAME= rarbsd
-PKGNAME= rar-2.02
+DISTNAME= rar # overridden in Makefile.${EMUL_PLATFORM}
CATEGORIES= archivers
-MASTER_SITES= ftp://ftp.elf.stuba.sk/pub/pc/pack/
-EXTRACT_SUFX= .sfx
+MASTER_SITES= # empty
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= http://www.rarsoft.com/
-COMMENT= File archiver (binary port)
+COMMENT= RAR file archiver (binary)
-ONLY_FOR_PLATFORM= NetBSD-*-i386
+EMUL_PLATFORMS= linux-i386 netbsd-i386
LICENSE= rar-license
RESTRICTED= Only unmodified original package can be distributed
NO_BIN_ON_CDROM= ${RESTRICTED}
NO_BIN_ON_FTP= ${RESTRICTED}
-WRKSRC= ${WRKDIR}
-EXTRACT_CMD= exec "$$extract_file" >/dev/null
+MESSAGE_SRC= ${PKGDIR}/MESSAGE.${EMUL_PLATFORM}
+
+.include "../../mk/bsd.prefs.mk"
-pre-extract:
- ${_PKG_SILENT}${_PKG_DEBUG} set -e; set -u; \
- if [ -z "$${KERNEL-}" ]; then \
- KERNEL=/`env PATH="$${PATH}:/sbin:/usr/sbin" sysctl -n machdep.booted_kernel`; \
- fi; \
- if [ ! -f "$$KERNEL" ]; then \
- ${ECHO} "No kernel image found. Let's try without."; \
- elif (${NM} "$$KERNEL" | ${GREP} -q compat_12 && \
- ${NM} "$$KERNEL" | ${GREP} -q exec_nomid && \
- ${NM} "$$KERNEL" | ${GREP} -q exec_aout); then \
- ${TRUE}; \
- else \
- ${ECHO} "Make can not proceed! In order to extract (and run)"; \
- ${ECHO} "this package, you must have have booted from a kernel"; \
- ${ECHO} "with options COMPAT_NOMID and COMPAT_12 (and EXEC_AOUT, if ELF)."; \
- ${FALSE}; \
- fi
- ${TEST} -x ${DISTDIR}/${DISTFILES:Q} \
- || ${CHMOD} a+x ${DISTDIR:Q}/${DISTFILES:Q}
-
-do-build:
- ${_PKG_SILENT}${_PKG_DEBUG} set -e; set -u; \
- cd ${WRKSRC:Q}; \
- for i in *.Txt *.Lst; do \
- ${TR} -d '\015' < "$$i" > "$$i".tmp; \
- ${MV} "$$i".tmp "$$i"; \
- done
-
-do-install:
- ${INSTALL_DATA_DIR} ${PREFIX:Q}/share/doc/rar ${PREFIX:Q}/share/rar
- cd ${WRKSRC:Q} && \
- ${INSTALL_SCRIPT} rar ${PREFIX:Q}/bin/rar && \
- ${INSTALL_MAN} Rar.Txt Rar_FAQ.txt TechNote.Txt \
- License.Txt Internet.Txt ${PREFIX:Q}/share/doc/rar && \
- ${INSTALL_DATA} RarFiles.Lst \
- ${PREFIX:Q}/share/rar/rarfiles.lst && \
- ${INSTALL_DATA} default.sfx \
- ${PREFIX:Q}/share/rar/default.sfx && \
- ${INSTALL_DATA} Dos.SFX \
- ${PREFIX:Q}/share/rar/dos.sfx
+.if exists(Makefile.${EMUL_PLATFORM})
+. include "Makefile.${EMUL_PLATFORM}"
+.else
+NO_BUILD= yes
+do-install: # nothing
+.endif
.include "../../mk/bsd.pkg.mk"
diff -r 15681c99db3a -r 95a08c0a5abf archivers/rar/Makefile.linux-i386
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/archivers/rar/Makefile.linux-i386 Wed Aug 22 16:43:31 2007 +0000
@@ -0,0 +1,24 @@
+# $NetBSD: Makefile.linux-i386,v 1.1 2007/08/22 16:43:34 jlam 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:Q}/rar_static ${PREFIX:Q}/bin/rar
+ ${INSTALL_DATA} ${WRKSRC:Q}/default.sfx ${DATADIR:Q}
+ ${INSTALL_DATA} ${WRKSRC}/*.txt ${DOCDIR:Q}
+ ${INSTALL_DATA} ${WRKSRC}/rarfiles.lst ${DOCDIR:Q}
diff -r 15681c99db3a -r 95a08c0a5abf archivers/rar/Makefile.netbsd-i386
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/archivers/rar/Makefile.netbsd-i386 Wed Aug 22 16:43:31 2007 +0000
@@ -0,0 +1,55 @@
+# $NetBSD: Makefile.netbsd-i386,v 1.1 2007/08/22 16:43:34 jlam Exp $
+
+DISTNAME= rarbsd
+PKGNAME= rar-2.02
+MASTER_SITES= ftp://ftp.elf.stuba.sk/pub/pc/pack/
+EXTRACT_SUFX= .sfx
+
+NETBSD_VERSION_REQD= 1.2
+
+WRKSRC= ${WRKDIR}
+EXTRACT_CMD= exec "$$extract_file" >/dev/null
+
+DATADIR= ${PREFIX}/share/rar
+DOCDIR= ${PREFIX}/share/doc/rar
+
+INSTALLATION_DIRS= ${DATADIR} ${DOCDIR}
+
+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} || \
Home |
Main Index |
Thread Index |
Old Index