- fix WRKSRC value for solaris

- fix badly out of date PLIST for solaris
- add missing response of 'n' to the install.sh script to avoid installing
  some xpm's in /usr/share/....
Opera seems to build, install, package, and run ok on solaris 9/sparc now.

2 files changed, 33 insertions, 73 deletions

diff --git a/www/opera/Makefile b/www/opera/Makefile
index 50d40eff1b1..3c99ddac489 100644
--- a/www/opera/Makefile
+++ b/www/opera/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.59 2006/09/30 18:37:09 jdolecek Exp $
+# $NetBSD: Makefile,v 1.60 2006/10/23 11:01:54 dmcmahill Exp $
 
 DISTNAME=		opera-${OPERA_PKG_VERSION:S/u/pl/}
 CATEGORIES=		www
@@ -64,7 +64,7 @@ OPERA_ARCH=		-sol8-sparc
 OPERA_DIR=		unix/solaris/${OPERA_PKG_VERSION_DIR}/final/${OPERA_LANG}/${_OPERA_MACHINE_ARCH}/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}
+WRKSRC=			${WRKDIR}/opera-${OPERA_DIST_VERSION}${OPERA_ARCH}-${OPERA_LANG}-434
 
 BUILD_DEFS+=		INSTALL_ETC_OPERARC
 INSTALL_ETC_OPERARC?=	no
@@ -122,7 +122,9 @@ post-install-manpage:
 
 .if (((${_OPERA_OPSYS} == SunOS) && (${_OPERA_MACHINE_ARCH} == sparc)) || (${_OPERA_OPSYS} == FreeBSD))
 do-install:
-	@cd ${WRKSRC} && ${ECHO} "n" | ./install.sh --prefix=${PREFIX:Q}
+	@${ECHO} "n" > ${WRKSRC}/inst.cmd
+	@${ECHO} "n" >> ${WRKSRC}/inst.cmd
+	@cd ${WRKSRC} && ${CAT} ${WRKSRC}/inst.cmd | ./install.sh --prefix=${PREFIX:Q}
 	@${ECHO} "=> You can ignore any previous lines about opera6rc"
 	@${ECHO}
 
diff --git a/www/opera/PLIST.SunOS b/www/opera/PLIST.SunOS
index babd12770cc..2aca3344416 100644
--- a/www/opera/PLIST.SunOS
+++ b/www/opera/PLIST.SunOS
@@ -1,123 +1,81 @@
-@comment $NetBSD: PLIST.SunOS,v 1.3 2005/04/30 22:25:15 tron Exp $
-bin/opera
+@comment $NetBSD: PLIST.SunOS,v 1.4 2006/10/23 11:01:54 dmcmahill Exp $
 lib/opera/${OPERA_PKG_VERSION}-${OPERA_VER_DATE}.1/missingsyms.so
 lib/opera/${OPERA_PKG_VERSION}-${OPERA_VER_DATE}.1/opera
 lib/opera/${OPERA_PKG_VERSION}-${OPERA_VER_DATE}.1/spellcheck.so
 lib/opera/${OPERA_PKG_VERSION}-${OPERA_VER_DATE}.1/works
 lib/opera/plugins/libnpp.so
-lib/opera/plugins/operamotifwrapper-1
-lib/opera/plugins/operamotifwrapper-2
-lib/opera/plugins/operamotifwrapper-3
-lib/opera/plugins/operamotifwrapper-4
 lib/opera/plugins/operaplugincleaner
-man/man1/opera.1
+lib/opera/plugins/operapluginwrapper
 share/doc/opera/LICENSE
-share/doc/opera/help
+share/man/man1/opera.1
 share/opera/chartables-be.bin
 share/opera/config/opera6rc
 share/opera/config/opera6rc.fixed
-share/opera/help/advertising.html
-share/opera/help/background.png
-share/opera/help/chat.html
-share/opera/help/dialogs.html
-share/opera/help/filetypes.html
-share/opera/help/fonts.html
-share/opera/help/glossary.html
-share/opera/help/help.css
-share/opera/help/history.html
-share/opera/help/index.html
-share/opera/help/input.html
-share/opera/help/keyboard.html
-share/opera/help/languages.html
-share/opera/help/layout.html
-share/opera/help/license.txt
-share/opera/help/m2.html
-share/opera/help/mail.html
-share/opera/help/menus.html
-share/opera/help/mouse.html
-share/opera/help/multimedia.html
-share/opera/help/network.html
-share/opera/help/page.html
-share/opera/help/panels.html
-share/opera/help/paths.html
-share/opera/help/personal.html
-share/opera/help/preferences.html
-share/opera/help/privacy.html
-share/opera/help/search.html
-share/opera/help/security.html
-share/opera/help/skin.html
-share/opera/help/sounds.html
-share/opera/help/start.html
-share/opera/help/toc.html
-share/opera/help/toolbars.html
-share/opera/help/windows.html
-share/opera/hhd.ssr
-share/opera/images/background.gif
-share/opera/images/blank.gif
-share/opera/images/drive.gif
-share/opera/images/file.gif
-share/opera/images/folder.gif
-share/opera/images/link.gif
-share/opera/images/opera.xpm
+share/opera/html40_entities.dtd
 share/opera/images/opera_16x16.png
 share/opera/images/opera_22x22.png
 share/opera/images/opera_32x32.png
 share/opera/images/opera_48x48.png
-share/opera/images/operabanner.png
-share/opera/images/shared.gif
-share/opera/images/splash.png
-share/opera/images/startup1.png
-share/opera/images/startup2.png
+share/opera/images/opera.xpm
 share/opera/ini/dialog.ini
 share/opera/ini/fastforward.ini
 share/opera/ini/filehandler.ini
 share/opera/ini/pluginpath.ini
-share/opera/ini/spellcheck.ini
 share/opera/ini/standard_keyboard.ini
 share/opera/ini/standard_menu.ini
 share/opera/ini/standard_mouse.ini
 share/opera/ini/standard_toolbar.ini
 share/opera/ini/unix_keyboard.ini
+share/opera/ini/xmlentities.ini
 share/opera/java/opera.jar
 share/opera/java/opera.policy
-share/opera/jsconsole.html
 share/opera/lngcode.txt
 share/opera/locale/en/default.adr
-share/opera/locale/en/lngcode.txt
-share/opera/locale/en/search.ini
 share/opera/locale/english.lng
+share/opera/locale/en/license.txt
+share/opera/locale/en/search.ini
 share/opera/opera6.adr
 share/opera/search.ini
 share/opera/skin/standard_skin.zip
 share/opera/skin/windows_skin.zip
-share/opera/styles/OPF.css
 share/opera/styles/about.css
 share/opera/styles/cache.css
-share/opera/styles/csr.css
+share/opera/styles/certinfo.css
+share/opera/styles/config.css
+share/opera/styles/contentblock.css
 share/opera/styles/dir.css
 share/opera/styles/drives.css
-share/opera/styles/email.css
+share/opera/styles/error.css
 share/opera/styles/history.css
+share/opera/styles/image.css
+share/opera/styles/images/bar.png
+share/opera/styles/images/center.png
+share/opera/styles/images/opera.png
+share/opera/styles/images/root.png
+share/opera/styles/images/top.png
 share/opera/styles/im.css
 share/opera/styles/info.css
 share/opera/styles/mime.css
-share/opera/styles/mimehead.css
-share/opera/styles/opf.css
 share/opera/styles/plugins.css
 share/opera/styles/user/accessibility.css
 share/opera/styles/user/contrastbw.css
 share/opera/styles/user/contrastwb.css
 share/opera/styles/user/debugwithoutline.css
 share/opera/styles/user/disabletables.css
-share/opera/styles/user/hidecertainsizes.css
 share/opera/styles/user/hidenonlinkimages.css
 share/opera/styles/user/imageandlinkonly.css
 share/opera/styles/user/nostalgia.css
 share/opera/styles/user/showstructure.css
 share/opera/styles/user/textonly.css
-share/opera/styles/user/userstyle.ini
 share/opera/styles/wml.css
+share/opera/svg-mobd.dat
+share/opera/svg-mo.dat
+share/opera/svg-sabd.dat
+share/opera/svg-sa.dat
+share/opera/svg-sebd.dat
+share/opera/svg-se.dat
 @dirrm share/opera/styles/user
+@dirrm share/opera/styles/images
 @dirrm share/opera/styles
 @dirrm share/opera/skin
 @dirrm share/opera/locale/en
@@ -125,10 +83,10 @@ share/opera/styles/wml.css
 @dirrm share/opera/java
 @dirrm share/opera/ini
 @dirrm share/opera/images
-@dirrm share/opera/help
 @dirrm share/opera/config
 @dirrm share/opera
+@dirrm share/man/man1
 @dirrm share/doc/opera
+@dirrm lib/opera/plugins
 @dirrm lib/opera/${OPERA_PKG_VERSION}-${OPERA_VER_DATE}.1
-@comment @dirrm lib/opera/plugins
-@comment @dirrm lib/opera
+@dirrm lib/opera