[pkgsrc/trunk]: pkgsrc/www/opera Rework evaluation of directory on Opera down...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6982454d2c82
branches:  trunk
changeset: 493317:6982454d2c82
user:      tron <tron%pkgsrc.org@localhost>
date:      Tue May 03 09:13:26 2005 +0000

description:
Rework evaluation of directory on Opera download sites. Loosely based
on a patch submitted by Antoine Reilles. This fixes PR pkg/30114.

diffstat:

 www/opera/Makefile |  11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diffs (53 lines):

diff -r 9c657750f883 -r 6982454d2c82 www/opera/Makefile
--- a/www/opera/Makefile        Mon May 02 23:02:06 2005 +0000
+++ b/www/opera/Makefile        Tue May 03 09:13:26 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2005/05/02 08:59:08 tron Exp $
+# $NetBSD: Makefile,v 1.34 2005/05/03 09:13:26 tron Exp $
 
 DISTNAME=      opera-${OPERA_PKG_VERSION:S/u/pl/}
 PKGREVISION=   # empty
@@ -31,6 +31,7 @@
 OPERA_LANG=            en
 OPERA_VER_DATE=                20050415
 OPERA_PKG_VERSION=     8.0
+OPERA_PKG_VERSION_DIR= 800
 
 _OPERA_OPSYS?=         ${OPSYS}
 _OPERA_MACHINE_ARCH?=  ${MACHINE_ARCH}
@@ -45,7 +46,7 @@
 
 EXTRACT_SUFX=          .rpm
 OPERA_ARCH=            .i386
-OPERA_DIR=             linux/${OPERA_PKG_VERSION:S/.//g:C/beta.*//}/final/${OPERA_LANG}/${OPERA_ARCH:S/.//}/static
+OPERA_DIR=             linux/${OPERA_PKG_VERSION_DIR}/final/${OPERA_LANG}/${OPERA_ARCH:S/.//}/static
 OPERA_DIST_VERSION=    ${OPERA_PKG_VERSION:C/beta.*//:C/u.*//}-${OPERA_VER_DATE}.1-static-qt
 
 RPMFILES=      ${DISTFILES}
@@ -54,7 +55,7 @@
 .elif (${_OPERA_OPSYS} == FreeBSD)
 EXTRACT_SUFX=          .tar.bz2
 OPERA_ARCH=            .i386.freebsd
-OPERA_DIR=             unix/freebsd/${OPERA_PKG_VERSION:S/.//g:}/final/${OPERA_LANG}/static
+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}
@@ -64,7 +65,7 @@
 .elif (${_OPERA_OPSYS} == SunOS) && (${_OPERA_MACHINE_ARCH} == sparc)
 EXTRACT_SUFX=          .tar.bz2
 OPERA_ARCH=            -sol8-sparc-local
-OPERA_DIR=             unix/solaris/${OPERA_PKG_VERSION:S/.//g}/final/${OPERA_LANG}/static
+OPERA_DIR=             unix/solaris/${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}
@@ -130,7 +131,7 @@
 
 # regenerate distinfo for all ports supported by this package
 opera-distinfo:
-       ( echo '$$NetBSD: Makefile,v 1.33 2005/05/02 08:59:08 tron Exp $$'; echo ''; \
+       ( echo '$$NetBSD: Makefile,v 1.34 2005/05/03 09:13:26 tron Exp $$'; echo ''; \
        _OPERA_OPSYS=NetBSD ${MAKE} distinfo 1>&2; \
                ${GREP} opera distinfo; \
        _OPERA_OPSYS=FreeBSD ${MAKE} distinfo 1>&2; \