Sat Aug 29 13:15:54 2009 UTC ()
Add user-destdir support.


(obache)
diff -r1.88 -r1.89 pkgsrc/www/opera/Makefile
diff -r1.5 -r1.6 pkgsrc/www/opera/Makefile.rpm
cvs diff -r1.88 -r1.89 pkgsrc/www/opera/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/www/opera/Attic/Makefile 2009/05/19 08:59:37 1.88
+++ pkgsrc/www/opera/Attic/Makefile 2009/08/29 13:15:54 1.89
@@ -1,35 +1,35 @@ @@ -1,35 +1,35 @@
1# $NetBSD: Makefile,v 1.88 2009/05/19 08:59:37 wiz Exp $ 1# $NetBSD: Makefile,v 1.89 2009/08/29 13:15:54 obache Exp $
2 2
3DISTNAME= opera-${OPERA_PKG_VERSION:S/u/pl/} 3DISTNAME= opera-${OPERA_PKG_VERSION:S/u/pl/}
4CATEGORIES= www 4CATEGORIES= www
5MASTER_SITES+= http://ftp.sunet.se/pub/www/clients/Opera/${OPERA_DIR}/ 5MASTER_SITES+= http://ftp.sunet.se/pub/www/clients/Opera/${OPERA_DIR}/
6MASTER_SITES+= ftp://ftp.hu-berlin.de/pub/www/opera/${OPERA_DIR}/ 6MASTER_SITES+= ftp://ftp.hu-berlin.de/pub/www/opera/${OPERA_DIR}/
7MASTER_SITES+= ftp://ftp.task.gda.pl/pub/opera/${OPERA_DIR}/ 7MASTER_SITES+= ftp://ftp.task.gda.pl/pub/opera/${OPERA_DIR}/
8MASTER_SITES+= ftp://ftp.tuwien.ac.at/infosys/browsers/opera/${OPERA_DIR}/ 8MASTER_SITES+= ftp://ftp.tuwien.ac.at/infosys/browsers/opera/${OPERA_DIR}/
9MASTER_SITES+= ftp://opera.nsc.no/pub/nsc.no/mirrors/operasoftware/${OPERA_DIR}/ 9MASTER_SITES+= ftp://opera.nsc.no/pub/nsc.no/mirrors/operasoftware/${OPERA_DIR}/
10MASTER_SITES+= ftp://ftp.opera.com/pub/opera/${OPERA_DIR}/ 10MASTER_SITES+= ftp://ftp.opera.com/pub/opera/${OPERA_DIR}/
11DISTFILES= opera-${OPERA_DIST_VERSION}${OPERA_ARCH}${EXTRACT_SUFX} 11DISTFILES= opera-${OPERA_DIST_VERSION}${OPERA_ARCH}${EXTRACT_SUFX}
12 12
13MAINTAINER= pkgsrc-users@NetBSD.org 13MAINTAINER= pkgsrc-users@NetBSD.org
14HOMEPAGE= http://www.opera.com/ 14HOMEPAGE= http://www.opera.com/
15COMMENT= Small, fast and customizable WWW client 15COMMENT= Small, fast and customizable WWW client
16LICENSE= opera-850-license 16LICENSE= opera-850-license
17 17
18EMUL_PLATFORMS= freebsd-i386 18EMUL_PLATFORMS= freebsd-i386
19EMUL_PLATFORMS+= linux-i386 19EMUL_PLATFORMS+= linux-i386
20EMUL_PLATFORMS+= solaris-sparc 20EMUL_PLATFORMS+= solaris-sparc
21 21
22#PKG_DESTDIR_SUPPORT= user-destdir 22PKG_DESTDIR_SUPPORT= user-destdir
23 23
24.include "../../mk/bsd.prefs.mk" 24.include "../../mk/bsd.prefs.mk"
25 25
26USE_LANGUAGES= # empty 26USE_LANGUAGES= # empty
27BUILD_DIRS= # empty 27BUILD_DIRS= # empty
28 28
29OPERA_LANG= en 29OPERA_LANG= en
30OPERA_VER_DATE= 20090303 30OPERA_VER_DATE= 20090303
31OPERA_PKG_BUILD= 2480 31OPERA_PKG_BUILD= 2480
32OPERA_PKG_VERSION= 9.64 32OPERA_PKG_VERSION= 9.64
33OPERA_PKG_VERSION_DIR= 964 33OPERA_PKG_VERSION_DIR= 964
34 34
35INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 35INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
cvs diff -r1.5 -r1.6 pkgsrc/www/opera/Attic/Makefile.rpm (expand / switch to unified diff)

--- pkgsrc/www/opera/Attic/Makefile.rpm 2009/02/22 11:54:23 1.5
+++ pkgsrc/www/opera/Attic/Makefile.rpm 2009/08/29 13:15:54 1.6
@@ -1,39 +1,39 @@ @@ -1,39 +1,39 @@
1# $NetBSD: Makefile.rpm,v 1.5 2009/02/22 11:54:23 ahoka Exp $ 1# $NetBSD: Makefile.rpm,v 1.6 2009/08/29 13:15:54 obache Exp $
2 2
3# This package installs from an RPM directly into "/usr" on a Linux 3# This package installs from an RPM directly into "/usr" on a Linux
4# system, which can't be managed by pkgsrc. 4# system, which can't be managed by pkgsrc.
5# 5#
6NOT_FOR_PLATFORMS= Linux-*-* 6NOT_FOR_PLATFORMS= Linux-*-*
7 7
8EMUL_MODULES.linux= x11 fontconfig 8EMUL_MODULES.linux= x11 fontconfig
9EMUL_REQD= suse>=7.3 9EMUL_REQD= suse>=7.3
10 10
11EXTRACT_SUFX= .rpm 11EXTRACT_SUFX= .rpm
12OPERA_ARCH= .i386 12OPERA_ARCH= .i386
13OPERA_DIR= linux/${OPERA_PKG_VERSION_DIR}/final/${OPERA_LANG}/${OPERA_ARCH:S/.//}/static 13OPERA_DIR= linux/${OPERA_PKG_VERSION_DIR}/final/${OPERA_LANG}/${OPERA_ARCH:S/.//}/static
14OPERA_DIST_VERSION= ${OPERA_PKG_VERSION:C/beta.*//:C/u.*//}.gcc4-static-qt3 14OPERA_DIST_VERSION= ${OPERA_PKG_VERSION:C/beta.*//:C/u.*//}.gcc4-static-qt3
15 15
16WRKSRC= ${WRKDIR} 16WRKSRC= ${WRKDIR}
17BUILD_DIRS= # empty 17BUILD_DIRS= # empty
18 18
19EMUL_PKG_FMT= rpm 19EMUL_PKG_FMT= rpm
20RPM2PKG_PREFIX= ${PREFIX} 20RPM2PKG_PREFIX= ${DESTDIR}${PREFIX}
21RPM2PKG_SUBPREFIX= ${EMULSUBDIR} 21RPM2PKG_SUBPREFIX= ${EMULSUBDIR}
22RPM2PKG_STAGE= do-install 22RPM2PKG_STAGE= do-install
23 23
24SUBST_CLASSES+= opera-sh 24SUBST_CLASSES+= opera-sh
25SUBST_STAGE.opera-sh= post-build 25SUBST_STAGE.opera-sh= post-build
26SUBST_FILES.opera-sh= opera.sh 26SUBST_FILES.opera-sh= opera.sh
27SUBST_VARS.opera-sh= CMP EMULDIR MKDIR MV RM SED SH 27SUBST_VARS.opera-sh= CMP EMULDIR MKDIR MV RM SED SH
28 28
29post-extract: 29post-extract:
30 ${CP} ${FILESDIR}/opera.sh ${WRKSRC} 30 ${CP} ${FILESDIR}/opera.sh ${WRKSRC}
31 31
32post-install: 32post-install:
33 ${INSTALL_SCRIPT} ${WRKDIR}/opera.sh ${PREFIX}/bin/opera 33 ${INSTALL_SCRIPT} ${WRKDIR}/opera.sh ${DESTDIR}${PREFIX}/bin/opera
34 ${LN} -fs ${EMULDIR}/usr/share/man/man1/opera.1 \ 34 ${LN} -fs ${EMULDIR}/usr/share/man/man1/opera.1 \
35 ${PREFIX}/${PKGMANDIR}/man1 35 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
36 ${ECHO} "bin/opera" >> ${RPM2PKG_PLIST} 36 ${ECHO} "bin/opera" >> ${RPM2PKG_PLIST}
37 ${ECHO} "${PKGMANDIR}/man1/opera.1" >> ${RPM2PKG_PLIST} 37 ${ECHO} "${PKGMANDIR}/man1/opera.1" >> ${RPM2PKG_PLIST}
38 ${ECHO} "${PREFIX}/lib/netscape/plugins=1" >> \ 38 ${ECHO} "${PREFIX}/lib/netscape/plugins=1" >> \
39 ${PREFIX}/${EMULSUBDIR}/usr/share/opera/ini/pluginpath.ini 39 ${DESTDIR}${PREFIX}/${EMULSUBDIR}/usr/share/opera/ini/pluginpath.ini