[pkgsrc/trunk]: pkgsrc/www/nspluginwrapper Use the standard RPM extraction lo...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/fd422df79152
branches:  trunk
changeset: 531493:fd422df79152
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Tue Jul 31 17:53:56 2007 +0000

description:
Use the standard RPM extraction logic in the extract module instead of
custom code.

Adjust the installation commands to deal with different locations of the
extracted files from the RPMs.

diffstat:

 www/nspluginwrapper/Makefile |  33 ++++++++++++++-------------------
 1 files changed, 14 insertions(+), 19 deletions(-)

diffs (58 lines):

diff -r 0a5f01182000 -r fd422df79152 www/nspluginwrapper/Makefile
--- a/www/nspluginwrapper/Makefile      Tue Jul 31 17:42:40 2007 +0000
+++ b/www/nspluginwrapper/Makefile      Tue Jul 31 17:53:56 2007 +0000
@@ -1,40 +1,35 @@
-# $NetBSD: Makefile,v 1.4 2007/04/19 16:11:34 xtraeme Exp $
+# $NetBSD: Makefile,v 1.5 2007/07/31 17:53:56 jlam Exp $
 #
 
 DISTNAME=       nspluginwrapper-0.9.91.3
 CATEGORIES=     www
 MASTER_SITES=   http://gwenole.beauchesne.info/projects/nspluginwrapper/files/
 EXTRACT_SUFX=   .tar.bz2
-DISTFILES=     ${DISTNAME}${EXTRACT_SUFX} ${RPMFILE}
+DISTFILES=     ${DISTNAME}${EXTRACT_SUFX} ${DISTNAME:S/-/-i386-/}-1.x86_64.rpm
 
 MAINTAINER=     abs%NetBSD.org@localhost
 HOMEPAGE=       http://gwenole.beauchesne.info/projects/nspluginwrapper/
 COMMENT=        Use Netscape compatible plugins from other platforms
 
-HAS_CONFIGURE= yes
-USE_LANGUAGES= c c++
-USE_TOOLS+=    gmake pkg-config
-CONFIGURE_ARGS+= --prefix=${PREFIX} --x11=${X11BASE}
+HAS_CONFIGURE=         yes
+USE_LANGUAGES=         c c++
+USE_TOOLS+=            gmake pkg-config
+CONFIGURE_ARGS+=       --prefix=${PREFIX} --x11=${X11BASE}
 
-RPMFILE=       ${DISTNAME:S:-:-i386-:}-1.x86_64.rpm
-BUILD_DEPENDS+=        rpm2pkg>=1.2:../../pkgtools/rpm2pkg
-RPM2PKG=       ${PREFIX}/sbin/rpm2pkg
-RPM2PKGARGS=   ${DISTDIR}/${DIST_SUBDIR}/${RPMFILE}
-LINUXLIBDIR=   ${PREFIX}/lib/nspluginwrapper/i386/linux
+PLUGIN_SUBDIR=         lib/nspluginwrapper/i386/linux
+PLUGIN_INSTDIR=                ${PREFIX}/${PLUGIN_SUBDIR}
+PLUGIN_SRCDIR=         ${WRKDIR}/usr/${PLUGIN_SUBDIR}
 
 SUBST_CLASSES+=                npviewer
 SUBST_STAGE.npviewer=  post-build
-SUBST_FILES.npviewer=  ../i386/linux/npviewer
+SUBST_FILES.npviewer=  ${PLUGIN_SRCDIR}/npviewer
 SUBST_SED.npviewer=    -e "s|/usr/|${PREFIX}/|g"
 
-post-extract:
-       ${RPM2PKG} -d ${WRKDIR} -s 4 ${RPM2PKGARGS}
-
 post-install:
-       ${MKDIR} ${LINUXLIBDIR}
-       ${INSTALL_SCRIPT} ${WRKDIR}/i386/linux/libxpcom.so ${LINUXLIBDIR}
-       ${INSTALL_SCRIPT} ${WRKDIR}/i386/linux/npviewer ${LINUXLIBDIR}
-       ${INSTALL_SCRIPT} ${WRKDIR}/i386/linux/npviewer.bin ${LINUXLIBDIR}
+       ${INSTALL_LIB_DIR} ${PLUGIN_INSTDIR}
+       ${INSTALL_LIB} ${PLUGIN_SRCDIR}/libxpcom.so ${PLUGIN_INSTDIR}
+       ${INSTALL_SCRIPT} ${PLUGIN_SRCDIR}/npviewer ${PLUGIN_INSTDIR}
+       ${INSTALL_LIB} ${PLUGIN_SRCDIR}/npviewer.bin ${PLUGIN_INSTDIR}
 
 ONLY_FOR_PLATFORM=     *-*-i386 *-*-x86_64