[Midnightbsd-cvs] mports: www/opera: This should be considered a work in progress.

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Thu Jun 12 17:30:47 EDT 2008


Log Message:
-----------
This should be considered a work in progress.

Opera 9.50 for i386 only!  They don't seem to have a static version now.  The directory layout on the ftp servers changed a lot.  This port isn't yet customized for plugin paths, etc.

Modified Files:
--------------
    mports/www/opera:
        Makefile (r1.20 -> r1.21)
        distinfo (r1.13 -> r1.14)
        pkg-plist (r1.8 -> r1.9)
    mports/www/opera/files:
        patch-install.sh (r1.3 -> r1.4)

Removed Files:
-------------
    mports/www/opera/files:
        patch-config_opera6rc
        patch-ini_pluginpath.ini
        patch-install.sh2

-------------- next part --------------
Index: pkg-plist
===================================================================
RCS file: /home/cvs/mports/www/opera/pkg-plist,v
retrieving revision 1.8
retrieving revision 1.9
diff -L www/opera/pkg-plist -L www/opera/pkg-plist -u -r1.8 -r1.9
--- www/opera/pkg-plist
+++ www/opera/pkg-plist
@@ -1,126 +1,290 @@
- at comment $FreeBSD: ports/www/opera/pkg-plist,v 1.32 2007/10/24 23:36:51 marcus Exp $
+ at comment $MidnightBSD$
 bin/opera
-%%DOCSDIR%%/LICENSE
-%%DATADIR%%/bin/missingsyms.so
-%%DATADIR%%/bin/opera
-%%DATADIR%%/bin/spellcheck.so
-%%DATADIR%%/bin/works
-%%DATADIR%%/chartables.bin
-%%DATADIR%%/config/opera6rc
-%%DATADIR%%/config/opera6rc.fixed
-%%DATADIR%%/html40_entities.dtd
-%%DATADIR%%/images/opera.xpm
-%%DATADIR%%/images/opera_16x16.png
-%%DATADIR%%/images/opera_22x22.png
-%%DATADIR%%/images/opera_32x32.png
-%%DATADIR%%/images/opera_48x48.png
-%%DATADIR%%/ini/dialog.ini
-%%DATADIR%%/ini/fastforward.ini
-%%DATADIR%%/ini/filehandler.ini
-%%DATADIR%%/ini/pluginpath.ini
-%%DATADIR%%/ini/standard_keyboard.ini
-%%DATADIR%%/ini/standard_menu.ini
-%%DATADIR%%/ini/standard_mouse.ini
-%%DATADIR%%/ini/standard_toolbar.ini
-%%DATADIR%%/ini/unix_keyboard.ini
-%%DATADIR%%/ini/xmlentities.ini
-%%DATADIR%%/java/opera.jar
-%%DATADIR%%/java/opera.policy
-%%DATADIR%%/lngcode.txt
-%%DATADIR%%/locale/en/default.adr
-%%DATADIR%%/locale/en/license.txt
-%%DATADIR%%/locale/en/search.ini
-%%DATADIR%%/locale/english.lng
-%%DATADIR%%/opera6.adr
-%%DATADIR%%/plugins/libnpp.so
-%%DATADIR%%/plugins/operapluginwrapper
-%%DATADIR%%/plugins/operaplugincleaner
-%%DATADIR%%/search.ini
-%%DATADIR%%/skin/standard_skin.zip
-%%DATADIR%%/skin/windows_skin.zip
-%%DATADIR%%/styles/about.css
-%%DATADIR%%/styles/cache.css
-%%DATADIR%%/styles/certinfo.css
-%%DATADIR%%/styles/config.css
-%%DATADIR%%/styles/contentblock.css
-%%DATADIR%%/styles/dir.css
-%%DATADIR%%/styles/drives.css
-%%DATADIR%%/styles/error.css
-%%DATADIR%%/styles/history.css
-%%DATADIR%%/styles/im.css
-%%DATADIR%%/styles/image.css
-%%DATADIR%%/styles/images/bar.png
-%%DATADIR%%/styles/images/center.png
-%%DATADIR%%/styles/images/opera.png
-%%DATADIR%%/styles/images/red_center.png
-%%DATADIR%%/styles/images/red_left.png
-%%DATADIR%%/styles/images/red_right.png
-%%DATADIR%%/styles/images/root.png
-%%DATADIR%%/styles/images/top.png
-%%DATADIR%%/styles/info.css
-%%DATADIR%%/styles/mime.css
-%%DATADIR%%/styles/plugins.css
-%%DATADIR%%/styles/user/accessibility.css
-%%DATADIR%%/styles/user/altdebugger.css
-%%DATADIR%%/styles/user/classid.css
-%%DATADIR%%/styles/user/contrastbw.css
-%%DATADIR%%/styles/user/contrastwb.css
-%%DATADIR%%/styles/user/disablebreaks.css
-%%DATADIR%%/styles/user/disablefloats.css
-%%DATADIR%%/styles/user/disableforms.css
-%%DATADIR%%/styles/user/disablepositioning.css
-%%DATADIR%%/styles/user/disabletables.css
-%%DATADIR%%/styles/user/outline.css
-%%DATADIR%%/styles/user/structureblock.css
-%%DATADIR%%/styles/user/structureinline.css
-%%DATADIR%%/styles/user/structuretables.css
-%%DATADIR%%/styles/user/tablelayout.css
-%%DATADIR%%/styles/user/toc.css
-%%DATADIR%%/styles/warning.css
-%%DATADIR%%/styles/wml.css
-%%DATADIR%%/svg-sebd.dat
-%%DATADIR%%/svg-se.dat
-%%DATADIR%%/svg-sabd.dat
-%%DATADIR%%/svg-sa.dat
-%%DATADIR%%/svg-mobd.dat
-%%DATADIR%%/svg-mo.dat
-%%GNOME%%share/apps/Internet/opera.desktop
-%%GNOME%%share/pixmaps/opera.xpm
- at dirrm %%DATADIR%%/styles/user
- at dirrm %%DATADIR%%/styles/images
- at dirrm %%DATADIR%%/styles
- at dirrm %%DATADIR%%/skin
- at dirrm %%DATADIR%%/plugins
- at dirrm %%DATADIR%%/locale/en
- at dirrm %%DATADIR%%/locale
- at dirrm %%DATADIR%%/java
- at dirrm %%DATADIR%%/ini
- at dirrm %%DATADIR%%/images
- at dirrm %%DATADIR%%/config
- at dirrm %%DATADIR%%/bin
- at dirrm %%DATADIR%%
- at dirrm %%DOCSDIR%%
-
- at cwd %%LOCALBASE%%
-%%KDE%%share/applnk/Internet/opera.desktop
+share/doc/opera/LICENSE
+share/doc/opera/LGPL
+share/opera/bin/missingsyms.so
+share/opera/bin/spellcheck.so
+share/opera/bin/opera
+share/opera/bin/works
+share/opera/bin/operaplugincleaner
+share/opera/bin/operapluginwrapper
+share/opera/locale/ka/georgian.lng
+share/opera/locale/ka/license.txt
+share/opera/locale/ka/search.ini
+share/opera/locale/ka/opera6.adr
+share/opera/locale/sv/svenska.lng
+share/opera/locale/sv/license.txt
+share/opera/locale/sv/search.ini
+share/opera/locale/sv/opera6.adr
+share/opera/locale/fr/francais.lng
+share/opera/locale/fr/license.txt
+share/opera/locale/fr/search.ini
+share/opera/locale/fr/opera6.adr
+share/opera/locale/zh-tw/chinese.lng
+share/opera/locale/zh-tw/license.txt
+share/opera/locale/zh-tw/search.ini
+share/opera/locale/zh-tw/opera6.adr
+share/opera/locale/bg/bulgarian.lng
+share/opera/locale/bg/license.txt
+share/opera/locale/bg/search.ini
+share/opera/locale/bg/opera6.adr
+share/opera/locale/it/italiano.lng
+share/opera/locale/it/license.txt
+share/opera/locale/it/search.ini
+share/opera/locale/it/opera6.adr
+share/opera/locale/fr-CA/francais-canadien.lng
+share/opera/locale/fr-CA/license.txt
+share/opera/locale/fr-CA/search.ini
+share/opera/locale/fr-CA/opera6.adr
+share/opera/locale/be/byelorussian.lng
+share/opera/locale/be/license.txt
+share/opera/locale/be/search.ini
+share/opera/locale/be/opera6.adr
+share/opera/locale/fy/frisian.lng
+share/opera/locale/fy/license.txt
+share/opera/locale/fy/search.ini
+share/opera/locale/fy/opera6.adr
+share/opera/locale/pt-BR/brazilportuguese.lng
+share/opera/locale/pt-BR/license.txt
+share/opera/locale/pt-BR/search.ini
+share/opera/locale/pt-BR/opera6.adr
+share/opera/locale/pl/polski.lng
+share/opera/locale/pl/license.txt
+share/opera/locale/pl/search.ini
+share/opera/locale/pl/opera6.adr
+share/opera/locale/de/deutsch.lng
+share/opera/locale/de/license.txt
+share/opera/locale/de/search.ini
+share/opera/locale/de/opera6.adr
+share/opera/locale/es-ES/espanol-espana.lng
+share/opera/locale/es-ES/license.txt
+share/opera/locale/es-ES/search.ini
+share/opera/locale/es-ES/opera6.adr
+share/opera/locale/nb/norsk.lng
+share/opera/locale/nb/license.txt
+share/opera/locale/nb/search.ini
+share/opera/locale/nb/opera6.adr
+share/opera/locale/hi/hindi.lng
+share/opera/locale/hi/license.txt
+share/opera/locale/hi/search.ini
+share/opera/locale/hi/opera6.adr
+share/opera/locale/hu/hungarian.lng
+share/opera/locale/hu/license.txt
+share/opera/locale/hu/search.ini
+share/opera/locale/hu/opera6.adr
+share/opera/locale/nn/nynorsk.lng
+share/opera/locale/nn/license.txt
+share/opera/locale/nn/search.ini
+share/opera/locale/nn/opera6.adr
+share/opera/locale/lt/lithuanian.lng
+share/opera/locale/lt/license.txt
+share/opera/locale/lt/search.ini
+share/opera/locale/lt/opera6.adr
+share/opera/locale/mk/macedonian.lng
+share/opera/locale/mk/license.txt
+share/opera/locale/mk/search.ini
+share/opera/locale/mk/opera6.adr
+share/opera/locale/en/license.txt
+share/opera/locale/en/search.ini
+share/opera/locale/en/opera6.adr
+share/opera/locale/ja/japanese.lng
+share/opera/locale/ja/license.txt
+share/opera/locale/ja/search.ini
+share/opera/locale/ja/opera6.adr
+share/opera/locale/zh-cn/chinese_simp.lng
+share/opera/locale/zh-cn/license.txt
+share/opera/locale/zh-cn/search.ini
+share/opera/locale/zh-cn/opera6.adr
+share/opera/locale/hr/croatian.lng
+share/opera/locale/hr/license.txt
+share/opera/locale/hr/search.ini
+share/opera/locale/hr/opera6.adr
+share/opera/locale/es-LA/espanol-america_latina.lng
+share/opera/locale/es-LA/license.txt
+share/opera/locale/es-LA/search.ini
+share/opera/locale/es-LA/opera6.adr
+share/opera/locale/el/greek.lng
+share/opera/locale/el/license.txt
+share/opera/locale/el/search.ini
+share/opera/locale/el/opera6.adr
+share/opera/locale/tr/turkce.lng
+share/opera/locale/tr/license.txt
+share/opera/locale/tr/search.ini
+share/opera/locale/tr/opera6.adr
+share/opera/locale/da/dansk.lng
+share/opera/locale/da/license.txt
+share/opera/locale/da/search.ini
+share/opera/locale/da/opera6.adr
+share/opera/locale/fi/suomi.lng
+share/opera/locale/fi/license.txt
+share/opera/locale/fi/search.ini
+share/opera/locale/fi/opera6.adr
+share/opera/locale/ko/korean.lng
+share/opera/locale/ko/license.txt
+share/opera/locale/ko/search.ini
+share/opera/locale/ko/opera6.adr
+share/opera/locale/pt/portuguese.lng
+share/opera/locale/pt/license.txt
+share/opera/locale/pt/search.ini
+share/opera/locale/pt/opera6.adr
+share/opera/locale/ru/russian.lng
+share/opera/locale/ru/license.txt
+share/opera/locale/ru/search.ini
+share/opera/locale/ru/opera6.adr
+share/opera/locale/en-GB/british.lng
+share/opera/locale/en-GB/license.txt
+share/opera/locale/en-GB/search.ini
+share/opera/locale/en-GB/opera6.adr
+share/opera/locale/nl/nederlands.lng
+share/opera/locale/nl/license.txt
+share/opera/locale/nl/search.ini
+share/opera/locale/nl/opera6.adr
+share/opera/locale/cs/czech.lng
+share/opera/locale/cs/license.txt
+share/opera/locale/cs/search.ini
+share/opera/locale/cs/opera6.adr
+share/opera/locale/english.lng
+share/opera/ini/dialog.ini
+share/opera/ini/fastforward.ini
+share/opera/ini/mailproviders.xml
+share/opera/ini/standard_keyboard.ini
+share/opera/ini/standard_keyboard_compat.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/ini/filehandler.ini
+share/opera/ini/font.ini
+share/opera/ini/pluginpath.ini
+share/opera/styles/user/accessibility.css
+share/opera/styles/user/altdebugger.css
+share/opera/styles/user/classid.css
+share/opera/styles/user/contrastbw.css
+share/opera/styles/user/contrastwb.css
+share/opera/styles/user/disablebreaks.css
+share/opera/styles/user/disablefloats.css
+share/opera/styles/user/disableforms.css
+share/opera/styles/user/disablepositioning.css
+share/opera/styles/user/disabletables.css
+share/opera/styles/user/outline.css
+share/opera/styles/user/structureblock.css
+share/opera/styles/user/structureinline.css
+share/opera/styles/user/structuretables.css
+share/opera/styles/user/tablelayout.css
+share/opera/styles/user/toc.css
+share/opera/styles/images/bar.png
+share/opera/styles/images/center.png
+share/opera/styles/images/customize.gif
+share/opera/styles/images/darkBox.png
+share/opera/styles/images/defaultFavicon.png
+share/opera/styles/images/flag.png
+share/opera/styles/images/folder.png
+share/opera/styles/images/opera.png
+share/opera/styles/images/red_center.png
+share/opera/styles/images/red_left.png
+share/opera/styles/images/red_right.png
+share/opera/styles/images/root.png
+share/opera/styles/images/section.png
+share/opera/styles/images/smartGroup.png
+share/opera/styles/images/top.png
+share/opera/styles/about.css
+share/opera/styles/cache.css
+share/opera/styles/certinfo.css
+share/opera/styles/config.css
+share/opera/styles/contentblock.css
+share/opera/styles/dir.css
+share/opera/styles/error.css
+share/opera/styles/history.css
+share/opera/styles/image.css
+share/opera/styles/im.css
+share/opera/styles/info.css
+share/opera/styles/mathml.css
+share/opera/styles/message.css
+share/opera/styles/mime.css
+share/opera/styles/plugins.css
+share/opera/styles/search.css
+share/opera/styles/warning.css
+share/opera/styles/wml.css
+share/opera/skin/standard_skin.zip
+share/opera/skin/windows_skin.zip
+share/opera/java/opera.jar
+share/opera/java/opera.policy
+share/opera/opera6.adr
+share/opera/search.ini
+share/opera/lngcode.txt
+share/opera/html40_entities.dtd
+share/opera/svg-mo.dat
+share/opera/svg-mobd.dat
+share/opera/svg-sa.dat
+share/opera/svg-sabd.dat
+share/opera/svg-se.dat
+share/opera/svg-sebd.dat
+share/opera/encoding.bin
+share/apps/Internet/opera.desktop
+share/pixmaps/opera.xpm
+share/applnk/Internet/opera.desktop
+share/icons/hicolor/16x16/apps/opera.png
 share/icons/hicolor/22x22/apps/opera.png
 share/icons/hicolor/32x32/apps/opera.png
 share/icons/hicolor/48x48/apps/opera.png
-share/icons/locolor/16x16/apps/opera.png
-share/icons/locolor/22x22/apps/opera.png
-share/icons/locolor/32x32/apps/opera.png
- at dirrmtry share/icons/hicolor/48x48/apps
- at dirrmtry share/icons/hicolor/48x48
- at dirrmtry share/icons/hicolor/32x32/apps
- at dirrmtry share/icons/hicolor/32x32
- at dirrmtry share/icons/hicolor/22x22/apps
- at dirrmtry share/icons/hicolor/22x22
- at dirrmtry share/icons/hicolor
- at dirrmtry share/icons/locolor/32x32/apps
- at dirrmtry share/icons/locolor/32x32
- at dirrmtry share/icons/locolor/22x22/apps
- at dirrmtry share/icons/locolor/22x22
- at dirrmtry share/icons/locolor/16x16/apps
- at dirrmtry share/icons/locolor/16x16
- at dirrmtry share/icons/locolor
- at dirrmtry share/icons
+ at dirrm share/doc/opera
+ at dirrm share/opera/bin
+ at dirrm share/opera/locale/ka
+ at dirrm share/opera/locale/sv
+ at dirrm share/opera/locale/fr
+ at dirrm share/opera/locale/zh-tw
+ at dirrm share/opera/locale/bg
+ at dirrm share/opera/locale/it
+ at dirrm share/opera/locale/fr-CA
+ at dirrm share/opera/locale/be
+ at dirrm share/opera/locale/fy
+ at dirrm share/opera/locale/pt-BR
+ at dirrm share/opera/locale/pl
+ at dirrm share/opera/locale/de
+ at dirrm share/opera/locale/es-ES
+ at dirrm share/opera/locale/nb
+ at dirrm share/opera/locale/hi
+ at dirrm share/opera/locale/hu
+ at dirrm share/opera/locale/nn
+ at dirrm share/opera/locale/lt
+ at dirrm share/opera/locale/mk
+ at dirrm share/opera/locale/en
+ at dirrm share/opera/locale/ja
+ at dirrm share/opera/locale/zh-cn
+ at dirrm share/opera/locale/hr
+ at dirrm share/opera/locale/es-LA
+ at dirrm share/opera/locale/el
+ at dirrm share/opera/locale/tr
+ at dirrm share/opera/locale/da
+ at dirrm share/opera/locale/fi
+ at dirrm share/opera/locale/ko
+ at dirrm share/opera/locale/pt
+ at dirrm share/opera/locale/ru
+ at dirrm share/opera/locale/en-GB
+ at dirrm share/opera/locale/nl
+ at dirrm share/opera/locale/cs
+ at dirrm share/opera/locale
+ at dirrm share/opera/ini
+ at dirrm share/opera/styles/user
+ at dirrm share/opera/styles/images
+ at dirrm share/opera/styles
+ at dirrm share/opera/skin
+ at dirrm share/opera/java
+ at dirrm share/opera/plugins
+ at dirrm share/opera
+ at dirrm share/apps/Internet
+ at dirrm share/apps
+ at dirrm share/pixmaps
+ at dirrm share/applnk/Internet
+ at dirrm share/applnk
+ at dirrm share/icons/hicolor/16x16/apps
+ at dirrm share/icons/hicolor/16x16
+ at dirrm share/icons/hicolor/22x22/apps
+ at dirrm share/icons/hicolor/22x22
+ at dirrm share/icons/hicolor/32x32/apps
+ at dirrm share/icons/hicolor/32x32
+ at dirrm share/icons/hicolor/48x48/apps
+ at dirrm share/icons/hicolor/48x48
+ at dirrm share/icons/hicolor
+ at dirrm share/icons
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/www/opera/Makefile,v
retrieving revision 1.20
retrieving revision 1.21
diff -L www/opera/Makefile -L www/opera/Makefile -u -r1.20 -r1.21
--- www/opera/Makefile
+++ www/opera/Makefile
@@ -7,8 +7,8 @@
 #
 
 PORTNAME=	opera
-PORTVERSION=	${OPERA_VER}.${OPERA_DATE}
-PORTREVISION=	1
+PORTVERSION=	${OPERA_VER}
+PORTREVISION=	0
 CATEGORIES=	www ipv6
 MASTER_SITES=	ftp://opera.inode.at/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/${OPERA_LIB}/ \
 		http://gd.tuwien.ac.at/infosys/browsers/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/${OPERA_LIB}/ \
@@ -25,17 +25,17 @@
 		ftp://ftp.tiscali.nl/pub/mirrors/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/${OPERA_LIB}/ \
 		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/${OPERA_LIB}/&,} \
 		ftp://ftp.opera.com/pub/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/${OPERA_LIB}/
-DISTNAME=	${PORTNAME}-${OPERA_VER}-${OPERA_DATE}.${OPERA_TYPE}-${OPERA_LIB}-qt.i386.freebsd-en
+DISTNAME=	${PORTNAME}-${OPERA_VER}-freebsd6-${OPERA_LIB}-qt3.i386
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	A blazingly fast, full-featured, standards-compliant browser
 LICENSE=	restricted
 
-OPERA_VER=	9.27
+OPERA_VER=	9.50
 OPERA_MINVER=	
 OPERA_REL=	final
 OPERA_DATE=	20080331
-OPERA_BUILD=	709
+OPERA_BUILD=	2042
 
 DATADIR=	${PREFIX}/share/${PORTNAME}
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}
@@ -43,14 +43,14 @@
 USE_BZIP2=	yes
 WANT_GNOME=	yes
 USE_XLIB=	yes
-ONLY_FOR_ARCHS=	i386 amd64
-WRKSRC=		${WRKDIR}/${DISTNAME}-${OPERA_BUILD}
+ONLY_FOR_ARCHS=	i386
+WRKSRC=		${WRKDIR}/${DISTNAME}
+WRKSRC=		${WRKDIR}/${PORTNAME}-${OPERA_VER}-${OPERA_BUILD}.freebsd6-shared-qt3.i386
 
 MAN1=		opera.1
 NO_BUILD=	yes
 
-OPTIONS=	ASPELL	"Use the aspell library for spell checking"	on \
-		SHARED	"Use a shared QT library (instead of static)" 	on
+OPTIONS=	ASPELL	"Use the aspell library for spell checking"	on
 
 .if exists(${LOCALBASE}/lib/libqt-mt.prl)
 QT_PRESENT=	on
@@ -60,22 +60,15 @@
 
 .include <bsd.port.pre.mk>
 
+
 OPERA_TYPE=	4
 
 .if !defined(WITHOUT_ASPELL)
 LIB_DEPENDS+=	aspell.16:${PORTSDIR}/textproc/aspell
 .endif
 
-.if defined(WITH_SHARED)
 OPERA_LIB=	shared
 LIB_DEPENDS+=	qt-mt:${PORTSDIR}/x11-toolkits/qt33
-.else
-OPERA_LIB=	static
-OPERA_TYPE=	1
-# The static version requires both compat4x and compat5x
- LIB_DEPENDS+=   z.2:${PORTSDIR}/misc/compat5x
- LIB_DEPENDS+=   m.2:${PORTSDIR}/misc/compat4x
-.endif
 
 .if ${HAVE_GNOME:Mgnomehier}!=""
 PLIST_SUB+=	GNOME=""
@@ -93,35 +86,28 @@
 	@${SED} -e 's|@PREFIX@|${LOCALBASE}|g' ${FILESDIR}/opera.desktop.in >${WRKDIR}/opera.desktop
 
 post-patch:
-	@${CP} ${WRKSRC}/search.ini ${WRKSRC}/locale/en
+#	@${CP} ${WRKSRC}/search.ini ${WRKSRC}/locale/en
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g ; \
 		s|%%LOCALBASE%%|${LOCALBASE}|g ; s|%%X11BASE%%|${X11BASE}|g' \
-			${WRKSRC}/install.sh ${WRKSRC}/ini/pluginpath.ini \
-			${WRKSRC}/config/opera6rc
+			${WRKSRC}/usr/local/etc/opera6rc
 	@${FIND} ${WRKSRC} -name '*.orig' -delete
 	@${FIND} ${WRKSRC} -name '*.bak' -delete
 
 do-install:
 	@(cd ${WRKSRC} && ./install.sh --prefix=${TRUE_PREFIX} --DESTDIR=${FAKE_DESTDIR})
-
-post-install:
 	@${MKDIR} ${PREFIX}/share/apps/Internet
 	@${MKDIR} ${PREFIX}/share/pixmaps
 	@${MKDIR} ${PREFIX}/share/applnk/Internet
+	@${MKDIR} ${PREFIX}/share/icons/hicolor/16x16/apps
 	@${MKDIR} ${PREFIX}/share/icons/hicolor/22x22/apps
 	@${MKDIR} ${PREFIX}/share/icons/hicolor/32x32/apps
 	@${MKDIR} ${PREFIX}/share/icons/hicolor/48x48/apps
-	@${MKDIR} ${PREFIX}/share/icons/locolor/16x16/apps
-	@${MKDIR} ${PREFIX}/share/icons/locolor/22x22/apps
-	@${MKDIR} ${PREFIX}/share/icons/locolor/32x32/apps
-	@${INSTALL_DATA} ${WRKSRC}/images/opera.xpm ${PREFIX}/share/pixmaps/opera.xpm
-	@${INSTALL_DATA} ${WRKSRC}/images/opera_16x16.png ${PREFIX}/share/icons/locolor/16x16/apps/opera.png
-	@${INSTALL_DATA} ${WRKSRC}/images/opera_22x22.png ${PREFIX}/share/icons/locolor/22x22/apps/opera.png
-	@${INSTALL_DATA} ${WRKSRC}/images/opera_22x22.png ${PREFIX}/share/icons/hicolor/22x22/apps/opera.png
-	@${INSTALL_DATA} ${WRKSRC}/images/opera_32x32.png ${PREFIX}/share/icons/locolor/32x32/apps/opera.png
-	@${INSTALL_DATA} ${WRKSRC}/images/opera_32x32.png ${PREFIX}/share/icons/hicolor/32x32/apps/opera.png
-	@${INSTALL_DATA} ${WRKSRC}/images/opera_48x48.png ${PREFIX}/share/icons/hicolor/48x48/apps/opera.png
-	${INSTALL_DATA} ${WRKDIR}/opera.desktop ${PREFIX}/share/apps/Internet/
-	${INSTALL_DATA} ${WRKDIR}/opera.desktop ${PREFIX}/share/applnk/Internet/
+	@${INSTALL_DATA} ${WRKSRC}/usr/share/pixmaps/opera.xpm ${PREFIX}/share/pixmaps/opera.xpm
+	@${INSTALL_DATA} ${WRKSRC}/usr/share/icons/hicolor/16x16/apps/opera.png ${PREFIX}/share/icons/hicolor/16x16/apps/opera.png
+	@${INSTALL_DATA} ${WRKSRC}/usr/share/icons/hicolor/22x22/apps/opera.png ${PREFIX}/share/icons/hicolor/22x22/apps/opera.png
+	@${INSTALL_DATA} ${WRKSRC}/usr/share/icons/hicolor/32x32/apps/opera.png ${PREFIX}/share/icons/hicolor/32x32/apps/opera.png
+	@${INSTALL_DATA} ${WRKSRC}/usr/share/icons/hicolor/48x48/apps/opera.png ${PREFIX}/share/icons/hicolor/48x48/apps/opera.png
+	@${INSTALL_DATA} ${WRKDIR}/opera.desktop ${PREFIX}/share/apps/Internet/
+	@${INSTALL_DATA} ${WRKDIR}/opera.desktop ${PREFIX}/share/applnk/Internet/
 
 .include <bsd.port.post.mk>
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/www/opera/distinfo,v
retrieving revision 1.13
retrieving revision 1.14
diff -L www/opera/distinfo -L www/opera/distinfo -u -r1.13 -r1.14
--- www/opera/distinfo
+++ www/opera/distinfo
@@ -1,3 +1,3 @@
-MD5 (opera-9.27-20080331.4-shared-qt.i386.freebsd-en.tar.bz2) = 155d70909a62aff585f76fa6125e0833
-SHA256 (opera-9.27-20080331.4-shared-qt.i386.freebsd-en.tar.bz2) = 07b5ba9d9f012a281f76de272b06d7cb8c74fcd3a87f82ed3bde6cb42996017a
-SIZE (opera-9.27-20080331.4-shared-qt.i386.freebsd-en.tar.bz2) = 5137208
+MD5 (opera-9.50-freebsd6-shared-qt3.i386.tar.bz2) = a36b743ead6600c04fe1a652ec1bc066
+SHA256 (opera-9.50-freebsd6-shared-qt3.i386.tar.bz2) = f08d731c286a87e70a18b5a7f2dadf673d142d1405927d4643c5bc0751a25eb9
+SIZE (opera-9.50-freebsd6-shared-qt3.i386.tar.bz2) = 7102733
--- www/opera/files/patch-install.sh2
+++ /dev/null
@@ -1,11 +0,0 @@
---- install.sh.orig	Wed Apr  4 11:36:53 2007
-+++ install.sh	Wed Apr  4 11:38:15 2007
-@@ -81,7 +81,7 @@
- 
-     os=`uname -s` || error 'uname'
-     case $os in
--	FreeBSD|NetBSD|DragonFly) os=AnyBSD;;
-+	FreeBSD|NetBSD|DragonFly|MidnightBSD) os=AnyBSD;;
- 	SunOS*) os=SunOS;;
-     esac
-     case $os in AnyBSD|OpenBSD) str_defaultprefix="/usr/local";; esac
--- www/opera/files/patch-ini_pluginpath.ini
+++ /dev/null
@@ -1,37 +0,0 @@
---- ini/pluginpath.ini.orig	Thu May 10 12:52:27 2007
-+++ ini/pluginpath.ini	Tue Jun 26 21:32:06 2007
-@@ -7,21 +7,20 @@
- 
- [Paths]
- $HOME/.opera/plugins=1
--/usr/local/share/opera/plugins=1
--/usr/local/share/opera/plugins=1
-+%%PREFIX%%/share/opera/plugins=1
-+%%LOCALBASE%%/share/opera/plugins=1
- 
- ; Adobe Acrobat
--/usr/X11R6/Acrobat7/Browser/intellinux=1
--/usr/local/Acrobat5/Browsers/intellinux=1
--/usr/local/Acrobat4/Browsers/intellinux=1
-+%%X11BASE%%/Adobe/Acrobat7.0/ENU/Browser/intellinux=1
- 
--; Realplayer
--/usr/local/lib/RealPlayer8/Plugins=1
-+; BSD Plug-in Paths
-+%%X11BASE%%/lib/browser_plugins=1
-+%%LOCALBASE%%/lib/browser_plugins=1
-+%%X11BASE%%/lib/npapi/symlinks/opera=1
-+%%LOCALBASE%%/lib/npapi/symlinks/opera=1
- 
--; Netscape Plug-in Paths
--/usr/X11R6/lib/browser_plugins=1
--$HOME/.netscape/plugins=1
--
--; FreeBSD Plug-in Paths
--/usr/local/lib/npapi/symlinks/opera
--/usr/local/lib/npapi/symlinks/linux-opera
-+; BSD Linux Plug-in Paths
-+%%LOCALBASE%%/lib/browser_linux_plugins=1
-+%%X11BASE%%/lib/browser_linux_plugins=1
-+%%LOCALBASE%%/lib/npapi/symlinks/linux-opera=1
-+%%X11BASE%%/lib/npapi/symlinks/linux-opera=1
Index: patch-install.sh
===================================================================
RCS file: /home/cvs/mports/www/opera/files/patch-install.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -L www/opera/files/patch-install.sh -L www/opera/files/patch-install.sh -u -r1.3 -r1.4
--- www/opera/files/patch-install.sh
+++ www/opera/files/patch-install.sh
@@ -1,351 +1,11 @@
---- install.sh.orig	Thu Dec 14 15:06:40 2006
-+++ install.sh	Thu Jan 25 15:56:02 2007
-@@ -924,69 +924,14 @@
- 
- if test ! \"\${OPERA_JAVA_DIR}\"; then
- 
--    PREFIXES=\"
--	/usr
--	/usr/java
--	/usr/lib
--	/usr/local
--	/opt\"
-+    PREFIXES=\"%%LOCALBASE%%\"
- 
-     for SUNJAVA in \\
--	java-1.5.0-sun-1.5.0.06 \\
--	java-1.5.0-sun-1.5.0.06/jre \\
--	java-1.5.0-sun-1.5.0.05 \\
--	java-1.5.0-sun-1.5.0.05/jre \\
--	java-1.5.0-sun-1.5.0.04 \\
--	java-1.5.0-sun-1.5.0.04/jre \\
--	jre1.5.0_06 \\
--	jdk1.5.0_06/jre \\
--	jre1.5.0_05 \\
--	jdk1.5.0_05/jre \\
--	jre1.5.0_04 \\
--	jdk1.5.0_04/jre \\
--	jre1.5.0_03 \\
--	jdk1.5.0_03/jre \\
--	jre1.5.0_02 \\
--	jdk1.5.0_02/jre \\
--	jre1.5.0_01 \\
--	jdk1.5.0_01/jre \\
--	j2re1.4.2_06 \\
--	j2sdk1.4.2_06/jre \\
--	j2re1.4.2_04 \\
--	j2sdk1.4.2_04/jre \\
--	j2re1.4.2_03 \\
--	j2sdk1.4.2_03/jre \\
--	j2re1.4.2_02 \\
--	j2sdk1.4.2_02/jre \\
--	j2re1.4.2_01 \\
--	j2sdk1.4.2_01/jre \\
--	j2re1.4.2 \\
--	j2sdk1.4.2/jre \\
--	j2re1.4.1_01 \\
--	j2re1.4.1 \\
--	SUNJava2-1.4.1 \\
--	BlackdownJava2-1.4.1/jre \\
--	j2re1.4.0_01 \\
--	j2sdk1.4.0_01/jre \\
--	j2re1.4.0 \\
--	jre1.4.0 \\
--	j2se/1.4/jre \\
--	j2se/1.3/jre \\
--	j2se/jre \\
--	jre1.3.1_15 \\
--	jre1.3.1_04 \\
--	jre1.3.1_02 \\
--	jre1.3.1_01 \\
--	j2re1.3.1 \\
--	jre1.3.1 \\
--	j2re1.3 \\
--	j2se/1.3/jre \\
--	SunJava2-1.3/jre \\
--	java2re \\
--	jdk1.2.2/jre \\
--	jdk1.2/jre \\
--	jre \\
--	java \\
-+	jdk1.3.1/jre \\
-+	jdk1.4.2/jre \\
-+	jdk1.5.0/jre \\
-+	diablo-jre1.5.0 \\
-+	diablo-jdk1.5.0/jre \\
- 	; do
- 	for PREFIX in \${PREFIXES}; do
- 	    if test -f \"\${PREFIX}/\${SUNJAVA}/lib/${wrapper_sunjava_machine}/libjava.so\"; then OPERA_JAVA_DIR=\"\${PREFIX}/\${SUNJAVA}/lib/${wrapper_sunjava_machine}\" && break; fi
-@@ -1037,11 +982,8 @@
- 
- # Acrobat Reader
- for BINDIR in \\
--    /usr/local/Acrobat[45]/bin \\
--    /usr/lib/Acrobat[45]/bin \\
--    /usr/X11R6/lib/Acrobat[45]/bin \\
--    /opt/Acrobat[45]/bin \\
--    /usr/Acrobat[45]/bin \\
-+    %%LOCALBASE%%/Acrobat4/bin \\
-+    %%LOCALBASE%%/Acrobat5/bin \\
-     ; do
-     if test -d \${BINDIR} ; then PATH=\${PATH}:\${BINDIR}; fi
- done
-@@ -1052,12 +994,13 @@
- LD_LIBRARY_PATH=\"\${OPERA_BINARYDIR}\${LD_LIBRARY_PATH:+:}\${LD_LIBRARY_PATH}\"
- export LD_LIBRARY_PATH
- 
--# Spellchecker needs to find libaspell.so.15
-+# Spellchecker needs to find libaspell.so.16
- for LIBASPELL_DIR in \\
-+    %%LOCALBASE%%/lib \\
-     /usr/local/lib \\
-     /opkg/lib \\
- ; do
--    if test -f \"\${LIBASPELL_DIR}/libaspell.so.15\"; then
-+    if test -f \"\${LIBASPELL_DIR}/libaspell.so.16\"; then
-         LD_LIBRARY_PATH=\"\${LD_LIBRARY_PATH}:\${LIBASPELL_DIR}\"
-     fi
- done"
-@@ -1167,7 +1110,7 @@
-     chop "${OPERADESTDIR}" "str_localdirshare"
-     chop "${OPERADESTDIR}" "str_localdirplugin"
- 
--    backup ${wrapper_dir}/opera opera
-+    #backup ${wrapper_dir}/opera opera
- 
-     # Executable
-     debug_msg 1 "Executable"
-@@ -1340,41 +1283,9 @@
- 
-     if test -z "${OPERADESTDIR}"
-     then
--	# System wide configuration files
--	config_dir='/usr/local/etc'
--	if can_write_to "$config_dir"
--	then
--	    echo
--	    echo "System wide configuration files:"
--	    echo "  $config_dir/opera6rc"
--	    echo "  $config_dir/opera6rc.fixed"
--	    echo " would be ignored if installed with the prefix \"$prefix\"."
--	    if con_firm "Do you want to install them in $config_dir"
--	    then
--		backup $config_dir/opera6rc opera6rc config
--		backup $config_dir/opera6rc.fixed opera6rc.fixed config
--		cp $cpv $cpf config/opera6rc $config_dir
--		cp $cpv $cpf config/opera6rc.fixed $config_dir
--	    fi
--	else
--	    echo
--	    echo "User \"${USERNAME}\" does not have write access to $config_dir"
--	    echo " System wide configuration files:"
--	    echo "  $config_dir/opera6rc"
--	    echo "  $config_dir/opera6rc.fixed"
--	    echo " were not installed."
--	fi
--
- 	# Shorcuts and Icons
- 	bool_icons=1 # install icons by default
- 
--	if test "${flag_mode}" = "--force" -o "${flag_mode}" = "--prefix="
--	then
--	    echo
--	    echo "Shortcut icons will be ignored if installed with the prefix \"$prefix\"."
--	    con_firm "Do you want to (try to) install them in default locations" || bool_icons=0
--	fi
--
- 	if test "${bool_icons}" -ne 0
- 	then xdg
- 	fi
-@@ -1585,48 +1496,43 @@
-     # This function searches for common gnome icon paths.
-     debug_msg 1 "in gnome()"
- 
--    if test -d /opt/gnome/
-+    if test -d %%LOCALBASE%%/share/gnome/;
-     then
--	# /opt/gnome share
--	if test -d /opt/gnome/share
--	then
--	    # /opt/gnome icon
--	    if test ! -d /opt/gnome/share/pixmaps/
-+	    # %%LOCALBASE%%/share/gnome icon
-+	    if test ! -d %%LOCALBASE%%/share/gnome/pixmaps/;
- 	    then
--		if test -w /opt/gnome/share
-+		if test -w %%LOCALBASE%%/share/gnome;
- 		then
--		    mkdir $mkdirv $mkdirp /opt/gnome/share/pixmaps/
--		    chmod $chmodv 755 /opt/gnome/share/pixmaps
--		    cp $cpv $share_dir/images/opera.xpm /opt/gnome/share/pixmaps/opera.xpm
-+		    mkdir $mkdirv $mkdirp %%LOCALBASE%%/share/gnome/pixmaps/
-+		    chmod $chmodv 755 %%LOCALBASE%%/share/gnome/pixmaps
-+		    cp $cpv $share_dir/images/opera.xpm %%LOCALBASE%%/share/gnome/pixmaps/opera.xpm
- 		fi
--	    elif test -w /opt/gnome/share/pixmaps
--	    then cp $cpv $share_dir/images/opera.xpm /opt/gnome/share/pixmaps/opera.xpm
-+	    elif test -w %%LOCALBASE%%/share/gnome/pixmaps
-+	    then cp $cpv $share_dir/images/opera.xpm %%LOCALBASE%%/share/gnome/pixmaps/opera.xpm
- 	    fi
--	    # end /opt/gnome icon
-+	    # end %%LOCALBASE%%/share/gnome icon
- 
--	    # /opt/gnome link
--	    if test -d /opt/gnome/share/gnome/apps/
-+	    # %%LOCALBASE%%/share/gnome link
-+	    if test -d %%LOCALBASE%%/share/gnome/apps/
- 	    then
--		if test -d /opt/gnome/share/gnome/apps/Internet/
-+		if test -d %%LOCALBASE%%/share/gnome/apps/Internet/
- 		then
--		    if test -w /opt/gnome/share/gnome/apps/Internet
--		    then generate_desktop /opt/gnome/share/gnome/apps/Internet
-+		    if test -w %%LOCALBASE%%/share/gnome/apps/Internet
-+		    then generate_desktop %%LOCALBASE%%/share/gnome/apps/Internet
- 		    fi
--		elif test -d /opt/gnome/share/gnome/apps/Networking/WWW/
-+		elif test -d %%LOCALBASE%%/share/gnome/apps/Networking/WWW/
- 		then
--		    if test -w /opt/gnome/share/gnome/apps/Networking/WWW
--		    then generate_desktop /opt/gnome/share/gnome/apps/Networking/WWW
-+		    if test -w %%LOCALBASE%%/share/gnome/apps/Networking/WWW
-+		    then generate_desktop %%LOCALBASE%%/share/gnome/apps/Networking/WWW
- 		    fi
--		elif test -w /opt/gnome/share/gnome/apps
-+		elif test -w %%LOCALBASE%%/share/gnome/apps
- 		then
--		    mkdir $mkdirv $mkdirp /opt/gnome/share/gnome/apps/Internet/
--		    chmod $chmodv 755 /opt/gnome/share/gnome/apps/Internet
--		    generate_desktop /opt/gnome/share/gnome/apps/Internet
-+		    mkdir $mkdirv $mkdirp %%LOCALBASE%%/share/gnome/apps/Internet/
-+		    chmod $chmodv 755 %%LOCALBASE%%/share/gnome/apps/Internet
-+		    generate_desktop %%LOCALBASE%%/share/gnome/apps/Internet
- 		fi
- 	    fi
--	    # end /opt/gnome link
--	fi
--	# end /opt/gnome share
-+	    # end %%LOCALBASE%%/share/gnome link
- 
-     elif test -d /usr/share/gnome/
-     then
-@@ -1674,47 +1580,34 @@
-     # This function searches for common kde2 and kde 3 icon paths.
-     debug_msg 1 "in kde()"
- 
--    if test -d /opt/kde$1/share
--    then
--	DIR_HI=/opt/kde$1/share/icons/hicolor
--	if test -d "$DIR_HI" -a -w "$DIR_HI"
--	then
--	    if test -d "$DIR_HI"/48x48/apps -a -w "$DIR_HI"/48x48/apps
--	    then cp $cpv $share_dir/images/opera_48x48.png $DIR_HI/48x48/apps/opera.png
--	    fi
--	    if test -d "$DIR_HI"/32x32/apps -a -w "$DIR_HI"/32x32/apps
--	    then cp $cpv $share_dir/images/opera_32x32.png $DIR_HI/32x32/apps/opera.png
--	    fi
--	    if test -d "$DIR_HI"/22x22/apps -a -w "$DIR_HI"/22x22/apps
--	    then cp $cpv $share_dir/images/opera_22x22.png $DIR_HI/22x22/apps/opera.png
--	    fi
--	fi
-+    DIR_HI=%%LOCALBASE%%/share/icons/hicolor
-+    mkdir -p $DIR_HI/48x48/apps
-+    mkdir -p $DIR_HI/32x32/apps
-+    mkdir -p $DIR_HI/22x22/apps
-+
-+    cp $cpv $share_dir/images/opera_48x48.png $DIR_HI/48x48/apps/opera.png
-+    cp $cpv $share_dir/images/opera_32x32.png $DIR_HI/32x32/apps/opera.png
-+    cp $cpv $share_dir/images/opera_22x22.png $DIR_HI/22x22/apps/opera.png
-+
-+    DIR_LO=%%LOCALBASE%%/share/icons/locolor
-+    mkdir -p $DIR_LO/32x32/apps
-+    mkdir -p $DIR_LO/22x22/apps
-+    mkdir -p $DIR_LO/16x16/apps
-+
-+    cp $cpv $share_dir/images/opera_32x32.png $DIR_LO/32x32/apps/opera.png
-+    cp $cpv $share_dir/images/opera_22x22.png $DIR_LO/22x22/apps/opera.png
-+    cp $cpv $share_dir/images/opera_16x16.png $DIR_LO/16x16/apps/opera.png
- 
--	DIR_LO=/opt/kde$1/share/icons/locolor
--	if test -d $DIR_LO -a -w $DIR_LO
-+    if test -d %%LOCALBASE%%/share/applnk/
- 	then
--	    if test -d $DIR_LO/32x32/apps -a -w $DIR_LO/32x32/apps
--	    then cp $cpv $share_dir/images/opera_32x32.png $DIR_LO/32x32/apps/opera.png
--	    fi
--	    if test -d $DIR_LO/22x22/apps -a -w $DIR_LO/22x22/apps
--	    then cp $cpv $share_dir/images/opera_22x22.png $DIR_LO/22x22/apps/opera.png
--	    fi
--	    if test -d $DIR_LO/16x16/apps -a -w $DIR_LO/16x16/apps
--	    then cp $cpv $share_dir/images/opera_16x16.png $DIR_LO/16x16/apps/opera.png
--	    fi
--	fi
--
--	if test -d /opt/kde$1/share/applnk/
--	then
--	    if test ! -d /opt/kde$1/share/applnk/Internet/ -a -w /opt/kde$1/share/applnk
-+	    if test ! -d %%LOCALBASE%%/share/applnk/Internet/ -a -w %%LOCALBASE%%/share/applnk
- 	    then
--		mkdir $mkdirv $mkdirp /opt/kde$1/share/applnk/Internet/
--		chmod $chmodv 755 /opt/kde$1/share/applnk/Internet
-+		mkdir $mkdirv $mkdirp %%LOCALBASE%%/share/applnk/Internet/
-+		chmod $chmodv 755 %%LOCALBASE%%/share/applnk/Internet
- 	    fi
--	    if test -w /opt/kde$1/share/applnk/Internet
--	    then generate_desktop /opt/kde$1/share/applnk/Internet $1
-+	    if test -w %%LOCALBASE%%/share/applnk/Internet
-+	    then generate_desktop %%LOCALBASE%%/share/applnk/Internet $1
- 	    fi
--	fi
-     fi
- 
-     if test -d /usr/share/applnk/Networking
-@@ -1796,45 +1689,9 @@
- }
- 
- xdg()
--{   # http://standards.freedesktop.org
--    UDD=''
--    for BIN_DIR in `pathdirs`; do
--	test -x ${BIN_DIR}/update-desktop-database || continue
--	UDD=${BIN_DIR}/update-desktop-database; break
--    done
--
--    # http://standards.freedesktop.org/icon-theme-spec/icon-theme-spec-latest.html
--    if test "$UDD"; then
--	for ICON_DIR in `echo ${XDG_DATA_DIRS}:/usr/local/share:/usr/share|tr : '\012'|sed -e '/^$/d;s:$:/icons/hicolor:'` /usr/share/pixmaps/hicolor; do
--	    test -d ${ICON_DIR} && break
--	done
--
--	if   test ! -d ${ICON_DIR}; then echo "Could not find icon installation directory, icons not installed." >&2
--	elif test ! -w ${ICON_DIR}; then echo "Directory \"${ICON_DIR}\" not writable by user \"${USER}\", icons not installed." >&2
--	else
--	    for RESOLUTION in 48x48 32x32 22x22; do
--		TO_DIR=${ICON_DIR}/${RESOLUTION}/apps
--		test -d ${TO_DIR} && test -w ${TO_DIR} && cp $cpv $share_dir/images/opera_${RESOLUTION}.png ${TO_DIR}/opera.png
--	    done
--	fi
--
--	for SHORTCUT_DIR in ${XDG_DATA_HOME}/applications /usr/local/share/applications /usr/share/applications; do
--	    test -d ${SHORTCUT_DIR} && break;
--	done
--
--	if   test ! -d ${SHORTCUT_DIR}; then echo "Could not find shortcut installation directory, desktop entry not installed." >&2; return
--	elif test ! -w ${SHORTCUT_DIR}; then echo "Directory \"${SHORTCUT_DIR}\" not writable by user \"${USER}\", desktop entry not installed." >&2; return
--	fi
--	generate_desktop ${SHORTCUT_DIR} xdg
--	${UDD}
--    else
--	icons
--	gnome
--	kde 3
--	kde 2
--	kde1
--	mandrake
--    fi
-+{
-+    gnome
-+    kde 3
- }
- 
- echo test | sed -n -e 's/test//' || error 'sed'
+--- install.sh.orig	Thu Jun 12 17:07:59 2008
++++ install.sh	Thu Jun 12 17:08:16 2008
+@@ -97,7 +97,7 @@
+ 
+     os=`uname -s` || error 'uname'
+     case $os in
+-	FreeBSD|NetBSD|DragonFly) os=AnyBSD;;
++	FreeBSD|NetBSD|DragonFly|MidnightBSD) os=AnyBSD;;
+ 	SunOS*) os=SunOS;;
+     esac
+     case $os in SunOS|AnyBSD|OpenBSD) str_defaultprefix="/usr/local";; esac
--- www/opera/files/patch-config_opera6rc
+++ /dev/null
@@ -1,9 +0,0 @@
---- config/opera6rc.orig	Mon Jul 19 23:00:06 2004
-+++ config/opera6rc	Mon Jul 19 23:00:16 2004
-@@ -1,5 +1,5 @@
- ; Put any default settings here that are overridable by users
- 
- [User Prefs]
--Language Files Directory=/usr/share/opera/locale/
-+Language Files Directory=%%PREFIX%%/share/opera/locale/
- 


More information about the Midnightbsd-cvs mailing list