pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/www/opera Add user-destdir support.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/09c15f232ffc
branches:  trunk
changeset: 564187:09c15f232ffc
user:      obache <obache%pkgsrc.org@localhost>
date:      Sat Aug 29 13:15:54 2009 +0000

description:
Add user-destdir support.

diffstat:

 www/opera/Makefile     |   4 ++--
 www/opera/Makefile.rpm |  10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diffs (50 lines):

diff -r a524b2dc17b3 -r 09c15f232ffc www/opera/Makefile
--- a/www/opera/Makefile        Sat Aug 29 13:08:42 2009 +0000
+++ b/www/opera/Makefile        Sat Aug 29 13:15:54 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.88 2009/05/19 08:59:37 wiz Exp $
+# $NetBSD: Makefile,v 1.89 2009/08/29 13:15:54 obache Exp $
 
 DISTNAME=              opera-${OPERA_PKG_VERSION:S/u/pl/}
 CATEGORIES=            www
@@ -19,7 +19,7 @@
 EMUL_PLATFORMS+=       linux-i386
 EMUL_PLATFORMS+=       solaris-sparc
 
-#PKG_DESTDIR_SUPPORT=  user-destdir
+PKG_DESTDIR_SUPPORT=   user-destdir
 
 .include "../../mk/bsd.prefs.mk"
 
diff -r a524b2dc17b3 -r 09c15f232ffc www/opera/Makefile.rpm
--- a/www/opera/Makefile.rpm    Sat Aug 29 13:08:42 2009 +0000
+++ b/www/opera/Makefile.rpm    Sat Aug 29 13:15:54 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.rpm,v 1.5 2009/02/22 11:54:23 ahoka Exp $
+# $NetBSD: Makefile.rpm,v 1.6 2009/08/29 13:15:54 obache Exp $
 
 # This package installs from an RPM directly into "/usr" on a Linux
 # system, which can't be managed by pkgsrc.
@@ -17,7 +17,7 @@
 BUILD_DIRS=            # empty
 
 EMUL_PKG_FMT=          rpm
-RPM2PKG_PREFIX=                ${PREFIX}
+RPM2PKG_PREFIX=                ${DESTDIR}${PREFIX}
 RPM2PKG_SUBPREFIX=     ${EMULSUBDIR}
 RPM2PKG_STAGE=         do-install
 
@@ -30,10 +30,10 @@
        ${CP} ${FILESDIR}/opera.sh ${WRKSRC}
 
 post-install:
-       ${INSTALL_SCRIPT} ${WRKDIR}/opera.sh ${PREFIX}/bin/opera
+       ${INSTALL_SCRIPT} ${WRKDIR}/opera.sh ${DESTDIR}${PREFIX}/bin/opera
        ${LN} -fs ${EMULDIR}/usr/share/man/man1/opera.1                 \
-               ${PREFIX}/${PKGMANDIR}/man1
+               ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
        ${ECHO} "bin/opera" >> ${RPM2PKG_PLIST}
        ${ECHO} "${PKGMANDIR}/man1/opera.1" >> ${RPM2PKG_PLIST}
        ${ECHO} "${PREFIX}/lib/netscape/plugins=1" >> \
-               ${PREFIX}/${EMULSUBDIR}/usr/share/opera/ini/pluginpath.ini
+               ${DESTDIR}${PREFIX}/${EMULSUBDIR}/usr/share/opera/ini/pluginpath.ini



Home | Main Index | Thread Index | Old Index