[pkgsrc/trunk]: pkgsrc/mk Teach the extract module to extract RPMs with rpm2pkg.

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0a5f01182000
branches:  trunk
changeset: 531492:0a5f01182000
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Tue Jul 31 17:42:40 2007 +0000

description:
Teach the extract module to extract RPMs with rpm2pkg.

diffstat:

 mk/extract/bsd.extract-vars.mk |   5 ++++-
 mk/extract/extract             |  10 +++++++++-
 mk/extract/extract.mk          |   4 +++-
 mk/tools/replace.mk            |  13 ++++++++++++-
 4 files changed, 28 insertions(+), 4 deletions(-)

diffs (118 lines):

diff -r aaa697924151 -r 0a5f01182000 mk/extract/bsd.extract-vars.mk
--- a/mk/extract/bsd.extract-vars.mk    Tue Jul 31 14:44:02 2007 +0000
+++ b/mk/extract/bsd.extract-vars.mk    Tue Jul 31 17:42:40 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.extract-vars.mk,v 1.6 2006/10/15 01:56:06 minskim Exp $
+# $NetBSD: bsd.extract-vars.mk,v 1.7 2007/07/31 17:42:40 jlam Exp $
 #
 # This Makefile fragment is included separately by bsd.pkg.mk and
 # defines some variables which must be defined earlier than where
@@ -65,6 +65,9 @@
 .if !empty(EXTRACT_ONLY:M*.rar)
 USE_TOOLS+=    unrar
 .endif
+.if !empty(EXTRACT_ONLY:M*.rpm)
+USE_TOOLS+=    rpm2pkg
+.endif
 .if !empty(EXTRACT_ONLY:M*.gem)
 USE_TOOLS+=    gem
 .endif
diff -r aaa697924151 -r 0a5f01182000 mk/extract/extract
--- a/mk/extract/extract        Tue Jul 31 14:44:02 2007 +0000
+++ b/mk/extract/extract        Tue Jul 31 17:42:40 2007 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: extract,v 1.6 2006/10/18 19:18:12 ben Exp $
+# $NetBSD: extract,v 1.7 2007/07/31 17:42:40 jlam Exp $
 #
 # Copyright (c) 2006 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -88,6 +88,7 @@
 #      EXTRACT_OPTS_LHA
 #      EXTRACT_OPTS_PAX
 #      EXTRACT_OPTS_RAR
+#      EXTRACT_OPTS_RPM
 #      EXTRACT_OPTS_TAR
 #      EXTRACT_OPTS_ZIP
 #      EXTRACT_OPTS_ZOO
@@ -110,6 +111,7 @@
 : ${MKDIR:=mkdir}
 : ${PAX:=pax}
 : ${RM:=rm}
+: ${RPM2PKG:=rpm2pkg}
 : ${SH:=sh}
 : ${TAR:=tar}
 : ${TEST:=test}
@@ -208,6 +210,7 @@
                _format=compressed ;;
 *.zoo)         _format=zoo ;;
 *.rar)         _format=rar ;;
+*.rpm)         _format=rpm ;;
 *.bin)         _format=jre-bin ;;
 *.gem)         _format=gem ;;
 *)             _format=none ;;
@@ -319,6 +322,11 @@
        ${UNRAR} x ${EXTRACT_OPTS_RAR} "$distfile" ${1+"$@"}
        ;;
 
+rpm)
+       : ${EXTRACT_OPTS_RPM=}
+       ${RPM2PKG} -d . ${EXTRACT_OPTS_RPM} "$distfile" ${1+"$@"}
+       ;;
+
 jre-bin)
        : ${EXTRACT_OPTS_BIN=}
        ${ECHO} yes | "$distfile" ${EXTRACT_OPTS_BIN} >/dev/null
diff -r aaa697924151 -r 0a5f01182000 mk/extract/extract.mk
--- a/mk/extract/extract.mk     Tue Jul 31 14:44:02 2007 +0000
+++ b/mk/extract/extract.mk     Tue Jul 31 17:42:40 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: extract.mk,v 1.19 2007/01/09 05:13:27 rillig Exp $
+# $NetBSD: extract.mk,v 1.20 2007/07/31 17:42:40 jlam Exp $
 #
 # The following variables may be set by the package Makefile and
 # specify how extraction happens:
@@ -154,6 +154,7 @@
 _EXTRACT_ENV+= ${EXTRACT_OPTS_LHA:D    EXTRACT_OPTS_LHA=${EXTRACT_OPTS_LHA:Q}}
 _EXTRACT_ENV+= ${EXTRACT_OPTS_PAX:D    EXTRACT_OPTS_PAX=${EXTRACT_OPTS_PAX:Q}}
 _EXTRACT_ENV+= ${EXTRACT_OPTS_RAR:D    EXTRACT_OPTS_RAR=${EXTRACT_OPTS_RAR:Q}}
+_EXTRACT_ENV+= ${EXTRACT_OPTS_RPM:D    EXTRACT_OPTS_LHA=${EXTRACT_OPTS_RPM:Q}}
 _EXTRACT_ENV+= ${EXTRACT_OPTS_TAR:D    EXTRACT_OPTS_TAR=${EXTRACT_OPTS_TAR:Q}}
 _EXTRACT_ENV+= ${EXTRACT_OPTS_ZIP:D    EXTRACT_OPTS_ZIP=${EXTRACT_OPTS_ZIP:Q}}
 _EXTRACT_ENV+= ${EXTRACT_OPTS_ZOO:D    EXTRACT_OPTS_ZOO=${EXTRACT_OPTS_ZOO:Q}}
@@ -165,6 +166,7 @@
 _EXTRACT_ENV+= ${TOOLS_LHA:D           LHA=${TOOLS_LHA:Q}}
 _EXTRACT_ENV+= ${TOOLS_MKDIR:D         MKDIR=${TOOLS_MKDIR:Q}}
 _EXTRACT_ENV+= ${TOOLS_RM:D            RM=${TOOLS_RM:Q}}
+_EXTRACT_ENV+= ${TOOLS_RPM2PKG:D       RPM2PKG=${TOOLS_RPM2PKG:Q}}
 _EXTRACT_ENV+= ${TOOLS_PAX:D           PAX=${TOOLS_PAX:Q}}
 _EXTRACT_ENV+= ${TOOLS_SH:D            SH=${TOOLS_SH:Q}}
 _EXTRACT_ENV+= ${TOOLS_TAR:D           TAR=${TOOLS_TAR:Q}}
diff -r aaa697924151 -r 0a5f01182000 mk/tools/replace.mk
--- a/mk/tools/replace.mk       Tue Jul 31 14:44:02 2007 +0000
+++ b/mk/tools/replace.mk       Tue Jul 31 17:42:40 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.193 2007/07/02 14:56:10 joerg Exp $
+# $NetBSD: replace.mk,v 1.194 2007/07/31 17:42:40 jlam Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -635,6 +635,17 @@
 .  endif
 .endif
 
+.if !defined(TOOLS_IGNORE.rpm2pkg) && !empty(_USE_TOOLS:Mrpm2pkg)
+.  if !empty(PKGPATH:Mpkgtools/rpm2pkg)
+MAKEFLAGS+=                    TOOLS_IGNORE.rpm2pkg=
+.  elif !empty(_TOOLS_USE_PKGSRC.rpm2pkg:M[yY][eE][sS])
+TOOLS_DEPENDS.rpm2pkg?=                rpm2pkg>=2.1:../../pkgtools/rpm2pkg
+TOOLS_CREATE+=                 rpm2pkg
+TOOLS_FIND_PREFIX+=            TOOLS_PREFIX.rpm2pkg=rpm2pkg
+TOOLS_PATH.rpm2pkg=            ${TOOLS_PREFIX.rpm2pkg}/bin/rpm2pkg
+.  endif
+.endif
+
 .if !defined(TOOLS_IGNORE.sed) && !empty(_USE_TOOLS:Msed)
 .  if !empty(PKGPATH:Mtextproc/nbsed)
 MAKEFLAGS+=                    TOOLS_IGNORE.sed=