Rearranged Makefile and added support for SunOS-*-sparc

3 files changed, 198 insertions, 27 deletions

diff --git a/www/opera7/Makefile b/www/opera7/Makefile
index 3761cda7e68..c03d478d635 100644
--- a/www/opera7/Makefile
+++ b/www/opera7/Makefile
@@ -1,31 +1,24 @@
-# $NetBSD: Makefile,v 1.11 2003/11/14 19:55:13 jdolecek Exp $
+# $NetBSD: Makefile,v 1.12 2003/11/14 23:59:06 heinz Exp $
 
 DISTNAME=	opera-${OPERA_PKG_VERSION}
 PKGREVISION=	# empty
 CATEGORIES=	www
-MASTER_SITES=	http://www.panix.com/opera/files/linux/${OPERA_DIR}/ \
-		ftp://ftp.hu-berlin.de/pub/www/opera/linux/${OPERA_DIR}/ \
-		http://ftp.sunet.se/pub/www/clients/Opera/linux/${OPERA_DIR}/ \
-		http://ftp.opera.com/pub/opera/linux/${OPERA_DIR}/ \
-		http://opera.online.no/linux/${OPERA_DIR}/ \
-		ftp://ftp.tuwien.ac.at/infosys/browsers/opera/linux/${OPERA_DIR}/ \
-		ftp://ftp.opera.com/pub/opera/linux/
-EXTRACT_SUFX=	.rpm
-DISTFILES=	opera-${OPERA_DIST_VERSION}.${OPERA_ARCH}-${OPERA_LANG}${EXTRACT_SUFX}
+MASTER_SITES=	http://www.panix.com/opera/files/${OPERA_DIR}/ \
+		ftp://ftp.hu-berlin.de/pub/www/opera/${OPERA_DIR}/ \
+		http://ftp.sunet.se/pub/www/clients/Opera/${OPERA_DIR}/ \
+		http://opera.online.no/${OPERA_DIR}/ \
+		ftp://ftp.tuwien.ac.at/infosys/browsers/opera/${OPERA_DIR}/ \
+		ftp://ftp.opera.com/pub/opera/${OPERA_DIR}/
+DISTFILES=	opera-${OPERA_DIST_VERSION}${OPERA_ARCH}-${OPERA_LANG}${EXTRACT_SUFX}
 
 MAINTAINER=	jdolecek@NetBSD.org
 HOMEPAGE=	http://www.opera.com/
 COMMENT=	Small, fast and customizable WWW client
 
-ONLY_FOR_PLATFORM=	NetBSD-*-i386
+ONLY_FOR_PLATFORM=	NetBSD-*-i386 SunOS-*-sparc
 
 LICENSE=	opera-license
 
-# we need the DIST_SUBDIR=. because of the inclusion of suse's Makefile.common
-DIST_SUBDIR=	.
-EXTRACT_ONLY=	# empty
-PLIST_SRC=	${WRKDIR}/PLIST_DYNAMIC
-
 USE_BUILDLINK2=	# defined
 
 .include "../../mk/bsd.prefs.mk"
@@ -41,18 +34,54 @@ DEPENDS+=	suse_libpng>=7.3:../../emulators/${SUSE_DIR_PREFIX}_libpng
 DEPENDS+=	suse_x11>=7.3:../../emulators/${SUSE_DIR_PREFIX}_x11
 DEPENDS+=	suse_openmotif>=7.3:../../emulators/${SUSE_DIR_PREFIX}_openmotif
 
-OPERA_ARCH=		i386
-OPERA_PKG_VERSION=	7.22
+# we need the DIST_SUBDIR=. because of the inclusion of suse's Makefile.common
+DIST_SUBDIR=	.
+EXTRACT_ONLY=	# empty
+PLIST_SRC=	${WRKDIR}/PLIST_DYNAMIC
+
+EXTRACT_SUFX=		.rpm
+OPERA_ARCH=		.i386
 OPERA_LANG=		en
-OPERA_DIR=		${OPERA_PKG_VERSION:S/.//g:C/beta.*//}/final/${OPERA_LANG}/${OPERA_ARCH}/static
+OPERA_PKG_VERSION=	7.22
+OPERA_DIR=		linux/${OPERA_PKG_VERSION:S/.//g:C/beta.*//}/final/${OPERA_LANG}/${OPERA_ARCH:S/.//}/static
 OPERA_DIST_VERSION=	${OPERA_PKG_VERSION:C/beta.*//}-20031103.1-static-qt
-.endif
 
 RPMFILES=	${DISTFILES}
 
+.elif (${OPSYS} == SunOS) && (${MACHINE_ARCH} == sparc)
+EXTRACT_SUFX=		.tar.bz2
+OPERA_ARCH=		-sol8-sparc-local
+OPERA_LANG=		en
+OPERA_VER_DATE=		20031103
+OPERA_PKG_VERSION=	7.22
+OPERA_DIR=		unix/solaris/${OPERA_PKG_VERSION:S/.//g}/final/${OPERA_LANG}/static
+OPERA_DIST_VERSION=	${OPERA_PKG_VERSION}-${OPERA_VER_DATE}.1-static-qt
+
+WRKSRC=			${WRKDIR}/opera-${OPERA_DIST_VERSION}${OPERA_ARCH}-${OPERA_LANG}
+
+SOLARIS_INSTALL_ETC_OPERARC?=	no
+BUILD_DEFS+=		SOLARIS_INSTALL_ETC_OPERARC
+OWN_DIRS=		${PREFIX}/lib/opera/plugins
+
+.  if !empty(SOLARIS_INSTALL_ETC_OPERARC:M[yY][eE][sS])
+CONF_FILES+=		${PREFIX}/share/opera/config/opera6rc \
+			/etc/opera6rc
+CONF_FILES+=		${PREFIX}/share/opera/config/opera6rc.fixed \
+			/etc/opera6rc.fixed
+.  endif
+
+PLIST_SUBST+=		OPERA_VER_DATE=${OPERA_VER_DATE}
+
+SUBST_CLASSES+=		opera7
+SUBST_STAGE.opera7=	post-build
+SUBST_FILES.opera7=	${WRKSRC}/man/opera.1
+SUBST_SED.opera7=	-e 's,/usr/,${PREFIX}/,g'
+.endif
+
 do-build:
+.if (${MACHINE_ARCH} == i386)
 	${SED} -e 's#@EMULDIR@#${EMULDIR}#g' ${FILESDIR}/opera.sh > \
-	  ${WRKDIR}/opera
+		${WRKDIR}/opera
 
 post-install: post-install-manpage
 	${INSTALL_SCRIPT} ${WRKDIR}/opera ${PREFIX}/bin
@@ -60,14 +89,27 @@ post-install: post-install-manpage
 .include "../../emulators/suse_linux/Makefile.application"
 
 post-install-manpage:
-# The SuSE common makefile defines "MANCOMPRESSED".
-.if defined(MANCOMPRESSED)
+  # The SuSE common makefile defines "MANCOMPRESSED".
+.  if defined(MANCOMPRESSED)
 	${GZIP_CMD} ${EMULDIR}/usr/share/man/man1/opera.1
 	${LN} -fs ../../${EMULSUBDIR}/usr/share/man/man1/opera.1.gz \
-	  ${PREFIX}/man/man1
-.else
+		${PREFIX}/man/man1
+.  else
 	${LN} -fs ../../${EMULSUBDIR}/usr/share/man/man1/opera \
-	  ${PREFIX}/man/man1
+		${PREFIX}/man/man1
+.  endif
+.endif
+
+.if (${OPSYS} == SunOS) && (${MACHINE_ARCH} == sparc)
+do-install:
+	@cd ${WRKSRC} && ${ECHO} "n" | ./install.sh --prefix=${PREFIX}
+	@${ECHO} "=> You can ignore the previous lines about '... cannot be prefixed'"
+	@${ECHO}
+
+post-install:
+	@${INSTALL_MAN} ${WRKSRC}/man/opera.1 ${PREFIX}/man/man1
+
+.include "../../mk/bsd.pkg.install.mk"
 .endif
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/opera7/PLIST.SunOS b/www/opera7/PLIST.SunOS
new file mode 100644
index 00000000000..8dfc55ef152
--- /dev/null
+++ b/www/opera7/PLIST.SunOS
@@ -0,0 +1,127 @@
+@comment $NetBSD: PLIST.SunOS,v 1.1 2003/11/14 23:59:06 heinz Exp $
+bin/opera
+lib/opera/${PKGVERSION}-${OPERA_VER_DATE}.1/m2.so
+lib/opera/${PKGVERSION}-${OPERA_VER_DATE}.1/missingsyms.so
+lib/opera/${PKGVERSION}-${OPERA_VER_DATE}.1/opera
+lib/opera/${PKGVERSION}-${OPERA_VER_DATE}.1/works
+lib/opera/plugins/libnpp.so
+lib/opera/plugins/operamotifwrapper
+lib/opera/plugins/operaplugincleaner
+man/man1/opera.1
+share/doc/opera/LICENSE
+share/doc/opera/help
+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/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/hotlist.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/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/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/ini/dialog.ini
+share/opera/ini/fastforward.ini
+share/opera/ini/minimal_toolbar.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/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/search.ini
+share/opera/locale/english.lng
+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/dir.css
+share/opera/styles/drives.css
+share/opera/styles/email.css
+share/opera/styles/history.css
+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
+@dirrm share/opera/styles/user
+@dirrm share/opera/styles
+@dirrm share/opera/skin
+@dirrm share/opera/locale/en
+@dirrm share/opera/locale
+@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/doc/opera
+@dirrm lib/opera/${PKGVERSION}-${OPERA_VER_DATE}.1
+@comment @dirrm lib/opera/plugins
+@comment @dirrm lib/opera
diff --git a/www/opera7/distinfo b/www/opera7/distinfo
index 28075518f13..8a0e58e8edc 100644
--- a/www/opera7/distinfo
+++ b/www/opera7/distinfo
@@ -1,4 +1,6 @@
-$NetBSD: distinfo,v 1.5 2003/11/14 19:45:54 jdolecek Exp $
+$NetBSD: distinfo,v 1.6 2003/11/14 23:59:06 heinz Exp $
 
 SHA1 (./opera-7.22-20031103.1-static-qt.i386-en.rpm) = a7985aad2f063e503b76604b945bb6971f452098
 Size (./opera-7.22-20031103.1-static-qt.i386-en.rpm) = 5133873 bytes
+SHA1 (opera-7.22-20031103.1-static-qt-sol8-sparc-local-en.tar.bz2) = 3a52330de60b716c163a7c9033d75c463b7abac3
+Size (opera-7.22-20031103.1-static-qt-sol8-sparc-local-en.tar.bz2) = 5845800 bytes