[pkgsrc/trunk]: pkgsrc/www/opera Fix this again on solaris. WRKSRC was out o...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f67e5eb782da
branches:  trunk
changeset: 533823:f67e5eb782da
user:      dmcmahill <dmcmahill%pkgsrc.org@localhost>
date:      Mon Oct 01 23:40:17 2007 +0000

description:
Fix this again on solaris.  WRKSRC was out of date and there was a missing
option to the install script for where to install the man page.

diffstat:

 www/opera/Makefile.plain |  15 +++++++--------
 1 files changed, 7 insertions(+), 8 deletions(-)

diffs (44 lines):

diff -r b2d54064684f -r f67e5eb782da www/opera/Makefile.plain
--- a/www/opera/Makefile.plain  Mon Oct 01 23:39:20 2007 +0000
+++ b/www/opera/Makefile.plain  Mon Oct 01 23:40:17 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.plain,v 1.1 2007/08/23 22:22:07 jlam Exp $
+# $NetBSD: Makefile.plain,v 1.2 2007/10/01 23:40:17 dmcmahill Exp $
 
 .if ${EMUL_PLATFORM} == "freebsd-i386"
 ONLY_FOR_PLATFORM+=    FreeBSD-*-i386
@@ -7,7 +7,7 @@
 OPERA_DIR=             unix/freebsd/${OPERA_PKG_VERSION_DIR}/final/${OPERA_LANG}/static
 OPERA_DIST_VERSION=    ${OPERA_PKG_VERSION:C/u.*//}-${OPERA_VER_DATE}.1-static-qt
 
-WRKSRC=                        ${WRKDIR}/opera-${OPERA_DIST_VERSION}${OPERA_ARCH}-${OPERA_LANG}-655
+WRKSRC=                        ${WRKDIR}/opera-${OPERA_DIST_VERSION}${OPERA_ARCH}-${OPERA_LANG}-660
 
 OWN_DIRS=              ${PREFIX}/share/opera/plugins
 
@@ -19,7 +19,7 @@
 OPERA_DIR=             unix/solaris/${OPERA_PKG_VERSION_DIR}/final/${OPERA_LANG}/sparc/static
 OPERA_DIST_VERSION=    ${OPERA_PKG_VERSION:C/u.*//}-${OPERA_VER_DATE}.1-static-qt
 
-WRKSRC=                        ${WRKDIR}/opera-${OPERA_DIST_VERSION}${OPERA_ARCH}-${OPERA_LANG}-655
+WRKSRC=                        ${WRKDIR}/opera-${OPERA_DIST_VERSION}${OPERA_ARCH}-${OPERA_LANG}-660
 
 BUILD_DEFS+=           INSTALL_ETC_OPERARC
 INSTALL_ETC_OPERARC?=  no
@@ -38,12 +38,11 @@
 SUBST_FILES.opera=     man/opera.1
 SUBST_SED.opera=       -e 's,/usr/,${PREFIX}/,g'
 
+FULLMANDIR=            ${PREFIX}/${PKGMANDIR}
 do-install:
-       @(${ECHO} "n"; ${ECHO} "n") > ${WRKSRC}/inst.cmd
-       @cd ${WRKSRC} && ${CAT} ${WRKSRC}/inst.cmd |                    \
-               ./install.sh --prefix=${PREFIX:Q}
+       (${ECHO} "n"; ${ECHO} "n") > ${WRKSRC}/inst.cmd
+       cd ${WRKSRC} && ${CAT} ${WRKSRC}/inst.cmd |                     \
+               ./install.sh --prefix=${PREFIX:Q} --mandir=${FULLMANDIR:Q}
        @${ECHO} "=> You can ignore any previous lines about opera6rc"
        @${ECHO}
 
-post-install:
-       @${INSTALL_MAN} ${WRKSRC}/man/opera.1 ${PREFIX}/${PKGMANDIR}/man1