Re: CVS commit: pkgsrc/www/opera

["OBATA Akio" <obache%netbsd.org@localhost>]

On Thu, 08 Mar 2012 14:14:48 +0900, David Holland 
<dholland-pkgchanges%netbsd.org@localhost> wrote:

> On Fri, Mar 02, 2012 at 12:00:14PM +0000, Aleksej Saushev wrote:
>  > Modified Files:
>  >   pkgsrc/www/opera: DESCR Makefile distinfo
>  > Added Files:
>  >   pkgsrc/www/opera: PLIST
>  > Removed Files:
>  >   pkgsrc/www/opera/files: opera.sh
>  >
>  > Log Message:
>  > Update to Opera 11.61
>
> When I "built" this it failed as follows:
>
> ERROR: ************************************************************
> ERROR: The following files are in /home/pkgbulk/b/pkg but not in the PLIST:
> ERROR: 
> /home/pkgbulk/c/obj/www/opera/work/.destdir/home/pkgbulk/b/pkg/lib/opera/operapluginwrapper-ia32-linux
> ERROR: 
> /home/pkgbulk/c/obj/www/opera/work/.destdir/home/pkgbulk/b/pkg/lib/opera/operapluginwrapper-native
> *** Error code 1

(I've removed the trick when updated wip/opera to 10.61...I cannot remember 
why...)

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/www/opera/Makefile,v
retrieving revision 1.92
diff -u -r1.92 Makefile
--- Makefile    2 Mar 2012 12:00:14 -0000       1.92
+++ Makefile    8 Mar 2012 08:14:10 -0000
@@ -34,6 +34,8 @@
 OPERA_PKG_VERSION=     11.61
 OPERA_PKG_VERSION_DIR= 1161

+PLIST_VARS+=           ia32w
+
 .if ${EMUL_OPSYS} == "linux"
 EMUL_MODULES.linux=    base x11 fontconfig
 EMUL_REQD=             suse>=10.0
@@ -43,6 +45,9 @@
 TOOLS_CREATE+=         md5
 TOOLS_SCRIPT.md5=      /usr/bin/md5 -n "$$2" | { read sum file; echo $$sum; }
 .endif
+.if ${EMUL_ARCH} == "x86_64"
+PLIST.ia32w=           yes
+.endif

 .elif ${EMUL_OPSYS} == "freebsd"
 OPERA_ARCH.x86_64=     amd64
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/www/opera/PLIST,v
retrieving revision 1.5
diff -u -r1.5 PLIST
--- PLIST       2 Mar 2012 12:00:14 -0000       1.5
+++ PLIST       8 Mar 2012 08:14:10 -0000
@@ -9,6 +9,8 @@
 lib/opera/opera
 lib/opera/operaplugincleaner
 lib/opera/operapluginwrapper
+${PLIST.ia32w}lib/opera/operapluginwrapper-ia32-linux
+${PLIST.ia32w}lib/opera/operapluginwrapper-native
 lib/opera/plugins/README
 man/man1/opera-widget-manager.1
 man/man1/opera.1


--
OBATA Akio / obache%NetBSD.org@localhost